okstra 0.71.1 → 0.72.0

package/runtime/validators/validate-run.py

@@ -334,8 +334,29 @@ def effective_run_task_type(run_manifest: dict, task_manifest: dict) -> str:
     ).strip()
 
 
+def _is_legal_concurrent_run_skip(
+    team_create: object, concurrent_run_authorized: bool
+) -> bool:
+    """prepare 가 run-manifest 에 동시-run 을 기록한 run 에서만, 렌더 게이트
+    ("Concurrent-run: no-team background")가 지시한 teamCreate skipped 형태를
+    legal 터미널 상태로 인정한다. lead 의 team-state 자기 선언만으로는(앵커
+    없이) 열리지 않는다 — 선언이 아닌 prepare-측 사실이 강제 근거다."""
+    if not concurrent_run_authorized or not isinstance(team_create, dict):
+        return False
+    return (
+        team_create.get("attempted") is False
+        and str(team_create.get("status", "")).strip() == "skipped"
+        and str(team_create.get("reason", "")).strip() == "concurrent-run"
+    )
+
+
 def validate_team_state(
-    team_state: dict, project_root: Path, contract: dict, failures: list[str]
+    team_state: dict,
+    project_root: Path,
+    contract: dict,
+    failures: list[str],
+    *,
+    concurrent_run_authorized: bool = False,
 ) -> None:
     artifacts = team_state.get("artifacts")
     if not isinstance(artifacts, dict):
@@ -377,12 +398,18 @@ def validate_team_state(
     )
     if any_dispatched:
         team_create = team_state.get("teamCreate")
-        if not isinstance(team_create, dict) or not team_create.get("attempted"):
+        if _is_legal_concurrent_run_skip(team_create, concurrent_run_authorized):
+            pass
+        elif not isinstance(team_create, dict) or not team_create.get("attempted"):
             failures.append(
                 "team-state.teamCreate.attempted must be true once any worker has "
                 "been dispatched (status in completed/timeout/error/in-progress). "
                 "Phase 3 (TeamCreate) was skipped — workers ran in-process without "
-                "the Teams split-pane surface. See agents/SKILL.md Phase 3."
+                "the Teams split-pane surface. See agents/SKILL.md Phase 3. "
+                "(The no-team concurrent-run path is legal ONLY when the "
+                "run-manifest carries prepare-recorded `concurrentRun.detected: "
+                'true` AND team-state records `teamCreate: { attempted: false, '
+                'status: "skipped", reason: "concurrent-run" }`.)'
             )
         else:
             tc_status = str(team_create.get("status", "")).strip()
@@ -1342,6 +1369,19 @@ def _data_path_for(report_path: Path) -> Path:
     return report_path.with_suffix(".data.json")
 
 
+def _load_final_report_data(report_path: Path) -> dict:
+    """Best-effort parse of the final-report data.json sibling. Returns {} when
+    absent or unparseable — those conditions are already surfaced as failures by
+    validate_final_report_data; this loader only feeds cross-field checks."""
+    data_path = _data_path_for(report_path)
+    if not data_path.is_file():
+        return {}
+    try:
+        return json.loads(data_path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return {}
+
+
 def validate_final_report_data(report_path: Path, failures: list[str]) -> None:
     """Validate the final-report data.json against the v1.0 schema.
 
@@ -1721,6 +1761,31 @@ def _validate_improvement_discovery(
             failures.append(f"improvement-discovery: {err}")
 
 
+def _validate_fix_cycle(run_manifest: dict, data: dict, failures: list[str]) -> None:
+    """Enforce: when the run-manifest carries a fixCycleId, the final-report
+    data.json MUST contain a fixCycle block whose ``cycle`` matches it.
+
+    Direction is one-way: a fixCycle block present without a run-manifest
+    fixCycleId is NOT rejected — same posture as the schema-optional block.
+    This check owns only the run→report direction (no missing/mismatched
+    block when the run is attached), never the reverse."""
+    cycle_id = (run_manifest or {}).get("fixCycleId", "")
+    if not cycle_id:
+        return
+    block = (data or {}).get("fixCycle")
+    if not isinstance(block, dict):
+        failures.append(
+            f"fix-cycle: run-manifest fixCycleId={cycle_id} but data.json has "
+            "no fixCycle block"
+        )
+        return
+    if block.get("cycle") != cycle_id:
+        failures.append(
+            f"fix-cycle: data.json fixCycle.cycle={block.get('cycle')!r} does "
+            f"not match run-manifest fixCycleId={cycle_id!r}"
+        )
+
+
 def _validate_session_conformance(
     team_state: dict,
     team_state_path: Path,
@@ -2114,13 +2179,25 @@ def main() -> int:
     if autofix_state == "accuracy-failed":
         failures.extend(autofix_messages)
     contract = extract_contract(run_manifest, task_manifest, failures)
-    validate_team_state(team_state, project_root, contract, failures)
+    concurrent_run_authorized = bool(
+        (run_manifest.get("concurrentRun") or {}).get("detected")
+    )
+    validate_team_state(
+        team_state,
+        project_root,
+        contract,
+        failures,
+        concurrent_run_authorized=concurrent_run_authorized,
+    )
     # Schema validation runs BEFORE markdown substring checks: if the
     # data.json is well-formed, the rendered markdown is guaranteed to
     # contain every required section. Substring checks below are a
     # safety net for hand-edited or pre-v1.0 reports.
     task_type = effective_run_task_type(run_manifest, task_manifest)
     validate_final_report_data(report_path, failures)
+    _validate_fix_cycle(
+        run_manifest, _load_final_report_data(report_path), failures
+    )
     validate_report(report_path, contract["required_agent_status_entries"], failures)
     validate_team_state_usage(team_state, failures)
 

package/runtime/validators/validate_session_conformance.py

@@ -271,7 +271,13 @@ def _check_progress_checkpoints(
         str(w.get("status", "")).strip() in _DISPATCHED_STATUSES for w in workers
     )
     require("phase-2-prompts", bool(workers), "before any Write to assigned prompt paths")
-    require("phase-3-team-create", any_dispatched, "immediately before the TeamCreate call")
+    require(
+        "phase-3-team-create",
+        any_dispatched,
+        "immediately before the TeamCreate call — or, in the authorized no-team "
+        "concurrent-run path, the `phase-3-team-create skipped (concurrent-run)` "
+        "variant emitted right after recording teamCreate skipped in team-state",
+    )
     _check_worker_checkpoint_lines(by_phase, analysis_workers, errors)
     require(
         "phase-5.5-convergence",

package/src/render-bundle.mjs

@@ -18,11 +18,14 @@ Usage:
     [--gemini-model <m>] [--report-writer-model <m>] \\
     [--related-tasks <list>] [--base-ref <ref>] \\
     [--clarification-response <path>] [--work-category <cat>] \\
-    [--stage <auto|N>] [--stages <csv>] [--pr-template-path <path>]
+    [--stage <auto|N>] [--stages <csv>] [--pr-template-path <path>] \\
+    [--fix-cycle <yes|no>]
 
   --stage             implementation / final-verification only
   --stages            release-handoff only: PR stage bundle csv (empty = whole-task)
   --pr-template-path  release-handoff only
+  --fix-cycle         entry phase only: record this re-entry of a done task as a
+                      bug-fix cycle (yes opens/continues the cycle)
 
 release-handoff takes NO --task-brief (briefs belong to entry phases) —
 prepare generates the run's input document from the cited verification