ao-core 0.1.0

Core traits and types for the ao-rs agent orchestrator framework
Documentation
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
use super::*;

impl LifecycleManager {
    /// Probe the configured SCM plugin for this session and apply any
    /// status transition the observation implies.
    ///
    /// Structure:
    ///   1. `detect_pr` → `Option<PullRequest>`. `None` skips all field
    ///      probes and lets `derive_scm_status(current, None)` decide
    ///      whether the session should drop off the PR track.
    ///   2. `tokio::join!` fans out `pr_state` / `ci_status` /
    ///      `review_decision` / `mergeability` in parallel so the four
    ///      `gh` calls pay one RTT, not four. Matches `ao-rs pr`.
    ///   3. Failures in any field probe emit `TickError` and skip the
    ///      transition — we'd rather miss a tick than transition on a
    ///      partial observation. Next tick re-probes.
    ///   4. The observation is folded through the pure `derive_scm_status`
    ///      function (see `scm_transitions` module) which returns
    ///      `Some(next)` only when a real transition is warranted.
    pub(super) async fn poll_scm(&self, session: &mut Session) -> Result<()> {
        // Defense in depth: `tick()` already filters terminal sessions at
        // line ~199, and the activity path in `poll_one` can't currently
        // transition *into* a terminal status before reaching step 5. But
        // the invariant is implicit, not enforced by the type system, and
        // a future step 4 that ends in `Merged`/`Terminated` would bypass
        // the `tick()` filter for the current tick. Re-check here so the
        // SCM probe can never run — or worse, re-transition — a session
        // that some upstream step has already finalised.
        if session.is_terminal() {
            return Ok(());
        }

        let scm = self
            .scm
            .as_ref()
            .expect("poll_scm called without an SCM plugin");

        // ---- 1. Detect PR ----
        // Prefer the pre-detected PR from tick() Pass 1. Fall back to
        // a fresh detect_pr call for tests or edge cases where the
        // cache wasn't populated.
        let pr = {
            let mut cache = self.detected_prs_cache.lock().unwrap_or_else(|e| {
                tracing::error!("detected_prs_cache mutex poisoned; recovering inner state: {e}");
                e.into_inner()
            });
            cache.remove(&session.id)
        };
        let pr = match pr {
            Some(cached) => cached,
            None => match scm.detect_pr(session).await {
                Ok(pr) => pr,
                Err(e) => {
                    self.emit(OrchestratorEvent::TickError {
                        id: session.id.clone(),
                        message: format!("scm.detect_pr: {e}"),
                    });
                    return Ok(());
                }
            },
        };

        // Save a clone so later helpers (check_ci_failed, check_review_backlog)
        // can reference the PR after the observation-building block moves it.
        let pr_saved = pr.clone();

        // Build the optional observation.
        let observation = if let Some(pr) = pr {
            // ---- 2. Check batch enrichment cache ----
            let cache_key = format!("{}/{}#{}", pr.owner, pr.repo, pr.number);
            let cached = {
                let mut cache = self.pr_enrichment_cache.lock().unwrap_or_else(|e| {
                    tracing::error!(
                        "pr_enrichment_cache mutex poisoned; recovering inner state: {e}"
                    );
                    e.into_inner()
                });
                cache.remove(&cache_key)
            };

            if let Some(obs) = cached {
                tracing::trace!(
                    "poll_scm: using cached batch observation for PR #{}",
                    pr.number
                );
                Some(obs)
            } else {
                // ---- Review backlog throttle ----
                // When there's no batch cache hit and the session is in a
                // review-related state, skip the expensive REST fallback
                // unless 2+ minutes have passed since the last check.
                if is_review_stable(session.status) {
                    let throttled = {
                        let map = self
                            .last_review_backlog_check
                            .lock()
                            .unwrap_or_else(|e| {
                                tracing::error!("last_review_backlog_check mutex poisoned; recovering inner state: {e}");
                                e.into_inner()
                            });
                        map.get(&session.id)
                            .map(|t| t.elapsed() < REVIEW_BACKLOG_THROTTLE)
                            .unwrap_or(false)
                    };
                    if throttled {
                        tracing::trace!(
                            "poll_scm: review backlog throttled for session {}",
                            session.id.0
                        );
                        return Ok(());
                    }
                }

                // ---- 3. Parallel fan-out (fallback) ----
                let (state_res, ci_res, review_res, readiness_res) = tokio::join!(
                    scm.pr_state(&pr),
                    scm.ci_status(&pr),
                    scm.review_decision(&pr),
                    scm.mergeability(&pr),
                );

                // Record the check timestamp for throttling
                {
                    let mut map = self.last_review_backlog_check.lock().unwrap_or_else(|e| {
                        tracing::error!(
                            "last_review_backlog_check mutex poisoned; recovering inner state: {e}"
                        );
                        e.into_inner()
                    });
                    map.insert(session.id.clone(), Instant::now());
                }

                match assemble_observation(state_res, ci_res, review_res, readiness_res) {
                    Ok(obs) => Some(obs),
                    Err(msg) => {
                        self.emit(OrchestratorEvent::TickError {
                            id: session.id.clone(),
                            message: format!("scm probes: {msg}"),
                        });
                        return Ok(());
                    }
                }
            }
        } else {
            None
        };

        // ---- 4. Pure decision + transition ----
        if let Some(mut next) = derive_scm_status(session.status, observation.as_ref()) {
            // TS stuck detection can override the fallback `pr_open` state when
            // the agent has been idle beyond threshold. To preserve the Rust
            // invariant of **one transition per tick**, we apply that override
            // here before persisting/emitting the transition.
            if next == SessionStatus::PrOpen && self.should_mark_stuck(session) {
                next = SessionStatus::Stuck;
            }
            self.transition(session, next).await?;
        }

        // ---- 5. Orthogonal merge-conflict check ----
        // Runs after the transition so we see the post-transition status
        // (in particular, `Merged` / `Killed` correctly enter the clear
        // branch). Skipped when the reaction engine is absent or no PR is
        // in hand — the helper is safe to call either way and returns
        // early, but checking here keeps the hot path allocation-free.
        if self.reaction_engine.is_some() {
            self.check_merge_conflicts(session, observation.as_ref())
                .await?;
        }

        // ---- 6. CI-failed detail dispatch (issue #195 H3) ----
        // When the session just landed in `CiFailed`, supplement the generic
        // status-driven reaction with check names + URLs from `ci_checks`.
        // Only runs when a PR is in hand and a reaction engine is wired in.
        if session.status == SessionStatus::CiFailed {
            if let Some(ref pr) = pr_saved {
                if self.reaction_engine.is_some() {
                    self.check_ci_failed(session, pr).await?;
                }
            }
        }

        // ---- 7. Review-backlog re-dispatch (issue #195 H2) ----
        // When fingerprint of pending comments changes, re-fire
        // `changes-requested` so the agent sees fresh reviewer feedback.
        // Only called when the throttle (managed by `poll_scm` above) allowed
        // the full REST fan-out this tick.
        if let Some(ref pr) = pr_saved {
            if self.reaction_engine.is_some() {
                self.check_review_backlog(session, pr).await?;
            }
        }

        Ok(())
    }

    /// Port of `maybeDispatchReviewBacklog` from
    /// `packages/core/src/lifecycle-manager.ts:758-932`.
    ///
    /// After the initial `changes-requested` reaction fires, this helper
    /// re-dispatches whenever reviewers leave *new* comments. It fingerprints
    /// the current `pending_comments` set and compares against the last-seen
    /// fingerprint stored on the session. When the fingerprint changes a fresh
    /// `changes-requested` dispatch is fired so the agent sees the new
    /// feedback. Same-fingerprint ticks are silent (de-dup).
    ///
    /// **Throttle**: the caller (`poll_scm`) manages the 2-minute throttle via
    /// `last_review_backlog_check`; this helper is only called when the
    /// throttle has already been cleared for this tick.
    ///
    /// Only runs when:
    /// - A reaction engine is wired in.
    /// - The session is in a review-backlog-eligible state (`is_review_stable`).
    /// - A PR is in hand (caller guarantees this via `pr` parameter).
    pub(super) async fn check_review_backlog(
        &self,
        session: &mut Session,
        pr: &PullRequest,
    ) -> Result<()> {
        let Some(engine) = self.reaction_engine.as_ref() else {
            return Ok(());
        };
        let Some(scm) = self.scm.as_ref() else {
            return Ok(());
        };

        if !is_review_stable(session.status) {
            return Ok(());
        }

        let comments = match scm.pending_comments(pr).await {
            Ok(c) => c,
            Err(e) => {
                tracing::warn!(
                    session = %session.id,
                    error = %e,
                    "pending_comments failed; skipping review backlog check"
                );
                return Ok(());
            }
        };

        // Fingerprint: stable hash of sorted (author, body, url) triples.
        let fingerprint = fingerprint_comments(&comments);

        let prev = session.last_review_backlog_fingerprint;
        if prev == Some(fingerprint) {
            // Nothing changed — no dispatch.
            return Ok(());
        }

        // Only dispatch when there are actual comments to act on.
        if comments.is_empty() {
            // No comments yet; store the empty fingerprint so a future
            // non-empty set triggers a dispatch.
            if prev.is_none() {
                session.last_review_backlog_fingerprint = Some(fingerprint);
                self.sessions.save(session).await?;
            }
            return Ok(());
        }

        // Build a formatted message from the new comments.
        let mut msg = String::from("New review comments on your PR:\n");
        for c in &comments {
            if let Some(ref path) = c.path {
                msg.push_str(&format!("- {} ({}): {}\n", c.author, path, c.body));
            } else {
                msg.push_str(&format!("- {}: {}\n", c.author, c.body));
            }
        }
        msg.push_str("\nCheck with `gh pr view --comments`, address the feedback, and push.");

        // Dispatch. The engine tracks attempts; cleared on transition exit.
        engine
            .dispatch_with_message(session, "changes-requested", msg)
            .await?;

        session.last_review_backlog_fingerprint = Some(fingerprint);
        self.sessions.save(session).await?;

        Ok(())
    }

    /// Build a CI-failure detail message and dispatch the `ci-failed`
    /// reaction when the session just entered `CiFailed`.
    ///
    /// Unlike the status-driven path in `transition` (which dispatches
    /// through `status_to_reaction_key` using the static YAML message),
    /// this helper fetches the live `ci_checks` list and formats failing
    /// check names / run URLs into the message body so the agent knows
    /// *which* checks failed.
    ///
    /// Called from `poll_scm` after the transition to `CiFailed`.
    pub(super) async fn check_ci_failed(&self, session: &Session, pr: &PullRequest) -> Result<()> {
        let Some(engine) = self.reaction_engine.as_ref() else {
            return Ok(());
        };
        let Some(scm) = self.scm.as_ref() else {
            return Ok(());
        };

        let checks = match scm.ci_checks(pr).await {
            Ok(c) => c,
            Err(e) => {
                tracing::warn!(
                    session = %session.id,
                    error = %e,
                    "ci_checks failed; using generic ci-failed message"
                );
                // Fall back to generic dispatch without detail.
                engine.dispatch(session, "ci-failed").await?;
                return Ok(());
            }
        };

        let failed: Vec<_> = checks
            .iter()
            .filter(|c| c.status == CheckStatus::Failed)
            .collect();

        let msg = if failed.is_empty() {
            // No individual failures returned (e.g. provider didn't
            // populate per-check data) — fall through to the static YAML
            // message via normal dispatch.
            engine.dispatch(session, "ci-failed").await?;
            return Ok(());
        } else {
            let mut s = String::from("CI failed. Failing checks:\n");
            for check in &failed {
                if let Some(ref url) = check.url {
                    s.push_str(&format!("- {}{}\n", check.name, url));
                } else {
                    s.push_str(&format!("- {}\n", check.name));
                }
            }
            s.push_str("\nFix the failures, push, and wait for CI to re-run.");
            s
        };

        engine
            .dispatch_with_message(session, "ci-failed", msg)
            .await?;

        Ok(())
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::lifecycle::tests::{
        fake_pr, fake_session, recv_timeout, script_ready_pr, setup_with_scm,
        setup_with_scm_and_auto_merge_engine, MockAgent, MockRuntime, MockScm,
    };
    use crate::reactions::ReactionAction;
    use std::collections::HashSet;
    use std::sync::atomic::Ordering;

    // ---------- SCM polling integration (Phase F) ---------- //

    #[tokio::test]
    async fn scm_poll_with_no_pr_leaves_working_untouched() {
        let (lifecycle, sessions, scm, base) = setup_with_scm("scm-no-pr").await;
        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        assert_eq!(
            scm.detect_calls.load(Ordering::SeqCst),
            1,
            "detect_pr should be called exactly once"
        );
        let persisted = sessions.list().await.unwrap();
        assert_eq!(persisted[0].status, SessionStatus::Working);

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn scm_poll_opens_pr_transitions_working_to_pr_open() {
        use crate::scm::{CiStatus, PrState, ReviewDecision};
        let (lifecycle, sessions, scm, base) = setup_with_scm("scm-open").await;
        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        scm.set_pr(Some(fake_pr(42, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Pending);
        scm.set_review(ReviewDecision::None);

        let mut rx = lifecycle.subscribe();
        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let mut events = Vec::new();
        while let Some(e) = recv_timeout(&mut rx).await {
            events.push(e);
        }
        assert!(
            events.iter().any(|e| matches!(
                e,
                OrchestratorEvent::StatusChanged {
                    from: SessionStatus::Working,
                    to: SessionStatus::PrOpen,
                    ..
                }
            )),
            "expected Working → PrOpen, got {events:?}"
        );

        let persisted = sessions.list().await.unwrap();
        assert_eq!(persisted[0].status, SessionStatus::PrOpen);

        assert_eq!(
            scm.detect_calls.load(Ordering::SeqCst),
            1,
            "expected exactly one detect_pr call per tick"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn scm_poll_ci_failing_transitions_pr_open_to_ci_failed() {
        use crate::scm::{CiStatus, PrState, ReviewDecision};
        let (lifecycle, sessions, scm, base) = setup_with_scm("scm-ci-fail").await;
        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::PrOpen;
        sessions.save(&s).await.unwrap();

        scm.set_pr(Some(fake_pr(42, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Failing);
        scm.set_review(ReviewDecision::Pending);

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let persisted = sessions.list().await.unwrap();
        assert_eq!(persisted[0].status, SessionStatus::CiFailed);
        assert_eq!(
            scm.detect_calls.load(Ordering::SeqCst),
            1,
            "expected exactly one detect_pr call per tick"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn scm_poll_full_green_transitions_through_to_mergeable() {
        use crate::scm::{CiStatus, MergeReadiness, PrState, ReviewDecision};
        let (lifecycle, sessions, scm, base) = setup_with_scm("scm-all-green").await;
        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        scm.set_pr(Some(fake_pr(42, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Passing);
        scm.set_review(ReviewDecision::Approved);
        scm.set_readiness(MergeReadiness {
            mergeable: true,
            ci_passing: true,
            approved: true,
            no_conflicts: true,
            blockers: vec![],
        });

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let persisted = sessions.list().await.unwrap();
        assert_eq!(persisted[0].status, SessionStatus::Mergeable);

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn scm_poll_pr_disappears_drops_pr_track_back_to_working() {
        let (lifecycle, sessions, scm, base) = setup_with_scm("scm-pr-gone").await;
        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::PrOpen;
        sessions.save(&s).await.unwrap();

        scm.set_pr(None);

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let persisted = sessions.list().await.unwrap();
        assert_eq!(persisted[0].status, SessionStatus::Working);

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn scm_poll_detect_pr_error_emits_tick_error_and_skips() {
        let (lifecycle, sessions, scm, base) = setup_with_scm("scm-detect-err").await;
        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        scm.detect_pr_errors.store(true, Ordering::SeqCst);

        let mut rx = lifecycle.subscribe();
        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let mut saw_tick_error = false;
        while let Some(e) = recv_timeout(&mut rx).await {
            if let OrchestratorEvent::TickError { message, .. } = e {
                if message.contains("detect_pr") {
                    saw_tick_error = true;
                }
            }
        }
        assert!(saw_tick_error, "expected TickError from scm.detect_pr");

        let persisted = sessions.list().await.unwrap();
        assert_eq!(persisted[0].status, SessionStatus::Working);

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn scm_poll_field_probe_error_emits_tick_error_and_skips_transition() {
        struct Case {
            label: &'static str,
            toggle: fn(&MockScm),
            expected_slot: &'static str,
        }
        let cases = [
            Case {
                label: "pr_state",
                toggle: |s| s.pr_state_errors.store(true, Ordering::SeqCst),
                expected_slot: "pr_state",
            },
            Case {
                label: "ci_status",
                toggle: |s| s.ci_status_errors.store(true, Ordering::SeqCst),
                expected_slot: "ci_status",
            },
            Case {
                label: "review_decision",
                toggle: |s| s.review_decision_errors.store(true, Ordering::SeqCst),
                expected_slot: "review_decision",
            },
            Case {
                label: "mergeability",
                toggle: |s| s.mergeability_errors.store(true, Ordering::SeqCst),
                expected_slot: "mergeability",
            },
        ];

        for case in cases {
            let (lifecycle, sessions, scm, base) =
                setup_with_scm(&format!("scm-field-err-{}", case.label)).await;
            let mut s = fake_session("s1", "demo");
            s.status = SessionStatus::Working;
            sessions.save(&s).await.unwrap();

            scm.set_pr(Some(fake_pr(42, "ao-s1")));
            (case.toggle)(&scm);

            let mut rx = lifecycle.subscribe();
            let mut seen = HashSet::new();
            lifecycle.tick(&mut seen).await.unwrap();

            let mut saw_probe_error = false;
            while let Some(e) = recv_timeout(&mut rx).await {
                if let OrchestratorEvent::TickError { message, .. } = e {
                    if message.contains(case.expected_slot) {
                        saw_probe_error = true;
                    }
                }
            }
            assert!(
                saw_probe_error,
                "expected TickError mentioning {} for case {}",
                case.expected_slot, case.label
            );

            let persisted = sessions.list().await.unwrap();
            assert_eq!(persisted[0].status, SessionStatus::Working);

            let _ = std::fs::remove_dir_all(&base);
        }
    }

    #[tokio::test]
    async fn scm_poll_is_off_when_scm_is_not_configured() {
        use crate::lifecycle::tests::unique_temp_dir;
        use crate::session_manager::SessionManager;
        let base = unique_temp_dir("scm-absent");
        let sessions = Arc::new(SessionManager::new(base.clone()));
        let runtime: Arc<dyn Runtime> = Arc::new(MockRuntime::new(true));
        let agent: Arc<dyn Agent> = Arc::new(MockAgent::new(ActivityState::Ready));
        let lifecycle = Arc::new(LifecycleManager::new(sessions.clone(), runtime, agent));

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let persisted = sessions.list().await.unwrap();
        assert_eq!(persisted[0].status, SessionStatus::Working);

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn scm_poll_fires_reaction_when_transitioning_into_ci_failed() {
        use crate::lifecycle::tests::unique_temp_dir;
        use crate::reactions::ReactionConfig;
        use crate::scm::{CiStatus, PrState, ReviewDecision};
        use crate::session_manager::SessionManager;
        let base = unique_temp_dir("scm-reaction");
        let sessions = Arc::new(SessionManager::new(base.clone()));
        let runtime: Arc<dyn Runtime> = Arc::new(MockRuntime::new(true));
        let agent: Arc<dyn Agent> = Arc::new(MockAgent::new(ActivityState::Ready));
        let scm = Arc::new(MockScm::new());

        let lifecycle = LifecycleManager::new(sessions.clone(), runtime, agent);

        let mut cfg = ReactionConfig::new(ReactionAction::SendToAgent);
        cfg.message = Some("CI broke, please fix".into());
        let mut map = std::collections::HashMap::new();
        map.insert("ci-failed".into(), cfg);
        let engine_runtime = Arc::new(MockRuntime::new(true));
        let engine = Arc::new(ReactionEngine::new(
            map,
            engine_runtime.clone() as Arc<dyn Runtime>,
            lifecycle.events_sender(),
        ));

        let lifecycle = Arc::new(
            lifecycle
                .with_reaction_engine(engine.clone())
                .with_scm(scm.clone() as Arc<dyn Scm>),
        );

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        scm.set_pr(Some(fake_pr(42, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Failing);
        scm.set_review(ReviewDecision::Pending);

        let mut rx = lifecycle.subscribe();
        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let mut events = Vec::new();
        while let Some(e) = recv_timeout(&mut rx).await {
            events.push(e);
        }

        assert!(
            events.iter().any(|e| matches!(
                e,
                OrchestratorEvent::StatusChanged {
                    to: SessionStatus::CiFailed,
                    ..
                }
            )),
            "expected StatusChanged to CiFailed, got {events:?}"
        );
        assert!(
            events.iter().any(|e| matches!(
                e,
                OrchestratorEvent::ReactionTriggered {
                    action: ReactionAction::SendToAgent,
                    ..
                }
            )),
            "expected ReactionTriggered(SendToAgent), got {events:?}"
        );
        let sends = engine_runtime.sends();
        assert_eq!(sends.len(), 1, "expected exactly one send, got {sends:?}");
        assert_eq!(sends[0].1, "CI broke, please fix");

        let _ = std::fs::remove_dir_all(&base);
    }

    // ---------- MergeFailed parking loop (Phase G) ---------- //

    #[tokio::test]
    async fn auto_merge_failure_parks_in_merge_failed_then_retries_next_tick() {
        let (lifecycle, sessions, scm, engine, base) =
            setup_with_scm_and_auto_merge_engine("park-retry", Some(5)).await;

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        script_ready_pr(&scm, 42);
        scm.merge_errors.store(true, Ordering::SeqCst);

        let mut rx = lifecycle.subscribe();

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let persisted = sessions.list().await.unwrap();
        assert_eq!(
            persisted[0].status,
            SessionStatus::MergeFailed,
            "tick 1 must park in MergeFailed after merge failure"
        );
        assert_eq!(
            engine.attempts(&s.id, "approved-and-green"),
            1,
            "tracker must increment on the failed merge"
        );
        assert_eq!(scm.merges().len(), 0, "failed merge does not record");

        scm.merge_errors.store(false, Ordering::SeqCst);

        lifecycle.tick(&mut seen).await.unwrap();

        let persisted = sessions.list().await.unwrap();
        assert_eq!(
            persisted[0].status,
            SessionStatus::Mergeable,
            "tick 2 must re-promote and stay in Mergeable after successful merge"
        );
        assert_eq!(
            engine.attempts(&s.id, "approved-and-green"),
            2,
            "tracker must accumulate across the parking loop"
        );
        assert_eq!(scm.merges().len(), 1, "second attempt must actually merge");
        assert_eq!(scm.merges()[0], (42, None));

        let mut events = Vec::new();
        while let Some(e) = recv_timeout(&mut rx).await {
            events.push(e);
        }
        let park_seen = events.iter().any(|e| {
            matches!(
                e,
                OrchestratorEvent::StatusChanged {
                    from: SessionStatus::Working,
                    to: SessionStatus::MergeFailed,
                    ..
                }
            )
        });
        let repromote_seen = events.iter().any(|e| {
            matches!(
                e,
                OrchestratorEvent::StatusChanged {
                    from: SessionStatus::MergeFailed,
                    to: SessionStatus::Mergeable,
                    ..
                }
            )
        });
        assert!(park_seen, "expected park event, got {events:?}");
        assert!(repromote_seen, "expected re-promote event, got {events:?}");

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn persistent_merge_failure_escalates_after_retries_exhausted() {
        let (lifecycle, sessions, scm, engine, base) =
            setup_with_scm_and_auto_merge_engine("park-escalate", Some(2)).await;

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        script_ready_pr(&scm, 42);
        scm.merge_errors.store(true, Ordering::SeqCst);

        let mut rx = lifecycle.subscribe();

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(engine.attempts(&s.id, "approved-and-green"), 1);
        assert_eq!(
            sessions.list().await.unwrap()[0].status,
            SessionStatus::MergeFailed
        );

        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(engine.attempts(&s.id, "approved-and-green"), 2);
        assert_eq!(
            sessions.list().await.unwrap()[0].status,
            SessionStatus::MergeFailed
        );

        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(engine.attempts(&s.id, "approved-and-green"), 3);

        let persisted = sessions.list().await.unwrap();
        assert_eq!(
            persisted[0].status,
            SessionStatus::Mergeable,
            "after escalation, session must stay in Mergeable (not parked)"
        );
        assert_eq!(
            scm.merges().len(),
            0,
            "both failed merges are rejected by the mock; no successful records"
        );

        let mut events = Vec::new();
        while let Some(e) = recv_timeout(&mut rx).await {
            events.push(e);
        }
        let escalated_count = events
            .iter()
            .filter(|e| matches!(e, OrchestratorEvent::ReactionEscalated { .. }))
            .count();
        assert_eq!(
            escalated_count, 1,
            "expected exactly one ReactionEscalated event, got {events:?}"
        );

        let attempts_before_tick4 = engine.attempts(&s.id, "approved-and-green");
        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(
            engine.attempts(&s.id, "approved-and-green"),
            attempts_before_tick4,
            "tick 4 must not increment attempts — session is frozen"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn merge_failed_exit_to_ci_failed_clears_approved_and_green_tracker() {
        use crate::scm::{CiStatus, MergeReadiness};
        let (lifecycle, sessions, scm, engine, base) =
            setup_with_scm_and_auto_merge_engine("park-exit-clears", Some(5)).await;

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        script_ready_pr(&scm, 42);
        scm.merge_errors.store(true, Ordering::SeqCst);

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(
            sessions.list().await.unwrap()[0].status,
            SessionStatus::MergeFailed
        );
        assert_eq!(engine.attempts(&s.id, "approved-and-green"), 1);

        scm.set_ci(CiStatus::Failing);
        scm.set_readiness(MergeReadiness {
            mergeable: false,
            ci_passing: false,
            approved: true,
            no_conflicts: true,
            blockers: vec!["CI is failing".into()],
        });

        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(
            sessions.list().await.unwrap()[0].status,
            SessionStatus::CiFailed
        );
        assert_eq!(
            engine.attempts(&s.id, "approved-and-green"),
            0,
            "approved-and-green tracker must be cleared on exit from MergeFailed"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn merge_failed_drops_back_to_working_when_pr_disappears() {
        let (lifecycle, sessions, scm, _engine, base) =
            setup_with_scm_and_auto_merge_engine("park-pr-gone", Some(5)).await;

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::MergeFailed;
        sessions.save(&s).await.unwrap();

        scm.set_pr(None);

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let persisted = sessions.list().await.unwrap();
        assert_eq!(
            persisted[0].status,
            SessionStatus::Working,
            "MergeFailed must be on the PR track so detect_pr(None) drops to Working"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn stuck_overrides_pr_open_in_same_tick_when_idle_beyond_threshold() {
        use crate::lifecycle::tests::{fake_pr, rewind_idle_since, unique_temp_dir};
        use crate::reactions::ReactionConfig;
        use crate::scm::{CiStatus, PrState, ReviewDecision};
        use crate::session_manager::SessionManager;
        let base = unique_temp_dir("stuck_overrides_pr_open");
        let sessions = Arc::new(SessionManager::new(base.clone()));
        let runtime: Arc<dyn Runtime> = Arc::new(MockRuntime::new(true));
        let agent: Arc<dyn Agent> = Arc::new(MockAgent::new(ActivityState::Idle));
        let scm = Arc::new(MockScm::new());

        let lifecycle = LifecycleManager::new(sessions.clone(), runtime, agent);

        let mut stuck_cfg = ReactionConfig::new(ReactionAction::Notify);
        stuck_cfg.threshold = Some("1s".into());
        let mut map = std::collections::HashMap::new();
        map.insert("agent-stuck".into(), stuck_cfg);
        let engine_runtime: Arc<dyn Runtime> = Arc::new(MockRuntime::new(true));
        let engine = Arc::new(ReactionEngine::new(
            map,
            engine_runtime,
            lifecycle.events_sender(),
        ));

        let lifecycle = Arc::new(
            lifecycle
                .with_reaction_engine(engine)
                .with_scm(scm.clone() as Arc<dyn Scm>),
        );

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        rewind_idle_since(&lifecycle, &s.id, Duration::from_secs(2));

        scm.set_pr(Some(fake_pr(42, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Pending);
        scm.set_review(ReviewDecision::None);

        let mut rx = lifecycle.subscribe();
        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let events: Vec<_> = {
            let mut v = Vec::new();
            while let Some(e) = recv_timeout(&mut rx).await {
                v.push(e);
            }
            v
        };
        assert!(
            events.iter().any(|e| matches!(
                e,
                OrchestratorEvent::StatusChanged {
                    from: SessionStatus::Working,
                    to: SessionStatus::Stuck,
                    ..
                }
            )),
            "expected Working → Stuck transition, got {events:?}"
        );
        assert!(
            !events.iter().any(|e| matches!(
                e,
                OrchestratorEvent::StatusChanged {
                    to: SessionStatus::PrOpen,
                    ..
                }
            )),
            "must not emit an intermediate PrOpen transition: {events:?}"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    // ---------- Issue #195 H3: CI-failed message includes check names ---------- //

    #[tokio::test]
    async fn ci_failed_message_includes_check_names() {
        use crate::lifecycle::tests::unique_temp_dir;
        use crate::reactions::ReactionConfig;
        use crate::scm::{CheckRun, CheckStatus, CiStatus, PrState, ReviewDecision};
        use crate::session_manager::SessionManager;

        let base = unique_temp_dir("ci-detail");
        let sessions = Arc::new(SessionManager::new(base.clone()));
        let lifecycle_runtime: Arc<dyn Runtime> = Arc::new(MockRuntime::new(true));
        let agent: Arc<dyn Agent> = Arc::new(MockAgent::new(ActivityState::Ready));
        let scm = Arc::new(MockScm::new());

        let lifecycle = LifecycleManager::new(sessions.clone(), lifecycle_runtime, agent);
        let engine_runtime = Arc::new(MockRuntime::new(true));
        let mut cfg = ReactionConfig::new(ReactionAction::SendToAgent);
        cfg.message = Some("CI failed (generic)".into());
        let mut map = std::collections::HashMap::new();
        map.insert("ci-failed".into(), cfg);
        let engine = Arc::new(ReactionEngine::new(
            map,
            engine_runtime.clone() as Arc<dyn Runtime>,
            lifecycle.events_sender(),
        ));
        let lifecycle = Arc::new(
            lifecycle
                .with_reaction_engine(engine.clone())
                .with_scm(scm.clone() as Arc<dyn Scm>),
        );

        scm.set_ci_checks(vec![
            CheckRun {
                name: "unit-tests".into(),
                status: CheckStatus::Failed,
                url: Some("https://ci.example.com/run/1".into()),
                conclusion: Some("failure".into()),
            },
            CheckRun {
                name: "lint".into(),
                status: CheckStatus::Failed,
                url: None,
                conclusion: Some("failure".into()),
            },
        ]);

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::Working;
        sessions.save(&s).await.unwrap();

        scm.set_pr(Some(fake_pr(10, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Failing);
        scm.set_review(ReviewDecision::None);

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let sends = engine_runtime.sends();
        assert_eq!(
            sends.len(),
            1,
            "expected exactly one ci-failed send, got {sends:?}"
        );
        let msg = &sends[0].1;
        assert!(
            msg.contains("unit-tests"),
            "message must include check name 'unit-tests', got: {msg}"
        );
        assert!(
            msg.contains("https://ci.example.com/run/1"),
            "message must include check URL, got: {msg}"
        );
        assert!(
            msg.contains("lint"),
            "message must include check name 'lint', got: {msg}"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    // ---------- Issue #195 H2: review backlog dispatch + de-dup ---------- //

    #[tokio::test]
    async fn review_backlog_dispatches_once_on_new_comments() {
        use crate::lifecycle::tests::unique_temp_dir;
        use crate::reactions::ReactionConfig;
        use crate::scm::{CiStatus, PrState, ReviewComment, ReviewDecision};
        use crate::session_manager::SessionManager;

        let base = unique_temp_dir("review-backlog-new");
        let sessions = Arc::new(SessionManager::new(base.clone()));
        let lifecycle_runtime: Arc<dyn Runtime> = Arc::new(MockRuntime::new(true));
        let agent: Arc<dyn Agent> = Arc::new(MockAgent::new(ActivityState::Ready));
        let scm = Arc::new(MockScm::new());

        let lifecycle = LifecycleManager::new(sessions.clone(), lifecycle_runtime, agent);
        let engine_runtime = Arc::new(MockRuntime::new(true));
        let mut cfg = ReactionConfig::new(ReactionAction::SendToAgent);
        cfg.message = Some("Address review comments".into());
        let mut map = std::collections::HashMap::new();
        map.insert("changes-requested".into(), cfg);
        let engine = Arc::new(ReactionEngine::new(
            map,
            engine_runtime.clone() as Arc<dyn Runtime>,
            lifecycle.events_sender(),
        ));
        let lifecycle = Arc::new(
            lifecycle
                .with_reaction_engine(engine.clone())
                .with_scm(scm.clone() as Arc<dyn Scm>),
        );

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::ChangesRequested;
        sessions.save(&s).await.unwrap();

        scm.set_pr(Some(fake_pr(20, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Pending);
        scm.set_review(ReviewDecision::ChangesRequested);

        scm.set_pending_comments(vec![
            ReviewComment {
                id: "c1".into(),
                author: "alice".into(),
                body: "Please fix the indentation".into(),
                path: Some("src/main.rs".into()),
                line: Some(42),
                is_resolved: false,
                url: "https://github.com/a/b/pull/20#comment-1".into(),
            },
            ReviewComment {
                id: "c2".into(),
                author: "bob".into(),
                body: "Add a test for this".into(),
                path: None,
                line: None,
                is_resolved: false,
                url: "https://github.com/a/b/pull/20#comment-2".into(),
            },
        ]);

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();

        let sends = engine_runtime.sends();
        assert_eq!(
            sends.len(),
            1,
            "expected exactly 1 send for new comments, got {sends:?}"
        );
        let msg = &sends[0].1;
        assert!(
            msg.contains("alice") || msg.contains("New review"),
            "message should mention the comment author or be a review summary"
        );

        let _ = std::fs::remove_dir_all(&base);
    }

    #[tokio::test]
    async fn review_backlog_no_redispatch_on_same_comments() {
        use crate::lifecycle::tests::unique_temp_dir;
        use crate::reactions::ReactionConfig;
        use crate::scm::{CiStatus, PrState, ReviewComment, ReviewDecision};
        use crate::session_manager::SessionManager;

        let base = unique_temp_dir("review-backlog-dedup");
        let sessions = Arc::new(SessionManager::new(base.clone()));
        let lifecycle_runtime: Arc<dyn Runtime> = Arc::new(MockRuntime::new(true));
        let agent: Arc<dyn Agent> = Arc::new(MockAgent::new(ActivityState::Ready));
        let scm = Arc::new(MockScm::new());

        let lifecycle = LifecycleManager::new(sessions.clone(), lifecycle_runtime, agent);
        let engine_runtime = Arc::new(MockRuntime::new(true));
        let mut cfg = ReactionConfig::new(ReactionAction::SendToAgent);
        cfg.message = Some("Address review comments".into());
        let mut map = std::collections::HashMap::new();
        map.insert("changes-requested".into(), cfg);
        let engine = Arc::new(ReactionEngine::new(
            map,
            engine_runtime.clone() as Arc<dyn Runtime>,
            lifecycle.events_sender(),
        ));
        let lifecycle = Arc::new(
            lifecycle
                .with_reaction_engine(engine.clone())
                .with_scm(scm.clone() as Arc<dyn Scm>),
        );

        let mut s = fake_session("s1", "demo");
        s.status = SessionStatus::ChangesRequested;
        sessions.save(&s).await.unwrap();

        scm.set_pr(Some(fake_pr(21, "ao-s1")));
        scm.set_state(PrState::Open);
        scm.set_ci(CiStatus::Pending);
        scm.set_review(ReviewDecision::ChangesRequested);

        let comments = vec![ReviewComment {
            id: "c1".into(),
            author: "alice".into(),
            body: "Fix this".into(),
            path: None,
            line: None,
            is_resolved: false,
            url: "https://github.com/a/b/pull/21#comment-1".into(),
        }];
        scm.set_pending_comments(comments.clone());

        let mut seen = HashSet::new();
        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(engine_runtime.sends().len(), 1, "tick 1 should dispatch");

        {
            let mut map = lifecycle.last_review_backlog_check.lock().unwrap();
            map.clear();
        }
        lifecycle.tick(&mut seen).await.unwrap();
        assert_eq!(
            engine_runtime.sends().len(),
            1,
            "tick 2 with same comments must NOT dispatch again"
        );

        let _ = std::fs::remove_dir_all(&base);
    }
}