soryu-co/soryu - makima (#67)

* feat: soryu-co/soryu - makima: Fix contracts page scrolling overflow

* WIP: heartbeat checkpoint

* WIP: heartbeat checkpoint

* WIP: heartbeat checkpoint

* WIP: heartbeat checkpoint

* feat: soryu-co/soryu - makima: Remove contract association from orders and make directive mandatory in UI

* feat: soryu-co/soryu - makima: Add directive name to order metadata for searchability

* feat: soryu-co/soryu - makima: Change directive link in orders to use search interface

* feat: soryu-co/soryu - makima: Name directive PRs based on content not directive title

* feat: soryu-co/soryu - makima: Add orderId to step creation and auto-link orders to steps

* feat: soryu-co/soryu - makima: Add under_review status and auto-complete orders in plan flow

4 files changed, 91 insertions, 10 deletions

diff --git a/makima/src/db/models.rs b/makima/src/db/models.rs
index 33b9795..f9a34b8 100644
--- a/makima/src/db/models.rs
+++ b/makima/src/db/models.rs
@@ -2860,6 +2860,9 @@ pub struct CreateDirectiveStepRequest {
     #[serde(default)]
     pub order_index: i32,
     pub generation: Option<i32>,
+    /// Optional order ID to auto-link this step to an order.
+    #[serde(default)]
+    pub order_id: Option<Uuid>,
 }
 
 /// Request to update a directive step.
@@ -2891,7 +2894,7 @@ pub struct Order {
     pub description: Option<String>,
     /// Priority: critical, high, medium, low, none
     pub priority: String,
-    /// Status: open, in_progress, done, archived
+    /// Status: open, in_progress, under_review, done, archived
     pub status: String,
     /// Type of work: feature, bug, spike, chore, improvement
     pub order_type: String,
@@ -2957,7 +2960,7 @@ pub struct OrderListResponse {
 #[derive(Debug, Deserialize, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct OrderListQuery {
-    /// Filter by status (e.g., "open", "in_progress", "done", "archived")
+    /// Filter by status (e.g., "open", "in_progress", "under_review", "done", "archived")
     pub status: Option<String>,
     /// Filter by order type (e.g., "feature", "bug", "spike", "chore", "improvement")
     #[serde(rename = "type")]
diff --git a/makima/src/db/repository.rs b/makima/src/db/repository.rs
index d274548..aa1203a 100644
--- a/makima/src/db/repository.rs
+++ b/makima/src/db/repository.rs
@@ -5387,7 +5387,8 @@ pub async fn create_directive_step(
     req: CreateDirectiveStepRequest,
 ) -> Result<DirectiveStep, sqlx::Error> {
     let generation = req.generation.unwrap_or(1);
-    sqlx::query_as::<_, DirectiveStep>(
+    let order_id = req.order_id;
+    let step = sqlx::query_as::<_, DirectiveStep>(
         r#"
         INSERT INTO directive_steps (directive_id, name, description, task_plan, depends_on, order_index, generation)
         VALUES ($1, $2, $3, $4, $5, $6, $7)
@@ -5402,7 +5403,20 @@ pub async fn create_directive_step(
     .bind(req.order_index)
     .bind(generation)
     .fetch_one(pool)
-    .await
+    .await?;
+
+    // If an order_id was provided, auto-link the order to this step
+    if let Some(oid) = order_id {
+        sqlx::query(
+            r#"UPDATE orders SET directive_step_id = $1, updated_at = NOW() WHERE id = $2"#,
+        )
+        .bind(step.id)
+        .bind(oid)
+        .execute(pool)
+        .await?;
+    }
+
+    Ok(step)
 }
 
 /// Batch create multiple directive steps.
@@ -6392,3 +6406,38 @@ pub async fn get_orders_by_step_id(
     .await
 }
 
+/// Reconcile directive orders by checking linked step statuses.
+/// - Orders linked to completed steps are marked "done"
+/// - Orders linked to running/ready steps are marked "under_review"
+/// Returns the count of orders updated.
+pub async fn reconcile_directive_orders(
+    pool: &PgPool,
+    owner_id: Uuid,
+    directive_id: Uuid,
+) -> Result<i64, sqlx::Error> {
+    let rows: Vec<(Uuid,)> = sqlx::query_as(
+        r#"
+        UPDATE orders o
+        SET status = CASE
+            WHEN ds.status = 'completed' THEN 'done'
+            WHEN ds.status IN ('running', 'ready') THEN 'under_review'
+            ELSE o.status
+          END,
+          updated_at = NOW()
+        FROM directive_steps ds
+        WHERE o.directive_step_id = ds.id
+          AND o.directive_id = $1
+          AND o.owner_id = $2
+          AND o.status NOT IN ('done', 'archived')
+          AND ds.status IN ('completed', 'running', 'ready')
+        RETURNING o.id
+        "#,
+    )
+    .bind(directive_id)
+    .bind(owner_id)
+    .fetch_all(pool)
+    .await?;
+
+    Ok(rows.len() as i64)
+}
+
diff --git a/makima/src/orchestration/directive.rs b/makima/src/orchestration/directive.rs
index 62f15d9..5c134d6 100644
--- a/makima/src/orchestration/directive.rs
+++ b/makima/src/orchestration/directive.rs
@@ -1359,6 +1359,11 @@ gh pr view {pr_url} --json state --jq '.state'
 
 The previous PR was already merged/closed. You need to create a NEW PR with a fresh branch.
 
+Goal: {goal}
+
+Steps completed:
+{step_summary}
+
 1. Clear the old PR URL:
 ```
 makima directive update --pr-url ""
@@ -1373,10 +1378,13 @@ git checkout -b "$NEW_BRANCH" origin/{base_branch}
 git push -u origin "$NEW_BRANCH"
 ```
 
-3. Create a new PR:
+3. Create a new PR. Generate a concise, descriptive PR title (max 72 characters) based on the steps completed.
+The title should summarize what the changes actually accomplish — do NOT just use the directive name "{title}".
+Focus on the actual work done in the steps listed below.
 ```
-gh pr create --title "{title}" --body "{pr_body}" --head "$NEW_BRANCH" --base {base_branch}
+gh pr create --title "<YOUR_GENERATED_TITLE>" --body "{pr_body}" --head "$NEW_BRANCH" --base {base_branch}
 ```
+Replace <YOUR_GENERATED_TITLE> with the concise descriptive title you generated.
 
 4. Store the new PR URL:
 ```
@@ -1408,6 +1416,7 @@ git push origin {directive_branch}
 Already-merged branches will be a no-op. If there are merge conflicts, resolve them sensibly.
 "#,
             title = directive.title,
+            goal = directive.goal,
             pr_url = pr_url,
             directive_branch = directive_branch,
             base_branch = base_branch,
@@ -1437,10 +1446,15 @@ git checkout -b {directive_branch} origin/{base_branch}
 git push -u origin {directive_branch}
 ```
 
-Then create the PR:
+Then create the PR. You MUST generate a concise, descriptive PR title (max 72 characters) based on the steps completed above.
+The title should summarize what the changes actually accomplish — do NOT just use the directive name "{title}".
+For example, instead of "soryu-co/soryu - makima" use something like "Fix order lifecycle, PR update, and contracts overflow".
+Focus on the actual work done in the steps.
+
 ```
-gh pr create --title "{title}" --body "{pr_body}" --head {directive_branch} --base {base_branch}
+gh pr create --title "<YOUR_GENERATED_TITLE>" --body "{pr_body}" --head {directive_branch} --base {base_branch}
 ```
+Replace <YOUR_GENERATED_TITLE> with the concise descriptive title you generated.
 
 IMPORTANT: After creating the PR, you MUST store the PR URL so the directive system can track it.
 
@@ -1576,7 +1590,7 @@ pub fn build_order_pickup_prompt(
                      Review them and create steps to fulfil them.\n\n");
     for (i, order) in orders.iter().enumerate() {
         prompt.push_str(&format!(
-            "  {}. [{}] [{}] {} (id: {})\n",
+            "  {}. [{}] [{}] {} \n     orderId: {}\n",
             i + 1,
             order.priority,
             order.order_type,
@@ -1707,13 +1721,15 @@ For each order (or group of related orders), create one or more steps:
 - dependsOn: UUIDs of steps this depends on (use IDs from previous add-step responses)
 - orderIndex: Execution phase number. Steps only start after ALL steps with a lower orderIndex complete.
   Steps with the same orderIndex run in parallel. Use ascending values (0, 1, 2, ...) to create sequential phases.
+- orderId: The UUID of the order this step fulfils. Include this so the order is automatically marked done
+  when the step completes. Use the orderId shown in the order listing above.
 
 Submit steps using generation {generation}:
   makima directive add-step "Step Name" --description "..." --task-plan "..." --generation {generation}
   (Use --depends-on "uuid1,uuid2" for dependencies)
 
 Or batch:
-  makima directive batch-add-steps --json '[{{"name":"...","description":"...","taskPlan":"...","dependsOn":[],"orderIndex":0,"generation":{generation}}}]'
+  makima directive batch-add-steps --json '[{{"name":"...","description":"...","taskPlan":"...","dependsOn":[],"orderIndex":0,"generation":{generation},"orderId":"<order-uuid>"}}]'
 
 DEPENDENCY WORKTREE CONTINUATION:
 Each step runs in its own git worktree. How that worktree is initialised depends on dependsOn:
diff --git a/makima/src/server/handlers/directives.rs b/makima/src/server/handlers/directives.rs
index 15df6d5..cb59581 100644
--- a/makima/src/server/handlers/directives.rs
+++ b/makima/src/server/handlers/directives.rs
@@ -1062,6 +1062,19 @@ pub async fn pick_up_orders(
             }
         };
 
+    // Reconcile existing orders: mark done if step completed, under_review if step in progress
+    match repository::reconcile_directive_orders(pool, auth.owner_id, id).await {
+        Ok(count) => {
+            if count > 0 {
+                tracing::info!("Reconciled {} orders for directive {}", count, id);
+            }
+        }
+        Err(e) => {
+            tracing::warn!("Failed to reconcile directive orders: {}", e);
+            // Non-fatal: continue with pickup even if reconciliation fails
+        }
+    }
+
     // Fetch available orders
     let orders = match repository::get_available_orders_for_pickup(pool, auth.owner_id, id).await {
         Ok(o) => o,