okstra 0.137.0 → 0.138.0

package/runtime/python/okstra_ctl/dispatch_core.py

@@ -29,7 +29,6 @@ from .dispatch_state import (
     string_value as _string_value,
     utc_now as _utc_now,
     validate_initial_prompts as _validate_initial_prompts,
-    worker_prompt_path as _worker_prompt_path,
     worker_state as _worker_state,
     worktree_path as _worktree_path,
     write_json as _write_json,
@@ -39,13 +38,15 @@ from .final_report_paths import (
     final_report_markdown_path as _final_report_markdown_path,
 )
 from .lead_events import LeadEvent, append_lead_event
+from .initial_prompt_materialization import (
+    InitialPromptMaterializationError,
+    InitialPromptMaterializationRequest,
+    InitialPromptWorkerRequest,
+    PromptDeliveryMode,
+    materialize_initial_prompts,
+)
 from .path_hints import hydrate_active_run_context
-from .worker_prompt_headers import WorkerPromptHeaderError, worker_prompt_headers
-from .report_language import resolve_report_language
-from .worker_prompt_body import analysis_prompt_body, report_writer_prompt_body
 from .worker_prompt_body import REPORT_WRITER_WORKER_ID
-from .worker_prompt_contract import PromptRecord, validate_initial_prompt_records
-from .worker_prompt_policy import resolve_prompt_plan_for_manifest
 from .worker_artifact_paths import audit_sidecar_rel
 from .wrapper_status import read_wrapper_status, status_path_for_prompt
 
@@ -116,6 +117,15 @@ class _BuildOptions:
     dispatch_kind: str
 
 
+@dataclass(frozen=True)
+class _RosterWorkerFacts:
+    worker_id: str
+    model: str
+    provider: str
+    result_path: str
+    role: str
+
+
 def build_dispatch_plan(
     *,
     project_root: Path,
@@ -148,18 +158,22 @@ def build_dispatch_plan(
         unsupported_worker_label=unsupported_worker_label,
         dispatch_kind=dispatch_kind,
     )
-    jobs = _jobs_from_file(project_root, workspace_root, jobs_file, options) if jobs_file else _jobs_from_roster(
-        project_root,
-        workspace_root,
-        manifest,
-        team_state,
-        active_context,
-        requested_workers,
-        enable_report_writer,
-        report_writer_model,
-        options,
-    )
-    _validate_initial_prompts(manifest, jobs)
+    if jobs_file:
+        jobs = _jobs_from_file(project_root, workspace_root, jobs_file, options)
+        _validate_initial_prompts(manifest, jobs)
+    else:
+        jobs = _jobs_from_roster(
+            project_root,
+            workspace_root,
+            manifest_path,
+            manifest,
+            team_state,
+            active_context,
+            requested_workers,
+            enable_report_writer,
+            report_writer_model,
+            options,
+        )
     return DispatchPlan(
         project_root=project_root,
         workspace_root=workspace_root.resolve(),
@@ -220,6 +234,7 @@ def await_dispatches(
 def _jobs_from_roster(
     project_root: Path,
     workspace_root: Path,
+    manifest_path: Path,
     manifest: Mapping[str, Any],
     team_state: Mapping[str, Any],
     active_context: Mapping[str, Any],
@@ -230,12 +245,27 @@ def _jobs_from_roster(
 ) -> list[WorkerJob]:
     selected = _select_workers(manifest, requested_workers, enable_report_writer, options)
     _mark_roster_skips(project_root, manifest, team_state, selected, requested_workers, options)
+    worker_facts, prompt_paths = _materialize_roster_prompts(
+        project_root,
+        workspace_root,
+        manifest_path,
+        manifest,
+        team_state,
+        selected,
+        report_writer_model,
+        options,
+    )
     return [
         _job_from_roster_worker(
-            project_root, workspace_root, manifest, team_state, active_context,
-            worker_id, report_writer_model, options,
+            project_root,
+            workspace_root,
+            manifest,
+            active_context,
+            fact,
+            prompt_path,
+            options,
         )
-        for worker_id in selected
+        for fact, prompt_path in zip(worker_facts, prompt_paths, strict=True)
     ]
 
 
@@ -270,50 +300,87 @@ def _job_from_roster_worker(
     project_root: Path,
     workspace_root: Path,
     manifest: Mapping[str, Any],
-    team_state: Mapping[str, Any],
     active_context: Mapping[str, Any],
-    worker_id: str,
-    report_writer_model: str,
+    fact: _RosterWorkerFacts,
+    prompt_path: Path,
     options: _BuildOptions,
 ) -> WorkerJob:
-    state = _worker_state(team_state, worker_id)
-    provider = _provider_for_worker(worker_id)
-    model = _model_for_worker(worker_id, state, report_writer_model)
-    prompt_rel = _worker_prompt_path(manifest, worker_id)
-    result_rel = _require_string(state, "resultPath")
-    prompt_path = _resolve_project_path(project_root, prompt_rel)
-    result_path = _resolve_project_path(project_root, result_rel)
-    _materialize_prompt_if_missing(
-        prompt_path=prompt_path,
-        prompt_rel=prompt_rel,
-        worker_id=worker_id,
-        result_rel=result_rel,
-        project_root=project_root,
-        manifest=manifest,
-        team_state=team_state,
-        active_context=active_context,
-        dispatch_kind=options.dispatch_kind,
-        model=model,
-        role=_string_value(state.get("role")) or "worker",
-    )
+    result_path = _resolve_project_path(project_root, fact.result_path)
     return WorkerJob(
-        worker_id=worker_id,
-        provider=provider,
+        worker_id=fact.worker_id,
+        provider=fact.provider,
         backend=options.default_backend,
         project_root=project_root,
-        model_execution_value=model,
-        wrapper_path=_resolve_wrapper(provider, workspace_root, options),
+        model_execution_value=fact.model,
+        wrapper_path=_resolve_wrapper(fact.provider, workspace_root, options),
         prompt_path=prompt_path,
-        result_path=_result_path_for_worker(worker_id, result_path, manifest, project_root),
+        result_path=_result_path_for_worker(
+            fact.worker_id, result_path, manifest, project_root
+        ),
         worker_result_path=result_path,
-        completion_paths=_completion_paths(worker_id, result_path, manifest, project_root),
+        completion_paths=_completion_paths(
+            fact.worker_id, result_path, manifest, project_root
+        ),
         worktree_path=_worktree_path(manifest, active_context),
-        role=_string_value(state.get("role")) or "worker",
+        role=fact.role,
         idle_timeout_seconds=options.idle_timeout_seconds,
         dispatch_kind=options.dispatch_kind,
     )
 
 
+def _materialize_roster_prompts(
+    project_root: Path,
+    workspace_root: Path,
+    manifest_path: Path,
+    manifest: Mapping[str, Any],
+    team_state: Mapping[str, Any],
+    selected: Sequence[str],
+    report_writer_model: str,
+    options: _BuildOptions,
+) -> tuple[tuple[_RosterWorkerFacts, ...], tuple[Path, ...]]:
+    worker_facts = tuple(
+        _roster_worker_facts(team_state, worker_id, report_writer_model)
+        for worker_id in selected
+    )
+    try:
+        prompt_paths = materialize_initial_prompts(
+            InitialPromptMaterializationRequest(
+                project_root=project_root,
+                run_manifest_path=manifest_path,
+                runtime_root=workspace_root,
+                delivery_mode=_delivery_mode(options.default_backend),
+                workers=tuple(
+                    InitialPromptWorkerRequest(fact.worker_id, fact.model)
+                    for fact in worker_facts
+                ),
+            )
+        )
+    except InitialPromptMaterializationError as exc:
+        raise DispatchError(f"{exc.reason}: {exc}") from exc
+    return worker_facts, prompt_paths
+
+
+def _roster_worker_facts(
+    team_state: Mapping[str, Any],
+    worker_id: str,
+    report_writer_model: str,
+) -> _RosterWorkerFacts:
+    state = _worker_state(team_state, worker_id)
+    return _RosterWorkerFacts(
+        worker_id=worker_id,
+        model=_model_for_worker(worker_id, state, report_writer_model),
+        provider=_provider_for_worker(worker_id),
+        result_path=_require_string(state, "resultPath"),
+        role=_string_value(state.get("role")) or "worker",
+    )
+
+
+def _delivery_mode(default_backend: str) -> PromptDeliveryMode:
+    if default_backend == BACKEND_TMUX_PANE:
+        return PromptDeliveryMode.LAZY_PATH_REFERENCE
+    return PromptDeliveryMode.EAGER_INCLUDE
+
+
 def _jobs_from_file(
     project_root: Path,
     workspace_root: Path,
@@ -728,91 +795,6 @@ def _resolve_wrapper(provider: str, workspace_root: Path, options: _BuildOptions
     raise DispatchError(f"{script} not found (searched: {', '.join(str(c) for c in candidates)})")
 
 
-def _materialize_prompt_if_missing(
-    *,
-    prompt_path: Path,
-    prompt_rel: str,
-    worker_id: str,
-    result_rel: str,
-    project_root: Path,
-    manifest: Mapping[str, Any],
-    team_state: Mapping[str, Any],
-    active_context: Mapping[str, Any],
-    dispatch_kind: str,
-    model: str,
-    role: str,
-) -> None:
-    if prompt_path.is_file():
-        return
-    prompt_path.parent.mkdir(parents=True, exist_ok=True)
-    audit_source_rel = ""
-    if worker_id == REPORT_WRITER_WORKER_ID:
-        # The report-writer's Result Path is the report data.json; its own worker
-        # result stays the markdown the audit sidecar is derived from.
-        audit_source_rel = result_rel
-        result_rel = str(_final_report_data_path(
-            Path(_require_string(manifest, "expectedReportPath"))
-        ))
-    try:
-        headers = worker_prompt_headers(
-            project_root=project_root,
-            prompt_rel=prompt_rel,
-            result_rel=result_rel,
-            audit_source_rel=audit_source_rel or None,
-            worker_id=worker_id,
-            dispatch_kind=dispatch_kind,
-            manifest=manifest,
-            active_context=active_context,
-        )
-    except WorkerPromptHeaderError as exc:
-        raise DispatchError(str(exc)) from exc
-    try:
-        plan = resolve_prompt_plan_for_manifest(
-            manifest=manifest,
-            worker_id=worker_id,
-            dispatch_kind=dispatch_kind,
-        )
-    except ValueError as exc:
-        raise DispatchError(str(exc)) from exc
-    lines = list(headers)
-    if plan.audience == "report-writer":
-        lines.extend(
-            report_writer_prompt_body(
-                manifest,
-                active_context,
-                team_state,
-                model,
-                resolve_report_language(project_root, manifest, active_context),
-            )
-        )
-    elif plan.audience in {
-        "analysis",
-        "implementation-executor",
-        "implementation-verifier",
-    }:
-        if _string_value(manifest.get("taskType")) == "implementation":
-            worktree = _worktree_path(manifest, active_context)
-            if not worktree:
-                raise DispatchError(
-                    "implementation prompt generation requires a worktree path"
-                )
-            lines.append(f"**Worktree:** {worktree}")
-        try:
-            lines.extend(
-                analysis_prompt_body(
-                    manifest,
-                    active_context,
-                    worker_id,
-                    model,
-                    role,
-                    plan,
-                )
-            )
-        except ValueError as exc:
-            raise DispatchError(str(exc)) from exc
-    prompt_path.write_text("\n".join([*lines, ""]), encoding="utf-8")
-
-
 def _provider_for_worker(worker_id: str) -> str:
     if worker_id == REPORT_WRITER_WORKER_ID:
         return "claude"
@@ -870,5 +852,3 @@ def _run_seq(manifest: Mapping[str, Any]) -> str:
     if isinstance(seqs, Mapping):
         return _string_value(seqs.get("manifests")) or "001"
     return "001"
-
-