1 files changed, 102 insertions, 0 deletions
diff --git a/makima/src/db/models.rs b/makima/src/db/models.rs
index cc30465..fcbd044 100644
--- a/makima/src/db/models.rs
+++ b/makima/src/db/models.rs
@@ -1971,6 +1971,50 @@ pub struct SupervisorState {
     pub last_activity: DateTime<Utc>,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
+    /// Current supervisor state (initializing, idle, working, waiting_for_user, etc.)
+    pub state: String,
+    /// Human-readable description of current activity
+    pub current_activity: Option<String>,
+    /// Progress percentage (0-100)
+    pub progress: i32,
+    /// Error message when state is failed or blocked
+    pub error_message: Option<String>,
+    /// Tasks spawned by this supervisor
+    #[sqlx(try_from = "Vec<Uuid>")]
+    pub spawned_task_ids: Vec<Uuid>,
+    /// Pending questions awaiting user response
+    #[sqlx(json)]
+    pub pending_questions: serde_json::Value,
+    /// Number of times this supervisor has been restored
+    pub restoration_count: i32,
+    /// Timestamp of last restoration
+    pub last_restored_at: Option<DateTime<Utc>>,
+    /// Source of last restoration (daemon_restart, task_reassignment, manual)
+    pub restoration_source: Option<String>,
+}
+
+/// Pending question structure for supervisor state
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct PendingQuestion {
+    /// Unique question ID
+    pub id: Uuid,
+    /// The question text
+    pub question: String,
+    /// Optional choices (empty for free-form)
+    #[serde(default)]
+    pub choices: Vec<String>,
+    /// Optional context
+    pub context: Option<String>,
+    /// Question type: general, phase_confirmation, contract_complete
+    #[serde(default = "default_question_type")]
+    pub question_type: String,
+    /// When the question was asked
+    pub asked_at: DateTime<Utc>,
+}
+
+fn default_question_type() -> String {
+    "general".to_string()
 }
 
 /// Request to update supervisor state
@@ -1983,6 +2027,64 @@ pub struct UpdateSupervisorStateRequest {
     pub pending_task_ids: Option<Vec<Uuid>>,
     /// Current contract phase
     pub phase: Option<String>,
+    /// Current supervisor state
+    pub state: Option<String>,
+    /// Current activity description
+    pub current_activity: Option<String>,
+    /// Progress percentage
+    pub progress: Option<i32>,
+    /// Error message
+    pub error_message: Option<String>,
+    /// Spawned task IDs
+    pub spawned_task_ids: Option<Vec<Uuid>>,
+    /// Pending questions
+    pub pending_questions: Option<serde_json::Value>,
+}
+
+/// Restoration context returned when restoring a supervisor
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct SupervisorRestorationContext {
+    /// Whether restoration was successful
+    pub success: bool,
+    /// Previous state before restoration
+    pub previous_state: SupervisorStateEnum,
+    /// Restored conversation history
+    pub conversation_history: serde_json::Value,
+    /// Pending questions that need re-delivery
+    pub pending_questions: Vec<PendingQuestion>,
+    /// Tasks still being waited on
+    pub waiting_task_ids: Vec<Uuid>,
+    /// Spawned tasks to check status of
+    pub spawned_task_ids: Vec<Uuid>,
+    /// Restoration count (incremented)
+    pub restoration_count: i32,
+    /// Context message for Claude
+    pub restoration_context_message: String,
+    /// Any warnings during restoration
+    pub warnings: Vec<String>,
+}
+
+/// Validation result for supervisor state consistency
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct StateValidationResult {
+    pub is_valid: bool,
+    pub issues: Vec<String>,
+    /// Suggested recovery action
+    pub recovery_action: StateRecoveryAction,
+}
+
+/// Action to take when state validation fails
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum StateRecoveryAction {
+    /// State is valid, proceed with restoration
+    Proceed,
+    /// Start from last checkpoint
+    UseCheckpoint,
+    /// Start fresh
+    StartFresh,
+    /// Manual intervention required
+    ManualIntervention,
 }
 
 // ============================================================================