summaryrefslogtreecommitdiff
path: root/makima/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'makima/src/server')
-rw-r--r--makima/src/server/handlers/directive_documents.rs85
-rw-r--r--makima/src/server/handlers/directives.rs54
-rw-r--r--makima/src/server/mod.rs4
-rw-r--r--makima/src/server/openapi.rs1
4 files changed, 101 insertions, 43 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()
+}
diff --git a/makima/src/server/handlers/directives.rs b/makima/src/server/handlers/directives.rs
index 6d99179..35a46a0 100644
--- a/makima/src/server/handlers/directives.rs
+++ b/makima/src/server/handlers/directives.rs
@@ -232,15 +232,51 @@ pub async fn update_directive(
);
}
- // Transition the contract to 'inactive' now that its
- // iteration is "shipped" — editing the goal again starts
- // an amendment cycle, surfaced via the New draft action.
- if let Err(e) = repository::set_directive_inactive(pool, directive.id).await {
- tracing::warn!(
- directive_id = %directive.id,
- error = %e,
- "Failed to mark directive inactive after PR creation"
- );
+ // Auto-complete the active contract — flips its status
+ // to `shipped`, records pr_url/pr_branch, and (via the
+ // contract↔directive sync in repository) transitions
+ // the directive itself to `inactive`. This removes the
+ // need for a manual "Mark complete" click; the PR
+ // raise IS the completion signal.
+ match repository::get_active_contract_id_for_directive(pool, directive.id).await {
+ Ok(Some(contract_id)) => {
+ if let Err(e) = repository::complete_contract(
+ pool,
+ contract_id,
+ Some(new_pr_url.as_str()),
+ directive.pr_branch.as_deref(),
+ )
+ .await
+ {
+ tracing::warn!(
+ directive_id = %directive.id,
+ contract_id = %contract_id,
+ error = %e,
+ "Failed to auto-complete contract after PR creation — \
+ directive status not synced; user may need to manually ship"
+ );
+ }
+ }
+ Ok(None) => {
+ // No active contract — fall back to the old
+ // behaviour (mark directive inactive). This is
+ // the legacy path for directives without
+ // contracts attached yet.
+ if let Err(e) = repository::set_directive_inactive(pool, directive.id).await {
+ tracing::warn!(
+ directive_id = %directive.id,
+ error = %e,
+ "Failed to mark directive inactive after PR creation"
+ );
+ }
+ }
+ Err(e) => {
+ tracing::warn!(
+ directive_id = %directive.id,
+ error = %e,
+ "Failed to resolve active contract for auto-complete"
+ );
+ }
}
}
}
diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs
index 604caea..a6c7787 100644
--- a/makima/src/server/mod.rs
+++ b/makima/src/server/mod.rs
@@ -257,6 +257,10 @@ pub fn make_router(state: SharedState) -> Router {
post(directive_documents::unlock_contract),
)
.route(
+ "/contracts/{document_id}/reopen",
+ post(directive_documents::reopen_contract),
+ )
+ .route(
"/contracts/{document_id}/tasks",
get(directive_documents::list_document_tasks),
)
diff --git a/makima/src/server/openapi.rs b/makima/src/server/openapi.rs
index 437285f..5bbd0fe 100644
--- a/makima/src/server/openapi.rs
+++ b/makima/src/server/openapi.rs
@@ -127,6 +127,7 @@ use crate::server::messages::{ApiError, AudioEncoding, StartMessage, StopMessage
directive_documents::pause_contract,
directive_documents::complete_contract,
directive_documents::unlock_contract,
+ directive_documents::reopen_contract,
directive_documents::list_document_tasks,
// Order endpoints
orders::list_orders,
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-20 23:30:11 +0000