okstra 0.77.0 → 0.78.0

package/runtime/python/okstra_ctl/codex_dispatch.py

@@ -19,6 +19,7 @@ from pathlib import Path
 from typing import Any, Mapping, Sequence
 
 from .lead_events import LeadEvent, append_lead_event
+from .wrapper_status import status_path_for_prompt
 from .paths import task_dir
 
 
@@ -206,6 +207,7 @@ def dispatch_plan(plan: DispatchPlan) -> int:
 
 def _dispatch_worker_with_retry(plan: DispatchPlan, worker: WorkerDispatch) -> int:
     for attempt in range(1, MAX_WORKER_ATTEMPTS + 1):
+        _record_worker_attempt(plan, worker, attempt, "running")
         attempt_details = _attempt_event_details(worker, attempt)
         _append_event(plan, "worker-dispatched", attempt_details)
         result = _run_worker(plan, worker)
@@ -214,7 +216,8 @@ def _dispatch_worker_with_retry(plan: DispatchPlan, worker: WorkerDispatch) -> i
             post_process = _post_process_report_writer_result(plan, worker)
             if not post_process["ok"]:
                 reason = _require_string(post_process, "reason")
-                _set_worker_status(plan.team_state_path, worker.worker_id, "failed", reason)
+                _set_worker_status(plan.team_state_path, worker.worker_id, "error", reason)
+                _record_worker_attempt(plan, worker, attempt, "error", reason)
                 details = {
                     **attempt_details,
                     "exitCode": 1,
@@ -225,6 +228,7 @@ def _dispatch_worker_with_retry(plan: DispatchPlan, worker: WorkerDispatch) -> i
                 _append_event(plan, "worker-failed", details)
                 return 1
             _set_worker_status(plan.team_state_path, worker.worker_id, "completed", "")
+            _record_worker_attempt(plan, worker, attempt, "completed")
             details = {
                 **attempt_details,
                 "missingCompletionPaths": [],
@@ -238,11 +242,19 @@ def _dispatch_worker_with_retry(plan: DispatchPlan, worker: WorkerDispatch) -> i
                 "missingCompletionPaths": [str(path) for path in missing_paths],
                 "reason": "required worker artifact was not produced",
             }
+            _record_worker_attempt(
+                plan,
+                worker,
+                attempt,
+                "error",
+                "required worker artifact was not produced",
+            )
             _append_event(plan, "worker-retry-scheduled", retry_details)
             continue
 
         reason = _failure_reason(result.returncode, missing_paths)
-        _set_worker_status(plan.team_state_path, worker.worker_id, "failed", reason)
+        _set_worker_status(plan.team_state_path, worker.worker_id, "error", reason)
+        _record_worker_attempt(plan, worker, attempt, "error", reason)
         details = {
             **attempt_details,
             "exitCode": result.returncode,
@@ -252,6 +264,62 @@ def _dispatch_worker_with_retry(plan: DispatchPlan, worker: WorkerDispatch) -> i
         _append_event(plan, "worker-failed", details)
         return result.returncode if result.returncode else 1
     return 1
+def _record_worker_attempt(
+    plan: DispatchPlan,
+    worker: WorkerDispatch,
+    attempt: int,
+    status: str,
+    reason: str = "",
+) -> None:
+    payload = _load_json_object(plan.team_state_path, "team-state")
+    dispatches = payload.setdefault("workerDispatches", [])
+    if not isinstance(dispatches, list):
+        raise DispatchError(
+            f"team-state workerDispatches must be an array: {plan.team_state_path}"
+        )
+    for record in dispatches:
+        if _matches_worker_attempt(record, worker, attempt):
+            record["status"] = status
+            record["reason"] = reason
+            _write_json(plan.team_state_path, payload)
+            return
+    dispatches.append(_worker_dispatch_record(worker, attempt, status, reason))
+    _write_json(plan.team_state_path, payload)
+
+
+def _matches_worker_attempt(
+    record: object, worker: WorkerDispatch, attempt: int
+) -> bool:
+    return (
+        isinstance(record, dict)
+        and record.get("workerId") == worker.worker_id
+        and record.get("kind") == "initial"
+        and record.get("attempt") == attempt
+    )
+
+
+def _worker_dispatch_record(
+    worker: WorkerDispatch, attempt: int, status: str, reason: str
+) -> dict[str, Any]:
+    provider = "codex" if worker.worker_id == REPORT_WRITER_WORKER_ID else worker.worker_id
+    return {
+        "workerId": worker.worker_id,
+        "role": worker.role,
+        "kind": "initial",
+        "attempt": attempt,
+        "backendType": worker.backend,
+        "provider": provider,
+        "status": status,
+        "paneId": "",
+        "promptPath": str(worker.prompt_path),
+        "resultPath": str(worker.result_path),
+        "workerResultPath": str(worker.worker_result_path),
+        "statusSidecarPath": str(status_path_for_prompt(worker.prompt_path)),
+        "degradedFrom": "",
+        "reason": reason,
+    }
+
+
 
 
 def main(argv: Sequence[str] | None = None) -> int:

package/runtime/python/okstra_ctl/context_cost.py

@@ -188,7 +188,7 @@ def _skill_assets_metric() -> dict:
     for fname in WORKER_AGENT_FILES:
         path = _installed_or_dev(
             claude_home / "agents" / fname,
-            f"agents/workers/{fname}",
+            f"runtime/agents/workers/{fname}",
         )
         entries.append((f"agent:{fname}", path))