feat(tasks): adopt canonical task statuses

api/services/lifecycle.py

@@ -3,12 +3,13 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any
 
+from api.task_status import ACTIVE_TASK_STATUSES, normalize_task_status, status_value
 from api.workplan_status import normalize_workstream_status
 
 
-TASK_STARTED_STATUS = "in_progress"
+TASK_STARTED_STATUS = "progress"
 TASK_NOT_STARTED_STATUS = "todo"
-TASK_ACTIVE_STATUSES = {"in_progress", "blocked"}
+TASK_ACTIVE_STATUSES = ACTIVE_TASK_STATUSES
 PARENT_ACTIVATION_STATUSES = {"proposed", "ready", "backlog"}
 
 
@@ -21,12 +22,6 @@ class LifecycleTransitionResult:
     parent_activated: bool = False
 
 
-def status_value(status: Any) -> str:
-    if hasattr(status, "value"):
-        status = status.value
-    return str(status or "").strip().lower()
-
-
 def should_activate_parent_for_task_start(
     *,
     previous_task_status: Any,
@@ -109,8 +104,8 @@ def transition_task_status(
         if previous_task_status is None
         else previous_task_status
     )
-    normalised_target = status_value(target_status)
-    task.status = status_coercer(normalised_target) if status_coercer else target_status
+    normalised_target = normalize_task_status(target_status)
+    task.status = status_coercer(normalised_target) if status_coercer else normalised_target
     parent_activated = activate_parent_for_task_start(
         previous_task_status=previous_status,
         new_task_status=normalised_target,

api/services/recently_on_scope.py

@@ -123,7 +123,7 @@ async def collect_domain_activity(
     ]
     attention_tasks = [
         task for task in tasks
-        if task.needs_human and _enum_value(task.status) not in {TaskStatus.done.value, TaskStatus.cancelled.value}
+        if task.needs_human and _enum_value(task.status) not in {TaskStatus.done.value, TaskStatus.cancel.value}
     ]
 
     data = {

api/services/reconciliation.py

@@ -5,6 +5,7 @@ from enum import Enum
 from typing import Any
 
 from api.services.lifecycle import status_value
+from api.task_status import CANONICAL_TASK_STATUSES
 from api.workplan_status import CLOSED_WORKSTREAM_STATUSES, normalize_workstream_status
 
 
@@ -22,7 +23,7 @@ class StateChangeClassification:
 
 
 WRITE_THROUGH_WORKSTREAM_STATUSES = {"proposed", "ready", "active", "backlog"}
-TASK_STATUSES = {"todo", "in_progress", "blocked", "done", "cancelled"}
+TASK_STATUSES = set(CANONICAL_TASK_STATUSES)
 
 
 def classify_workstream_status_change(
@@ -129,11 +130,11 @@ def classify_task_status_change(
             "status is unchanged",
             "no file update required",
         )
-    if target == "blocked" and not (blocking_reason or "").strip():
+    if target == "wait" and not (blocking_reason or "").strip():
         return StateChangeClassification(
             ReconciliationClass.HUMAN_CONFIRMATION,
-            "blocked tasks require a blocking reason",
-            "capture the blocker before writing status",
+            "waiting tasks should explain the wait condition",
+            "capture the wait reason before writing status",
         )
     if target in TASK_STATUSES:
         return StateChangeClassification(