1 files changed, 51 insertions, 34 deletions

diff --git a/makima/src/server/handlers/directive_documents.rs b/makima/src/server/handlers/directive_documents.rs
index 23081b5..ee98a61 100644
--- a/makima/src/server/handlers/directive_documents.rs
+++ b/makima/src/server/handlers/directive_documents.rs
@@ -680,7 +680,7 @@ pub async fn reorder_contract(
 /// closure. Cuts the boilerplate from start/pause/complete/unlock down
 /// to a couple of lines each.
 async fn run_contract_transition<F, Fut>(
-    pool: sqlx::PgPool,
+    state: SharedState,
     owner_id: Uuid,
     contract_id: Uuid,
     f: F,
@@ -691,6 +691,14 @@ where
         Output = Result<Option<crate::db::models::DirectiveDocument>, RepositoryError>,
     >,
 {
+    let Some(pool) = state.db_pool.clone() else {
+        return (
+            StatusCode::SERVICE_UNAVAILABLE,
+            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
+        )
+            .into_response();
+    };
+
     match load_owned_document(&pool, owner_id, contract_id).await {
         Ok(Some(_)) => {}
         Ok(None) => {
@@ -710,7 +718,14 @@ where
     }
 
     match f(pool, contract_id).await {
-        Ok(Some(doc)) => Json(doc).into_response(),
+        Ok(Some(doc)) => {
+            // Any successful lifecycle transition may have flipped the
+            // parent directive's status (see repository helpers). Wake
+            // the reconciler so the user doesn't wait up to 15s before
+            // the orchestrator daemon spawns / stops.
+            state.kick_directive_reconciler();
+            Json(doc).into_response()
+        }
         Ok(None) => (
             StatusCode::NOT_FOUND,
             Json(ApiError::new("NOT_FOUND", "Contract not found")),
@@ -759,14 +774,7 @@ pub async fn start_contract(
     Authenticated(auth): Authenticated,
     Path(document_id): Path<Uuid>,
 ) -> impl IntoResponse {
-    let Some(pool) = state.db_pool.clone() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
-        )
-            .into_response();
-    };
-    run_contract_transition(pool, auth.owner_id, document_id, |pool, id| async move {
+    run_contract_transition(state, auth.owner_id, document_id, |pool, id| async move {
         repository::start_contract(&pool, id).await
     })
     .await
@@ -793,14 +801,7 @@ pub async fn pause_contract(
     Authenticated(auth): Authenticated,
     Path(document_id): Path<Uuid>,
 ) -> impl IntoResponse {
-    let Some(pool) = state.db_pool.clone() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
-        )
-            .into_response();
-    };
-    run_contract_transition(pool, auth.owner_id, document_id, |pool, id| async move {
+    run_contract_transition(state, auth.owner_id, document_id, |pool, id| async move {
         repository::pause_contract(&pool, id).await
     })
     .await
@@ -829,14 +830,7 @@ pub async fn complete_contract(
     Path(document_id): Path<Uuid>,
     Json(req): Json<CompleteContractRequest>,
 ) -> impl IntoResponse {
-    let Some(pool) = state.db_pool.clone() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
-        )
-            .into_response();
-    };
-    run_contract_transition(pool, auth.owner_id, document_id, move |pool, id| async move {
+    run_contract_transition(state, auth.owner_id, document_id, move |pool, id| async move {
         repository::complete_contract(&pool, id, req.pr_url.as_deref(), req.pr_branch.as_deref()).await
     })
     .await
@@ -863,16 +857,39 @@ pub async fn unlock_contract(
     Authenticated(auth): Authenticated,
     Path(document_id): Path<Uuid>,
 ) -> impl IntoResponse {
-    let Some(pool) = state.db_pool.clone() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")),
-        )
-            .into_response();
-    };
-    run_contract_transition(pool, auth.owner_id, document_id, |pool, id| async move {
+    run_contract_transition(state, auth.owner_id, document_id, |pool, id| async move {
         repository::unlock_contract(&pool, id).await
     })
     .await
     .into_response()
 }
+
+/// Reopen a shipped contract for amendment. The contract goes back to
+/// `active`, the parent directive flips to `active`, and the directive's
+/// PR linkage + orchestrator task id are cleared so the reconciler
+/// spawns a fresh planner. The planner reads
+/// `get_latest_merged_revision` and frames the new plan as a delta on
+/// top of the previously-merged PR.
+#[utoipa::path(
+    post,
+    path = "/api/v1/contracts/{document_id}/reopen",
+    params(("document_id" = Uuid, Path, description = "Contract ID")),
+    responses(
+        (status = 200, description = "Contract reopened", body = crate::db::models::DirectiveDocument),
+        (status = 400, description = "Invalid state transition", body = ApiError),
+        (status = 404, description = "Not found", body = ApiError),
+    ),
+    security(("bearer_auth" = []), ("api_key" = [])),
+    tag = "Directive Documents"
+)]
+pub async fn reopen_contract(
+    State(state): State<SharedState>,
+    Authenticated(auth): Authenticated,
+    Path(document_id): Path<Uuid>,
+) -> impl IntoResponse {
+    run_contract_transition(state, auth.owner_id, document_id, |pool, id| async move {
+        repository::reopen_contract(&pool, id).await
+    })
+    .await
+    .into_response()
+}