Complete workplan state model cleanup

api/schemas/workstream.py

@@ -2,14 +2,30 @@ import uuid
 from datetime import date, datetime
 from typing import Literal
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, field_validator
 
 from api.schemas.workstream_dependency import WorkstreamDepStub
+from api.workplan_status import normalize_workstream_status
 
-WorkstreamStatus = Literal["todo", "active", "blocked", "completed", "archived"]
+WorkstreamStatus = Literal[
+    "proposed",
+    "ready",
+    "active",
+    "blocked",
+    "backlog",
+    "finished",
+    "archived",
+]
 
 
-class WorkstreamCreate(BaseModel):
+class WorkstreamStatusMixin(BaseModel):
+    @field_validator("status", mode="before", check_fields=False)
+    @classmethod
+    def _normalise_status(cls, value):
+        return normalize_workstream_status(value)
+
+
+class WorkstreamCreate(WorkstreamStatusMixin):
     topic_id: uuid.UUID
     slug: str
     title: str
@@ -23,7 +39,7 @@ class WorkstreamCreate(BaseModel):
     repo_goal_id: uuid.UUID | None = None
 
 
-class WorkstreamUpdate(BaseModel):
+class WorkstreamUpdate(WorkstreamStatusMixin):
     title: str | None = None
     description: str | None = None
     status: WorkstreamStatus | None = None
@@ -35,7 +51,7 @@ class WorkstreamUpdate(BaseModel):
     repo_goal_id: uuid.UUID | None = None
 
 
-class WorkstreamRead(BaseModel):
+class WorkstreamRead(WorkstreamStatusMixin):
     model_config = ConfigDict(from_attributes=True)
     id: uuid.UUID
     topic_id: uuid.UUID