okstra 0.100.0 → 0.101.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "okstra",
-  "version": "0.100.0",
+  "version": "0.101.0",
   "description": "Multi-agent cross-verification orchestrator runtime + Claude Code skills.",
   "license": "MIT",
   "author": "devonshin",

package/runtime/BUILD.json

@@ -1,5 +1,5 @@
 {
-  "package": "0.100.0",
-  "builtAt": "2026-06-23T07:02:11.224Z",
+  "package": "0.101.0",
+  "builtAt": "2026-06-23T15:50:23.280Z",
   "repoRoot": "/home/runner/work/okstra/okstra"
 }

package/runtime/python/okstra_token_usage/report.py

@@ -67,6 +67,47 @@ def _populate_execution_row(row: dict, source: dict) -> None:
         row["cliCostUsd"] = usage["cliEstimatedCostUsd"]
 
 
+def _worker_detail_label(worker: dict) -> str:
+    role = str(worker.get("role") or worker.get("workerId") or "Worker").strip()
+    agent = str(worker.get("agent") or "").strip()
+    status = str(worker.get("status") or "").strip()
+    suffix = ", ".join(value for value in (agent, status) if value)
+    return f"{role} ({suffix})" if suffix else role
+
+
+def _worker_detail_row(label: str, usage: dict) -> dict:
+    if usage.get("source") == "unavailable":
+        return {
+            "label": label,
+            "totalTokens": None,
+            "billableTokens": None,
+            "costUsd": None,
+            "cliTotalTokens": None,
+            "cliCostUsd": None,
+        }
+    return {
+        "label": label,
+        "totalTokens": usage.get("totalTokens"),
+        "billableTokens": usage.get("billableEquivalentTokens"),
+        "costUsd": usage.get("estimatedCostUsd"),
+        "cliTotalTokens": usage.get("cliTotalTokens"),
+        "cliCostUsd": usage.get("cliEstimatedCostUsd"),
+    }
+
+
+def _worker_detail_rows(team_state: dict) -> list[dict]:
+    rows = []
+    for worker in team_state.get("workers") or []:
+        if isinstance(worker, dict):
+            rows.append(
+                _worker_detail_row(_worker_detail_label(worker), worker.get("usage") or {})
+            )
+    unattributed = (team_state.get("usageSummary") or {}).get("unattributedWorkerUsage")
+    if isinstance(unattributed, dict):
+        rows.append(_worker_detail_row("Unattributed worker usage", unattributed))
+    return rows
+
+
 def populate_data_token_cells(data_path: Path, team_state: dict) -> int:
     """Mutate ``data_path`` (final-report data.json) in place: fill
     ``tokenUsage`` rows and ``executionStatus`` row token cells from
@@ -122,6 +163,7 @@ def populate_data_token_cells(data_path: Path, team_state: dict) -> int:
         "costUsd": lead_cost + worker_cost,
     })
     token_usage.setdefault("cli", {})["costUsd"] = cli_cost
+    token_usage["workerDetails"] = _worker_detail_rows(team_state)
     changes += 4
 
     # Execution Status by Agent — per-row token / cost / duration.

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

@@ -227,6 +227,11 @@
         "lead": { "$ref": "#/$defs/TokenUsageRow" },
         "worker": { "$ref": "#/$defs/TokenUsageRow" },
         "grand": { "$ref": "#/$defs/TokenUsageRow" },
+        "workerDetails": {
+          "type": "array",
+          "description": "Optional Phase 7 expansion rows rendered under the Worker subtotal.",
+          "items": { "$ref": "#/$defs/TokenUsageWorkerDetailRow" }
+        },
         "cli": {
           "type": "object",
           "additionalProperties": false,
@@ -968,6 +973,52 @@
       }
     },
 
+    "TokenUsageWorkerDetailRow": {
+      "type": "object",
+      "required": [
+        "label",
+        "totalTokens",
+        "billableTokens",
+        "costUsd",
+        "cliTotalTokens",
+        "cliCostUsd"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "label": { "type": "string", "minLength": 1 },
+        "totalTokens": {
+          "oneOf": [
+            { "type": "integer", "minimum": 0 },
+            { "type": "null" }
+          ]
+        },
+        "billableTokens": {
+          "oneOf": [
+            { "type": "integer", "minimum": 0 },
+            { "type": "null" }
+          ]
+        },
+        "costUsd": {
+          "oneOf": [
+            { "type": "number", "minimum": 0 },
+            { "type": "null" }
+          ]
+        },
+        "cliTotalTokens": {
+          "oneOf": [
+            { "type": "integer", "minimum": 0 },
+            { "type": "null" }
+          ]
+        },
+        "cliCostUsd": {
+          "oneOf": [
+            { "type": "number", "minimum": 0 },
+            { "type": "null" }
+          ]
+        }
+      }
+    },
+
     "RoundHistoryRow": {
       "type": "object",
       "required": [

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

@@ -686,6 +686,9 @@ implementation-option: {{ frontmatter.implementationOption | yaml_scalar }}
 |------|-----------|------------------------|------------|
 | {{ 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 }}` |
+{% for row in tokenUsage.workerDetails or [] -%}
+| - {{ row.label | mdcell }} | `{{ row.totalTokens | format_int }}`{% if row.cliTotalTokens is not none and row.cliTotalTokens > 0 %}<br>CLI: `{{ row.cliTotalTokens | format_int }}`{% endif %} | `{{ row.billableTokens | format_int }}` | `{{ row.costUsd | format_usd }}`{% if row.cliCostUsd is not none and row.cliCostUsd > 0 %}<br>+ CLI `{{ row.cliCostUsd | format_usd }}`{% endif %} |
+{% endfor -%}
 | {{ 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 }}` |