summaryrefslogtreecommitdiff
path: root/makima/src/orchestration/directive.rs
blob: 044fce62982ecd6cc0c35775616cec6d3ce067a7 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
//! Directive orchestration — init, planning completion, chain advancement.

use serde::Deserialize;
use sqlx::PgPool;
use uuid::Uuid;

use serde::Serialize;
use crate::db::models::{
    ChainStep, CreateContractRequest, CreateTaskRequest, Directive, Task, UpdateContractRequest,
};
use crate::db::repository;
use crate::server::state::SharedState;

/// A single step in the chain plan produced by the planning supervisor.
#[derive(Debug, Deserialize)]
#[serde(rename_all = "snake_case")]
struct ChainPlanStep {
    name: String,
    description: String,
    #[serde(alias = "taskPlan")]
    task_plan: String,
    #[serde(default, alias = "dependsOn")]
    depends_on: Vec<String>, // names of steps this depends on
}

/// Wrapper for the plan JSON written by the planning supervisor.
#[derive(Debug, Deserialize)]
struct ChainPlan {
    steps: Vec<ChainPlanStep>,
}

/// Result written by the monitoring supervisor after evaluating a step.
#[derive(Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
struct MonitoringResult {
    passed: bool,
    overall_score: Option<f64>,
    confidence_level: Option<String>,
    #[serde(default)]
    criteria_results: serde_json::Value,
    #[serde(default)]
    summary_feedback: String,
    rework_instructions: Option<String>,
}

/// Initialize a directive: create a planning contract and transition to "planning".
pub async fn init_directive(
    pool: &PgPool,
    _state: &SharedState,
    owner_id: Uuid,
    directive_id: Uuid,
) -> Result<Directive, String> {
    // 1. Get directive, verify status
    let directive = repository::get_directive_for_owner(pool, directive_id, owner_id)
        .await
        .map_err(|e| format!("Failed to get directive: {}", e))?
        .ok_or("Directive not found")?;

    if directive.status != "draft" {
        return Err(format!(
            "Directive must be in 'draft' status to start, current status: '{}'",
            directive.status
        ));
    }

    // 2. Create planning contract
    let contract = repository::create_contract_for_owner(
        pool,
        owner_id,
        CreateContractRequest {
            name: format!("{} - Planning", directive.title),
            description: Some(format!(
                "Planning contract for directive: {}",
                directive.title
            )),
            contract_type: Some("simple".to_string()),
            template_id: None,
            initial_phase: Some("plan".to_string()),
            autonomous_loop: Some(true),
            phase_guard: None,
            local_only: Some(true),
            auto_merge_local: None,
        },
    )
    .await
    .map_err(|e| format!("Failed to create planning contract: {}", e))?;

    // 3. Mark contract as directive orchestrator
    repository::set_contract_directive_fields(pool, contract.id, Some(directive_id), true)
        .await
        .map_err(|e| format!("Failed to set contract directive fields: {}", e))?;

    // 4. Build planning prompt
    let planning_prompt = build_planning_prompt(&directive);

    // 5. Create supervisor task
    let supervisor_task = repository::create_task_for_owner(
        pool,
        owner_id,
        CreateTaskRequest {
            contract_id: Some(contract.id),
            name: format!("{} - Planner", directive.title),
            description: Some("Decompose directive goal into executable chain steps".to_string()),
            plan: planning_prompt,
            parent_task_id: None,
            is_supervisor: true,
            priority: 10,
            repository_url: directive.repository_url.clone(),
            base_branch: directive.base_branch.clone(),
            target_branch: None,
            merge_mode: None,
            target_repo_path: directive.local_path.clone(),
            completion_action: None,
            continue_from_task_id: None,
            copy_files: None,
            checkpoint_sha: None,
            branched_from_task_id: None,
            conversation_history: None,
            supervisor_worktree_task_id: None,
        },
    )
    .await
    .map_err(|e| format!("Failed to create supervisor task: {}", e))?;

    // 6. Link supervisor to contract
    repository::update_contract_for_owner(
        pool,
        contract.id,
        owner_id,
        UpdateContractRequest {
            supervisor_task_id: Some(supervisor_task.id),
            ..Default::default()
        },
    )
    .await
    .map_err(|e| match e {
        crate::db::repository::RepositoryError::Database(e) => {
            format!("Failed to link supervisor to contract: {}", e)
        }
        other => format!("Failed to link supervisor to contract: {:?}", other),
    })?;

    // 7. Set orchestrator_contract_id on directive
    repository::set_directive_orchestrator_contract(pool, directive_id, contract.id)
        .await
        .map_err(|e| format!("Failed to set orchestrator contract: {}", e))?;

    // 8. Transition directive to "planning"
    let updated = repository::update_directive_status(pool, directive_id, "planning")
        .await
        .map_err(|e| format!("Failed to update directive status: {}", e))?
        .ok_or("Directive not found after status update")?;

    // 9. Copy repo config to contract if repository_url is set
    if let Some(ref repo_url) = directive.repository_url {
        let _ = repository::add_remote_repository(
            pool,
            contract.id,
            "directive-repo",
            repo_url,
            true,
        )
        .await;
    } else if let Some(ref local_path) = directive.local_path {
        let _ = repository::add_local_repository(
            pool,
            contract.id,
            "directive-repo",
            local_path,
            true,
        )
        .await;
    }

    tracing::info!(
        directive_id = %directive_id,
        contract_id = %contract.id,
        task_id = %supervisor_task.id,
        "Directive started: planning contract created"
    );

    Ok(updated)
}

/// Submit a chain plan for a directive via the CLI/API (instead of file-based extraction).
pub async fn submit_plan(
    pool: &PgPool,
    state: &SharedState,
    owner_id: Uuid,
    directive_id: Uuid,
    plan_json: &str,
) -> Result<Directive, String> {
    // 1. Get directive, verify status
    let directive = repository::get_directive_for_owner(pool, directive_id, owner_id)
        .await
        .map_err(|e| format!("Failed to get directive: {}", e))?
        .ok_or("Directive not found")?;

    if directive.status != "planning" {
        return Err(format!(
            "Directive must be in 'planning' status to submit a plan, current status: '{}'",
            directive.status
        ));
    }

    // 2. Idempotency: if current_chain_id already set, return existing directive
    if directive.current_chain_id.is_some() {
        tracing::info!(
            directive_id = %directive_id,
            "Plan already submitted (current_chain_id set), returning existing directive"
        );
        return Ok(directive);
    }

    // 3. Parse the plan JSON
    let chain_plan: ChainPlan = serde_json::from_str(plan_json)
        .map_err(|e| format!("Failed to parse chain plan JSON: {}", e))?;

    if chain_plan.steps.is_empty() {
        return Err("Chain plan has no steps".to_string());
    }

    // 4. Create chain and steps, transition to active
    create_chain_and_steps(pool, state, &directive, &chain_plan, owner_id).await?;

    // 5. Re-fetch and return the updated directive
    let updated = repository::get_directive(pool, directive_id)
        .await
        .map_err(|e| format!("Failed to re-fetch directive: {}", e))?
        .ok_or("Directive not found after plan submission")?;

    tracing::info!(
        directive_id = %directive_id,
        step_count = chain_plan.steps.len(),
        "Plan submitted via API, directive now active"
    );

    Ok(updated)
}

/// Called when any task completes — checks if it's directive-related and advances.
/// Called when a contract's status is updated to "completed" via the API.
/// This is the primary entry point for directive orchestration because supervisor
/// tasks do not send TaskComplete messages — they complete via contract status updates.
pub async fn on_contract_completed(
    pool: &PgPool,
    state: &SharedState,
    contract: &crate::db::models::Contract,
    owner_id: Uuid,
) -> Result<(), String> {
    if contract.status != "completed" {
        return Ok(());
    }

    if contract.is_directive_orchestrator {
        let directive =
            repository::get_directive_by_orchestrator_contract(pool, contract.id)
                .await
                .map_err(|e| format!("Failed to get directive by orchestrator: {}", e))?;

        if let Some(directive) = directive {
            tracing::info!(
                directive_id = %directive.id,
                contract_id = %contract.id,
                "Directive orchestrator contract completed, handling planning completion"
            );
            handle_planning_completion(pool, state, &directive, owner_id).await?;
        } else {
            tracing::warn!(
                contract_id = %contract.id,
                "Directive orchestrator contract completed but no directive found"
            );
        }
    } else if let Some(directive_id) = contract.directive_id {
        // Check if this is a monitoring contract
        let monitoring_step =
            repository::get_step_by_monitoring_contract_id(pool, contract.id)
                .await
                .map_err(|e| format!("Failed to check monitoring contract: {}", e))?;

        if let Some(step) = monitoring_step {
            tracing::info!(
                directive_id = %directive_id,
                step_id = %step.id,
                contract_id = %contract.id,
                "Monitoring contract completed"
            );
            process_monitoring_result(pool, state, contract, &step, owner_id).await?;
        } else {
            // Step contract completed
            let step = repository::get_step_by_contract_id(pool, contract.id)
                .await
                .map_err(|e| format!("Failed to get step by contract: {}", e))?;

            if let Some(step) = step {
                let directive = repository::get_directive(pool, directive_id)
                    .await
                    .map_err(|e| format!("Failed to get directive: {}", e))?
                    .ok_or("Directive not found")?;

                tracing::info!(
                    directive_id = %directive_id,
                    step_id = %step.id,
                    contract_id = %contract.id,
                    "Step contract completed, dispatching monitoring"
                );

                // Step contract completed successfully — dispatch monitoring
                repository::update_step_status(pool, step.id, "evaluating")
                    .await
                    .map_err(|e| format!("Failed to update step status: {}", e))?;

                let _ = repository::create_directive_event(
                    pool,
                    directive.id,
                    directive.current_chain_id,
                    Some(step.id),
                    "step_evaluating",
                    "info",
                    None,
                    "system",
                    None,
                )
                .await;

                dispatch_monitoring(pool, &directive, &step, contract, owner_id).await?;
            }
        }
    }

    Ok(())
}

pub async fn on_task_completed(
    pool: &PgPool,
    state: &SharedState,
    task: &Task,
    owner_id: Uuid,
) -> Result<(), String> {
    let Some(contract_id) = task.contract_id else {
        return Ok(());
    };

    let contract = repository::get_contract_for_owner(pool, contract_id, owner_id)
        .await
        .map_err(|e| format!("Failed to get contract: {}", e))?;

    let Some(contract) = contract else {
        return Ok(());
    };

    if contract.is_directive_orchestrator {
        // This is a planning contract completion
        let directive =
            repository::get_directive_by_orchestrator_contract(pool, contract_id)
                .await
                .map_err(|e| format!("Failed to get directive by orchestrator: {}", e))?;

        if let Some(directive) = directive {
            on_planning_completed(pool, state, &directive, task, owner_id).await?;
        }
    } else if contract.directive_id.is_some() {
        // Check if this is a monitoring contract completion
        let monitoring_step =
            repository::get_step_by_monitoring_contract_id(pool, contract_id)
                .await
                .map_err(|e| format!("Failed to check monitoring contract: {}", e))?;

        if let Some(step) = monitoring_step {
            on_monitoring_completed(pool, state, &contract, &step, task, owner_id).await?;
        } else {
            // This is a step contract completion
            on_step_completed(pool, state, &contract, task, owner_id).await?;
        }
    }

    Ok(())
}

/// Handle planning task completion: parse chain plan, create steps, advance.
async fn on_planning_completed(
    pool: &PgPool,
    state: &SharedState,
    directive: &Directive,
    task: &Task,
    owner_id: Uuid,
) -> Result<(), String> {
    // If task failed, fail the directive
    if task.status == "failed" {
        tracing::warn!(
            directive_id = %directive.id,
            task_id = %task.id,
            "Planning task failed, marking directive as failed"
        );
        repository::update_directive_status(pool, directive.id, "failed")
            .await
            .map_err(|e| format!("Failed to update directive status: {}", e))?;
        return Ok(());
    }

    // Only process when the supervisor task itself is done
    if task.status != "done" || !task.is_supervisor {
        return Ok(());
    }

    handle_planning_completion(pool, state, directive, owner_id).await
}

/// Handle planning contract/task completion.
/// Checks if a plan was submitted via the CLI; if not, retries or fails.
async fn handle_planning_completion(
    pool: &PgPool,
    _state: &SharedState,
    directive: &Directive,
    owner_id: Uuid,
) -> Result<(), String> {
    // Re-fetch directive to check latest state
    let current = repository::get_directive(pool, directive.id)
        .await
        .map_err(|e| format!("Failed to re-fetch directive: {}", e))?
        .ok_or("Directive not found")?;

    // Idempotency: only process if still in "planning" status
    if current.status != "planning" {
        tracing::info!(
            directive_id = %directive.id,
            status = %current.status,
            "Skipping handle_planning_completion: directive no longer in planning status"
        );
        return Ok(());
    }

    // If plan was already submitted via CLI (current_chain_id is set), nothing to do
    if current.current_chain_id.is_some() {
        tracing::info!(
            directive_id = %directive.id,
            "Plan already submitted via CLI, skipping handle_planning_completion"
        );
        return Ok(());
    }

    // No plan was submitted — check retry budget
    let max_regenerations = current.max_chain_regenerations.unwrap_or(2);
    if current.chain_generation_count < max_regenerations {
        tracing::warn!(
            directive_id = %directive.id,
            attempt = current.chain_generation_count + 1,
            max = max_regenerations,
            "Planning completed without plan submission, retrying"
        );

        let _ = repository::create_directive_event(
            pool,
            directive.id,
            None,
            None,
            "planning_retry",
            "warn",
            Some(&serde_json::json!({
                "attempt": current.chain_generation_count + 1,
                "maxRegenerations": max_regenerations,
                "reason": "Planning contract completed without submitting a plan"
            })),
            "system",
            None,
        )
        .await;

        // Increment generation count
        repository::increment_chain_generation_count(pool, directive.id)
            .await
            .map_err(|e| format!("Failed to increment chain generation count: {}", e))?;

        // Reset to draft so init_directive can be called again
        repository::update_directive_status(pool, directive.id, "draft")
            .await
            .map_err(|e| format!("Failed to reset directive status: {}", e))?;

        // Re-init planning
        init_directive(pool, _state, owner_id, directive.id).await?;

        Ok(())
    } else {
        tracing::error!(
            directive_id = %directive.id,
            attempts = current.chain_generation_count,
            max = max_regenerations,
            "Planning failed: max regeneration attempts exhausted without plan submission"
        );

        let _ = repository::create_directive_event(
            pool,
            directive.id,
            None,
            None,
            "planning_failed",
            "error",
            Some(&serde_json::json!({
                "attempts": current.chain_generation_count,
                "maxRegenerations": max_regenerations,
                "reason": "Max chain regeneration attempts exhausted without plan submission"
            })),
            "system",
            None,
        )
        .await;

        repository::update_directive_status(pool, directive.id, "failed")
            .await
            .map_err(|e| format!("Failed to update directive status: {}", e))?;

        Ok(())
    }
}

/// Inner helper: create chain, steps, set current chain, transition to active, and advance.
/// Extracted so that `process_planning_result` can catch errors and mark the directive failed.
async fn create_chain_and_steps(
    pool: &PgPool,
    state: &SharedState,
    directive: &Directive,
    chain_plan: &ChainPlan,
    owner_id: Uuid,
) -> Result<(), String> {
    // Create chain
    let chain = repository::create_directive_chain(
        pool,
        directive.id,
        &format!("{} - Chain", directive.title),
        Some("Auto-generated from planning"),
        None,
        chain_plan.steps.len() as i32,
    )
    .await
    .map_err(|e| format!("Failed to create directive chain: {}", e))?;

    // Create steps (two passes: first create all, then resolve dependencies)
    let mut step_ids: Vec<(String, Uuid)> = Vec::new();

    for (i, plan_step) in chain_plan.steps.iter().enumerate() {
        let step = repository::create_chain_step(
            pool,
            chain.id,
            &plan_step.name,
            Some(&plan_step.description),
            "task",
            "simple",
            Some("plan"),
            Some(&plan_step.task_plan),
            None, // dependencies set in second pass
            i as i32,
        )
        .await
        .map_err(|e| format!("Failed to create chain step: {}", e))?;

        step_ids.push((plan_step.name.clone(), step.id));
    }

    // Second pass: resolve name-based dependencies to UUIDs and update
    for (i, plan_step) in chain_plan.steps.iter().enumerate() {
        if plan_step.depends_on.is_empty() {
            continue;
        }

        let dep_uuids: Vec<Uuid> = plan_step
            .depends_on
            .iter()
            .filter_map(|dep_name| {
                step_ids
                    .iter()
                    .find(|(name, _)| name == dep_name)
                    .map(|(_, id)| *id)
            })
            .collect();

        if !dep_uuids.is_empty() {
            let step_id = step_ids[i].1;
            sqlx::query(
                "UPDATE chain_steps SET depends_on = $2 WHERE id = $1",
            )
            .bind(step_id)
            .bind(&dep_uuids)
            .execute(pool)
            .await
            .map_err(|e| format!("Failed to update step dependencies: {}", e))?;
        }
    }

    // Set current chain on directive
    repository::set_directive_current_chain(pool, directive.id, chain.id)
        .await
        .map_err(|e| format!("Failed to set current chain: {}", e))?;

    // Transition directive to active
    let updated_directive = repository::update_directive_status(pool, directive.id, "active")
        .await
        .map_err(|e| format!("Failed to update directive status: {}", e))?
        .ok_or("Directive not found after status update")?;

    tracing::info!(
        directive_id = %directive.id,
        chain_id = %chain.id,
        step_count = chain_plan.steps.len(),
        "Chain plan created, advancing chain"
    );

    // Advance chain to dispatch ready steps
    advance_chain(pool, state, &updated_directive, owner_id).await
}

/// Handle a step contract task completion.
async fn on_step_completed(
    pool: &PgPool,
    state: &SharedState,
    contract: &crate::db::models::Contract,
    task: &Task,
    owner_id: Uuid,
) -> Result<(), String> {
    // Only process supervisor task completions
    if !task.is_supervisor {
        return Ok(());
    }

    let Some(directive_id) = contract.directive_id else {
        return Ok(());
    };

    // Find the step linked to this contract
    let step = repository::get_step_by_contract_id(pool, contract.id)
        .await
        .map_err(|e| format!("Failed to get step by contract: {}", e))?;

    let Some(step) = step else {
        return Ok(());
    };

    // Get the directive for threshold info
    let directive = repository::get_directive(pool, directive_id)
        .await
        .map_err(|e| format!("Failed to get directive: {}", e))?
        .ok_or("Directive not found")?;

    if task.status == "done" {
        // Step task succeeded — dispatch monitoring evaluation
        repository::update_step_status(pool, step.id, "evaluating")
            .await
            .map_err(|e| format!("Failed to update step status: {}", e))?;

        let _ = repository::create_directive_event(
            pool,
            directive.id,
            directive.current_chain_id,
            Some(step.id),
            "step_evaluating",
            "info",
            None,
            "system",
            None,
        )
        .await;

        tracing::info!(
            directive_id = %directive_id,
            step_id = %step.id,
            step_name = %step.name,
            "Step task done, dispatching monitoring evaluation"
        );

        dispatch_monitoring(pool, &directive, &step, contract, owner_id).await
    } else {
        // Step task failed — mark step failed and advance
        repository::update_step_status(pool, step.id, "failed")
            .await
            .map_err(|e| format!("Failed to update step status: {}", e))?;

        let _ = repository::increment_chain_failed_steps(pool, step.chain_id).await;

        tracing::info!(
            directive_id = %directive_id,
            step_id = %step.id,
            step_name = %step.name,
            "Step failed"
        );

        advance_chain(pool, state, &directive, owner_id).await
    }
}

/// Check chain progress and dispatch ready steps or mark directive complete.
async fn advance_chain(
    pool: &PgPool,
    _state: &SharedState,
    directive: &Directive,
    owner_id: Uuid,
) -> Result<(), String> {
    let Some(chain_id) = directive.current_chain_id else {
        return Ok(());
    };

    let steps = repository::list_steps_for_chain(pool, chain_id)
        .await
        .map_err(|e| format!("Failed to list steps: {}", e))?;

    // Check if all steps passed
    let all_passed = steps.iter().all(|s| s.status == "passed");
    if all_passed && !steps.is_empty() {
        repository::update_chain_status(pool, chain_id, "completed")
            .await
            .map_err(|e| format!("Failed to update chain status: {}", e))?;
        repository::update_directive_status(pool, directive.id, "completed")
            .await
            .map_err(|e| format!("Failed to update directive status: {}", e))?;
        tracing::info!(directive_id = %directive.id, "Directive completed: all steps passed");
        return Ok(());
    }

    // Check if any step failed
    let any_failed = steps.iter().any(|s| s.status == "failed");
    if any_failed {
        repository::update_chain_status(pool, chain_id, "failed")
            .await
            .map_err(|e| format!("Failed to update chain status: {}", e))?;
        repository::update_directive_status(pool, directive.id, "failed")
            .await
            .map_err(|e| format!("Failed to update directive status: {}", e))?;
        tracing::info!(directive_id = %directive.id, "Directive failed: step failure detected");
        return Ok(());
    }

    // Find and dispatch ready steps
    let ready_steps = repository::find_ready_steps(pool, chain_id)
        .await
        .map_err(|e| format!("Failed to find ready steps: {}", e))?;

    for step in ready_steps {
        if let Err(e) = dispatch_step(pool, directive, &step, owner_id).await {
            tracing::error!(
                step_id = %step.id,
                step_name = %step.name,
                error = %e,
                "Failed to dispatch step"
            );
        }
    }

    Ok(())
}

/// Dispatch a single chain step as a new contract with supervisor.
async fn dispatch_step(
    pool: &PgPool,
    directive: &Directive,
    step: &crate::db::models::ChainStep,
    owner_id: Uuid,
) -> Result<(), String> {
    // Mark step as running
    repository::update_step_status(pool, step.id, "running")
        .await
        .map_err(|e| format!("Failed to update step status: {}", e))?;

    // Create contract for this step.
    // Step contracts use the directive's repository config — not local_only,
    // so they can branch and merge to share work across steps.
    let has_repo = directive.repository_url.is_some() || directive.local_path.is_some();
    let contract = repository::create_contract_for_owner(
        pool,
        owner_id,
        CreateContractRequest {
            name: step.name.clone(),
            description: step.description.clone(),
            contract_type: Some(step.contract_type.clone()),
            template_id: None,
            initial_phase: step.initial_phase.clone(),
            autonomous_loop: Some(true),
            phase_guard: None,
            local_only: Some(!has_repo),
            auto_merge_local: if has_repo { Some(true) } else { None },
        },
    )
    .await
    .map_err(|e| format!("Failed to create step contract: {}", e))?;

    // Set directive_id on contract
    repository::set_contract_directive_fields(pool, contract.id, Some(directive.id), false)
        .await
        .map_err(|e| format!("Failed to set contract directive fields: {}", e))?;

    // Build the task plan, prepending rework instructions if this is a rework cycle
    let mut task_plan = step
        .task_plan
        .clone()
        .unwrap_or_else(|| format!("Execute step: {}", step.name));

    if let Some(eval_id) = step.last_evaluation_id {
        if let Ok(Some(evaluation)) = repository::get_directive_evaluation(pool, eval_id).await {
            if let Some(ref rework) = evaluation.rework_instructions {
                task_plan = format!(
                    "IMPORTANT — REWORK REQUIRED (attempt #{}):\n\
                     The previous attempt was evaluated and did NOT pass.\n\
                     Feedback: {}\n\
                     Rework instructions: {}\n\n\
                     ---\n\n\
                     Original task plan:\n{}",
                    step.rework_count + 1,
                    evaluation.summary_feedback,
                    rework,
                    task_plan,
                );
            }
        }
    }

    // Create supervisor task
    let supervisor_task = repository::create_task_for_owner(
        pool,
        owner_id,
        CreateTaskRequest {
            contract_id: Some(contract.id),
            name: format!("{} Supervisor", step.name),
            description: step.description.clone(),
            plan: task_plan,
            parent_task_id: None,
            is_supervisor: true,
            priority: 5,
            repository_url: directive.repository_url.clone(),
            base_branch: directive.base_branch.clone(),
            target_branch: None,
            merge_mode: None,
            target_repo_path: directive.local_path.clone(),
            completion_action: None,
            continue_from_task_id: None,
            copy_files: None,
            checkpoint_sha: None,
            branched_from_task_id: None,
            conversation_history: None,
            supervisor_worktree_task_id: None,
        },
    )
    .await
    .map_err(|e| format!("Failed to create step supervisor task: {}", e))?;

    // Link supervisor to contract
    repository::update_contract_for_owner(
        pool,
        contract.id,
        owner_id,
        UpdateContractRequest {
            supervisor_task_id: Some(supervisor_task.id),
            ..Default::default()
        },
    )
    .await
    .map_err(|e| match e {
        crate::db::repository::RepositoryError::Database(e) => {
            format!("Failed to link supervisor to step contract: {}", e)
        }
        other => format!("Failed to link supervisor to step contract: {:?}", other),
    })?;

    // Link step to contract/task
    repository::update_step_contract(pool, step.id, contract.id, supervisor_task.id)
        .await
        .map_err(|e| format!("Failed to update step contract link: {}", e))?;

    // Copy repo config from directive to step contract
    if let Some(ref repo_url) = directive.repository_url {
        let _ = repository::add_remote_repository(
            pool,
            contract.id,
            "directive-repo",
            repo_url,
            true,
        )
        .await;
    } else if let Some(ref local_path) = directive.local_path {
        let _ = repository::add_local_repository(
            pool,
            contract.id,
            "directive-repo",
            local_path,
            true,
        )
        .await;
    }

    tracing::info!(
        directive_id = %directive.id,
        step_id = %step.id,
        step_name = %step.name,
        contract_id = %contract.id,
        task_id = %supervisor_task.id,
        "Step dispatched"
    );

    Ok(())
}

/// Build the planning supervisor prompt from a directive.
fn build_planning_prompt(directive: &Directive) -> String {
    format!(
        r#"You are planning the execution of a directive.

DIRECTIVE: {title}
GOAL: {goal}
REQUIREMENTS: {requirements}
ACCEPTANCE CRITERIA: {acceptance_criteria}
CONSTRAINTS: {constraints}

Your job is to decompose this goal into a sequence of executable steps.
Each step will become a separate contract with its own supervisor.

The JSON format:
{{
  "steps": [
    {{
      "name": "Step name",
      "description": "What this step accomplishes",
      "task_plan": "Detailed instructions for the step's supervisor",
      "depends_on": []
    }}
  ]
}}

Rules:
- Steps with no dependencies (empty depends_on array) will run in parallel.
- Steps that depend on other steps will wait until those complete.
- The depends_on array contains names of steps this step depends on.
- Each step should be a self-contained unit of work.
- Be specific in task_plan — include file paths, function names, and acceptance criteria where possible.
- Keep the number of steps reasonable (3-10 typically).

Submit your plan by piping the JSON to stdin:
  echo '<your_json_plan>' | makima directive submit-plan --directive-id {directive_id}

After submitting the plan, mark the contract as complete:
  makima supervisor complete"#,
        title = directive.title,
        goal = directive.goal,
        requirements = serde_json::to_string_pretty(&directive.requirements).unwrap_or_default(),
        acceptance_criteria = serde_json::to_string_pretty(&directive.acceptance_criteria).unwrap_or_default(),
        constraints = serde_json::to_string_pretty(&directive.constraints).unwrap_or_default(),
        directive_id = directive.id,
    )
}

/// Extract JSON from file body elements.
fn extract_plan_json(body: &[crate::db::models::BodyElement]) -> Option<String> {
    use crate::db::models::BodyElement;

    for element in body {
        match element {
            BodyElement::Code { content, .. } => {
                // Try to parse as JSON
                let trimmed = content.trim();
                if trimmed.starts_with('{') || trimmed.starts_with('[') {
                    if serde_json::from_str::<serde_json::Value>(trimmed).is_ok() {
                        return Some(trimmed.to_string());
                    }
                }
            }
            BodyElement::Paragraph { text } => {
                let trimmed = text.trim();
                if trimmed.starts_with('{') || trimmed.starts_with('[') {
                    if serde_json::from_str::<serde_json::Value>(trimmed).is_ok() {
                        return Some(trimmed.to_string());
                    }
                }
            }
            BodyElement::Markdown { content } => {
                // Try to find JSON in markdown content
                let trimmed = content.trim();
                if trimmed.starts_with('{') || trimmed.starts_with('[') {
                    if serde_json::from_str::<serde_json::Value>(trimmed).is_ok() {
                        return Some(trimmed.to_string());
                    }
                }
                // Try to find JSON in code blocks within markdown
                if let Some(json_start) = trimmed.find("```json") {
                    let after = &trimmed[json_start + 7..];
                    if let Some(json_end) = after.find("```") {
                        let json_str = after[..json_end].trim();
                        if serde_json::from_str::<serde_json::Value>(json_str).is_ok() {
                            return Some(json_str.to_string());
                        }
                    }
                }
            }
            _ => {}
        }
    }

    // Fallback: concatenate all text content and try to find JSON
    let all_text: String = body
        .iter()
        .map(|el| match el {
            BodyElement::Code { content, .. } => content.clone(),
            BodyElement::Paragraph { text } => text.clone(),
            BodyElement::Markdown { content } => content.clone(),
            _ => String::new(),
        })
        .collect::<Vec<_>>()
        .join("\n");

    let trimmed = all_text.trim();
    if let Some(start) = trimmed.find('{') {
        // Find matching closing brace
        let substr = &trimmed[start..];
        if serde_json::from_str::<serde_json::Value>(substr).is_ok() {
            return Some(substr.to_string());
        }
    }

    None
}

/// Dispatch a monitoring contract to evaluate a completed step.
async fn dispatch_monitoring(
    pool: &PgPool,
    directive: &Directive,
    step: &ChainStep,
    step_contract: &crate::db::models::Contract,
    owner_id: Uuid,
) -> Result<(), String> {
    // Create monitoring contract
    let contract = repository::create_contract_for_owner(
        pool,
        owner_id,
        CreateContractRequest {
            name: format!("{} - Monitor", step.name),
            description: Some(format!("Monitoring evaluation for step: {}", step.name)),
            contract_type: Some("monitoring".to_string()),
            template_id: None,
            initial_phase: Some("plan".to_string()),
            autonomous_loop: Some(true),
            phase_guard: None,
            local_only: Some(true),
            auto_merge_local: None,
        },
    )
    .await
    .map_err(|e| format!("Failed to create monitoring contract: {}", e))?;

    // Mark contract as directive-related (not orchestrator)
    repository::set_contract_directive_fields(pool, contract.id, Some(directive.id), false)
        .await
        .map_err(|e| format!("Failed to set monitoring contract directive fields: {}", e))?;

    // Build evaluation prompt
    let prompt = build_monitoring_prompt(directive, step, step_contract);

    // Create supervisor task
    let supervisor_task = repository::create_task_for_owner(
        pool,
        owner_id,
        CreateTaskRequest {
            contract_id: Some(contract.id),
            name: format!("{} - Evaluator", step.name),
            description: Some("Evaluate step output against directive criteria".to_string()),
            plan: prompt,
            parent_task_id: None,
            is_supervisor: true,
            priority: 8,
            repository_url: directive.repository_url.clone(),
            base_branch: directive.base_branch.clone(),
            target_branch: None,
            merge_mode: None,
            target_repo_path: directive.local_path.clone(),
            completion_action: None,
            continue_from_task_id: None,
            copy_files: None,
            checkpoint_sha: None,
            branched_from_task_id: None,
            conversation_history: None,
            supervisor_worktree_task_id: None,
        },
    )
    .await
    .map_err(|e| format!("Failed to create monitoring supervisor task: {}", e))?;

    // Link supervisor to contract
    repository::update_contract_for_owner(
        pool,
        contract.id,
        owner_id,
        UpdateContractRequest {
            supervisor_task_id: Some(supervisor_task.id),
            ..Default::default()
        },
    )
    .await
    .map_err(|e| match e {
        crate::db::repository::RepositoryError::Database(e) => {
            format!("Failed to link supervisor to monitoring contract: {}", e)
        }
        other => format!("Failed to link supervisor to monitoring contract: {:?}", other),
    })?;

    // Link step to monitoring contract/task
    repository::update_step_monitoring_contract(pool, step.id, contract.id, supervisor_task.id)
        .await
        .map_err(|e| format!("Failed to update step monitoring contract link: {}", e))?;

    // Copy repo config from directive to monitoring contract
    if let Some(ref repo_url) = directive.repository_url {
        let _ = repository::add_remote_repository(
            pool,
            contract.id,
            "directive-repo",
            repo_url,
            true,
        )
        .await;
    } else if let Some(ref local_path) = directive.local_path {
        let _ = repository::add_local_repository(
            pool,
            contract.id,
            "directive-repo",
            local_path,
            true,
        )
        .await;
    }

    tracing::info!(
        directive_id = %directive.id,
        step_id = %step.id,
        step_name = %step.name,
        monitoring_contract_id = %contract.id,
        monitoring_task_id = %supervisor_task.id,
        "Monitoring evaluation dispatched"
    );

    Ok(())
}

/// Build the monitoring supervisor prompt.
fn build_monitoring_prompt(
    directive: &Directive,
    step: &ChainStep,
    step_contract: &crate::db::models::Contract,
) -> String {
    format!(
        r#"You are evaluating the output of a completed step in a directive chain.

DIRECTIVE: {title}
GOAL: {goal}
REQUIREMENTS: {requirements}
ACCEPTANCE CRITERIA: {acceptance_criteria}
CONSTRAINTS: {constraints}

STEP: {step_name}
STEP DESCRIPTION: {step_description}
STEP TASK PLAN: {task_plan}
STEP CONTRACT ID: {step_contract_id}

CONFIDENCE THRESHOLDS:
- Green (pass): >= {threshold_green}
- Yellow (marginal): >= {threshold_yellow}
- Red (fail): < {threshold_yellow}

Your job:
1. Read the step contract's files to understand what was delivered:
   makima contract files --contract-id {step_contract_id}
   makima contract file <file_id> --contract-id {step_contract_id}

2. Evaluate whether the step's output meets the directive's requirements and the step's specific task plan.

3. Write your evaluation result as a JSON file named "evaluation-result" to this contract:
   makima contract create-file "evaluation-result" < evaluation.json

The JSON format:
{{
  "passed": true/false,
  "overallScore": 0.0-1.0,
  "confidenceLevel": "green" | "yellow" | "red",
  "criteriaResults": [
    {{
      "criterion": "Description of what was checked",
      "passed": true/false,
      "score": 0.0-1.0,
      "evidence": "Evidence supporting the assessment"
    }}
  ],
  "summaryFeedback": "Brief summary of the evaluation",
  "reworkInstructions": "If failed, specific instructions for rework (null if passed)"
}}

Scoring guidelines:
- Score >= {threshold_green}: confidenceLevel = "green", passed = true
- Score >= {threshold_yellow} and < {threshold_green}: confidenceLevel = "yellow", use judgment on passed
- Score < {threshold_yellow}: confidenceLevel = "red", passed = false
- Be specific in reworkInstructions if the step fails — the step will be re-executed with these instructions.

After writing the evaluation file, mark the contract as complete:
  makima supervisor complete"#,
        title = directive.title,
        goal = directive.goal,
        requirements = serde_json::to_string_pretty(&directive.requirements).unwrap_or_default(),
        acceptance_criteria = serde_json::to_string_pretty(&directive.acceptance_criteria).unwrap_or_default(),
        constraints = serde_json::to_string_pretty(&directive.constraints).unwrap_or_default(),
        step_name = step.name,
        step_description = step.description.as_deref().unwrap_or("N/A"),
        task_plan = step.task_plan.as_deref().unwrap_or("N/A"),
        step_contract_id = step_contract.id,
        threshold_green = directive.confidence_threshold_green,
        threshold_yellow = directive.confidence_threshold_yellow,
    )
}

/// Handle monitoring contract task completion — parse evaluation and decide step outcome.
async fn on_monitoring_completed(
    pool: &PgPool,
    state: &SharedState,
    contract: &crate::db::models::Contract,
    step: &ChainStep,
    task: &Task,
    owner_id: Uuid,
) -> Result<(), String> {
    // Only process supervisor task completions
    if !task.is_supervisor {
        return Ok(());
    }

    let Some(directive_id) = contract.directive_id else {
        return Ok(());
    };

    let directive = repository::get_directive(pool, directive_id)
        .await
        .map_err(|e| format!("Failed to get directive: {}", e))?
        .ok_or("Directive not found")?;

    // If monitoring task itself failed, fail-open: mark step as passed
    if task.status == "failed" {
        tracing::warn!(
            directive_id = %directive_id,
            step_id = %step.id,
            "Monitoring task failed, fail-open: marking step as passed"
        );

        repository::update_step_status(pool, step.id, "passed")
            .await
            .map_err(|e| format!("Failed to update step status: {}", e))?;

        let _ = repository::increment_chain_completed_steps(pool, step.chain_id).await;

        let _ = repository::create_directive_event(
            pool,
            directive_id,
            directive.current_chain_id,
            Some(step.id),
            "monitoring_failed_open",
            "warn",
            None,
            "system",
            None,
        )
        .await;

        return advance_chain(pool, state, &directive, owner_id).await;
    }

    if task.status != "done" {
        return Ok(());
    }

    process_monitoring_result(pool, state, contract, step, owner_id).await
}

/// Core monitoring logic: read evaluation from files, create record, handle pass/fail/rework.
/// Called from both `on_monitoring_completed` (task path) and `on_contract_completed` (API path).
async fn process_monitoring_result(
    pool: &PgPool,
    state: &SharedState,
    contract: &crate::db::models::Contract,
    step: &ChainStep,
    owner_id: Uuid,
) -> Result<(), String> {
    let Some(directive_id) = contract.directive_id else {
        return Ok(());
    };

    // Idempotency guard: re-fetch step and only process if still "evaluating".
    let current_step = repository::get_chain_step(pool, step.id)
        .await
        .map_err(|e| format!("Failed to re-fetch step: {}", e))?;
    if let Some(ref s) = current_step {
        if s.status != "evaluating" {
            tracing::info!(
                step_id = %step.id,
                status = %s.status,
                "Skipping process_monitoring_result: step no longer in evaluating status"
            );
            return Ok(());
        }
    }

    let directive = repository::get_directive(pool, directive_id)
        .await
        .map_err(|e| format!("Failed to get directive: {}", e))?
        .ok_or("Directive not found")?;

    // Read evaluation result from monitoring contract files
    let files = repository::list_files_in_contract(pool, contract.id, owner_id)
        .await
        .map_err(|e| format!("Failed to list monitoring contract files: {}", e))?;

    let eval_file = files.iter().find(|f| {
        let name_lower = f.name.to_lowercase();
        name_lower.contains("evaluation") || name_lower.contains("eval")
    });

    let eval_file = eval_file.or_else(|| files.first());

    let monitoring_result = if let Some(eval_file) = eval_file {
        let full_file = repository::get_file(pool, eval_file.id)
            .await
            .map_err(|e| format!("Failed to get evaluation file: {}", e))?;

        if let Some(full_file) = full_file {
            let json_str = extract_plan_json(&full_file.body);
            json_str.and_then(|s| serde_json::from_str::<MonitoringResult>(&s).ok())
        } else {
            None
        }
    } else {
        None
    };

    // If we couldn't parse the result, fail-open
    let Some(result) = monitoring_result else {
        tracing::warn!(
            directive_id = %directive_id,
            step_id = %step.id,
            "Could not parse monitoring result, fail-open: marking step as passed"
        );

        repository::update_step_status(pool, step.id, "passed")
            .await
            .map_err(|e| format!("Failed to update step status: {}", e))?;

        let _ = repository::increment_chain_completed_steps(pool, step.chain_id).await;

        let _ = repository::create_directive_event(
            pool,
            directive_id,
            directive.current_chain_id,
            Some(step.id),
            "monitoring_parse_failed_open",
            "warn",
            None,
            "system",
            None,
        )
        .await;

        return advance_chain(pool, state, &directive, owner_id).await;
    };

    // Create evaluation record
    let chain_id = directive.current_chain_id.unwrap_or(step.chain_id);
    let evaluation = repository::create_directive_evaluation(
        pool,
        directive_id,
        chain_id,
        step.id,
        contract.id,
        "monitoring",
        Some("automated"),
        result.passed,
        result.overall_score,
        result.confidence_level.as_deref(),
        &result.criteria_results,
        &result.summary_feedback,
        result.rework_instructions.as_deref(),
    )
    .await
    .map_err(|e| format!("Failed to create directive evaluation: {}", e))?;

    // Update step evaluation fields
    repository::update_step_evaluation_fields(
        pool,
        step.id,
        result.overall_score,
        result.confidence_level.as_deref(),
        evaluation.id,
    )
    .await
    .map_err(|e| format!("Failed to update step evaluation fields: {}", e))?;

    // Create event
    let event_data = serde_json::json!({
        "passed": result.passed,
        "overallScore": result.overall_score,
        "confidenceLevel": result.confidence_level,
        "summaryFeedback": result.summary_feedback,
    });
    let _ = repository::create_directive_event(
        pool,
        directive_id,
        Some(chain_id),
        Some(step.id),
        if result.passed { "step_evaluation_passed" } else { "step_evaluation_failed" },
        "info",
        Some(&event_data),
        "system",
        None,
    )
    .await;

    if result.passed {
        // Evaluation passed — mark step as passed
        tracing::info!(
            directive_id = %directive_id,
            step_id = %step.id,
            step_name = %step.name,
            score = ?result.overall_score,
            "Step evaluation passed"
        );

        repository::update_step_status(pool, step.id, "passed")
            .await
            .map_err(|e| format!("Failed to update step status: {}", e))?;

        let _ = repository::increment_chain_completed_steps(pool, step.chain_id).await;

        advance_chain(pool, state, &directive, owner_id).await
    } else {
        // Evaluation failed — check rework budget
        let max_rework = directive.max_rework_cycles.unwrap_or(3);
        if step.rework_count >= max_rework {
            tracing::warn!(
                directive_id = %directive_id,
                step_id = %step.id,
                step_name = %step.name,
                rework_count = step.rework_count,
                max_rework = max_rework,
                "Step evaluation failed, max rework cycles exceeded"
            );

            repository::update_step_status(pool, step.id, "failed")
                .await
                .map_err(|e| format!("Failed to update step status: {}", e))?;

            let _ = repository::increment_chain_failed_steps(pool, step.chain_id).await;

            advance_chain(pool, state, &directive, owner_id).await
        } else {
            tracing::info!(
                directive_id = %directive_id,
                step_id = %step.id,
                step_name = %step.name,
                rework_count = step.rework_count,
                "Step evaluation failed, scheduling rework"
            );

            repository::increment_step_rework_count(pool, step.id)
                .await
                .map_err(|e| format!("Failed to increment rework count: {}", e))?;

            // Set step back to pending so advance_chain re-dispatches it
            repository::update_step_status(pool, step.id, "pending")
                .await
                .map_err(|e| format!("Failed to update step status: {}", e))?;

            advance_chain(pool, state, &directive, owner_id).await
        }
    }
}

/// Trigger a manual evaluation for a step. Public for use by handlers.
pub async fn trigger_manual_evaluation(
    pool: &PgPool,
    _state: &SharedState,
    owner_id: Uuid,
    directive_id: Uuid,
    step_id: Uuid,
) -> Result<ChainStep, String> {
    let directive = repository::get_directive_for_owner(pool, directive_id, owner_id)
        .await
        .map_err(|e| format!("Failed to get directive: {}", e))?
        .ok_or("Directive not found")?;

    // Get the step — find via chain steps
    let chain_id = directive.current_chain_id.ok_or("Directive has no active chain")?;
    let steps = repository::list_steps_for_chain(pool, chain_id)
        .await
        .map_err(|e| format!("Failed to list steps: {}", e))?;

    let step = steps
        .into_iter()
        .find(|s| s.id == step_id)
        .ok_or("Step not found in current chain")?;

    // Step must have a contract_id (must have been executed)
    let contract_id = step.contract_id.ok_or("Step has no contract — it hasn't been executed yet")?;

    let contract = repository::get_contract_for_owner(pool, contract_id, owner_id)
        .await
        .map_err(|e| format!("Failed to get step contract: {}", e))?
        .ok_or("Step contract not found")?;

    // Set step to evaluating
    let updated_step = repository::update_step_status(pool, step.id, "evaluating")
        .await
        .map_err(|e| format!("Failed to update step status: {}", e))?
        .ok_or("Step not found after status update")?;

    let _ = repository::create_directive_event(
        pool,
        directive.id,
        directive.current_chain_id,
        Some(step.id),
        "manual_evaluation_triggered",
        "info",
        None,
        "user",
        None,
    )
    .await;

    dispatch_monitoring(pool, &directive, &step, &contract, owner_id).await?;

    Ok(updated_step)
}