okstra 0.137.0 → 0.138.0

package/runtime/python/okstra_ctl/worktree.py

@@ -194,31 +194,38 @@ def preview_worktree_decision(
     )
 
 
-def preview_stage_worktree_decision(
+@dataclass
+class StageWorktreeDecision:
+    """Side-effect-free decision for one concrete implementation stage."""
+
+    status: str
+    path: str
+    branch: str = ""
+    base_ref: str = ""
+
+
+def resolve_stage_worktree_decision(
     *,
     project_id: str,
     task_group_segment: str,
     task_id_segment: str,
     work_category: str,
     stage_number: int,
-) -> "WorktreeDecision":
-    """Side-effect-free: what provision_stage_worktree WOULD do (reuse vs new).
-
-    Mirrors provision_stage_worktree's registry-reuse branch exactly. A "new"
-    decision carries no base_ref — the stage base commit is resolved later by
-    the prepare flow from the stage's dependency anchors.
-    """
+) -> StageWorktreeDecision:
+    """Resolve whether one concrete stage worktree is new or reusable."""
     safe_project = _safe_segment(project_id)
     safe_group = _safe_segment(task_group_segment)
     safe_task = _safe_segment(task_id_segment)
     existing = worktree_registry.lookup(
         safe_project, safe_group, safe_task, stage_number=stage_number)
     if existing is not None and existing.status == "active":
-        return WorktreeDecision(
-            status="reused", path=existing.worktree_path,
-            branch=existing.branch, base_ref=existing.base_ref,
+        return StageWorktreeDecision(
+            status="reused",
+            path=existing.worktree_path,
+            branch=existing.branch,
+            base_ref=existing.base_ref,
         )
-    return WorktreeDecision(
+    return StageWorktreeDecision(
         status="new",
         path=str(compute_worktree_path(
             project_id=safe_project, task_group_segment=safe_group,
@@ -923,31 +930,32 @@ def provision_stage_worktree(
     if not base_commit:
         raise RuntimeError("provision_stage_worktree requires a base_commit")
 
-    safe_project = _safe_segment(project_id)
-    safe_group = _safe_segment(task_group_segment)
-    safe_task = _safe_segment(task_id_segment)
-    worktree_path = compute_worktree_path(
-        project_id=safe_project, task_group_segment=safe_group,
-        task_id_segment=safe_task, stage_number=stage_number,
-    )
-    branch = compute_branch_name(
-        work_category=work_category, task_id_segment=safe_task,
+    decision = resolve_stage_worktree_decision(
+        project_id=project_id,
+        task_group_segment=task_group_segment,
+        task_id_segment=task_id_segment,
+        work_category=work_category,
         stage_number=stage_number,
     )
-
-    existing = worktree_registry.lookup(
-        safe_project, safe_group, safe_task, stage_number=stage_number)
-    if existing is not None and existing.status == "active":
+    if decision.status == "reused":
         return WorktreeProvision(
-            status="reused", path=existing.worktree_path,
-            branch=existing.branch, base_ref=existing.base_ref,
+            status="reused",
+            path=decision.path,
+            branch=decision.branch,
+            base_ref=decision.base_ref,
             note=(
                 f"stage {stage_number} worktree reused at "
-                f"{existing.worktree_path} on branch {existing.branch} "
-                f"(base {existing.base_ref[:12]})"
+                f"{decision.path} on branch {decision.branch} "
+                f"(base {decision.base_ref[:12]})"
             ),
         )
 
+    safe_project = _safe_segment(project_id)
+    safe_group = _safe_segment(task_group_segment)
+    safe_task = _safe_segment(task_id_segment)
+    worktree_path = Path(decision.path)
+    branch = decision.branch
+
     if worktree_path.exists():
         raise RuntimeError(
             f"stage worktree path already exists but is not in the registry: "

package/runtime/validators/lib/fixtures.sh

@@ -137,6 +137,7 @@ prompt_path.write_text(
             f"**Errors sidecar path:** {project_root}/run/worker-results/"
             f"{target_worker_id}-errors.json",
             f"Assigned worker prompt history path: {prompt_relative}",
+            "**Prompt Delivery Mode:** eager-include",
             f"- Primary analysis packet: `{analysis_packet_path}`",
             "",
             "# Initial Analysis Prompt",
@@ -230,6 +231,7 @@ for worker in team_state.get("workers", []):
             f"**Errors sidecar path:** {project_root}/run/worker-results/"
             f"{worker_id}-errors.json",
             f"Assigned worker prompt history path: {prompt_relative}",
+            "**Prompt Delivery Mode:** eager-include",
         ]
         if worker_id != "report-writer":
             prompt_lines.append(