okstra 0.173.0 → 0.175.1

package/runtime/validators/validate_session_conformance.py

@@ -50,7 +50,7 @@ from okstra_ctl.registry.host_registry import default_host_registry  # noqa: E40
 from okstra_ctl.wrapper_status import read_wrapper_status  # noqa: E402
 
 _DISPATCHED_STATUSES = {"completed", "timeout", "error", "in-progress"}
-_WORKER_DISPATCH_MODES = {"cli-wrapper", "mixed", "tmux-pane"}
+_WORKER_DISPATCH_MODES = {"cli-wrapper", "mixed"}
 _ATTEMPTED_STATUSES = {"completed", "timeout", "error"}
 _LIVENESS_AUDIT_HEARTBEAT = "audit-heartbeat"
 _LIVENESS_WRAPPER_STATUS = "wrapper-status"
@@ -146,6 +146,14 @@ _TRACKED_READ_BASENAMES = (
 @dataclass
 class SessionConformanceResult:
     errors: list[str] = field(default_factory=list)
+    # Conformance findings that are reported without failing the run: the
+    # PROGRESS narration lines. A missing checkpoint line means the run is
+    # harder to follow after the fact, not that any of its work is wrong, and
+    # by the time this validator runs the line can no longer be emitted — the
+    # session that would have written it has ended. Checks that verify a
+    # *claim* (a user confirmation the report says it obtained) stay in
+    # `errors`.
+    advisories: list[str] = field(default_factory=list)
 
     @property
     def ok(self) -> bool:
@@ -1089,26 +1097,30 @@ def _check_progress_checkpoints(
     suffix: str | None,
     report_path: Path,
     errors: list[str],
+    advisories: list[str] | None = None,
 ) -> None:
+    # The narration lines are advisory (see `SessionConformanceResult`); the
+    # user-confirmation cross-check below stays in `errors`.
+    narration = advisories if advisories is not None else errors
     by_phase: dict[str, list[tuple[str, str]]] = {}
     for ts, phase, line in evidence.progress:
         by_phase.setdefault(phase, []).append((ts, line))
 
     def require(phase: str, condition: bool, detail: str) -> None:
         if condition and phase not in by_phase:
-            errors.append(
+            narration.append(
                 f"PROGRESS checkpoint missing: `{phase}` ({detail}) — "
                 "prompts/lead/okstra-lead-contract.md 'Progress reporting (BLOCKING)'."
             )
 
     intake = by_phase.get("phase-1-intake", [])
     if not any("complete" not in line.lower() for _ts, line in intake):
-        errors.append(
+        narration.append(
             "PROGRESS checkpoint missing: `phase-1-intake reading task bundle` "
             "(start-of-Phase-1 line) — prompts/lead/okstra-lead-contract.md 'Progress reporting (BLOCKING)'."
         )
     if not any("complete" in line.lower() for _ts, line in intake):
-        errors.append(
+        narration.append(
             "PROGRESS checkpoint missing: `phase-1-intake complete` "
             "(after all intake reads) — prompts/lead/okstra-lead-contract.md 'Progress reporting (BLOCKING)'."
         )
@@ -1126,7 +1138,7 @@ def _check_progress_checkpoints(
         "`using implicit team (split-pane=<on|off>)` line, or the "
         "`skipped (concurrent-run)` variant in the concurrent-run path",
     )
-    _check_worker_checkpoint_lines(by_phase, analysis_workers, errors)
+    _check_worker_checkpoint_lines(by_phase, analysis_workers, narration)
     convergence_ran = _convergence_rounds_ran(run_dir, suffix)
     require(
         "phase-5.5-convergence",
@@ -1145,10 +1157,10 @@ def _check_progress_checkpoints(
     )
     require("phase-7-persist", True, "at the start of Phase 7")
     _check_batch_cleanup_checkpoints(
-        by_phase, convergence_ran, report_writer_dispatched, errors
+        by_phase, convergence_ran, report_writer_dispatched, narration
     )
     _check_plan_verify_cleanup_checkpoints(
-        by_phase, _plan_body_rounds_ran(run_dir, suffix), errors
+        by_phase, _plan_body_rounds_ran(run_dir, suffix), narration
     )
     _check_user_confirm_checkpoints(
         by_phase, _ids_reported_as_asked(report_path), errors
@@ -1413,7 +1425,13 @@ def validate_session_conformance(
         result.errors.append(error)
         return result
     _check_progress_checkpoints(
-        evidence, team_state, run_dir, suffix, report_path, result.errors
+        evidence,
+        team_state,
+        run_dir,
+        suffix,
+        report_path,
+        result.errors,
+        result.advisories,
     )
     _check_activity_contract(
         evidence,

package/runtime/bin/okstra-subagent-reclaim.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# okstra-subagent-reclaim.sh — SubagentStop / TaskCompleted 훅 엔트리.
-#
-# stdin(JSON)은 읽고 버린다: 어느 worker 가 끝났든 활성 run 전체의 "완료" pane 만
-# 회수하므로 session_id 매핑이 필요 없다. active.jsonl 의 각 활성 run 에 대해
-# okstra-trace-cleanup.sh --reclaim-completed 를 호출한다 — 완료 판정(pane_reclaim)이
-# cross-run 안전을 보장하므로 다른 run 의 진행 중 pane 은 건드리지 않는다.
-#
-# 훅은 세션 진행을 절대 막지 않는다: 모든 실패는 조용히 삼키고 항상 exit 0.
-set -u
-
-cat >/dev/null 2>&1 || true   # drain stdin
-
-_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
-home="${OKSTRA_HOME:-$HOME/.okstra}"
-# pane_reclaim 패키지는 repo 레이아웃(scripts/okstra_ctl)과 설치 레이아웃
-# ($OKSTRA_HOME/lib/python) 양쪽에 있을 수 있으므로 둘 다 PYTHONPATH 에 둔다.
-export PYTHONPATH="${_dir}:${home}/lib/python${PYTHONPATH:+:$PYTHONPATH}"
-
-while IFS= read -r run_dir; do
-  [[ -n "$run_dir" ]] || continue
-  "$_dir/okstra-trace-cleanup.sh" --reclaim-completed --run-dir "$run_dir" >/dev/null 2>&1 || true
-done < <(python3 -m okstra_ctl.pane_reclaim --active-dirs "$home" 2>/dev/null || true)
-
-exit 0