1use std::collections::{BTreeMap, BTreeSet};
42use std::fmt::Write as _;
43use std::path::{Path, PathBuf};
44use std::sync::Arc;
45use std::time::Duration;
46
47use anyhow::{Context as _, Result, bail};
48use jiff::Timestamp;
49use serde::{Deserialize, Serialize};
50
51use crate::agent::{self, Invocation, SeatState};
52use crate::ask;
53use crate::config::MergeMode;
54use crate::git;
55use crate::proc::Quiet as _;
56use crate::prompt;
57use crate::run::{
58 ContestedHandoff, LandApproval, LandReruns, MergeOutcome, RunState, RunStatus, tail,
59};
60
61pub const POLL: Duration = Duration::from_secs(30);
67
68pub const WAIT_CEILING: Duration = Duration::from_secs(45 * 60);
74
75pub const CHECKS_GRACE: Duration = Duration::from_secs(3 * 60);
87
88const LOG_TAIL: usize = 4_000;
91
92const MAX_LOGS: usize = 3;
95
96pub const MARKER: &str = "<!-- magi:land -->";
102
103const NOT_A_REVIEW: [&str; 3] = [
112 "skip review by coderabbit.ai",
113 "summarize by coderabbit.ai",
114 "<!-- tips_start -->",
115];
116
117#[derive(Debug, Clone, Copy, PartialEq, Eq)]
119pub enum PrLifecycle {
120 Open,
122 Merged,
124 Closed,
126}
127
128#[derive(Debug, Clone, Copy, PartialEq, Eq)]
130pub enum Checks {
131 Pending,
133 Green,
136 Red,
138 Unknown,
140}
141
142impl PrLifecycle {
143 pub fn as_str(self) -> &'static str {
145 match self {
146 Self::Open => "open",
147 Self::Merged => "merged",
148 Self::Closed => "closed",
149 }
150 }
151}
152
153impl Checks {
154 pub fn as_str(self) -> &'static str {
156 match self {
157 Self::Pending => "pending",
158 Self::Green => "green",
159 Self::Red => "red",
160 Self::Unknown => "unknown",
161 }
162 }
163}
164
165#[derive(Debug, Clone, PartialEq, Eq)]
167pub struct ReviewComment {
168 pub author: String,
170 pub path: Option<String>,
172 pub line: Option<u64>,
174 pub body: String,
176}
177
178#[derive(Debug, Clone, PartialEq, Eq)]
180pub struct PrState {
181 pub url: String,
183 pub number: u64,
185 pub state: PrLifecycle,
187 pub checks: Checks,
189 pub failing: Vec<String>,
191 pub review_comments: Vec<ReviewComment>,
193 pub blocking: Blocking,
195}
196
197#[derive(Debug, Clone, Copy, PartialEq, Eq)]
210pub enum Blocking {
211 No,
213 Yes,
215 Conflict,
217 Unsaid,
221}
222
223impl Blocking {
224 fn of(raw: &str) -> Self {
226 match raw.to_ascii_uppercase().as_str() {
227 "CLEAN" | "UNSTABLE" | "HAS_HOOKS" => Self::No,
230 "DIRTY" => Self::Conflict,
231 "" | "UNKNOWN" => Self::Unsaid,
232 _ => Self::Yes,
234 }
235 }
236
237 #[must_use]
239 pub fn stops_a_merge(self) -> bool {
240 !matches!(self, Self::No)
241 }
242}
243
244#[derive(Debug, Clone, PartialEq, Eq)]
246pub enum Step {
247 Wait,
249 Rebase,
257 Fix {
259 reason: String,
261 },
262 Merge,
264 Done {
266 merged: bool,
268 },
269 GiveUp {
271 reason: String,
273 },
274}
275
276pub(crate) fn merged_after_all(
298 argv: &[String],
299 stderr: &str,
300 after: Option<PrLifecycle>,
301) -> Option<MergeOutcome> {
302 if after? != PrLifecycle::Merged {
303 return None;
304 }
305 Some(MergeOutcome {
306 mode: MergeMode::Pr,
307 ok: true,
308 detail: format!(
309 "gh {} (the command reported `{}`, but the pull request is merged)",
310 argv.join(" "),
311 stderr.trim()
312 ),
313 empty: false,
314 })
315}
316
317pub fn decide(pr: &PrState, round: usize, budget: usize, waited: Duration) -> Step {
337 decide_with(pr, round, budget, waited, CiExpectation::Expected)
338}
339
340#[derive(Debug, Clone, Copy, PartialEq, Eq)]
342pub enum CiExpectation {
343 Expected,
346 Absent,
351}
352
353pub fn decide_with(
358 pr: &PrState,
359 round: usize,
360 budget: usize,
361 waited: Duration,
362 ci: CiExpectation,
363) -> Step {
364 match pr.state {
365 PrLifecycle::Merged => return Step::Done { merged: true },
366 PrLifecycle::Closed => return Step::Done { merged: false },
367 PrLifecycle::Open => {}
368 }
369
370 if pr.blocking == Blocking::Conflict {
373 return Step::Rebase;
374 }
375
376 if ci == CiExpectation::Absent {
377 return Step::Merge;
378 }
379
380 let spent = round >= budget;
381 match pr.checks {
382 Checks::Pending => Step::Wait,
383 Checks::Unknown if waited < CHECKS_GRACE => Step::Wait,
384 Checks::Unknown => Step::GiveUp {
385 reason: format!(
386 "no check status is readable on the pull request after {} minute(s); \
387 refusing to merge on a guess",
388 CHECKS_GRACE.as_secs() / 60
389 ),
390 },
391 Checks::Red if !pr.blocking.stops_a_merge() && pr.review_comments.is_empty() => Step::Merge,
398 Checks::Red => {
399 let what = format!(
400 "{} check(s) failing: {}",
401 pr.failing.len(),
402 pr.failing.join(", ")
403 );
404 if spent {
405 Step::GiveUp {
406 reason: format!("{what} — still red after {budget} fix round(s)"),
407 }
408 } else {
409 Step::Fix { reason: what }
410 }
411 }
412 Checks::Green if pr.review_comments.is_empty() => Step::Merge,
413 Checks::Green => {
414 let what = format!(
415 "checks are green but {} review comment(s) are unresolved: {}",
416 pr.review_comments.len(),
417 authors(&pr.review_comments)
418 );
419 if spent {
420 Step::GiveUp {
421 reason: format!("{what} — still unresolved after {budget} fix round(s)"),
422 }
423 } else {
424 Step::Fix { reason: what }
425 }
426 }
427 }
428}
429
430fn authors(comments: &[ReviewComment]) -> String {
432 let mut seen: Vec<&str> = Vec::new();
433 for c in comments {
434 if !seen.contains(&c.author.as_str()) {
435 seen.push(&c.author);
436 }
437 }
438 seen.join(", ")
439}
440
441pub fn merge_argv(number: u64, subject: &str) -> Vec<String> {
445 vec![
446 "pr".to_owned(),
447 "merge".to_owned(),
448 number.to_string(),
449 "--squash".to_owned(),
450 "--delete-branch".to_owned(),
451 "--subject".to_owned(),
452 subject.to_owned(),
453 ]
454}
455
456pub fn merge_argv_at(number: u64, subject: &str, head: &str) -> Vec<String> {
462 let mut argv = merge_argv(number, subject);
463 argv.push("--match-head-commit".to_owned());
464 argv.push(head.to_owned());
465 argv
466}
467
468pub fn disable_automerge_argv(number: u64) -> Vec<String> {
473 ["pr", "merge", &number.to_string(), "--disable-auto"]
474 .map(str::to_owned)
475 .to_vec()
476}
477
478fn direct_merge_is_safe(
484 fresh: Option<&Seen>,
485 approved_head: &str,
486 shown: &BTreeSet<String>,
487 round: usize,
488 budget: usize,
489 waited: Duration,
490) -> bool {
491 let Some(fresh) = fresh else {
492 return false;
493 };
494 if fresh.pr.state != PrLifecycle::Open {
495 return false;
496 }
497 let Some(bound) = bound_head(&fresh.head, &fresh.rollup_head, None) else {
498 return false;
499 };
500 if !bound.eq_ignore_ascii_case(approved_head) {
501 return false;
502 }
503 let mut pr = fresh.pr.clone();
504 pr.review_comments.retain(|c| !shown.contains(&c.body));
505 decide(&pr, round, budget, waited) == Step::Merge
506}
507
508fn waiting_on(
515 merge_state: &str,
516 contexts: &[CheckInfo],
517 required_set: Option<&BTreeSet<String>>,
518) -> String {
519 let state = if merge_state.is_empty() {
520 "unknown"
521 } else {
522 merge_state
523 };
524 let tag = |c: &CheckInfo| match c.verdict {
525 Verdict::Fail => "failed",
526 _ => "pending",
527 };
528 let unsettled: Vec<&CheckInfo> = contexts
529 .iter()
530 .filter(|c| c.verdict != Verdict::Pass)
531 .collect();
532 let required: Vec<String> = unsettled
533 .iter()
534 .filter(|c| c.required == Some(true))
535 .map(|c| format!("{} ({})", c.label, tag(c)))
536 .collect();
537 let unknown: Vec<String> = unsettled
538 .iter()
539 .filter(|c| c.required.is_none())
540 .map(|c| format!("{} ({})", c.label, tag(c)))
541 .collect();
542 let never: Vec<&str> = required_set
546 .map(|set| {
547 set.iter()
548 .filter(|name| !contexts.iter().any(|c| c.label.eq_ignore_ascii_case(name)))
549 .map(String::as_str)
550 .collect()
551 })
552 .unwrap_or_default();
553 let mut out = format!("merge state: {state}");
554 if !never.is_empty() {
555 let _ = write!(
556 out,
557 "; required checks never reported: {}",
558 never.join(", ")
559 );
560 }
561 if !required.is_empty() {
562 let _ = write!(
563 out,
564 "; required checks not passing: {}",
565 required.join(", ")
566 );
567 }
568 if !unknown.is_empty() {
569 let _ = write!(
570 out,
571 "; whether these are required could not be read, so they may be: {}",
572 unknown.join(", ")
573 );
574 }
575 if required.is_empty() && unknown.is_empty() && never.is_empty() {
576 if required_set.is_some() {
577 out.push_str(
578 "; no required check is pending, failing or unreported, so GitHub is probably \
579 waiting for a review or another branch rule",
580 );
581 } else {
582 out.push_str(
583 "; the required check list could not be read, so a required check that was \
584 never reported cannot be ruled out",
585 );
586 }
587 }
588 out
589}
590
591pub fn merge_subject(pr_title: &str, instruction: &str) -> String {
598 let title = pr_title.trim();
599 if !title.is_empty() && !title.starts_with("magi: candidate") {
600 return title.to_owned();
601 }
602 let first = instruction
603 .lines()
604 .map(str::trim)
605 .find(|l| !l.is_empty())
606 .unwrap_or("magi: land the winning candidate");
607 first.trim_start_matches(['#', ' ']).to_owned()
608}
609
610pub const APPROVE: &str = "merge";
612
613pub const HOLD: &str = "hold";
615
616pub const REPAIR: &str = "fix findings and re-review";
618
619pub fn repair_available(state: &RunState) -> bool {
622 state.reviews.last().is_some_and(|r| {
623 state.open_findings().iter().any(|f| f.severity.blocks())
624 || r.final_votes()
625 .iter()
626 .any(|(_, _, v)| *v == crate::verdict::ReviewVote::Reject)
627 })
628}
629
630pub fn approval_choices(state: &RunState) -> Vec<String> {
632 let mut choices = vec![
633 APPROVE.to_owned(),
634 HOLD.to_owned(),
635 REPAIR.to_owned(),
636 crate::merge_decision::WITHDRAW.to_owned(),
637 crate::merge_decision::DISMISS.to_owned(),
638 ];
639 choices.extend(
640 state
641 .config
642 .agents
643 .iter()
644 .map(|a| format!("{}{id}", crate::merge_decision::REIMPLEMENT, id = a.id)),
645 );
646 choices
647}
648
649pub fn upgrade_repair_choice(q: &mut ask::Question, state: &RunState) -> bool {
652 if q.node != APPROVAL_NODE
653 || !state
654 .land_approval
655 .as_ref()
656 .is_some_and(|a| a.question == q.id)
657 {
658 return false;
659 }
660 let before = (q.choices.clone(), q.actions.clone(), q.merge_target.clone());
661 if q.status.open() {
662 q.actions.remove(HOLD);
665 for choice in approval_choices(state) {
666 if !q.choices.contains(&choice) {
667 q.choices.push(choice);
668 }
669 }
670 if q.merge_target.is_none() {
671 q.merge_target = state.pr.as_ref().map(|pr| crate::merge_decision::Target {
672 pr: pr.url.clone(),
673 head: state.land_approval.as_ref().unwrap().head.clone(),
674 language: state.config.graph.language.clone(),
675 });
676 }
677 }
678 for choice in q.choices.clone() {
679 if (q.status.open()
680 && crate::merge_decision::stops(&choice)
681 && choice != HOLD
682 && choice != crate::merge_decision::DISMISS)
683 || (choice == REPAIR && (q.status.open() || q.resolution().as_deref() == Some(REPAIR)))
684 {
685 q.actions.insert(
686 choice,
687 ask::ChoiceAction::Resume {
688 run: state.id.clone(),
689 },
690 );
691 }
692 }
693 before != (q.choices.clone(), q.actions.clone(), q.merge_target.clone())
694}
695
696pub fn unhedged(message: &str, quote: &str) -> bool {
704 let quote = quote.trim();
705 !quote.is_empty() && message.contains(quote) && !hedged(message) && !retracts(message)
706}
707
708fn hedged(text: &str) -> bool {
712 const WORDS: &[&str] = &[
713 "maybe",
714 "probably",
715 "perhaps",
716 "might",
717 "if",
718 "unless",
719 "not",
720 "no",
721 "nope",
722 "stop",
723 "dont",
724 "abort",
725 "revert",
726 "undo",
727 "never",
728 "wait",
729 "hold",
730 "cancel",
731 "but",
732 "think",
733 "guess",
734 "suppose",
735 "unsure",
736 "yet",
737 "except",
738 "only",
739 "cannot",
740 "should",
741 "once",
742 "provided",
743 "providing",
744 "when",
745 "whenever",
746 "after",
747 "until",
748 "before",
749 "assuming",
750 "given",
751 "while",
752 "whether",
753 "depending",
754 "pending",
755 ];
756 const JA: &[&str] = &[
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 if text.contains(['?', '?']) || JA.iter().any(|w| text.contains(w)) {
791 return true;
792 }
793 text.to_lowercase()
794 .replace('\u{2019}', "'")
795 .split(|c: char| !(c.is_alphanumeric() || c == '\'') || !c.is_ascii())
796 .filter(|w| !w.is_empty())
797 .any(|w| WORDS.contains(&w) || w.ends_with("n't"))
798}
799
800fn retracts(message: &str) -> bool {
803 let lower = message.to_lowercase();
804 [
805 "やっぱ",
806 "待って",
807 "撤回",
808 "never mind",
809 "actually",
810 "on second thought",
811 ]
812 .iter()
813 .any(|w| lower.contains(w))
814 || lower
815 .split(|c: char| !c.is_ascii_alphabetic())
816 .any(|w| w == "wait")
817}
818
819pub const APPROVAL_NODE: &str = "land-approval";
825
826pub const DIFF_MAX_LINES: usize = 400;
834
835#[derive(Debug, Clone, Copy, PartialEq, Eq)]
837pub enum Approval {
838 Merge,
840 Repair,
842 Hold,
844}
845
846pub fn approval(answer: Option<&str>) -> Approval {
854 match answer {
855 Some(a) if a.trim().eq_ignore_ascii_case(APPROVE) => Approval::Merge,
856 Some(a) if a.trim() == REPAIR => Approval::Repair,
857 _ => Approval::Hold,
858 }
859}
860
861#[derive(Debug, Clone, Copy, PartialEq, Eq)]
863enum ApprovalGate {
864 Approved,
866 Repair,
868 Held,
871 Pending,
873}
874
875fn esc(s: &str) -> String {
885 let mut out = String::with_capacity(s.len());
886 for c in s.chars() {
887 match c {
888 '&' => out.push_str("&"),
889 '<' => out.push_str("<"),
890 '>' => out.push_str(">"),
891 '"' => out.push_str("""),
892 '\'' => out.push_str("'"),
893 _ => out.push(c),
894 }
895 }
896 out
897}
898
899#[derive(Debug, Clone, PartialEq, Eq)]
901struct StatRow {
902 path: String,
903 added: Option<u64>,
905 removed: Option<u64>,
906}
907
908impl StatRow {
909 fn churn(&self) -> u64 {
912 self.added.unwrap_or(0) + self.removed.unwrap_or(0)
913 }
914}
915
916fn parse_numstat(numstat: &str) -> Vec<StatRow> {
922 let mut rows: Vec<StatRow> = numstat
923 .lines()
924 .filter_map(|line| {
925 let mut parts = line.splitn(3, '\t');
926 let added = parts.next()?.trim();
927 let removed = parts.next()?.trim();
928 let path = parts.next()?.trim();
929 if path.is_empty() {
930 return None;
931 }
932 Some(StatRow {
933 path: path.to_owned(),
934 added: added.parse().ok(),
935 removed: removed.parse().ok(),
936 })
937 })
938 .collect();
939 rows.sort_by(|a, b| b.churn().cmp(&a.churn()).then_with(|| a.path.cmp(&b.path)));
942 rows
943}
944
945fn diff_row(line: &str) -> (&'static str, &'static str, &str) {
954 if line.starts_with("+++") || line.starts_with("---") {
955 (" ", "color:#57606a;font-weight:600", line)
956 } else if let Some(body) = line.strip_prefix('+') {
957 ("+", "background:#e6ffec;color:#0a3622", body)
958 } else if let Some(body) = line.strip_prefix('-') {
959 ("-", "background:#ffebe9;color:#5c1a17", body)
960 } else if line.starts_with("@@") {
961 ("~", "background:#eef2ff;color:#3730a3", line)
962 } else if let Some(body) = line.strip_prefix(' ') {
963 (" ", "", body)
964 } else {
965 (" ", "color:#57606a;font-weight:600", line)
966 }
967}
968
969struct Words {
978 html_lang: &'static str,
979 task: &'static str,
980 what_changed: &'static str,
981 review_verdict: &'static str,
982 reviewer: &'static str,
983 reviewer_no_answer: &'static str,
984 checks: &'static str,
985 nothing_failing: &'static str,
986 files_changed: &'static str,
987 commits: &'static str,
988 no_commits: &'static str,
989 comments: &'static str,
990 no_comments: &'static str,
991 diff: &'static str,
992 truncated: &'static str,
993 lands_as: &'static str,
994}
995
996const EN: Words = Words {
997 html_lang: "en",
998 task: "Task",
999 what_changed: "What changed",
1000 review_verdict: "Review verdict",
1001 reviewer: "Reviewer",
1002 reviewer_no_answer: "produced no answer",
1003 checks: "Checks",
1004 nothing_failing: "Nothing failing.",
1005 files_changed: "file(s) changed",
1006 commits: "Commits being squashed",
1007 no_commits: "No commit subjects could be read from the branch.",
1008 comments: "Review comments",
1009 no_comments: "Nothing outstanding at this observation.",
1010 diff: "Diff",
1011 truncated: "Truncated",
1012 lands_as: "They land as one commit titled",
1013};
1014
1015const JA: Words = Words {
1016 html_lang: "ja",
1017 task: "タスク",
1018 what_changed: "変更内容",
1019 review_verdict: "レビューの結論",
1020 reviewer: "レビュアー",
1021 reviewer_no_answer: "回答なし",
1022 checks: "チェック",
1023 nothing_failing: "失敗しているものはありません。",
1024 files_changed: "ファイル変更",
1025 commits: "squash されるコミット",
1026 no_commits: "ブランチからコミット件名を読めませんでした。",
1027 comments: "レビューコメント",
1028 no_comments: "この時点で未対応のものはありません。",
1029 diff: "差分",
1030 truncated: "省略",
1031 lands_as: "これらは次の件名の1コミットとして入ります:",
1032};
1033
1034impl Words {
1035 fn lands_as_tail(&self) -> &'static str {
1039 if self.html_lang == "ja" {
1040 "。この件名も承認の対象です。"
1041 } else {
1042 ", which you are approving too."
1043 }
1044 }
1045
1046 fn approval_summary(&self, number: u64, subject: &str) -> String {
1048 if self.html_lang == "ja" {
1049 format!("プルリクエスト #{number} をマージ: {subject}")
1050 } else {
1051 format!("merge pull request #{number}: {subject}")
1052 }
1053 }
1054
1055 fn approval_detail(
1057 &self,
1058 url: &str,
1059 base: &str,
1060 subject: &str,
1061 contested: Option<&ContestedHandoff>,
1062 ) -> String {
1063 let body = if self.html_lang == "ja" {
1064 format!(
1065 "{url} はチェックが緑で、`{base}` へ `{subject}` として squash \
1066 できる状態です。差分の要約・パッチ・squash されるコミットは\
1067 下のパネルにあります。"
1068 )
1069 } else {
1070 format!(
1071 "{url} is green and ready to squash into `{base}` as `{subject}`. \
1072 The panel holds the diffstat, the patch and the commits being squashed."
1073 )
1074 };
1075 match contested {
1076 Some(c) => format!("{}\n\n{body}", self.contested_reason(url, c)),
1077 None => body,
1078 }
1079 }
1080
1081 fn contested_reason(&self, url: &str, c: &ContestedHandoff) -> String {
1084 const SHOWN: usize = 5;
1085 const TITLE_CHARS: usize = 100;
1086 let ja = self.html_lang == "ja";
1087 let mut out = if ja {
1088 format!(
1089 "{url} は、マージ承認がオフでも保留しています。レビューが予算切れで終わった\
1090 時点で、却下票を伴う重大な未解決の指摘が残っているためです。\n"
1091 )
1092 } else {
1093 format!(
1094 "{url} is held for approval although merge approvals are off: the \
1095 review ended with blocking findings still open and a reviewer \
1096 voting reject.\n"
1097 )
1098 };
1099 for f in c.findings.iter().take(SHOWN) {
1100 let at = match (&f.file, f.line) {
1101 (Some(file), Some(line)) => format!("{file}:{line}"),
1102 (Some(file), None) => file.clone(),
1103 _ => (if ja { "場所未指定" } else { "no location" }).to_owned(),
1104 };
1105 let title: String = f.title.chars().take(TITLE_CHARS).collect();
1106 let _ = writeln!(out, "- {} {} {at}: {title}", f.id, f.severity);
1107 }
1108 if c.findings.len() > SHOWN {
1109 let more = c.findings.len() - SHOWN;
1110 let _ = writeln!(
1111 out,
1112 "{}",
1113 if ja {
1114 format!("- ほか {more} 件")
1115 } else {
1116 format!("- and {more} more")
1117 }
1118 );
1119 }
1120 let seats: Vec<String> = c
1121 .rejecters
1122 .iter()
1123 .map(|(seat, agent)| format!("#{seat} ({agent})"))
1124 .collect();
1125 let _ = write!(
1126 out,
1127 "{} {}",
1128 if ja {
1129 "却下したレビュアー:"
1130 } else {
1131 "Rejected by reviewer:"
1132 },
1133 seats.join(", ")
1134 );
1135 out
1136 }
1137
1138 fn truncated_note(
1140 &self,
1141 omitted: usize,
1142 total: usize,
1143 shown: usize,
1144 where_: &str,
1145 base: &str,
1146 head: &str,
1147 ) -> String {
1148 if self.html_lang == "ja" {
1149 format!(
1150 "先頭 {shown} 行のあと、差分 {total} 行のうち {omitted} 行を省略しました。\
1151 全体は <code>{where_}</code>(<code>git diff {base}...{head}</code>)と\
1152 プルリクエストにあります。"
1153 )
1154 } else {
1155 format!(
1156 "{omitted} of {total} diff lines omitted after the first {shown}. \
1157 The whole patch is in <code>{where_}</code> \
1158 (<code>git diff {base}...{head}</code>) and on the pull request."
1159 )
1160 }
1161 }
1162}
1163
1164fn words(language: &str) -> &'static Words {
1167 if crate::lang::is_japanese(language) {
1168 &JA
1169 } else {
1170 &EN
1171 }
1172}
1173
1174pub fn approval_panel(
1186 state: &RunState,
1187 pr: &PrState,
1188 diffstat: &str,
1189 diff: &str,
1190 commits: &[String],
1191 subject: &str,
1192) -> String {
1193 let rows = parse_numstat(diffstat);
1194 let w = words(&state.config.graph.language);
1195 let mut h = String::with_capacity(4_096 + diff.len().min(200_000));
1196
1197 let _ = writeln!(
1198 h,
1199 "<!doctype html>\n<html lang=\"{}\">\n<head>\n<meta charset=\"utf-8\">\n\
1200 <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">",
1201 w.html_lang
1202 );
1203 let _ = writeln!(
1204 h,
1205 "<title>merge #{} — {}</title>\n</head>",
1206 pr.number,
1207 esc(subject)
1208 );
1209 h.push_str(
1210 "<body style=\"margin:0;padding:12px;font:15px/1.5 -apple-system,\
1211 'Segoe UI',system-ui,sans-serif;color:#1f2328;background:#fff;\
1212 word-break:break-word\">\n",
1213 );
1214
1215 let _ = writeln!(
1217 h,
1218 "<h1 style=\"margin:0 0 4px;font-size:19px\">Merge #{} into \
1219 <code style=\"background:#f6f8fa;padding:1px 4px;border-radius:4px\">{}</code></h1>\n\
1220 <p style=\"margin:0 0 4px;font-size:17px;font-weight:600\">{}</p>\n\
1221 <p style=\"margin:0 0 12px;font-size:13px;color:#57606a\">squash merge · run {} · \
1222 <a href=\"{}\" target=\"_blank\" rel=\"noopener noreferrer\" style=\"color:#0969da\">{}</a></p>",
1223 pr.number,
1224 esc(&state.base_branch),
1225 esc(subject),
1226 esc(&state.id),
1227 esc(&pr.url),
1228 esc(&pr.url),
1229 );
1230
1231 let _ = writeln!(
1234 h,
1235 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>\n\
1236 <p style=\"margin:0;font-size:13px;white-space:pre-wrap\">{}</p>",
1237 w.task,
1238 esc(&state.instruction)
1239 );
1240
1241 if let Some(summary) = state
1243 .winner()
1244 .map(|c| c.summary.as_str())
1245 .filter(|s| !s.is_empty())
1246 {
1247 let _ = writeln!(
1248 h,
1249 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>\n\
1250 <p style=\"margin:0;font-size:13px;white-space:pre-wrap\">{}</p>",
1251 w.what_changed,
1252 esc(summary)
1253 );
1254 }
1255
1256 if let Some(round) = state.reviews.last() {
1259 let _ = writeln!(
1260 h,
1261 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1262 w.review_verdict
1263 );
1264 for r in &round.reviews {
1265 let body = match &r.failed {
1272 Some(reason) => format!("{}: {}", w.reviewer_no_answer, esc(reason)),
1273 None => esc(&r.summary),
1274 };
1275 let _ = writeln!(
1276 h,
1277 "<div style=\"margin:0 0 8px;padding:8px;background:#f6f8fa;\
1278 border-radius:6px\">\
1279 <div style=\"font-size:12px;color:#57606a\">{} {} · {}</div>\
1280 <div style=\"white-space:pre-wrap;font-size:13px\">{}</div></div>",
1281 w.reviewer,
1282 r.reviewer,
1283 esc(&r.agent),
1284 body,
1285 );
1286 }
1287 }
1288
1289 let _ = writeln!(
1290 h,
1291 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}: {}</h2>",
1292 w.checks,
1293 esc(pr.checks.as_str())
1294 );
1295 if pr.failing.is_empty() {
1296 let _ = writeln!(
1297 h,
1298 "<p style=\"margin:0;font-size:13px;color:#57606a\">{}</p>",
1299 w.nothing_failing
1300 );
1301 } else {
1302 h.push_str("<ul style=\"margin:0;padding-left:20px;font-size:13px\">\n");
1303 for f in &pr.failing {
1304 let _ = writeln!(h, "<li>{}</li>", esc(f));
1305 }
1306 h.push_str("</ul>\n");
1307 }
1308
1309 let _ = writeln!(
1312 h,
1313 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{} {}</h2>",
1314 rows.len(),
1315 w.files_changed
1316 );
1317 h.push_str(
1318 "<table style=\"width:100%;border-collapse:collapse;font-size:13px\">\n\
1319 <thead><tr>\
1320 <th style=\"text-align:left;border-bottom:1px solid #d0d7de;padding:4px 2px\">file</th>\
1321 <th style=\"text-align:right;border-bottom:1px solid #d0d7de;padding:4px 2px\">added</th>\
1322 <th style=\"text-align:right;border-bottom:1px solid #d0d7de;padding:4px 2px\">removed\
1323 </th></tr></thead>\n<tbody>\n",
1324 );
1325 let mut total_added = 0u64;
1326 let mut total_removed = 0u64;
1327 for r in &rows {
1328 total_added += r.added.unwrap_or(0);
1329 total_removed += r.removed.unwrap_or(0);
1330 let cell = |n: Option<u64>| match n {
1331 Some(n) => n.to_string(),
1332 None => "bin".to_owned(),
1333 };
1334 let _ = writeln!(
1335 h,
1336 "<tr>\
1337 <td style=\"padding:4px 2px;border-bottom:1px solid #eaeef2;\
1338 font-family:ui-monospace,monospace\">{}</td>\
1339 <td style=\"padding:4px 2px;border-bottom:1px solid #eaeef2;text-align:right;\
1340 color:#0a3622\">{}</td>\
1341 <td style=\"padding:4px 2px;border-bottom:1px solid #eaeef2;text-align:right;\
1342 color:#5c1a17\">{}</td></tr>",
1343 esc(&r.path),
1344 cell(r.added),
1345 cell(r.removed),
1346 );
1347 }
1348 let _ = writeln!(
1349 h,
1350 "</tbody>\n<tfoot><tr style=\"font-weight:600\">\
1351 <td style=\"padding:4px 2px\">total</td>\
1352 <td style=\"padding:4px 2px;text-align:right\">{total_added}</td>\
1353 <td style=\"padding:4px 2px;text-align:right\">{total_removed}</td>\
1354 </tr></tfoot>\n</table>"
1355 );
1356
1357 let _ = writeln!(
1359 h,
1360 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1361 w.commits
1362 );
1363 if commits.is_empty() {
1364 h.push_str(&format!(
1365 "<p style=\"margin:0;font-size:13px;color:#57606a\">{}</p>\n",
1366 w.no_commits
1367 ));
1368 } else {
1369 h.push_str("<ol style=\"margin:0;padding-left:20px;font-size:13px\">\n");
1370 for c in commits {
1371 let _ = writeln!(h, "<li>{}</li>", esc(c));
1372 }
1373 h.push_str("</ol>\n");
1374 }
1375 let _ = writeln!(
1376 h,
1377 "<p style=\"margin:8px 0 0;font-size:13px\">{} <strong>{}</strong>{}</p>",
1378 w.lands_as,
1379 esc(subject),
1380 w.lands_as_tail()
1381 );
1382
1383 let _ = writeln!(
1385 h,
1386 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1387 w.comments
1388 );
1389 if pr.review_comments.is_empty() {
1390 h.push_str(&format!(
1391 "<p style=\"margin:0;font-size:13px;color:#57606a\">{}</p>\n",
1392 w.no_comments
1393 ));
1394 } else {
1395 for c in &pr.review_comments {
1396 let anchor = match (&c.path, c.line) {
1397 (Some(p), Some(l)) => format!("{p}:{l}"),
1398 (Some(p), None) => p.clone(),
1399 _ => "pull request thread".to_owned(),
1400 };
1401 let _ = writeln!(
1402 h,
1403 "<div style=\"margin:0 0 8px;padding:8px;background:#f6f8fa;border-radius:6px\">\
1404 <div style=\"font-size:12px;color:#57606a\">{} · {}</div>\
1405 <div style=\"white-space:pre-wrap;font-size:13px\">{}</div></div>",
1406 esc(&c.author),
1407 esc(&anchor),
1408 esc(&tail(&c.body, 800)),
1409 );
1410 }
1411 }
1412
1413 let total = diff.lines().count();
1415 let shown = total.min(DIFF_MAX_LINES);
1416 let _ = writeln!(
1417 h,
1418 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1419 w.diff
1420 );
1421 h.push_str(
1422 "<div style=\"font:12px/1.45 ui-monospace,SFMono-Regular,Menlo,monospace;\
1423 border:1px solid #d0d7de;border-radius:6px;overflow-x:auto\">\n",
1424 );
1425 for line in diff.lines().take(shown) {
1426 let (gutter, style, body) = diff_row(line);
1427 let _ = writeln!(
1428 h,
1429 "<div style=\"display:flex;{style}\">\
1430 <span style=\"flex:0 0 1.4em;text-align:center;user-select:none;\
1431 border-right:1px solid #d0d7de\">{gutter}</span>\
1432 <span style=\"white-space:pre;padding-left:6px\">{}</span></div>",
1433 esc(body),
1434 );
1435 }
1436 h.push_str("</div>\n");
1437 if total > shown {
1438 let omitted = total - shown;
1439 let head = state.winner().map_or("HEAD", |w| w.branch.as_str());
1440 let where_ = state.winner().map_or_else(
1441 || state.repo.display().to_string(),
1442 |w| w.worktree.display().to_string(),
1443 );
1444 let _ = writeln!(
1445 h,
1446 "<p style=\"margin:8px 0 0;padding:8px;background:#fff8c5;border-radius:6px;\
1447 font-size:13px\">{}: {}</p>",
1448 w.truncated,
1449 w.truncated_note(
1450 omitted,
1451 total,
1452 shown,
1453 &esc(&where_),
1454 &esc(&state.base_branch),
1455 &esc(head),
1456 ),
1457 );
1458 }
1459
1460 h.push_str("</body>\n</html>\n");
1461 h
1462}
1463
1464fn contested_to_ask(state: &RunState) -> Option<ContestedHandoff> {
1468 if state.config.graph.hold_contested_merge {
1469 state.contested_handoff.clone()
1470 } else {
1471 None
1472 }
1473}
1474
1475pub fn deputy_brief(q: &ask::Question, state: Option<&RunState>) -> String {
1484 let mut s = format!(
1485 "This is the merge approval for run {run} (`magi show {run}`). The question's \
1486 own text above names the pull request. Answering `{APPROVE}` squash-merges \
1487 it into the base branch, which cannot be undone; `{HOLD}` leaves the pull \
1488 request open. Silence is a hold: the owner not answering never merges. Only \
1489 the owner choosing `{APPROVE}`, or clearly telling you to merge in their \
1490 own words, merges. Whether their wording is a clear, unconditional instruction \
1491 is your judgement alone: if it is doubtful, conditional, retracted or a \
1492 question, do not settle - ask back with `magi ask --thread`. Doubt and \
1493 silence are a hold.\n\n\
1494 This brief is a snapshot from when you were attached: check `magi show {run}` \
1495 and `gh pr view` (read-only) before telling the owner anything current. \
1496 You run with permission to write the question record, and what keeps you \
1497 from touching anything else is this brief and your instructions - so do \
1498 not change files, branches or the pull request.",
1499 run = q.run
1500 );
1501 if let Some(target) = &q.merge_target {
1502 s.push_str(&format!("\n\nThis decision names PR {} at head `{}`. Merge through chat requires the owner's latest whole message and quote to be exactly `merge {}`. Discussion alone never approves. For hold, repair, withdrawal or replacement, use the exact offered token from the owner's latest whole message. Withdrawal explicitly closes the PR and ends the task. Replacement closes the old PR before dispatching a new attempt with the selected implementer; do not start a separate task yourself.", target.pr, target.head, target.head));
1503 }
1504 if q.choices.iter().any(|c| c == REPAIR) {
1505 s.push_str("\n\n`fix findings and re-review` requests one repair and bounded re-review on the existing PR. It never approves a merge. Settle this choice only when the owner's whole latest message is exactly this label; otherwise discuss it with `--thread`. The driver performs the repair; do not edit or queue another task. Updated review and gate results require a fresh merge decision.");
1506 }
1507 let Some(state) = state else {
1508 s.push_str(
1509 "\n\nThe run's record could not be read, so the pull request, the panel \
1510 summary and any contested findings are not known to you beyond the \
1511 question's own text. Say so to the owner rather than guessing.",
1512 );
1513 return s;
1514 };
1515 if let Some(pr) = &state.pr {
1516 s.push_str(&format!(
1517 "\n\nPull request #{} {} (recorded state: {}, last seen).",
1518 pr.number, pr.url, pr.state
1519 ));
1520 }
1521 s.push_str(&format!("\nBase branch: `{}`.", state.base_branch));
1522 if let Some(w) = state.winner() {
1523 s.push_str(&format!("\nWinning branch: `{}`.", w.branch));
1524 }
1525 match contested_to_ask(state) {
1526 Some(c) => {
1527 s.push_str(
1528 "\n\nThis question was filed although merge approvals are off, because \
1529 the review hand-off is contested. Open findings:",
1530 );
1531 for f in &c.findings {
1532 let at = match (&f.file, f.line) {
1533 (Some(file), Some(line)) => format!(" ({file}:{line})"),
1534 (Some(file), None) => format!(" ({file})"),
1535 _ => String::new(),
1536 };
1537 s.push_str(&format!("\n- [{}] {}{at}: {}", f.id, f.severity, f.title));
1538 }
1539 let seats: Vec<String> = c.rejecters.iter().map(|(n, _)| format!("#{n}")).collect();
1540 s.push_str(&format!("\nReviewers who rejected: {}.", seats.join(", ")));
1541 }
1542 None => s.push_str("\n\nThe review hand-off was not recorded as contested."),
1543 }
1544 s
1545}
1546
1547fn merge_consent_superseded(state: &RunState, question: &ask::Question) -> Result<bool> {
1551 if !question.status.open() && approval(question.resolution().as_deref()) != Approval::Merge {
1552 return Ok(false);
1553 }
1554 let Some(task_id) = state
1555 .origin
1556 .as_ref()
1557 .and_then(|origin| origin.task.as_ref())
1558 else {
1559 return Ok(false);
1560 };
1561 let task = crate::queue::Queue::open()
1562 .get(task_id)
1563 .context("cannot verify operator decisions for the merge approval")?;
1564 Ok(task
1565 .operator_decided_at
1566 .is_some_and(|at| at > question.answered_at.unwrap_or(question.asked_at)))
1567}
1568
1569async fn approval_gate(
1589 state: &mut RunState,
1590 pr: &PrState,
1591 subject: &str,
1592 contested: Option<&ContestedHandoff>,
1593 head: &str,
1594) -> Result<ApprovalGate> {
1595 let store = ask::Questions::open();
1596 let reusable = state.land_approval.as_ref().and_then(|a| {
1601 store
1602 .list()
1603 .into_iter()
1604 .find(|q| q.id == a.question)
1605 .filter(|q| {
1606 a.head.eq_ignore_ascii_case(head)
1607 || q.resolution()
1608 .as_deref()
1609 .is_some_and(crate::merge_decision::stops)
1610 })
1611 });
1612 let reusable = match reusable {
1613 Some(q) if merge_consent_superseded(state, &q)? => None,
1614 other => other,
1615 };
1616 if reusable.is_none() {
1617 for stale in store
1618 .list()
1619 .into_iter()
1620 .filter(|q| q.run == state.id && q.node == APPROVAL_NODE && q.status.open())
1621 {
1622 let why =
1623 "the pull request head or operator decision changed; asked again for approval";
1624 if let Err(e) = store.update(&stale.id, |q| {
1625 q.abandon(why);
1626 Ok(())
1627 }) {
1628 tracing::warn!("could not retire the superseded approval question: {e:#}");
1629 }
1630 }
1631 }
1632
1633 let q = match reusable {
1634 Some(mut q) => {
1635 if upgrade_repair_choice(&mut q, state) {
1636 q = store
1637 .update(&q.id, |current| {
1638 upgrade_repair_choice(current, state);
1639 Ok(())
1640 })?
1641 .0;
1642 }
1643 q
1644 }
1645 None => {
1646 let worktree = match state.winner() {
1647 Some(w) => w.worktree.clone(),
1648 None => state.repo.clone(),
1649 };
1650 let head = if head.is_empty() {
1653 state
1654 .winner()
1655 .map_or_else(|| "HEAD".to_owned(), |w| w.branch.clone())
1656 } else {
1657 head.to_owned()
1658 };
1659 let remote = &state.config.merge.remote;
1662 let tracking = format!("{remote}/{}", state.base_branch);
1663 let base = if git::rev_exists(&worktree, &tracking).await {
1664 tracking
1665 } else {
1666 String::new()
1667 };
1668 let range = format!("{base}...{head}");
1669 let numstat = if base.is_empty() {
1673 String::new()
1674 } else {
1675 git::git_raw(&worktree, &["diff", "--numstat", "-M", &range])
1676 .await
1677 .map(|o| o.stdout)
1678 .unwrap_or_default()
1679 };
1680 let diff = if base.is_empty() {
1681 String::new()
1682 } else {
1683 git::diff(&worktree, &base, &head).await.unwrap_or_default()
1684 };
1685 let commits: Vec<String> = if base.is_empty() {
1686 Vec::new()
1687 } else {
1688 git::git_raw(
1689 &worktree,
1690 &[
1691 "log",
1692 "--reverse",
1693 "--format=%s",
1694 &format!("{base}..{head}"),
1695 ],
1696 )
1697 .await
1698 .map(|o| o.stdout)
1699 .unwrap_or_default()
1700 .lines()
1701 .filter(|l| !l.trim().is_empty())
1702 .map(str::to_owned)
1703 .collect()
1704 };
1705
1706 let w = words(&state.config.graph.language);
1707 let html = approval_panel(state, pr, &numstat, &diff, &commits, subject);
1708 let mut fresh = ask::Question::new(
1709 state.id.clone(),
1710 APPROVAL_NODE.to_owned(),
1711 "land".to_owned(),
1712 w.approval_summary(pr.number, subject),
1713 w.approval_detail(&pr.url, &state.base_branch, subject, contested),
1714 approval_choices(state),
1715 );
1716 fresh.merge_target = Some(crate::merge_decision::Target {
1717 pr: pr.url.clone(),
1718 head: head.clone(),
1719 language: state.config.graph.language.clone(),
1720 });
1721 if fresh.choices.iter().any(|c| c == REPAIR) {
1722 fresh.actions.insert(
1723 REPAIR.to_owned(),
1724 ask::ChoiceAction::Resume {
1725 run: state.id.clone(),
1726 },
1727 );
1728 fresh.detail.push_str("\n\n`fix findings and re-review` runs one repair and bounded review on this PR; it does not approve a merge. A fresh decision follows the updated review and gate.");
1729 }
1730 for choice in fresh.choices.clone() {
1731 if crate::merge_decision::stops(&choice)
1732 && choice != HOLD
1733 && choice != crate::merge_decision::DISMISS
1734 {
1735 fresh.actions.insert(
1736 choice,
1737 ask::ChoiceAction::Resume {
1738 run: state.id.clone(),
1739 },
1740 );
1741 }
1742 }
1743 store
1744 .put_panel(&mut fresh, &html, &[])
1745 .context("write the merge approval panel")?;
1746 store
1747 .put(&mut fresh)
1748 .context("file the merge approval question")?;
1749 state.land_approval = Some(LandApproval {
1750 question: fresh.id.clone(),
1751 head: head.clone(),
1752 });
1753 state.event(
1754 "land",
1755 format!("asking for merge approval ({})", fresh.short()),
1756 );
1757 state.save()?;
1758 if let Err(e) = ask::notify(&state.config.notify, &fresh).await {
1759 tracing::warn!(
1763 "could not notify about merge approval question {}: {e:#} - \
1764 the web UI is the only surface for it now",
1765 fresh.short()
1766 );
1767 }
1768 fresh
1769 }
1770 };
1771
1772 Ok(match q.status {
1773 ask::QuestionStatus::Open => ApprovalGate::Pending,
1774 ask::QuestionStatus::Abandoned => ApprovalGate::Held,
1778 ask::QuestionStatus::Answered => match approval(q.resolution().as_deref()) {
1782 Approval::Merge => ApprovalGate::Approved,
1783 Approval::Repair if !state.reviews.is_empty() => {
1784 if !state.merge_repairs.iter().any(|r| r.question == q.id) {
1785 state.merge_repairs.push(crate::run::MergeRepair {
1786 question: q.id.clone(),
1787 head: head.to_owned(),
1788 pr: pr.url.clone(),
1789 reviews: state.reviews.clone(),
1790 gate: state.gate.clone(),
1791 gate_head: state.gate_head.clone(),
1792 gate_fixes: state.gate_fixes.clone(),
1793 pre_gate: state.pre_gate.clone(),
1794 phase: crate::run::MergeRepairPhase::Requested,
1795 failure: None,
1796 });
1797 state.land_approval = None;
1798 state.event(
1799 "repair",
1800 "owner requested fix findings and re-review; merge is not approved",
1801 );
1802 state.save()?;
1803 }
1804 ApprovalGate::Repair
1805 }
1806 Approval::Repair | Approval::Hold => ApprovalGate::Held,
1807 },
1808 })
1809}
1810
1811fn rollup_verdict(rollup: &[GhCheck]) -> (Checks, Vec<String>) {
1814 let mut failing = Vec::new();
1815 let mut pending = false;
1816 let mut unknown = false;
1817 for check in rollup {
1818 match check.verdict() {
1819 Verdict::Pass => {}
1820 Verdict::Pending => pending = true,
1821 Verdict::Fail => failing.push(check.label()),
1822 Verdict::Unknown => unknown = true,
1823 }
1824 }
1825 let checks = if rollup.is_empty() {
1826 Checks::Unknown
1827 } else if pending {
1828 Checks::Pending
1829 } else if !failing.is_empty() {
1830 Checks::Red
1831 } else if unknown {
1832 Checks::Unknown
1833 } else {
1834 Checks::Green
1835 };
1836 (checks, failing)
1837}
1838
1839pub fn parse_pr(json: &str) -> Result<PrState> {
1842 let raw: GhPr = serde_json::from_str(json).context("parse `gh pr view --json ...` output")?;
1843 let state = match raw.state.to_ascii_uppercase().as_str() {
1844 "OPEN" => PrLifecycle::Open,
1845 "MERGED" => PrLifecycle::Merged,
1846 "CLOSED" => PrLifecycle::Closed,
1847 other => bail!("unknown pull request state `{other}`"),
1848 };
1849
1850 let (checks, failing) = rollup_verdict(&raw.status_check_rollup);
1851
1852 let mut review_comments = Vec::new();
1853 for r in raw.reviews {
1854 push_if_outstanding(
1855 &mut review_comments,
1856 ReviewComment {
1857 author: r.author.login,
1858 path: None,
1859 line: None,
1860 body: r.body,
1861 },
1862 );
1863 }
1864 for c in raw.comments {
1865 push_if_outstanding(
1866 &mut review_comments,
1867 ReviewComment {
1868 author: c.author.login,
1869 path: None,
1870 line: None,
1871 body: c.body,
1872 },
1873 );
1874 }
1875
1876 Ok(PrState {
1877 url: raw.url,
1878 number: raw.number,
1879 state,
1880 checks,
1881 failing,
1882 review_comments,
1883 blocking: Blocking::of(&raw.merge_state_status),
1884 })
1885}
1886
1887#[derive(Debug, Clone, PartialEq, Eq)]
1889pub(crate) struct CheckView {
1890 pub name: String,
1891 pub verdict: Verdict,
1892 pub run: Option<String>,
1894 pub url: Option<String>,
1895}
1896
1897#[derive(Debug, Clone, PartialEq, Eq)]
1901pub(crate) struct RollupView {
1902 pub url: String,
1903 pub number: u64,
1904 pub state: PrLifecycle,
1905 pub head: String,
1906 pub checks: Vec<CheckView>,
1907}
1908
1909pub(crate) fn parse_rollup(json: &str) -> Result<RollupView> {
1912 let raw: GhPr = serde_json::from_str(json).context("parse `gh pr view --json ...` output")?;
1913 let state = match raw.state.to_ascii_uppercase().as_str() {
1914 "OPEN" => PrLifecycle::Open,
1915 "MERGED" => PrLifecycle::Merged,
1916 "CLOSED" => PrLifecycle::Closed,
1917 other => bail!("unknown pull request state `{other}`"),
1918 };
1919 let checks = raw
1920 .status_check_rollup
1921 .iter()
1922 .map(|c| CheckView {
1923 name: c.label(),
1924 verdict: c.verdict(),
1925 run: c.url().and_then(run_of),
1926 url: c.url().map(str::to_owned),
1927 })
1928 .collect();
1929 Ok(RollupView {
1930 url: raw.url,
1931 number: raw.number,
1932 state,
1933 head: raw.head_ref_oid,
1934 checks,
1935 })
1936}
1937
1938pub async fn lifecycle(repo: &Path, pr_url: &str) -> Result<PrLifecycle> {
1948 let view = gh(
1949 repo,
1950 &[
1951 "pr".to_owned(),
1952 "view".to_owned(),
1953 pr_url.to_owned(),
1954 "--json".to_owned(),
1955 "state".to_owned(),
1956 ],
1957 )
1958 .await?;
1959 if !view.0 {
1960 bail!("gh pr view {pr_url}: {}", view.1);
1961 }
1962 Ok(parse_pr(&view.1)?.state)
1966}
1967
1968#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
1972pub struct ExternalMerge {
1973 pub url: String,
1975 pub number: u64,
1977}
1978
1979#[derive(Debug, Deserialize)]
1980#[serde(rename_all = "camelCase")]
1981struct GhMergedPr {
1982 url: String,
1983 number: u64,
1984 merged_at: String,
1985 base_ref_name: String,
1986}
1987
1988fn pick_merged_pr(
2002 json: &str,
2003 base_branch: &str,
2004 created_at: Timestamp,
2005) -> Result<Option<ExternalMerge>> {
2006 let raw: Vec<GhMergedPr> =
2007 serde_json::from_str(json).context("parse `gh pr list ... --json ...` output")?;
2008 let mut matches: Vec<ExternalMerge> = Vec::new();
2009 for pr in raw {
2010 if pr.base_ref_name != base_branch {
2011 continue;
2012 }
2013 let Ok(merged_at) = pr.merged_at.parse::<Timestamp>() else {
2014 continue;
2015 };
2016 if merged_at < created_at {
2017 continue;
2018 }
2019 matches.push(ExternalMerge {
2020 url: pr.url,
2021 number: pr.number,
2022 });
2023 }
2024 if matches.len() == 1 {
2025 Ok(matches.pop())
2026 } else {
2027 Ok(None)
2028 }
2029}
2030
2031#[derive(Debug, Clone, PartialEq, Eq)]
2033pub enum OpenPr {
2034 None,
2036 One {
2038 url: String,
2040 title: String,
2042 },
2043 Many(Vec<String>),
2045}
2046
2047#[derive(Debug, Deserialize)]
2048#[serde(rename_all = "camelCase")]
2049struct GhOpenPr {
2050 url: String,
2054 #[serde(default)]
2055 title: String,
2056 base_ref_name: String,
2057 #[serde(default)]
2060 is_cross_repository: bool,
2061}
2062
2063pub fn pick_open_pr(json: &str, base: &str) -> Result<OpenPr> {
2069 let raw: Vec<GhOpenPr> =
2070 serde_json::from_str(json).context("parse `gh pr list ... --json ...` output")?;
2071 let mut hits: Vec<GhOpenPr> = raw
2072 .into_iter()
2073 .filter(|p| p.base_ref_name == base && !p.is_cross_repository)
2074 .collect();
2075 Ok(match hits.len() {
2076 0 => OpenPr::None,
2077 1 => {
2078 let p = hits.remove(0);
2079 OpenPr::One {
2080 url: p.url,
2081 title: p.title,
2082 }
2083 }
2084 _ => OpenPr::Many(hits.into_iter().map(|p| p.url).collect()),
2085 })
2086}
2087
2088pub async fn find_open_pr(repo: &Path, branch: &str, base: &str) -> Result<OpenPr> {
2092 let (ok, out) = gh(
2093 repo,
2094 &[
2095 "pr".to_owned(),
2096 "list".to_owned(),
2097 "--head".to_owned(),
2098 branch.to_owned(),
2099 "--base".to_owned(),
2100 base.to_owned(),
2101 "--state".to_owned(),
2102 "open".to_owned(),
2103 "--json".to_owned(),
2104 "number,url,title,baseRefName,isCrossRepository".to_owned(),
2105 ],
2106 )
2107 .await?;
2108 if !ok {
2109 bail!("gh pr list failed: {out}");
2110 }
2111 pick_open_pr(&out, base)
2112}
2113
2114#[derive(Debug, Deserialize)]
2115#[serde(rename_all = "camelCase")]
2116struct GhPrHead {
2117 head_ref_name: String,
2118 base_ref_name: String,
2119 state: String,
2120 is_cross_repository: bool,
2123 head_ref_oid: String,
2126}
2127
2128#[derive(Debug, Clone, PartialEq, Eq)]
2130pub struct Refusal {
2131 pub retry: bool,
2134 pub why: String,
2136}
2137
2138impl Refusal {
2139 fn final_(why: String) -> Self {
2140 Self { retry: false, why }
2141 }
2142}
2143
2144pub fn closable(
2153 json: &str,
2154 branch: &str,
2155 base: &str,
2156 verified: &[String],
2157) -> std::result::Result<(), Refusal> {
2158 let pr: GhPrHead = serde_json::from_str(json).map_err(|e| Refusal {
2159 retry: true,
2160 why: format!("could not read the pull request ({e})"),
2161 })?;
2162 if pr.head_ref_name != branch {
2163 return Err(Refusal::final_(format!(
2164 "its head is `{}`, not this run's `{branch}`",
2165 pr.head_ref_name
2166 )));
2167 }
2168 if pr.is_cross_repository {
2169 return Err(Refusal::final_("its head lives in a fork".to_owned()));
2170 }
2171 if pr.base_ref_name != base {
2172 return Err(Refusal::final_(format!(
2173 "it targets `{}`, not `{base}`",
2174 pr.base_ref_name
2175 )));
2176 }
2177 if !pr.state.eq_ignore_ascii_case("open") {
2178 return Err(Refusal::final_(format!(
2179 "it is already {}",
2180 pr.state.to_ascii_lowercase()
2181 )));
2182 }
2183 if !verified.contains(&pr.head_ref_oid) {
2187 return Err(Refusal {
2188 retry: true,
2189 why: format!(
2190 "its head {} is not a commit this run checked against the base",
2191 crate::already::short_sha(&pr.head_ref_oid)
2192 ),
2193 });
2194 }
2195 Ok(())
2196}
2197
2198async fn remote_is_forge(repo: &Path, remote: &str) -> bool {
2203 let Ok(url) = git::git(repo, &["remote", "get-url", remote]).await else {
2204 return false;
2205 };
2206 is_forge_url(url.trim())
2207}
2208
2209fn is_forge_url(url: &str) -> bool {
2210 url.contains("://") && !url.starts_with("file://")
2211 || url
2212 .split_once(':')
2213 .is_some_and(|(host, _)| host.contains('@') && !host.contains(['/', '\\']))
2214}
2215
2216fn forge_unavailable(message: &str) -> bool {
2219 message.contains("known GitHub host") || message.contains("spawn gh")
2220}
2221
2222pub fn superseded_comment(base: &str, evidence: &crate::already::Evidence) -> String {
2225 let how = match evidence.proof {
2226 crate::already::Proof::PatchId => format!(
2227 "carried by commit {} on `{base}` with the same patch",
2228 evidence.names()
2229 ),
2230 crate::already::Proof::Ancestry => {
2231 format!("already in the history of `{base}` as {}", evidence.names())
2232 }
2233 crate::already::Proof::Tree => format!(
2234 "already part of `{base}` (merging this branch changes nothing at {})",
2235 crate::already::short_sha(&evidence.tip)
2236 ),
2237 };
2238 format!(
2239 "Closing: everything this branch adds is {how}, so there is nothing left to \
2240 land. This pull request was closed automatically after that was verified; \
2241 reopen it if you disagree."
2242 )
2243}
2244
2245pub async fn close_superseded_pr(
2257 state: &mut RunState,
2258 branch: &str,
2259 evidence: &crate::already::Evidence,
2260 verified: &[String],
2261) -> Result<std::result::Result<String, String>> {
2262 let repo = state.repo.clone();
2263 let base = state.base_branch.clone();
2264 let url = match state.pr.as_ref().filter(|p| p.state == "open") {
2265 Some(p) => p.url.clone(),
2266 None if !remote_is_forge(&repo, &state.config.merge.remote).await => {
2271 return Ok(Err(
2272 "the remote is not a forge, so there is no pull request".to_owned(),
2273 ));
2274 }
2275 None => match find_open_pr(&repo, branch, &base).await {
2276 Err(e) if forge_unavailable(&format!("{e:#}")) => {
2277 return Ok(Err(format!("no forge to ask: {e:#}")));
2278 }
2279 Err(e) => return Err(e),
2280 Ok(OpenPr::One { url, .. }) => url,
2281 Ok(OpenPr::None) => return Ok(Err("no open pull request".to_owned())),
2282 Ok(OpenPr::Many(urls)) => {
2283 return Ok(Err(format!(
2284 "{} open pull requests name it; not choosing between them",
2285 urls.len()
2286 )));
2287 }
2288 },
2289 };
2290 let (ok, view) = gh(
2291 &repo,
2292 &[
2293 "pr".to_owned(),
2294 "view".to_owned(),
2295 url.clone(),
2296 "--json".to_owned(),
2297 "headRefName,headRefOid,baseRefName,state,isCrossRepository".to_owned(),
2298 ],
2299 )
2300 .await?;
2301 if !ok {
2302 bail!("gh pr view {url} failed: {view}");
2303 }
2304 if let Err(refusal) = closable(&view, branch, &base, verified) {
2305 if refusal.retry {
2308 bail!("left {url} open: {}", refusal.why);
2309 }
2310 return Ok(Err(format!("left {url} open: {}", refusal.why)));
2311 }
2312 let (ok, out) = gh(
2313 &repo,
2314 &[
2315 "pr".to_owned(),
2316 "close".to_owned(),
2317 url.clone(),
2318 "--comment".to_owned(),
2319 superseded_comment(&base, evidence),
2320 ],
2321 )
2322 .await?;
2323 if !ok {
2324 bail!("gh pr close {url} failed: {out}");
2325 }
2326 if let Some(p) = state.pr.as_mut().filter(|p| p.url == url) {
2327 p.state = "closed".to_owned();
2328 }
2329 Ok(Ok(url))
2330}
2331
2332pub async fn set_pr_title(state: &mut RunState, repo: &Path, url: &str, title: &str) -> Result<()> {
2336 let (title, _) = crate::github_text::prepare(state, title, "");
2337 edit_pr_title(repo, url, &title).await
2338}
2339
2340pub async fn set_pr_title_verbatim(repo: &Path, url: &str, title: &str) -> Result<()> {
2344 edit_pr_title(repo, url, title).await
2345}
2346
2347pub async fn set_pr_text_verbatim(repo: &Path, url: &str, title: &str, body: &str) -> Result<()> {
2350 let (ok, _) = gh(
2351 repo,
2352 &[
2353 "pr".to_owned(),
2354 "edit".to_owned(),
2355 url.to_owned(),
2356 "--title".to_owned(),
2357 title.to_owned(),
2358 "--body".to_owned(),
2359 body.to_owned(),
2360 ],
2361 )
2362 .await
2363 .map_err(|_| anyhow::anyhow!("could not run gh pr edit for the chosen rewrite"))?;
2364 if !ok {
2365 bail!("gh pr edit failed while posting the chosen rewrite");
2367 }
2368 Ok(())
2369}
2370
2371async fn edit_pr_title(repo: &Path, url: &str, title: &str) -> Result<()> {
2372 let (ok, out) = gh(
2373 repo,
2374 &[
2375 "pr".to_owned(),
2376 "edit".to_owned(),
2377 url.to_owned(),
2378 "--title".to_owned(),
2379 title.to_owned(),
2380 ],
2381 )
2382 .await?;
2383 if !ok {
2384 bail!("gh pr edit failed: {out}");
2385 }
2386 Ok(())
2387}
2388
2389pub async fn find_external_merge(state: &RunState) -> Result<Option<ExternalMerge>> {
2402 let Some(winner) = state.winner() else {
2403 return Ok(None);
2404 };
2405 let branch = state.pr_branch().unwrap_or(&winner.branch).to_owned();
2406 let out = gh(
2407 &state.repo,
2408 &[
2409 "pr".to_owned(),
2410 "list".to_owned(),
2411 "--head".to_owned(),
2412 branch.clone(),
2413 "--state".to_owned(),
2414 "merged".to_owned(),
2415 "--json".to_owned(),
2416 "url,number,mergedAt,baseRefName".to_owned(),
2417 ],
2418 )
2419 .await?;
2420 if !out.0 {
2421 bail!("gh pr list --head {branch}: {}", out.1);
2422 }
2423 pick_merged_pr(&out.1, &state.base_branch, state.created_at)
2424}
2425
2426pub async fn branch_is_ancestor(repo: &Path, branch: &str, base_branch: &str) -> Result<bool> {
2438 let out = tokio::process::Command::new("git")
2439 .args(["merge-base", "--is-ancestor", branch, base_branch])
2440 .current_dir(repo)
2441 .quiet()
2442 .stdin(std::process::Stdio::null())
2443 .output()
2444 .await
2445 .context("spawn git merge-base --is-ancestor")?;
2446 Ok(out.status.success())
2447}
2448
2449fn forge_slug(url: &str) -> Option<(String, &str)> {
2457 let rest = url.rsplit("://").next()?;
2458 let (host, path) = rest.split_once('/')?;
2459 if host.is_empty() {
2460 return None;
2461 }
2462 Some((host.to_ascii_lowercase(), path))
2463}
2464
2465pub(crate) fn slug_of_pr_url(url: &str) -> Option<String> {
2473 let (host, path) = forge_slug(url)?;
2474 let mut segments = path.split('/');
2475 let owner = segments.next()?;
2476 let repo = segments.next()?;
2477 let kind = segments.next()?;
2478 if owner.is_empty() || repo.is_empty() || kind != "pull" {
2479 return None;
2480 }
2481 Some(format!("{host}/{owner}/{repo}"))
2482}
2483
2484fn slug_of_repo_url(url: &str) -> Option<String> {
2488 let (host, path) = forge_slug(url)?;
2489 let mut segments = path.split('/');
2490 let owner = segments.next()?;
2491 let repo = segments.next()?;
2492 if owner.is_empty() || repo.is_empty() {
2493 return None;
2494 }
2495 Some(format!("{host}/{owner}/{repo}"))
2496}
2497
2498pub(crate) fn ensure_same_repo(run_repo_slug: &str, pr_repo_slug: &str) -> Result<()> {
2519 if run_repo_slug.eq_ignore_ascii_case(pr_repo_slug) {
2520 return Ok(());
2521 }
2522 bail!(
2523 "refusing to correct this run: it is recorded against {run_repo_slug}, but the pull \
2524 request URL belongs to {pr_repo_slug} - pass the run id whose repository the URL \
2525 actually belongs to (or, if `origin` is a fork opened against a different upstream, \
2526 verify by hand before treating this as a false positive)"
2527 );
2528}
2529
2530async fn repo_slug(repo: &Path) -> Result<String> {
2541 let out = gh(
2542 repo,
2543 &[
2544 "repo".to_owned(),
2545 "view".to_owned(),
2546 "--json".to_owned(),
2547 "url".to_owned(),
2548 ],
2549 )
2550 .await?;
2551 if !out.0 {
2552 bail!("gh repo view --json url: {}", out.1);
2553 }
2554 #[derive(Debug, Deserialize)]
2555 struct GhRepo {
2556 url: String,
2557 }
2558 let parsed: GhRepo = serde_json::from_str(&out.1)
2559 .with_context(|| format!("parse `gh repo view` output: {}", out.1))?;
2560 slug_of_repo_url(&parsed.url)
2561 .with_context(|| format!("could not parse a host/owner/repo out of {}", parsed.url))
2562}
2563
2564pub async fn correct_manual_merge(
2612 state: &mut RunState,
2613 url: &str,
2614) -> Result<(RunStatus, RunStatus)> {
2615 let Some(pr_slug) = slug_of_pr_url(url) else {
2616 bail!(
2617 "could not parse an owner/repo out of {url}; refusing to guess which repository \
2618 this pull request belongs to"
2619 );
2620 };
2621 let run_slug = repo_slug(&state.repo).await?;
2622 ensure_same_repo(&run_slug, &pr_slug)?;
2623 correct_merge(state, url).await
2624}
2625
2626pub(crate) async fn correct_confirmed_external_merge(
2637 state: &mut RunState,
2638 url: &str,
2639) -> Result<(RunStatus, RunStatus)> {
2640 correct_merge(state, url).await
2641}
2642
2643fn names_same_pr(a: &RunState, url: &str, number: u64, repo: &Path) -> bool {
2645 let Some(pr) = a.pr.as_ref() else {
2646 return false;
2647 };
2648 if !url.is_empty()
2649 && pr
2650 .url
2651 .trim_end_matches('/')
2652 .eq_ignore_ascii_case(url.trim_end_matches('/'))
2653 {
2654 return true;
2655 }
2656 number > 0
2657 && pr.number == number
2658 && match (a.repo.canonicalize(), repo.canonicalize()) {
2659 (Ok(x), Ok(y)) => x == y,
2660 _ => a.repo == repo,
2661 }
2662}
2663
2664fn rewrite_open_prs(
2678 home: &Path,
2679 decide: &mut dyn FnMut(&RunState) -> Option<PrLifecycle>,
2680) -> usize {
2681 let now = Timestamp::now();
2682 let mut changed = 0;
2683 for id in crate::run::list_ids_in(&home.join("runs")) {
2684 let Ok(_owner) = crate::pr_head::owner_lock(home, &id) else {
2685 continue;
2686 };
2687 let path = home.join("runs").join(&id).join("run.json");
2688 let Ok(body) = std::fs::read_to_string(&path) else {
2689 continue;
2690 };
2691 let Ok(mut state) = serde_json::from_str::<RunState>(&body) else {
2692 continue;
2693 };
2694 if !state.status.done()
2695 || state.pr.as_ref().is_none_or(|p| p.state != "open")
2696 || state.liveness_under(home, crate::daemon::is_working_on(home, &id, now))
2697 != crate::run::Liveness::Dead
2698 {
2699 continue;
2700 }
2701 let Some(to @ (PrLifecycle::Merged | PrLifecycle::Closed)) = decide(&state) else {
2702 continue;
2703 };
2704 if let Some(pr) = state.pr.as_mut() {
2705 pr.state = to.as_str().to_owned();
2706 }
2707 let url = state.pr.as_ref().map(|p| p.url.clone()).unwrap_or_default();
2708 state.event(
2709 "land",
2710 format!("recorded {url} as {}: another run settled it", to.as_str()),
2711 );
2712 match state.save_under(home) {
2713 Ok(()) => changed += 1,
2714 Err(e) => tracing::warn!("write pr state through to run {id}: {e:#}"),
2715 }
2716 }
2717 changed
2718}
2719
2720pub(crate) fn write_pr_state_through(run: &RunState, to: PrLifecycle) {
2725 if to == PrLifecycle::Open {
2726 return;
2727 }
2728 let Some(home) = crate::run::try_home() else {
2729 return;
2730 };
2731 write_pr_state_through_in(&home, run, to);
2732}
2733
2734pub(crate) fn write_pr_state_through_in(home: &Path, run: &RunState, to: PrLifecycle) -> usize {
2735 let Some(pr) = run.pr.as_ref() else {
2736 return 0;
2737 };
2738 let (url, number) = (pr.url.clone(), pr.number);
2739 rewrite_open_prs(home, &mut |other| {
2740 (other.id != run.id && names_same_pr(other, &url, number, &run.repo)).then_some(to)
2741 })
2742}
2743
2744pub(crate) fn stale_open_prs(home: &Path) -> Vec<(String, PathBuf, String)> {
2747 let now = Timestamp::now();
2748 let mut out = Vec::new();
2749 for id in crate::run::list_ids_in(&home.join("runs")) {
2750 let path = home.join("runs").join(&id).join("run.json");
2751 let Ok(body) = std::fs::read_to_string(&path) else {
2752 continue;
2753 };
2754 let Ok(state) = serde_json::from_str::<RunState>(&body) else {
2755 continue;
2756 };
2757 if let Some(pr) = state.pr.as_ref()
2758 && state.status.done()
2759 && pr.state == "open"
2760 && !pr.url.is_empty()
2761 && !crate::daemon::is_working_on(home, &id, now)
2762 {
2763 out.push((id, state.repo.clone(), pr.url.clone()));
2764 }
2765 }
2766 out
2767}
2768
2769pub(crate) fn apply_pr_states(home: &Path, known: &BTreeMap<String, PrLifecycle>) -> usize {
2772 rewrite_open_prs(home, &mut |s| {
2773 s.pr.as_ref().and_then(|p| known.get(&p.url)).copied()
2774 })
2775}
2776
2777pub async fn repair_stale_pr_states(home: &Path, max_lookups: usize) -> (usize, usize) {
2784 let mut known = BTreeMap::new();
2785 let mut failed = 0;
2786 let mut seen = BTreeSet::new();
2787 for (_, repo, url) in stale_open_prs(home) {
2788 if known.len() + failed >= max_lookups || !seen.insert(url.clone()) {
2789 continue;
2790 }
2791 match lifecycle(&repo, &url).await {
2792 Ok(state) => {
2793 known.insert(url, state);
2794 }
2795 Err(e) => {
2796 tracing::warn!("repair pr state of {url}: {e:#}");
2797 failed += 1;
2798 }
2799 }
2800 }
2801 (apply_pr_states(home, &known), failed)
2802}
2803
2804async fn correct_merge(state: &mut RunState, url: &str) -> Result<(RunStatus, RunStatus)> {
2805 match lifecycle(&state.repo, url).await? {
2806 PrLifecycle::Merged => {}
2807 other => bail!(
2808 "{url} is {}, not merged; refusing to record {} as merged on a guess",
2809 other.as_str(),
2810 state.id
2811 ),
2812 }
2813 let before = state.status;
2814 if let Err(e) = land(state, url).await {
2815 state.status = RunStatus::Blocked;
2822 state.event("fold", format!("manual-merge correction failed: {e:#}"));
2823 state.save()?;
2824 return Err(e).context(format!("confirming the merge of {url}"));
2825 }
2826 state.event(
2827 "fold",
2828 "operator recorded this pull request as a manual merge; this run never \
2829 re-entered `land`, so `bump::after_merge` did not run for it - a release \
2830 bump this change might warrant has to be filed by hand",
2831 );
2832 if state.status == RunStatus::Merged {
2835 crate::followup::after_merge(state, url).await;
2836 }
2837 state.save()?;
2838 Ok((before, state.status))
2839}
2840
2841pub fn parse_inline_comments(json: &str) -> Result<Vec<ReviewComment>> {
2848 let raw: Vec<GhInline> =
2849 serde_json::from_str(json).context("parse `gh api .../pulls/<n>/comments` output")?;
2850 let mut out = Vec::new();
2851 for c in raw {
2852 push_if_outstanding(
2853 &mut out,
2854 ReviewComment {
2855 author: c.user.login,
2856 path: c.path,
2857 line: c.line,
2858 body: c.body,
2859 },
2860 );
2861 }
2862 Ok(out)
2863}
2864
2865fn push_if_outstanding(out: &mut Vec<ReviewComment>, comment: ReviewComment) {
2871 if comment.body.trim().is_empty() || comment.body.contains(MARKER) {
2872 return;
2873 }
2874 if comment.path.is_none() && is_noise(&comment.body) {
2875 return;
2876 }
2877 out.push(comment);
2878}
2879
2880pub fn is_noise(body: &str) -> bool {
2898 if NOT_A_REVIEW.iter().any(|m| body.contains(m)) {
2899 return true;
2900 }
2901 let mut content = false;
2902 for line in strip_blocks(body).lines() {
2903 let line = unquote(line);
2904 if line.is_empty() || is_checklist(line) || is_decoration(line) || is_banner(line) {
2905 continue;
2906 }
2907 content = true;
2908 break;
2909 }
2910 !content
2911}
2912
2913fn strip_blocks(body: &str) -> String {
2915 let mut out = String::with_capacity(body.len());
2916 let mut rest = body;
2917 loop {
2918 let open = ["<!--", "<details>"]
2919 .iter()
2920 .filter_map(|tag| rest.find(tag).map(|i| (i, *tag)))
2921 .min_by_key(|(i, _)| *i);
2922 let Some((at, tag)) = open else {
2923 out.push_str(rest);
2924 return out;
2925 };
2926 out.push_str(&rest[..at]);
2927 let after = &rest[at + tag.len()..];
2928 let close = if tag == "<!--" { "-->" } else { "</details>" };
2929 match after.find(close) {
2930 Some(end) => rest = &after[end + close.len()..],
2931 None => return out,
2933 }
2934 }
2935}
2936
2937fn unquote(line: &str) -> &str {
2939 let mut s = line.trim();
2940 while let Some(rest) = s.strip_prefix('>') {
2941 s = rest.trim_start();
2942 }
2943 s.trim()
2944}
2945
2946fn is_checklist(line: &str) -> bool {
2948 let rest = line
2949 .strip_prefix("- ")
2950 .or_else(|| line.strip_prefix("* "))
2951 .unwrap_or("");
2952 let rest = rest.trim_start();
2953 matches!(
2954 rest.get(..3),
2955 Some("[ ]") | Some("[x]") | Some("[X]") | Some("[*]")
2956 )
2957}
2958
2959fn is_decoration(line: &str) -> bool {
2961 line.starts_with('#')
2962 || line.starts_with("[!")
2963 || (line.len() >= 3 && line.chars().all(|c| matches!(c, '-' | '=' | '*' | '_')))
2964}
2965
2966fn is_banner(line: &str) -> bool {
2973 let plain = drop_spans(line, "**", "**");
2974 let plain = if plain.contains("](") {
2975 drop_spans(&plain, "[", ")")
2976 } else {
2977 plain
2978 };
2979 !plain.chars().any(char::is_alphanumeric)
2980}
2981
2982fn drop_spans(s: &str, open: &str, close: &str) -> String {
2986 let mut out = String::with_capacity(s.len());
2987 let mut rest = s;
2988 while let Some(at) = rest.find(open) {
2989 out.push_str(&rest[..at]);
2990 let after = &rest[at + open.len()..];
2991 match after.find(close) {
2992 Some(end) => rest = &after[end + close.len()..],
2993 None => return out,
2994 }
2995 }
2996 out.push_str(rest);
2997 out
2998}
2999
3000fn repo_merge_lock(repo: &Path) -> Arc<tokio::sync::Mutex<()>> {
3018 static LOCKS: std::sync::LazyLock<
3019 std::sync::Mutex<BTreeMap<PathBuf, Arc<tokio::sync::Mutex<()>>>>,
3020 > = std::sync::LazyLock::new(|| std::sync::Mutex::new(BTreeMap::new()));
3021 LOCKS
3022 .lock()
3023 .unwrap_or_else(std::sync::PoisonError::into_inner)
3024 .entry(repo.to_path_buf())
3025 .or_insert_with(|| Arc::new(tokio::sync::Mutex::new(())))
3026 .clone()
3027}
3028
3029fn repo_label(repo: &Path, pr_url: &str) -> String {
3032 let parts: Vec<&str> = pr_url.split('/').collect();
3033 if let Some(at) = parts.iter().rposition(|p| *p == "pull")
3034 && at >= 2
3035 && !parts[at - 1].is_empty()
3036 && !parts[at - 2].is_empty()
3037 {
3038 return format!("{}/{}", parts[at - 2], parts[at - 1]);
3039 }
3040 repo.file_name()
3041 .map(|n| n.to_string_lossy().into_owned())
3042 .unwrap_or_default()
3043}
3044
3045fn red_merge_summary(repo_name: &str, pr: &PrState) -> Option<String> {
3049 (pr.checks == Checks::Red).then(|| {
3050 let details = crate::notices::format_list(&pr.failing)
3051 .map(|names| format!(": {names}"))
3052 .unwrap_or_default();
3053 format!(
3054 "Merged {repo_name} PR #{} with red checks{details} ({})",
3055 pr.number, pr.url
3056 )
3057 })
3058}
3059
3060async fn announce_red_merge(state: &mut RunState, pr: &PrState) {
3064 let repo_name = repo_label(&state.repo, &pr.url);
3065 let Some(summary) = red_merge_summary(&repo_name, pr) else {
3066 return;
3067 };
3068 if let Some(rec) = state.pr.as_mut() {
3069 rec.red_at_merge = pr.failing.clone();
3070 }
3071 state.event("land", summary.clone());
3072 crate::notices::raise_with(
3075 crate::notices::merged_red(&state.id, &summary),
3076 &state.config.notify,
3077 );
3078}
3079
3080pub async fn land(state: &mut RunState, pr_url: &str) -> Result<PrState> {
3087 land_with(state, pr_url, &GhForge).await
3088}
3089
3090trait Forge {
3094 async fn close(&self, repo: &Path, pr_url: &str, comment: &str) -> Result<()> {
3095 let (ok, out) = gh(
3096 repo,
3097 &[
3098 "pr".into(),
3099 "close".into(),
3100 pr_url.into(),
3101 "--comment".into(),
3102 comment.into(),
3103 ],
3104 )
3105 .await?;
3106 if !ok {
3107 bail!("PR closure failed: {out}");
3108 }
3109 Ok(())
3110 }
3111 async fn view(&self, repo: &Path, pr_url: &str) -> Result<Seen>;
3112 async fn merge(&self, repo: &Path, argv: &[String]) -> Result<(bool, String)>;
3113 async fn poll(&self);
3114 async fn rerun(&self, repo: &Path, run: &str) -> Result<()>;
3116 fn now(&self) -> i64;
3118 async fn required_contexts(&self, repo: &Path, base: &str) -> Option<BTreeSet<String>>;
3121 #[allow(clippy::too_many_arguments)]
3122 async fn fix(
3123 &self,
3124 state: &mut RunState,
3125 pr: &PrState,
3126 round: usize,
3127 budget: usize,
3128 reason: &str,
3129 logs: &str,
3130 ) -> Result<Fixed>;
3131}
3132
3133struct GhForge;
3134
3135impl Forge for GhForge {
3136 async fn view(&self, repo: &Path, pr_url: &str) -> Result<Seen> {
3137 observe(repo, pr_url).await
3138 }
3139 async fn merge(&self, repo: &Path, argv: &[String]) -> Result<(bool, String)> {
3140 gh(repo, argv).await
3141 }
3142 async fn poll(&self) {
3143 tokio::time::sleep(POLL).await;
3144 }
3145 async fn rerun(&self, repo: &Path, run: &str) -> Result<()> {
3146 let args = [
3147 "run".to_owned(),
3148 "rerun".to_owned(),
3149 run.to_owned(),
3150 "--failed".to_owned(),
3151 ];
3152 let (ok, out) = gh(repo, &args).await?;
3153 if !ok {
3154 bail!("gh run rerun {run}: {out}");
3155 }
3156 Ok(())
3157 }
3158 fn now(&self) -> i64 {
3159 jiff::Timestamp::now().as_second()
3160 }
3161 async fn required_contexts(&self, repo: &Path, base: &str) -> Option<BTreeSet<String>> {
3162 required_contexts_of(repo, base).await
3163 }
3164 async fn fix(
3165 &self,
3166 state: &mut RunState,
3167 pr: &PrState,
3168 round: usize,
3169 budget: usize,
3170 reason: &str,
3171 logs: &str,
3172 ) -> Result<Fixed> {
3173 fix_round(state, pr, round, budget, reason, logs).await
3174 }
3175}
3176
3177fn encode_path_segment(s: &str) -> String {
3179 let mut out = String::new();
3180 for b in s.bytes() {
3181 if b.is_ascii_alphanumeric() || matches!(b, b'-' | b'_' | b'.' | b'~') {
3182 out.push(b as char);
3183 } else {
3184 let _ = write!(out, "%{b:02X}");
3185 }
3186 }
3187 out
3188}
3189
3190async fn required_contexts_of(repo: &Path, base: &str) -> Option<BTreeSet<String>> {
3195 let enc = encode_path_segment(base);
3196 let mut all = BTreeSet::new();
3197 let classic = gh(
3200 repo,
3201 &[
3202 "api".to_owned(),
3203 format!("repos/{{owner}}/{{repo}}/branches/{enc}/protection/required_status_checks"),
3204 ],
3205 )
3206 .await
3207 .ok()?;
3208 if classic.0 {
3209 all.extend(parse_classic_required(&classic.1)?);
3210 } else if !classic.1.contains("404") {
3211 return None;
3212 }
3213 let rules = gh(
3214 repo,
3215 &[
3216 "api".to_owned(),
3217 format!("repos/{{owner}}/{{repo}}/rules/branches/{enc}"),
3218 ],
3219 )
3220 .await
3221 .ok()?;
3222 if !rules.0 {
3223 return None;
3224 }
3225 all.extend(parse_ruleset_required(&rules.1)?);
3226 Some(all)
3227}
3228
3229fn parse_classic_required(json: &str) -> Option<BTreeSet<String>> {
3232 let v: serde_json::Value = serde_json::from_str(json).ok()?;
3233 let mut out = BTreeSet::new();
3234 for c in v.get("contexts")?.as_array()? {
3235 out.insert(c.as_str()?.to_owned());
3236 }
3237 for c in v
3238 .get("checks")
3239 .and_then(|c| c.as_array())
3240 .into_iter()
3241 .flatten()
3242 {
3243 if let Some(name) = c.get("context").and_then(|n| n.as_str()) {
3244 out.insert(name.to_owned());
3245 }
3246 }
3247 Some(out)
3248}
3249
3250fn parse_ruleset_required(json: &str) -> Option<BTreeSet<String>> {
3252 let v: serde_json::Value = serde_json::from_str(json).ok()?;
3253 let mut out = BTreeSet::new();
3254 for rule in v.as_array()? {
3255 if rule.get("type").and_then(|t| t.as_str()) != Some("required_status_checks") {
3256 continue;
3257 }
3258 let checks = rule
3259 .pointer("/parameters/required_status_checks")?
3260 .as_array()?;
3261 for c in checks {
3262 out.insert(c.get("context")?.as_str()?.to_owned());
3263 }
3264 }
3265 Some(out)
3266}
3267
3268fn awaiting_new_head(awaiting: Option<&str>, observed: &str) -> bool {
3276 awaiting.is_some_and(|want| !observed.eq_ignore_ascii_case(want))
3277}
3278
3279fn bound_head<'a>(
3289 seen_head: &'a str,
3290 rollup_head: &str,
3291 awaiting: Option<&str>,
3292) -> Option<&'a str> {
3293 if seen_head.is_empty()
3294 || awaiting_new_head(awaiting, seen_head)
3295 || !rollup_head.eq_ignore_ascii_case(seen_head)
3296 {
3297 return None;
3298 }
3299 Some(seen_head)
3300}
3301
3302#[derive(Debug, Clone, Copy, PartialEq, Eq)]
3304enum Refused {
3305 Pending,
3307 Recheck,
3311 Final,
3314}
3315
3316fn classify_refusal(after: Option<&Seen>, rechecked: bool, observed_head: &str) -> Refused {
3319 let Some(after) = after else {
3320 return Refused::Pending;
3322 };
3323 if after.pr.state != PrLifecycle::Open {
3324 return Refused::Final;
3325 }
3326 if !after.head.eq_ignore_ascii_case(observed_head) {
3329 return Refused::Pending;
3330 }
3331 if bound_head(&after.head, &after.rollup_head, None).is_none() {
3333 return Refused::Pending;
3334 }
3335 let state = after.merge_state.to_ascii_uppercase();
3336 if matches!(after.pr.checks, Checks::Pending | Checks::Unknown)
3337 || state.is_empty()
3338 || state == "UNKNOWN"
3339 {
3340 return Refused::Pending;
3341 }
3342 if rechecked {
3343 Refused::Final
3344 } else {
3345 Refused::Recheck
3346 }
3347}
3348
3349async fn disarm<F: Forge>(
3354 forge: &F,
3355 state: &mut RunState,
3356 repo: &Path,
3357 number: u64,
3358) -> std::result::Result<(), String> {
3359 let argv = disable_automerge_argv(number);
3360 let out = {
3361 let merge_lock = repo_merge_lock(repo);
3362 let _merge_slot = merge_lock.lock().await;
3363 forge.merge(repo, &argv).await
3364 };
3365 match out {
3366 Ok((true, _)) => {
3367 state.land_armed_head = None;
3368 state.event("land", "auto-merge disabled");
3369 state.save().map_err(|e| format!("{e:#}"))?;
3370 Ok(())
3371 }
3372 Ok((false, msg)) => Err(msg),
3373 Err(e) => Err(format!("{e:#}")),
3374 }
3375}
3376
3377async fn stop_disarmed<F: Forge>(
3381 forge: &F,
3382 state: &mut RunState,
3383 repo: &Path,
3384 pr: &PrState,
3385 why: &str,
3386) -> Result<()> {
3387 if state.land_armed_head.is_none() {
3388 return stop(state, repo, pr, why).await;
3389 }
3390 match disarm(forge, state, repo, pr.number).await {
3391 Ok(()) => stop(state, repo, pr, why).await,
3392 Err(e) => {
3393 let why = format!("{why} (auto-merge could not be disabled and may still fire: {e})");
3394 stop(state, repo, pr, &why).await
3395 }
3396 }
3397}
3398
3399fn owner_requested_stop(state: &RunState) -> Result<bool> {
3401 let Some(binding) = &state.land_approval else {
3402 return Ok(false);
3403 };
3404 let q = ask::Questions::open().get(&binding.question)?;
3405 Ok(q.run == state.id
3406 && q.node == APPROVAL_NODE
3407 && q.resolution()
3408 .as_deref()
3409 .is_some_and(crate::merge_decision::stops))
3410}
3411
3412async fn owner_stop<F: Forge>(state: &mut RunState, pr: &mut PrState, forge: &F) -> Result<bool> {
3415 use crate::merge_decision as md;
3416 let Some(binding) = &state.land_approval else {
3417 return Ok(false);
3418 };
3419 let q = ask::Questions::open().get(&binding.question)?;
3420 let Some(choice) = q.resolution().filter(|c| md::stops(c)) else {
3421 return Ok(false);
3422 };
3423 if q.run != state.id || q.node != APPROVAL_NODE {
3424 bail!("stop decision names another run");
3425 }
3426 let target = q.merge_target.clone().unwrap_or_else(|| md::Target {
3427 pr: pr.url.clone(),
3428 head: binding.head.clone(),
3429 language: state.config.graph.language.clone(),
3430 });
3431 if target.pr != pr.url {
3432 bail!("stop decision names another PR");
3433 }
3434 if state.merge_decision.is_none() {
3435 state.merge_decision = Some(md::Decision {
3436 question: q.id.clone(),
3437 target,
3438 choice: choice.clone(),
3439 closed: false,
3440 replacement_run: None,
3441 replacement_pr: None,
3442 });
3443 state.save()?;
3444 }
3445 let repo = state.repo.clone();
3446 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
3448 stop(state, &repo, pr, &format!("owner stop requested, but auto-merge could not be disabled: {e}; no repair or replacement started")).await?;
3449 return Ok(true);
3450 }
3451 if choice.eq_ignore_ascii_case(HOLD) {
3452 stop(
3453 state,
3454 &repo,
3455 pr,
3456 "owner held the decision: PR left open; no further repair or merge work",
3457 )
3458 .await?;
3459 return Ok(true);
3460 }
3461 if md::selected_agent(&choice).is_some()
3462 || state
3463 .origin
3464 .as_ref()
3465 .and_then(|o| o.task.as_ref())
3466 .is_some()
3467 {
3468 let owners: Vec<_> = crate::queue::Queue::open()
3469 .list()
3470 .into_iter()
3471 .filter(|task| task.runs.last() == Some(&state.id))
3472 .collect();
3473 let owner = (owners.len() == 1).then(|| &owners[0]);
3474 if !owner.is_some_and(|task| {
3475 task.runs.last() == Some(&state.id)
3476 && (!task
3477 .operator_decided_at
3478 .is_some_and(|at| at > q.answered_at.unwrap_or(q.asked_at))
3479 || task.resumption.as_ref().is_some_and(|release| {
3480 release.question_id.as_deref() == Some(q.id.as_str())
3481 && task.operator_decided_at == Some(release.at)
3482 }))
3483 }) {
3484 stop(state, &repo, pr, "replacement requires the current original queue task owner and an unsuperseded answer; PR left open").await?;
3485 return Ok(true);
3486 }
3487 }
3488 if pr.state == PrLifecycle::Merged {
3489 stop(
3490 state,
3491 &repo,
3492 pr,
3493 "PR already merged; withdrawal/replacement cannot be applied",
3494 )
3495 .await?;
3496 return Ok(true);
3497 }
3498 let comment = format!(
3499 "{MARKER}\nOwner decision on question {}: {}. Previous attempt: `{}`. Original instruction and review history remain in the task record.",
3500 q.id, choice, state.id
3501 );
3502 if pr.state == PrLifecycle::Open {
3503 if let Err(e) = forge.close(&repo, &pr.url, &comment).await {
3504 stop(
3505 state,
3506 &repo,
3507 pr,
3508 &format!(
3509 "owner requested closure but it failed: {e}; task held, no replacement started"
3510 ),
3511 )
3512 .await?;
3513 return Ok(true);
3514 }
3515 }
3516 let confirmed = forge.view(&repo, &pr.url).await?;
3517 if confirmed.pr.state != PrLifecycle::Closed {
3518 stop(
3519 state,
3520 &repo,
3521 pr,
3522 "PR closure was not confirmed; task held, no replacement started",
3523 )
3524 .await?;
3525 return Ok(true);
3526 }
3527 *pr = confirmed.pr;
3528 state.merge_decision.as_mut().unwrap().closed = true;
3529 if let Some(record) = &mut state.pr {
3530 record.state = "closed".into();
3531 }
3532 state.status = RunStatus::Superseded;
3533 state.merge = Some(MergeOutcome {
3534 mode: MergeMode::Pr,
3535 ok: false,
3536 detail: format!("owner decision: {choice}; PR closure confirmed"),
3537 empty: false,
3538 });
3539 state.event(
3540 "land",
3541 format!(
3542 "{} applied: PR closure confirmed; old execution retired",
3543 choice
3544 ),
3545 );
3546 state.save()?;
3547 Ok(true)
3548}
3549
3550async fn land_with<F: Forge>(state: &mut RunState, pr_url: &str, forge: &F) -> Result<PrState> {
3551 crate::pr_head::ensure_owner(state)?;
3552 let reopening_hold = crate::merge_decision::resumable_hold(state);
3553 let repo = state.repo.clone();
3554 let budget = state.config.graph.land_rounds;
3555 let mut round = 0usize;
3556 let mut rebases = 0usize;
3559 let mut waited = Duration::ZERO;
3560 let mut shown: BTreeSet<String> = BTreeSet::new();
3565 let mut awaiting_head: Option<String> = state.pr_pushed_head.clone();
3567 let mut rechecked = false;
3569
3570 state.status = RunStatus::Landing;
3578 state.event("land", format!("watching {pr_url}"));
3579 state.save()?;
3580
3581 let mut resumed_armed = state.land_armed_head.is_some();
3585
3586 loop {
3587 let seen = forge.view(&repo, pr_url).await?;
3588 let mut pr = seen.pr.clone();
3589 pr.review_comments.retain(|c| !shown.contains(&c.body));
3590 state.pr = Some(crate::run::PrRecord {
3591 url: pr.url.clone(),
3592 number: pr.number,
3593 state: pr.state.as_str().to_owned(),
3594 checks: pr.checks.as_str().to_owned(),
3595 round,
3596 rounds: budget,
3597 red_at_merge: Vec::new(),
3598 });
3599 state.save()?;
3600
3601 crate::pr_head::ensure_owner(state)?;
3602 if reopening_hold {
3603 anyhow::ensure!(
3604 pr.state == PrLifecycle::Open,
3605 "held PR is no longer open; cannot request a fresh decision"
3606 );
3607 disarm(forge, state, &repo, pr.number)
3610 .await
3611 .map_err(anyhow::Error::msg)?;
3612 let previous = state.merge_decision.take();
3613 let binding = state.land_approval.take();
3614 state.config.graph.land_approval = true;
3615 let subject = merge_subject(
3616 crate::graph::landing_title(state, &seen.title),
3617 &crate::graph::landing_subject_source(state),
3618 );
3619 let contested = contested_to_ask(state);
3620 if let Err(error) =
3621 approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head).await
3622 {
3623 state.merge_decision = previous;
3624 state.land_approval = binding;
3625 return Err(error);
3626 }
3627 state.end_pass_parked(crate::run::ParkCause::Question);
3628 state.parked = true;
3629 state.event("land", format!("explicit resume reopened held decision {}; parked awaiting a fresh owner answer", previous.as_ref().map(|d| d.question.as_str()).unwrap_or_default()));
3630 state.save()?;
3631 return Ok(pr);
3632 }
3633 if owner_stop(state, &mut pr, forge).await? {
3634 return Ok(pr);
3635 }
3636
3637 if std::mem::take(&mut resumed_armed) && pr.state == PrLifecycle::Open {
3638 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
3643 let why = format!(
3644 "a previous pass may have armed auto-merge and it could not be disabled \
3645 on resume: {e}"
3646 );
3647 stop(state, &repo, &pr, &why).await?;
3648 return Ok(pr);
3649 }
3650 }
3651
3652 if pr.state == PrLifecycle::Open
3657 && !seen.head.is_empty()
3658 && state
3659 .land_armed_head
3660 .as_deref()
3661 .is_some_and(|armed| !armed.eq_ignore_ascii_case(&seen.head))
3662 {
3663 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
3664 let why = format!(
3665 "the head moved while auto-merge was armed and it could not be disabled: {e}"
3666 );
3667 stop(state, &repo, &pr, &why).await?;
3668 return Ok(pr);
3669 }
3670 }
3671
3672 if pr.state == PrLifecycle::Open {
3673 if bound_head(&seen.head, &seen.rollup_head, awaiting_head.as_deref()).is_none() {
3674 if waited >= WAIT_CEILING {
3675 let want = awaiting_head.as_deref().unwrap_or_default();
3676 let why = format!(
3677 "the pull request's checks were still not about one readable head after \
3678 {} minutes (expected {}, pull request points at {}, checks are for {}); \
3679 someone may have pushed over it",
3680 WAIT_CEILING.as_secs() / 60,
3681 if want.is_empty() { "any" } else { want },
3682 if seen.head.is_empty() {
3683 "nothing readable"
3684 } else {
3685 &seen.head
3686 },
3687 if seen.rollup_head.is_empty() {
3688 "nothing readable"
3689 } else {
3690 &seen.rollup_head
3691 },
3692 );
3693 stop_disarmed(forge, state, &repo, &pr, &why).await?;
3694 return Ok(pr);
3695 }
3696 waited += POLL;
3697 forge.poll().await;
3698 continue;
3699 }
3700 if awaiting_head.take().is_some() {
3703 waited = Duration::ZERO;
3706 }
3707 }
3708
3709 if pr.state == PrLifecycle::Open && state.config.graph.rerun_flaky_checks {
3714 let failing = rerunnable(&seen.contexts);
3715 let now = forge.now();
3716 match rerun_step(&failing, state.land_reruns.as_ref(), &seen.head, now) {
3717 RerunStep::Rerun(runs) => {
3718 let rec = state.land_reruns.get_or_insert_with(Default::default);
3719 if !rec.head.eq_ignore_ascii_case(&seen.head) {
3720 *rec = LandReruns {
3721 head: seen.head.clone(),
3722 runs: BTreeMap::new(),
3723 };
3724 }
3725 for run in &runs {
3726 rec.runs.insert(run.clone(), now);
3727 }
3728 state.save()?;
3732 let mut any = false;
3733 for run in &runs {
3734 let names = failing
3735 .iter()
3736 .filter(|(_, r)| r.as_deref() == Some(run))
3737 .map(|(l, _)| l.as_str())
3738 .collect::<Vec<_>>()
3739 .join(", ");
3740 match forge.rerun(&repo, run).await {
3741 Ok(()) => {
3742 any = true;
3743 state.event(
3744 "land",
3745 format!("reran failed check(s) {names} (run {run})"),
3746 );
3747 }
3748 Err(e) => state.event(
3750 "land",
3751 format!("could not rerun check(s) {names} (run {run}): {e:#}"),
3752 ),
3753 }
3754 }
3755 state.save()?;
3756 if any {
3757 waited = Duration::ZERO;
3758 forge.poll().await;
3759 continue;
3760 }
3761 }
3762 RerunStep::Grace => {
3763 if waited >= WAIT_CEILING {
3764 let why = format!(
3765 "checks were still failing after a rerun and {} minutes",
3766 WAIT_CEILING.as_secs() / 60
3767 );
3768 stop(state, &repo, &pr, &why).await?;
3769 return Ok(pr);
3770 }
3771 waited += POLL;
3772 forge.poll().await;
3773 continue;
3774 }
3775 RerunStep::Fix => {}
3776 }
3777 }
3778
3779 let step = decide(&pr, round, budget, waited);
3780 let armed_here = state
3785 .land_armed_head
3786 .as_deref()
3787 .is_some_and(|armed| armed.eq_ignore_ascii_case(&seen.head));
3788 if armed_here && matches!(step, Step::Merge | Step::Wait) {
3789 if waited >= WAIT_CEILING {
3790 let required = if seen.base.is_empty() {
3791 None
3792 } else {
3793 forge.required_contexts(&repo, &seen.base).await
3794 };
3795 let why = format!(
3796 "auto-merge was armed on {} but the pull request did not merge within {} \
3797 minutes ({})",
3798 seen.head,
3799 WAIT_CEILING.as_secs() / 60,
3800 waiting_on(&seen.merge_state, &seen.contexts, required.as_ref())
3801 );
3802 stop_disarmed(forge, state, &repo, &pr, &why).await?;
3803 return Ok(pr);
3804 }
3805 waited += POLL;
3806 forge.poll().await;
3807 continue;
3808 }
3809 if armed_here && !matches!(step, Step::Done { .. }) {
3810 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
3813 let why = format!("auto-merge could not be disabled: {e}");
3814 stop(state, &repo, &pr, &why).await?;
3815 return Ok(pr);
3816 }
3817 }
3818 match step {
3819 Step::Wait => {
3820 if waited >= WAIT_CEILING {
3821 let why = format!(
3822 "checks were still running after {} minutes",
3823 WAIT_CEILING.as_secs() / 60
3824 );
3825 stop(state, &repo, &pr, &why).await?;
3826 return Ok(pr);
3827 }
3828 waited += POLL;
3829 forge.poll().await;
3830 }
3831 Step::Done { merged } => {
3832 if let Some(armed) = state.land_armed_head.take() {
3837 if merged && !seen.head.is_empty() && !armed.eq_ignore_ascii_case(&seen.head) {
3838 let msg = format!(
3839 "{} merged on {} but the owner approved {armed}; review what landed",
3840 pr.url, seen.head
3841 );
3842 tracing::warn!("{msg}");
3843 state.event("land", msg);
3844 crate::notices::raise_with(
3848 crate::notices::Notice::warn(
3849 &format!("merged-unapproved-head:{}", state.id),
3850 "A pull request merged on a commit the owner did not approve; \
3851 review what landed",
3852 )
3853 .link(crate::notices::Link::Run {
3854 id: state.id.clone(),
3855 }),
3856 &state.config.notify,
3857 );
3858 }
3859 }
3860 state.status = if merged {
3861 RunStatus::Merged
3862 } else {
3863 RunStatus::Ready
3864 };
3865 let detail = if merged {
3866 format!("{} was merged", pr.url)
3867 } else {
3868 format!("{} was closed without merging", pr.url)
3869 };
3870 state.merge = Some(MergeOutcome {
3871 mode: MergeMode::Pr,
3872 ok: merged,
3873 detail: detail.clone(),
3874 empty: false,
3875 });
3876 state.event("land", detail);
3877 state.save()?;
3878 write_pr_state_through(state, pr.state);
3879 return Ok(pr);
3880 }
3881 Step::Merge => {
3882 let subject = merge_subject(
3883 crate::graph::landing_title(state, &seen.title),
3884 &crate::graph::landing_subject_source(state),
3885 );
3886 let contested = contested_to_ask(state);
3893 if state.config.graph.land_approval
3894 || contested.is_some()
3895 || repair_available(state)
3896 || !state.merge_repairs.is_empty()
3897 {
3898 match approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head)
3899 .await?
3900 {
3901 ApprovalGate::Approved => {}
3902 ApprovalGate::Repair => {
3903 if let Err(why) = disarm(forge, state, &repo, pr.number).await {
3906 state.event("repair", format!("auto-merge could not be disabled: {why}; repair preflight will retry"));
3907 state.save()?;
3908 }
3909 return Ok(pr);
3910 }
3911 ApprovalGate::Held => {
3912 if owner_stop(state, &mut pr, forge).await? {
3915 return Ok(pr);
3916 }
3917 stop(
3918 state,
3919 &repo,
3920 &pr,
3921 "the owner did not approve the merge (held or unanswered)",
3922 )
3923 .await?;
3924 return Ok(pr);
3925 }
3926 ApprovalGate::Pending => {
3934 state.end_pass_parked(crate::run::ParkCause::Question);
3935 state.parked = true;
3936 state.event(
3937 "land",
3938 "parked awaiting merge approval - resumes once answered",
3939 );
3940 state.save()?;
3941 return Ok(pr);
3942 }
3943 }
3944 }
3945 let observed_head = seen.head.clone();
3956 {
3959 let fresh = forge.view(&repo, pr_url).await.ok();
3960 if !direct_merge_is_safe(
3961 fresh.as_ref(),
3962 &observed_head,
3963 &shown,
3964 round,
3965 budget,
3966 waited,
3967 ) {
3968 if waited >= WAIT_CEILING {
3969 let why = "the pull request did not settle on the approved head \
3970 before it could be merged";
3971 stop(state, &repo, &pr, why).await?;
3972 return Ok(pr);
3973 }
3974 state.event(
3975 "land",
3976 "the pull request changed before merging; looking again",
3977 );
3978 waited += POLL;
3979 forge.poll().await;
3980 continue;
3981 }
3982 }
3983 let argv = merge_argv_at(pr.number, &subject, &observed_head);
3984 let out = {
3985 let merge_lock = repo_merge_lock(&repo);
3986 let _merge_slot = merge_lock.lock().await;
3987 crate::pr_head::ensure_owner(state)?;
3988 if let Some(task_id) = state
3989 .origin
3990 .as_ref()
3991 .and_then(|origin| origin.task.as_ref())
3992 {
3993 let task = crate::queue::Queue::open()
3994 .get(task_id)
3995 .context("cannot verify the task owner immediately before merge")?;
3996 if task.runs.last() != Some(&state.id)
3997 || task.operator_held()
3998 || task.status == crate::queue::TaskStatus::Done
3999 {
4000 bail!(
4001 "task ownership or an operator hold superseded this merge approval"
4002 );
4003 }
4004 }
4005 if let Some(binding) = &state.land_approval {
4006 let current = ask::Questions::open().get(&binding.question)?;
4007 if merge_consent_superseded(state, ¤t)?
4008 || current.run != state.id
4009 || !binding.head.eq_ignore_ascii_case(&observed_head)
4010 || approval(current.resolution().as_deref()) != Approval::Merge
4011 || current.merge_target.as_ref().is_some_and(|t| {
4012 t.pr != pr.url || !t.head.eq_ignore_ascii_case(&observed_head)
4013 })
4014 {
4015 bail!(
4016 "merge decision is stale or no longer authorizes the reviewed head"
4017 );
4018 }
4019 }
4020 forge.merge(&repo, &argv).await?
4021 };
4022 if out.0 {
4023 let confirmed = forge
4029 .view(&repo, pr_url)
4030 .await
4031 .is_ok_and(|c| c.pr.state == PrLifecycle::Merged);
4032 if !confirmed {
4033 if waited >= WAIT_CEILING {
4034 let why = "the merge request succeeded but the pull request \
4035 could not be confirmed merged after waiting";
4036 stop(state, &repo, &pr, why).await?;
4037 return Ok(pr);
4038 }
4039 state.event(
4040 "land",
4041 "merge accepted but the pull request is not confirmed merged yet; waiting",
4042 );
4043 state.save()?;
4044 waited += POLL;
4045 forge.poll().await;
4046 continue;
4047 }
4048 pr.state = PrLifecycle::Merged;
4049 state.status = RunStatus::Merged;
4050 state.merge = Some(MergeOutcome {
4051 mode: MergeMode::Pr,
4052 ok: true,
4053 detail: format!("gh {}", argv.join(" ")),
4054 empty: false,
4055 });
4056 if let Some(pr_record) = state.pr.as_mut() {
4061 pr_record.state = pr.state.as_str().to_owned();
4062 }
4063 state.event("land", format!("merged {} as `{subject}`", pr.url));
4064 announce_red_merge(state, &pr).await;
4065 state.save()?;
4066 write_pr_state_through(state, pr.state);
4067 return Ok(pr);
4068 }
4069 let after_seen = forge.view(&repo, pr_url).await.ok();
4070 let after = after_seen.as_ref().map(|s| s.pr.state);
4071 if let Some(outcome) = merged_after_all(&argv, &out.1, after) {
4072 pr.state = PrLifecycle::Merged;
4073 state.status = RunStatus::Merged;
4074 state.merge = Some(outcome);
4075 if let Some(pr_record) = state.pr.as_mut() {
4076 pr_record.state = pr.state.as_str().to_owned();
4077 }
4078 state.event("land", format!("merged {} as `{subject}`", pr.url));
4079 announce_red_merge(state, &pr).await;
4080 state.save()?;
4081 write_pr_state_through(state, pr.state);
4082 return Ok(pr);
4083 }
4084 let verdict = classify_refusal(after_seen.as_ref(), rechecked, &observed_head);
4085 match verdict {
4086 Refused::Final => {
4087 let merge_state = after_seen
4088 .as_ref()
4089 .map(|s| s.merge_state.as_str())
4090 .filter(|m| !m.is_empty())
4091 .unwrap_or("unknown");
4092 let why = format!(
4096 "the merge was refused: {} (merge state: {merge_state})",
4097 out.1
4098 );
4099 stop(state, &repo, &pr, &why).await?;
4100 return Ok(pr);
4101 }
4102 verdict => {
4103 if waited >= WAIT_CEILING {
4108 let why = format!(
4109 "the merge was still refused after {} minutes: {}",
4110 WAIT_CEILING.as_secs() / 60,
4111 out.1
4112 );
4113 stop(state, &repo, &pr, &why).await?;
4114 return Ok(pr);
4115 }
4116 if verdict == Refused::Recheck {
4117 rechecked = true;
4118 }
4119 state.event(
4120 "land",
4121 "merge refused while the branch policy is not satisfied yet; waiting",
4122 );
4123 state.save()?;
4124 waited += POLL;
4125 forge.poll().await;
4126 }
4127 }
4128 }
4129 Step::Rebase => {
4130 if rebases >= budget {
4136 let why = format!(
4137 "the base moved under this branch {budget} time(s) and it still does \
4138 not merge; rebasing again would only race it"
4139 );
4140 stop(state, &repo, &pr, &why).await?;
4141 return Ok(pr);
4142 }
4143 rebases += 1;
4144 let Some(branch) = state.winner().map(|w| w.branch.clone()) else {
4145 stop(
4146 state,
4147 &repo,
4148 &pr,
4149 "the pull request conflicts and this run has no winning branch to rebase",
4150 )
4151 .await?;
4152 return Ok(pr);
4153 };
4154 let base = state.base_branch.clone();
4155 state.event(
4156 "land",
4157 format!("{} no longer merges; rebasing onto {base}", pr.url),
4158 );
4159 state.save()?;
4160
4161 let remote = state.config.merge.remote.clone();
4165 git::fetch(&repo, &remote, &base).await.ok();
4166 if owner_stop(state, &mut pr, forge).await? {
4167 return Ok(pr);
4168 }
4169 let scratch = state.dir().join("rebase");
4170 let onto = format!("{remote}/{base}");
4171 let rebased =
4172 match crate::rebase::rebase_with_fixer(state, &scratch, &branch, &onto).await {
4173 Ok(crate::rebase::Rebased::Applied) => Ok(None),
4174 Ok(crate::rebase::Rebased::Stopped(why)) => Ok(Some(why)),
4175 Err(e) => Err(e),
4176 };
4177 if owner_stop(state, &mut pr, forge).await? {
4178 return Ok(pr);
4179 }
4180 match rebased {
4181 Ok(None) => {
4182 let pushed = {
4183 let merge_lock = repo_merge_lock(&repo);
4184 let _merge_slot = merge_lock.lock().await;
4185 if let Some(head) = &state.pr_head {
4186 git::push_as(
4187 &repo,
4188 &state.config.merge.remote,
4189 &branch,
4190 head,
4191 state
4192 .pr_pushed_head
4193 .as_deref()
4194 .context("missing public head lease")?,
4195 )
4196 .await?
4197 } else {
4198 git::push_pinned(
4199 &repo,
4200 &state.config.merge.remote,
4201 &branch,
4202 &seen.head,
4203 )
4204 .await?
4205 }
4206 };
4207 if !pushed.ok() {
4208 let why = format!(
4209 "rebased {branch} but could not push it: {}",
4210 pushed.stderr.trim()
4211 );
4212 stop(state, &repo, &pr, &why).await?;
4213 return Ok(pr);
4214 }
4215 let head =
4218 match git::rev_parse(&repo, &format!("refs/heads/{branch}")).await {
4219 Ok(head) => head,
4220 Err(e) => {
4221 let why = format!(
4222 "rebased and pushed {branch} but could not read the pushed \
4223 commit: {e:#}"
4224 );
4225 stop(state, &repo, &pr, &why).await?;
4226 return Ok(pr);
4227 }
4228 };
4229 crate::graph::refresh_reviewed_commits(state, &branch).await;
4230 state.pr_pushed_head = Some(head.clone());
4231 awaiting_head = Some(head);
4232 rechecked = false;
4233 state.event("land", format!("rebased {branch} onto {base}"));
4234 state.save()?;
4235 waited = Duration::ZERO;
4238 tokio::time::sleep(POLL).await;
4239 }
4240 Ok(Some(conflict)) => {
4243 let why = format!(
4244 "{} conflicts with {base} and the rebase did not apply: {}",
4245 pr.url,
4246 conflict.chars().take(600).collect::<String>()
4247 );
4248 stop(state, &repo, &pr, &why).await?;
4249 return Ok(pr);
4250 }
4251 Err(e) => {
4252 let why = format!("could not rebase {branch} onto {base}: {e:#}");
4253 stop(state, &repo, &pr, &why).await?;
4254 return Ok(pr);
4255 }
4256 }
4257 }
4258 Step::GiveUp { reason } => {
4259 stop(state, &repo, &pr, &reason).await?;
4260 return Ok(pr);
4261 }
4262 Step::Fix { reason } => {
4263 round += 1;
4264 waited = Duration::ZERO;
4265 for c in &pr.review_comments {
4266 shown.insert(c.body.clone());
4267 }
4268 state.event("land", format!("round {round}: {reason}"));
4269 state.save()?;
4270
4271 let logs = failing_logs(&repo, &seen.failing_urls).await;
4272 let was_red = pr.checks == Checks::Red;
4273 if owner_stop(state, &mut pr, forge).await? {
4274 return Ok(pr);
4275 }
4276 let fixed = forge.fix(state, &pr, round, budget, &reason, &logs).await?;
4277 if owner_stop(state, &mut pr, forge).await? {
4278 return Ok(pr);
4279 }
4280 match fixed {
4281 Fixed::Committed { head } => {
4282 state.pr_pushed_head = Some(head.clone());
4285 awaiting_head = Some(head);
4286 rechecked = false;
4287 waited = Duration::ZERO;
4288 forge.poll().await;
4289 }
4290 Fixed::Declined if was_red => {
4291 let why = format!(
4292 "the fixer produced no commit while {} check(s) were failing \
4293 ({}); stopping instead of looping on an unchanged tree",
4294 pr.failing.len(),
4295 pr.failing.join(", ")
4296 );
4297 stop(state, &repo, &pr, &why).await?;
4298 return Ok(pr);
4299 }
4300 Fixed::Declined => state.event(
4305 "land",
4306 format!("round {round}: fixer declined the comments, nothing committed"),
4307 ),
4308 Fixed::Failed(why) => {
4309 stop(state, &repo, &pr, &format!("the fix round failed: {why}")).await?;
4310 return Ok(pr);
4311 }
4312 }
4313 state.save()?;
4314 }
4315 }
4316 }
4317}
4318
4319#[derive(Clone)]
4323struct Seen {
4324 pr: PrState,
4325 title: String,
4326 failing_urls: Vec<(String, String)>,
4327 head: String,
4329 rollup_head: String,
4332 merge_state: String,
4335 contexts: Vec<CheckInfo>,
4337 base: String,
4339}
4340
4341#[derive(Clone)]
4343struct CheckInfo {
4344 label: String,
4345 verdict: Verdict,
4346 required: Option<bool>,
4347 run: Option<String>,
4349}
4350
4351#[derive(Debug, Clone, PartialEq, Eq)]
4353enum RerunStep {
4354 Rerun(Vec<String>),
4356 Grace,
4358 Fix,
4360}
4361
4362fn rerunnable(contexts: &[CheckInfo]) -> Vec<(String, Option<String>)> {
4366 contexts
4367 .iter()
4368 .filter(|c| c.verdict == Verdict::Fail && c.required != Some(false))
4369 .filter(|c| {
4371 c.run.as_ref().is_none_or(|r| {
4372 !contexts.iter().any(|o| {
4373 matches!(o.verdict, Verdict::Pending | Verdict::Unknown)
4374 && o.run.as_ref() == Some(r)
4375 })
4376 })
4377 })
4378 .map(|c| (c.label.clone(), c.run.clone()))
4379 .collect()
4380}
4381
4382fn rerun_step(
4384 failing: &[(String, Option<String>)],
4385 record: Option<&LandReruns>,
4386 head: &str,
4387 now: i64,
4388) -> RerunStep {
4389 if failing.is_empty() || failing.iter().any(|(_, run)| run.is_none()) {
4392 return RerunStep::Fix;
4393 }
4394 let record = record.filter(|r| r.head.eq_ignore_ascii_case(head));
4396 let mut fresh: Vec<String> = Vec::new();
4397 let mut recent = false;
4398 for run in failing.iter().filter_map(|(_, run)| run.as_deref()) {
4399 match record.and_then(|r| r.runs.get(run)) {
4400 None => {
4401 if !fresh.iter().any(|f| f == run) {
4402 fresh.push(run.to_owned());
4403 }
4404 }
4405 Some(&at) if now - at < crate::release_watch::RERUN_GRACE => recent = true,
4406 Some(_) => {}
4407 }
4408 }
4409 if !fresh.is_empty() {
4410 RerunStep::Rerun(fresh)
4411 } else if recent {
4412 RerunStep::Grace
4413 } else {
4414 RerunStep::Fix
4415 }
4416}
4417
4418async fn observe(repo: &Path, pr_url: &str) -> Result<Seen> {
4422 let view = gh(
4423 repo,
4424 &[
4425 "pr".to_owned(),
4426 "view".to_owned(),
4427 pr_url.to_owned(),
4428 "--json".to_owned(),
4429 "url,number,state,title,reviews,comments,mergeStateStatus,headRefOid,baseRefName"
4430 .to_owned(),
4431 ],
4432 )
4433 .await?;
4434 if !view.0 {
4435 bail!("gh pr view {pr_url}: {}", view.1);
4436 }
4437 let number = parse_pr(&view.1)?.number;
4438 let node = last_commit_node(repo, number).await;
4439 let mut seen = seen_from(&view.1, node.as_deref())?;
4440
4441 let inline = gh(
4442 repo,
4443 &[
4444 "api".to_owned(),
4445 format!("repos/{{owner}}/{{repo}}/pulls/{}/comments", seen.pr.number),
4446 ],
4447 )
4448 .await?;
4449 if inline.0 {
4450 match parse_inline_comments(&inline.1) {
4451 Ok(mut comments) => seen.pr.review_comments.append(&mut comments),
4452 Err(e) => tracing::warn!("inline review comments unreadable: {e}"),
4455 }
4456 } else {
4457 tracing::warn!("gh api pulls/{}/comments: {}", seen.pr.number, inline.1);
4458 }
4459 Ok(seen)
4460}
4461
4462fn seen_from(view_json: &str, node_json: Option<&str>) -> Result<Seen> {
4473 let mut pr = parse_pr(view_json)?;
4474 let raw: GhPr = serde_json::from_str(view_json).context("re-read pull request json")?;
4475
4476 let mut rollup_head = String::new();
4477 let mut failing_urls = Vec::new();
4478 let mut contexts = Vec::new();
4479 let mut checks = Checks::Unknown;
4480 let mut failing = Vec::new();
4481 if let Some((oid, rollup)) = node_json.and_then(parse_last_commit_node) {
4482 (checks, failing) = rollup_verdict(&rollup);
4483 failing_urls = rollup
4484 .iter()
4485 .filter(|c| c.verdict() == Verdict::Fail)
4486 .filter_map(|c| c.url().map(|u| (c.label(), u.to_owned())))
4487 .collect();
4488 contexts = rollup
4489 .iter()
4490 .map(|c| CheckInfo {
4491 label: c.label(),
4492 verdict: c.verdict(),
4493 required: c.is_required,
4494 run: c.url().and_then(run_of),
4495 })
4496 .collect();
4497 rollup_head = oid;
4498 }
4499 pr.checks = checks;
4500 pr.failing = failing;
4501
4502 Ok(Seen {
4503 pr,
4504 title: raw.title,
4505 failing_urls,
4506 head: raw.head_ref_oid,
4507 rollup_head,
4508 merge_state: raw.merge_state_status,
4509 contexts,
4510 base: raw.base_ref_name,
4511 })
4512}
4513
4514fn parse_last_commit_node(json: &str) -> Option<(String, Vec<GhCheck>)> {
4517 let v: serde_json::Value = serde_json::from_str(json).ok()?;
4518 if v.get("errors").is_some_and(|e| !e.is_null()) {
4519 return None;
4520 }
4521 let commit = v.pointer("/data/repository/pullRequest/commits/nodes/0/commit")?;
4522 let oid = commit.get("oid")?.as_str().filter(|o| !o.is_empty())?;
4523 let contexts = commit.pointer("/statusCheckRollup/contexts");
4524 let Some(contexts) = contexts.filter(|c| !c.is_null()) else {
4525 return Some((oid.to_owned(), Vec::new()));
4527 };
4528 if contexts.pointer("/pageInfo/hasNextPage")?.as_bool()? {
4529 return None;
4530 }
4531 let nodes = contexts.get("nodes")?.as_array()?;
4532 let rollup = nodes
4533 .iter()
4534 .map(|n| serde_json::from_value::<GhCheck>(n.clone()))
4535 .collect::<Result<Vec<_>, _>>()
4536 .ok()?;
4537 Some((oid.to_owned(), rollup))
4538}
4539
4540async fn last_commit_node(repo: &Path, number: u64) -> Option<String> {
4543 let out = gh(
4544 repo,
4545 &[
4546 "api".to_owned(),
4547 "graphql".to_owned(),
4548 "-F".to_owned(),
4549 "owner={owner}".to_owned(),
4550 "-F".to_owned(),
4551 "repo={repo}".to_owned(),
4552 "-F".to_owned(),
4553 format!("number={number}"),
4554 "-f".to_owned(),
4555 "query=query($owner:String!,$repo:String!,$number:Int!){repository(owner:$owner,\
4556 name:$repo){pullRequest(number:$number){commits(last:1){nodes{commit{oid \
4557 statusCheckRollup{contexts(first:100){pageInfo{hasNextPage} nodes{\
4558 ... on CheckRun{name status conclusion detailsUrl \
4559 isRequired(pullRequestNumber:$number)} \
4560 ... on StatusContext{context state targetUrl \
4561 isRequired(pullRequestNumber:$number)}}}}}}}}}}"
4562 .to_owned(),
4563 ],
4564 )
4565 .await
4566 .ok()?;
4567 out.0.then_some(out.1)
4568}
4569
4570#[doc(hidden)]
4572#[derive(Debug, PartialEq)]
4573pub enum Fixed {
4574 Committed {
4576 head: String,
4578 },
4579 Declined,
4581 Failed(String),
4583}
4584
4585#[doc(hidden)]
4591pub async fn fix_round(
4592 state: &mut RunState,
4593 pr: &PrState,
4594 round: usize,
4595 budget: usize,
4596 reason: &str,
4597 logs: &str,
4598) -> Result<Fixed> {
4599 let winner = state
4600 .winner()
4601 .cloned()
4602 .context("landing needs a winning candidate; none is recorded on this run")?;
4603 let roles = state
4604 .config
4605 .resolve_roles()
4606 .context("resolve the roster for the fix round")?;
4607 let attempts = crate::fixer::attempts(state, &roles, &winner);
4611 let ids: Vec<String> = attempts.iter().map(|(s, _)| s.id.clone()).collect();
4612
4613 let prompt = fix_prompt(state, pr, round, budget, reason, logs);
4614 let mut artifacts = agent::artifacts_dir(&state.dir());
4615 if let Some(request) = state
4616 .merge_repairs
4617 .last()
4618 .filter(|r| r.phase == crate::run::MergeRepairPhase::Fixing)
4619 {
4620 artifacts = artifacts.join(format!("merge-repair-{}", request.question));
4621 }
4622 let prompt = if state.config.cache_dir().is_some() {
4623 format!("{prompt}\n\n{}", prompt::build_cache_note("fix", true))
4624 } else {
4625 prompt
4626 };
4627 let before = git::rev_parse(&winner.worktree, "HEAD").await?;
4631 let mut last = None;
4635 for (i, (spec, seat_key)) in attempts.into_iter().enumerate() {
4636 if owner_requested_stop(state)? {
4637 return Ok(Fixed::Declined);
4638 }
4639 let mut seat = seat_of(state, &seat_key, &spec.id);
4640 let stem = if i == 0 {
4641 format!("land-{round}")
4642 } else {
4643 format!("land-{round}-{}", spec.id)
4644 };
4645 let out = agent::invoke(
4646 &spec,
4647 &mut seat,
4648 &Invocation {
4649 coordination: state.config.coordination.as_ref(),
4650 fetched_base: state.fetched_base.as_ref(),
4651 cwd: &winner.worktree,
4652 prompt: &prompt,
4653 timeout: Duration::from_secs(state.config.graph.timeout_fix),
4654 allow_write: true,
4655 unsandboxed: false,
4656 sessions: state.config.graph.sessions,
4657 artifacts: &artifacts,
4658 stem: &stem,
4659 run: &state.id,
4660 node: "land",
4661 cache_dir: state.config.cache_dir().as_deref(),
4662 attachments: &[],
4663 writable: &[],
4664 },
4665 )
4666 .await;
4667 state.seats.insert(seat.key.clone(), seat);
4668 if let Some(next) = ids.get(i + 1)
4669 && agent::chain_advances(&out)
4670 {
4671 let (class, why) = crate::fixer::failure_of(&out);
4672 crate::graph::record_handover(state, "land", &seat_key, &spec.id, next, &class, &why);
4673 continue;
4674 }
4675 last = Some(out);
4676 break;
4677 }
4678 let out = last.expect("the fixer chain always has an entry");
4679
4680 match out {
4681 Ok(o) if o.quota_exhausted() => {
4682 return Ok(Fixed::Failed(
4683 "rate limited (quota); the fixer could not run".to_owned(),
4684 ));
4685 }
4686 Ok(o) if !o.usable() => {
4687 return Ok(Fixed::Failed(format!(
4688 "the fixer produced nothing usable ({})",
4689 crate::notices::turn_status(o.exit_code, o.timed_out, o.quota_exhausted())
4690 )));
4691 }
4692 Ok(_) => {}
4693 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
4694 Err(e) => return Ok(Fixed::Failed(format!("{e:#}"))),
4695 }
4696
4697 if owner_requested_stop(state)? {
4698 return Ok(Fixed::Declined);
4699 }
4700
4701 let wait = crate::repo_lock::WaitPolicy::new(
4704 Duration::from_secs(state.config.graph.timeout_resource_wait),
4705 || false,
4706 );
4707 let coordination = crate::repo_lock::SeatLease::operation_with(
4708 &winner.worktree,
4709 state.config.coordination.as_ref(),
4710 &wait,
4711 )
4712 .await?;
4713 match git::rescue_commit(
4714 &winner.worktree,
4715 &format!("magi: land round {round} fixes (uncommitted work)"),
4716 )
4717 .await
4718 {
4719 Ok(r) => state.note_withheld("land", &r.withheld),
4720 Err(e)
4721 if state
4722 .merge_repairs
4723 .last()
4724 .is_some_and(|r| r.phase == crate::run::MergeRepairPhase::Fixing) =>
4725 {
4726 return Ok(Fixed::Failed(format!("saving repair commit failed: {e:#}")));
4727 }
4728 Err(_) => {}
4729 }
4730 let after = git::rev_parse(&winner.worktree, "HEAD").await?;
4731 drop(coordination);
4732 if after == before {
4733 return Ok(Fixed::Declined);
4734 }
4735
4736 if owner_requested_stop(state)? {
4737 return Ok(Fixed::Declined);
4738 }
4739 crate::pr_head::ensure_owner(state)?;
4740 let remote = state.config.merge.remote.clone();
4741 let public_head = state.pr_branch().unwrap_or(&winner.branch).to_owned();
4742 let push = if state.pr_head.is_some() {
4743 let expected = state
4744 .pr_pushed_head
4745 .as_deref()
4746 .context("missing public head lease")?;
4747 git::push_as(
4748 &winner.worktree,
4749 &remote,
4750 &winner.branch,
4751 &public_head,
4752 expected,
4753 )
4754 .await?
4755 } else {
4756 git::push(&winner.worktree, &remote, &winner.branch).await?
4757 };
4758 if !push.ok() {
4759 return Ok(Fixed::Failed(format!(
4760 "pushing {} to {remote} failed: {}",
4761 public_head, push.stderr
4762 )));
4763 }
4764 state.event(
4765 "land",
4766 format!("round {round}: pushed a fix to {public_head}"),
4767 );
4768 state.pr_pushed_head = Some(after.clone());
4769 state.save()?;
4770 Ok(Fixed::Committed { head: after })
4771}
4772
4773pub(crate) fn seat_of(state: &mut RunState, key: &str, agent: &str) -> SeatState {
4775 crate::fixer::seat_for(state, key, agent)
4776}
4777
4778pub(crate) async fn repair_preflight(state: &RunState, url: &str, head: &str) -> Result<PrState> {
4781 let seen = observe(&state.repo, url).await?;
4782 let winner = state.winner().context("no winning branch to repair")?;
4783 if seen.pr.state != PrLifecycle::Open || seen.head != head {
4784 anyhow::bail!(
4785 "PR is closed or its head changed; review the current head before requesting repair again"
4786 );
4787 }
4788 if git::rev_parse(&winner.worktree, "HEAD").await? != head
4789 || !git::is_clean(&winner.worktree).await?
4790 {
4791 anyhow::bail!(
4792 "repair worktree is missing, dirty or at a different head; restore the reviewed branch and resume this run"
4793 );
4794 }
4795 let view = gh(
4798 &state.repo,
4799 &[
4800 "pr".into(),
4801 "view".into(),
4802 url.into(),
4803 "--json".into(),
4804 "autoMergeRequest,headRefOid,state,headRefName,baseRefName,isCrossRepository".into(),
4805 ],
4806 )
4807 .await?;
4808 if !view.0 {
4809 bail!("cannot check auto-merge: {}", view.1);
4810 }
4811 let live: serde_json::Value = serde_json::from_str(&view.1)?;
4812 let public = state.pr_branch().unwrap_or(&winner.branch);
4813 if live["state"] != "OPEN"
4814 || live["headRefOid"] != head
4815 || live["headRefName"] != public
4816 || live["baseRefName"] != state.base_branch
4817 || live["isCrossRepository"] != false
4818 {
4819 bail!("PR changed during repair preflight; review its current head explicitly");
4820 }
4821 let auto_merge = live
4822 .get("autoMergeRequest")
4823 .context("cannot read the PR auto-merge reservation; repair held")?;
4824 if !auto_merge.is_null() {
4825 let out = gh(&state.repo, &disable_automerge_argv(seen.pr.number)).await?;
4826 if !out.0 {
4827 bail!("cannot disable auto-merge; repair held: {}", out.1);
4828 }
4829 }
4830 Ok(seen.pr)
4831}
4832
4833fn fix_prompt(
4835 state: &RunState,
4836 pr: &PrState,
4837 round: usize,
4838 budget: usize,
4839 reason: &str,
4840 logs: &str,
4841) -> String {
4842 let mut s = format!(
4843 "Your patch is open as a pull request and it is not landing. Land round \
4844 {round} of {budget}.\n\n\
4845 Pull request: {}\n\n\
4846 What is holding it: {reason}\n\n\
4847 # The task\n\n{}\n",
4848 pr.url, state.instruction
4849 );
4850
4851 if pr.failing.is_empty() {
4852 s.push_str("\n# Failing checks\n\n(none)\n");
4853 } else {
4854 let _ = write!(s, "\n# Failing checks\n\n- {}\n", pr.failing.join("\n- "));
4855 if logs.trim().is_empty() {
4856 s.push_str(
4857 "\nNo log could be read; investigate the failure with necessary focused checks.\n",
4858 );
4859 } else {
4860 let _ = write!(s, "\n## Failing log tails\n\n{logs}\n");
4861 }
4862 }
4863
4864 if pr.review_comments.is_empty() {
4865 s.push_str("\n# Review comments\n\n(none)\n");
4866 } else {
4867 s.push_str("\n# Review comments\n");
4868 for c in &pr.review_comments {
4869 let where_ = match (&c.path, c.line) {
4870 (Some(p), Some(l)) => format!(" ({p}:{l})"),
4871 (Some(p), None) => format!(" ({p})"),
4872 _ => String::new(),
4873 };
4874 let _ = write!(s, "\n## {}{where_}\n\n{}\n", c.author, c.body.trim());
4875 }
4876 }
4877
4878 s.push_str(
4879 "\n# Rules\n\n\
4880 1. Fix the cause, never the symptom. Do not delete, skip, or weaken a \
4881 failing test; do not silence a lint with an allow attribute; do not \
4882 stretch a timeout to hide a race. If the check is right, the code is \
4883 wrong.\n\
4884 2. Change nothing the checks and the comments did not raise. A \
4885 drive-by refactor turns a one-line fix into a pull request that \
4886 needs reviewing again.\n\
4887 3. If a comment is wrong, say so with a checkable argument and change \
4888 nothing for it. A declined comment with a reason is a correct \
4889 outcome; a change made to appease a reviewer is not.\n\
4890 4. Commit in this worktree. magi pushes to the pull request's branch \
4891 for you; do not push, merge, or close anything yourself.\n\
4892 5. Never name yourself, your vendor, or your model, anywhere.\n\n\
4893 # Output\n\n\
4894 Say what you changed and why, and what you declined and why.",
4895 );
4896
4897 let language = &state.config.graph.language;
4898 if !(language.trim().is_empty() || language.eq_ignore_ascii_case("en")) {
4899 let _ = write!(s, "\n\nWrite all prose in {language}.");
4900 }
4901 s.push_str(&crate::prompt::github_rule(
4903 language,
4904 &state.config.graph.github_language,
4905 ));
4906 if let Some(overlay) = state.config.prompts.overlay("fix") {
4907 let _ = write!(s, "\n\n{overlay}");
4908 }
4909 s.push('\n');
4910 s.push_str(crate::prompt::child_run_ownership());
4911 s
4912}
4913
4914async fn failing_logs(repo: &Path, failing: &[(String, String)]) -> String {
4917 let mut out = String::new();
4918 for (name, url) in failing.iter().take(MAX_LOGS) {
4919 let args = match (job_of(url), run_of(url)) {
4920 (Some(job), _) => vec![
4921 "run".to_owned(),
4922 "view".to_owned(),
4923 "--log-failed".to_owned(),
4924 "--job".to_owned(),
4925 job,
4926 ],
4927 (None, Some(run)) => vec![
4928 "run".to_owned(),
4929 "view".to_owned(),
4930 run,
4931 "--log-failed".to_owned(),
4932 ],
4933 (None, None) => continue,
4935 };
4936 let (ok, body) = match gh(repo, &args).await {
4937 Ok(v) => v,
4938 Err(e) => (false, format!("{e:#}")),
4939 };
4940 if !ok && body.trim().is_empty() {
4941 continue;
4942 }
4943 let _ = write!(out, "### {name}\n\n```\n{}\n```\n\n", tail(&body, LOG_TAIL));
4944 }
4945 out
4946}
4947
4948fn job_of(details_url: &str) -> Option<String> {
4951 let after = details_url.split("/job/").nth(1)?;
4952 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
4953 (!id.is_empty()).then_some(id)
4954}
4955
4956pub(crate) fn run_of(details_url: &str) -> Option<String> {
4958 let after = details_url.split("/actions/runs/").nth(1)?;
4959 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
4960 (!id.is_empty()).then_some(id)
4961}
4962
4963fn stop_comment(run_id: &str, why: &str) -> String {
4967 format!(
4968 "{MARKER}\nmagi stopped landing this pull request: {why}\n\n\
4969 The branch is untouched and the run is `{run_id}`. Nothing was merged."
4970 )
4971}
4972
4973async fn stop(state: &mut RunState, repo: &Path, pr: &PrState, why: &str) -> Result<()> {
4978 let body = stop_comment(&state.id, why);
4979 let (_, mut body) = crate::github_text::prepare(state, "", &body);
4980 if !body.contains(MARKER) {
4981 body = format!("{MARKER}\n{body}");
4982 }
4983 let posted = gh(
4984 repo,
4985 &[
4986 "pr".to_owned(),
4987 "comment".to_owned(),
4988 pr.number.to_string(),
4989 "--body".to_owned(),
4990 body,
4991 ],
4992 )
4993 .await;
4994 match posted {
4995 Ok((true, _)) => {}
4996 Ok((false, out)) => tracing::warn!("could not comment on {}: {out}", pr.url),
4997 Err(e) => tracing::warn!("could not comment on {}: {e:#}", pr.url),
4998 }
4999 state.status = RunStatus::Blocked;
5000 state.merge = Some(MergeOutcome {
5001 mode: MergeMode::Pr,
5002 ok: false,
5003 detail: why.to_owned(),
5004 empty: false,
5005 });
5006 state.event("land", format!("stopped: {why}"));
5007 state.save()?;
5008 Ok(())
5009}
5010
5011pub(crate) async fn gh(cwd: &Path, args: &[String]) -> Result<(bool, String)> {
5027 let out = tokio::process::Command::new("gh")
5028 .args(args)
5029 .current_dir(cwd)
5030 .env_remove("GH_REPO")
5031 .quiet()
5032 .stdin(std::process::Stdio::null())
5033 .output()
5034 .await
5035 .with_context(|| format!("spawn gh {}", args.join(" ")))?;
5036 let mut body = String::from_utf8_lossy(&out.stdout).into_owned();
5037 let err = String::from_utf8_lossy(&out.stderr);
5038 if body.trim().is_empty() {
5039 body = err.into_owned();
5040 } else if !err.trim().is_empty() {
5041 body.push_str(&err);
5042 }
5043 Ok((out.status.success(), body.trim().to_owned()))
5044}
5045
5046#[derive(Debug, Clone, Copy, PartialEq, Eq)]
5048pub(crate) enum Verdict {
5049 Pass,
5050 Fail,
5051 Pending,
5052 Unknown,
5053}
5054
5055impl Verdict {
5056 pub(crate) fn label(self) -> &'static str {
5058 match self {
5059 Self::Pass => "passed",
5060 Self::Fail => "failed",
5061 Self::Pending => "pending",
5062 Self::Unknown => "unknown",
5063 }
5064 }
5065}
5066
5067#[derive(Debug, Deserialize)]
5068#[serde(rename_all = "camelCase")]
5069struct GhPr {
5070 #[serde(default)]
5071 url: String,
5072 #[serde(default)]
5073 number: u64,
5074 #[serde(default)]
5075 state: String,
5076 #[serde(default)]
5077 title: String,
5078 #[serde(default)]
5079 status_check_rollup: Vec<GhCheck>,
5080 #[serde(default)]
5087 merge_state_status: String,
5088 #[serde(default)]
5092 head_ref_oid: String,
5093 #[serde(default)]
5094 base_ref_name: String,
5095 #[serde(default)]
5096 reviews: Vec<GhReview>,
5097 #[serde(default)]
5098 comments: Vec<GhComment>,
5099}
5100
5101#[derive(Debug, Deserialize)]
5106#[serde(rename_all = "camelCase")]
5107struct GhCheck {
5108 #[serde(default)]
5109 name: Option<String>,
5110 #[serde(default)]
5111 context: Option<String>,
5112 #[serde(default)]
5113 status: Option<String>,
5114 #[serde(default)]
5115 conclusion: Option<String>,
5116 #[serde(default)]
5117 state: Option<String>,
5118 #[serde(default)]
5119 details_url: Option<String>,
5120 #[serde(default)]
5121 target_url: Option<String>,
5122 #[serde(default)]
5125 is_required: Option<bool>,
5126}
5127
5128impl GhCheck {
5129 fn label(&self) -> String {
5131 self.name
5132 .clone()
5133 .or_else(|| self.context.clone())
5134 .unwrap_or_else(|| "(unnamed check)".to_owned())
5135 }
5136
5137 fn url(&self) -> Option<&str> {
5139 self.details_url
5140 .as_deref()
5141 .or(self.target_url.as_deref())
5142 .filter(|u| !u.is_empty())
5143 }
5144
5145 fn verdict(&self) -> Verdict {
5153 if let Some(status) = self.status.as_deref() {
5154 if !status.eq_ignore_ascii_case("COMPLETED") {
5155 return Verdict::Pending;
5156 }
5157 }
5158 let outcome = self
5159 .conclusion
5160 .as_deref()
5161 .or(self.state.as_deref())
5162 .unwrap_or("");
5163 match outcome.to_ascii_uppercase().as_str() {
5164 "SUCCESS" | "SKIPPED" | "NEUTRAL" => Verdict::Pass,
5165 "FAILURE" | "ERROR" | "TIMED_OUT" | "CANCELLED" | "STARTUP_FAILURE"
5166 | "ACTION_REQUIRED" => Verdict::Fail,
5167 "PENDING" | "EXPECTED" | "QUEUED" | "IN_PROGRESS" | "WAITING" | "REQUESTED" => {
5168 Verdict::Pending
5169 }
5170 _ => Verdict::Unknown,
5171 }
5172 }
5173}
5174
5175#[derive(Debug, Deserialize)]
5176struct GhAuthor {
5177 #[serde(default)]
5178 login: String,
5179}
5180
5181#[derive(Debug, Deserialize)]
5182struct GhReview {
5183 #[serde(default)]
5184 author: GhAuthor,
5185 #[serde(default)]
5186 body: String,
5187}
5188
5189#[derive(Debug, Deserialize)]
5190struct GhComment {
5191 #[serde(default)]
5192 author: GhAuthor,
5193 #[serde(default)]
5194 body: String,
5195}
5196
5197#[derive(Debug, Deserialize)]
5198struct GhUser {
5199 #[serde(default)]
5200 login: String,
5201}
5202
5203#[derive(Debug, Deserialize)]
5204struct GhInline {
5205 #[serde(default)]
5206 user: GhUser,
5207 #[serde(default)]
5208 path: Option<String>,
5209 #[serde(default)]
5210 line: Option<u64>,
5211 #[serde(default)]
5212 body: String,
5213}
5214
5215impl Default for GhAuthor {
5216 fn default() -> Self {
5217 Self {
5218 login: "(unknown)".to_owned(),
5219 }
5220 }
5221}
5222
5223impl Default for GhUser {
5224 fn default() -> Self {
5225 Self {
5226 login: "(unknown)".to_owned(),
5227 }
5228 }
5229}
5230
5231#[cfg(test)]
5232pub(crate) mod tests {
5233 use super::*;
5234 use crate::run::{Candidate, ReviewRecord, ReviewRound, Tally};
5235
5236 fn head_json(head: &str, base: &str, state: &str, cross: bool) -> String {
5237 format!(
5238 r#"{{"headRefName":"{head}","headRefOid":"aaa","baseRefName":"{base}","state":"{state}","isCrossRepository":{cross}}}"#
5239 )
5240 }
5241
5242 #[test]
5243 fn a_pull_request_is_closed_only_when_its_head_is_exactly_the_runs_branch() {
5244 let ok = head_json("magi/27b2/A", "main", "OPEN", false);
5245 assert_eq!(
5246 closable(&ok, "magi/27b2/A", "main", &["aaa".to_owned()]),
5247 Ok(())
5248 );
5249 for (json, why) in [
5250 (head_json("magi/27b2/B", "main", "OPEN", false), "head"),
5251 (head_json("magi/27b2/A-2", "main", "OPEN", false), "head"),
5252 (head_json("magi/27b2/A", "main", "OPEN", true), "fork"),
5253 (head_json("magi/27b2/A", "dev", "OPEN", false), "targets"),
5254 (head_json("magi/27b2/A", "main", "MERGED", false), "already"),
5255 (head_json("magi/27b2/A", "main", "CLOSED", false), "already"),
5256 ] {
5257 let err = closable(&json, "magi/27b2/A", "main", &["aaa".to_owned()])
5258 .unwrap_err()
5259 .why;
5260 assert!(err.contains(why), "{json}: {err}");
5261 }
5262 let moved = head_json("magi/27b2/A", "main", "OPEN", false);
5264 let err = closable(&moved, "magi/27b2/A", "main", &["bbb".to_owned()]).unwrap_err();
5265 assert!(err.retry && err.why.contains("not a commit"), "{err:?}");
5266 assert!(
5267 !closable(
5268 &head_json("x", "main", "OPEN", false),
5269 "magi/27b2/A",
5270 "main",
5271 &[]
5272 )
5273 .unwrap_err()
5274 .retry
5275 );
5276 assert!(is_forge_url("https://github.com/o/r.git"));
5277 assert!(is_forge_url("git@github.com:o/r.git"));
5278 assert!(!is_forge_url("/tmp/origin.git"));
5279 assert!(!is_forge_url("C:\\work\\origin.git"));
5280 assert!(!is_forge_url("file:///tmp/origin.git"));
5281 assert!(forge_unavailable(
5282 "gh pr list failed: none of the git remotes configured for this repository point to a known GitHub host."
5283 ));
5284 assert!(!forge_unavailable(
5285 "gh pr list failed: error connecting to api.github.com"
5286 ));
5287 assert!(closable("not json", "magi/27b2/A", "main", &[]).is_err());
5288 assert!(
5290 closable(
5291 r#"{"headRefName":"b","headRefOid":"aaa","baseRefName":"main","state":"OPEN"}"#,
5292 "b",
5293 "main",
5294 &["aaa".to_owned()]
5295 )
5296 .is_err()
5297 );
5298 }
5299
5300 #[test]
5301 fn the_close_comment_names_the_commit_on_the_base() {
5302 let e = crate::already::Evidence {
5303 proof: crate::already::Proof::PatchId,
5304 tip: "1234567890".to_owned(),
5305 commits: vec!["0e368de0000".to_owned()],
5306 };
5307 let c = superseded_comment("main", &e);
5308 assert!(c.contains("0e368de") && c.contains("`main`"), "{c}");
5309 }
5310
5311 const GREEN_OPEN: &str = r####"{
5313 "url": "https://github.com/yukimemi/magi/pull/10",
5314 "number": 10,
5315 "state": "OPEN",
5316 "mergeStateStatus": "CLEAN",
5317 "statusCheckRollup": [
5318 {
5319 "__typename": "CheckRun",
5320 "conclusion": "SKIPPED",
5321 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278334/job/99378963755",
5322 "name": "review",
5323 "status": "COMPLETED",
5324 "workflowName": "claude-review"
5325 },
5326 {
5327 "__typename": "CheckRun",
5328 "conclusion": "SUCCESS",
5329 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963144",
5330 "name": "check (ubuntu-latest)",
5331 "status": "COMPLETED",
5332 "workflowName": "CI"
5333 },
5334 {
5335 "__typename": "CheckRun",
5336 "conclusion": "SUCCESS",
5337 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963095",
5338 "name": "rustfmt",
5339 "status": "COMPLETED",
5340 "workflowName": "CI"
5341 },
5342 {
5343 "__typename": "StatusContext",
5344 "context": "CodeRabbit",
5345 "state": "SUCCESS",
5346 "targetUrl": ""
5347 }
5348 ],
5349 "reviews": [],
5350 "comments": [
5351 {
5352 "author": {
5353 "login": "coderabbitai"
5354 },
5355 "authorAssociation": "NONE",
5356 "body": "<!-- This is an auto-generated comment: summarize by coderabbit.ai -->\n<!-- This is an auto-generated comment: skip review by coderabbit.ai -->\n\n> [!IMPORTANT]\n> - [ ] <!-- {\"checkboxId\":\"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe\"} --> 🔍 Trigger review\n> \n> This repository does not receive automatic reviews because it has fewer than 10 stars.\n> \n> <details>\n> <summary>⚙️ Run configuration</summary>\n> \n> **Configuration used**: defaults\n> \n> **Review profile**: CHILL\n> \n> **Plan**: Pro Plus\n> \n> **Run ID**: `78e70bf3-c5a0-4269-a96c-2afb2dba7eff`\n> \n> </details>\n\n<!-- end of auto-generated comment: skip review by coderabbit.ai -->\n\n<!-- tips_start -->\n\n---\n\nThanks for using [CodeRabbit](https://coderabbit.ai?utm_source=oss&utm_medium=github&utm_campaign=yukimemi/magi&utm_content=10)! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.\n\n<details>\n<summary>❤️ Share</summary>\n\n- [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%2"
5357 }
5358 ]
5359}"####;
5360
5361 const RED_OPEN: &str = r####"{
5363 "url": "https://github.com/yukimemi/magi/pull/9",
5364 "number": 9,
5365 "state": "OPEN",
5366 "mergeStateStatus": "UNSTABLE",
5367 "statusCheckRollup": [
5368 {
5369 "__typename": "CheckRun",
5370 "conclusion": "SUCCESS",
5371 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
5372 "name": "check (ubuntu-latest)",
5373 "status": "COMPLETED",
5374 "workflowName": "CI"
5375 },
5376 {
5377 "__typename": "CheckRun",
5378 "conclusion": "SUCCESS",
5379 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
5380 "name": "rustfmt",
5381 "status": "COMPLETED",
5382 "workflowName": "CI"
5383 },
5384 {
5385 "__typename": "CheckRun",
5386 "conclusion": "FAILURE",
5387 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
5388 "name": "editorconfig",
5389 "status": "COMPLETED",
5390 "workflowName": "CI"
5391 },
5392 {
5393 "__typename": "StatusContext",
5394 "context": "CodeRabbit",
5395 "state": "SUCCESS",
5396 "targetUrl": ""
5397 }
5398 ],
5399 "reviews": [],
5400 "comments": [
5401 {
5402 "author": {
5403 "login": "coderabbitai"
5404 },
5405 "authorAssociation": "NONE",
5406 "body": "<!-- This is an auto-generated comment: summarize by coderabbit.ai -->\n<!-- This is an auto-generated comment: skip review by coderabbit.ai -->\n\n> [!IMPORTANT]\n> - [ ] <!-- {\"checkboxId\":\"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe\"} --> 🔍 Trigger review\n> \n> This repository does not receive automatic reviews because it has fewer than 10 stars.\n> \n> <details>\n> <summary>⚙️ Run configuration</summary>\n> \n> **Configuration used**: defaults\n> \n> **Review profile**: CHILL\n> \n> **Plan**: Team\n> \n> **Run ID**: `91e0dc24-6040-4c3d-92c6-f7d2b542523d`\n> \n> </details>\n\n<!-- end of auto-generated comment: skip review by coderabbit.ai -->\n\n<!-- tips_start -->\n\n---\n\nThanks for using [CodeRabbit](https://coderab"
5407 }
5408 ]
5409}"####;
5410
5411 const PENDING_OPEN: &str = r####"{
5413 "url": "https://github.com/yukimemi/magi/pull/9",
5414 "number": 9,
5415 "state": "OPEN",
5416 "statusCheckRollup": [
5417 {
5418 "__typename": "CheckRun",
5419 "conclusion": "SUCCESS",
5420 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
5421 "name": "check (ubuntu-latest)",
5422 "status": "COMPLETED",
5423 "workflowName": "CI"
5424 },
5425 {
5426 "__typename": "CheckRun",
5427 "conclusion": "SUCCESS",
5428 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
5429 "name": "rustfmt",
5430 "status": "COMPLETED",
5431 "workflowName": "CI"
5432 },
5433 {
5434 "__typename": "CheckRun",
5435 "conclusion": null,
5436 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
5437 "name": "editorconfig",
5438 "status": "IN_PROGRESS",
5439 "workflowName": "CI"
5440 },
5441 {
5442 "__typename": "StatusContext",
5443 "context": "CodeRabbit",
5444 "state": "SUCCESS",
5445 "targetUrl": ""
5446 }
5447 ],
5448 "reviews": [],
5449 "comments": []
5450}"####;
5451
5452 const MERGED: &str = r####"{
5454 "url": "https://github.com/yukimemi/magi/pull/16",
5455 "number": 16,
5456 "state": "MERGED",
5457 "statusCheckRollup": [
5458 {
5459 "__typename": "CheckRun",
5460 "conclusion": "SUCCESS",
5461 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587933/job/100268878095",
5462 "name": "check (ubuntu-latest)",
5463 "status": "COMPLETED",
5464 "workflowName": "CI"
5465 },
5466 {
5467 "__typename": "CheckRun",
5468 "conclusion": "SUCCESS",
5469 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587918/job/100268876427",
5470 "name": "review",
5471 "status": "COMPLETED",
5472 "workflowName": "claude-review"
5473 }
5474 ],
5475 "reviews": [],
5476 "comments": []
5477}"####;
5478
5479 const REVIEWED_OPEN: &str = r####"{
5481 "url": "https://github.com/yukimemi/magi/pull/12",
5482 "number": 12,
5483 "state": "OPEN",
5484 "statusCheckRollup": [
5485 {
5486 "__typename": "CheckRun",
5487 "conclusion": "SUCCESS",
5488 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212506/job/100065355258",
5489 "name": "check (ubuntu-latest)",
5490 "status": "COMPLETED",
5491 "workflowName": "CI"
5492 },
5493 {
5494 "__typename": "CheckRun",
5495 "conclusion": "SUCCESS",
5496 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212566/job/100065355810",
5497 "name": "review",
5498 "status": "COMPLETED",
5499 "workflowName": "claude-review"
5500 }
5501 ],
5502 "reviews": [
5503 {
5504 "author": {
5505 "login": "claude"
5506 },
5507 "state": "COMMENTED",
5508 "body": ""
5509 }
5510 ],
5511 "comments": [
5512 {
5513 "author": {
5514 "login": "coderabbitai"
5515 },
5516 "authorAssociation": "NONE",
5517 "body": "<!-- This is an auto-generated comment: summarize by coderabbit.ai -->\n<!-- This is an auto-generated comment: skip review by coderabbit.ai -->\n\n> [!IMPORTANT]\n> - [ ] <!-- {\"checkboxId\":\"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe\"} --> 🔍 Trigger review\n> \n> This repository does not receive automatic reviews because it has fewer than 10 stars.\n> \n> <details>\n> <summary>⚙️ Run configuration</summary>\n> \n> **Configuration used**: defaults\n> \n> **Review profile**: CHILL\n> \n> **Plan**: Team\n> \n> **Run ID**: `72058bf3-b7df-41d9-8e4d-a06a31be4a26`\n> \n> </details>\n\n<!-- end of auto-generated comment: skip review by coderabbit.ai -->\n\n<!-- tips_start -->\n\n---\n\nThanks for using [CodeRabbit](https://coderabbit.ai?utm_source=oss&utm_medium=github&utm_campaign=yukimemi/magi&utm_content=12)! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.\n\n<details>\n<summa"
5518 },
5519 {
5520 "author": {
5521 "login": "claude"
5522 },
5523 "authorAssociation": "NONE",
5524 "body": "**Claude finished @yukimemi's task in 3m 52s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33571212566)\n\n---\n### Review: `magi review <branch>` — cheap-half-only graph\n\nRead through `src/graph.rs`, `src/main.rs`, `src/prompt.rs`, and the new/edited tests, and traced the claimed degeneration (`prep` short-circuits on a non-empty candidate list, `implement` skips because `commits != 0`, `judge`/`vote` skip on `viable().len() == 1`, `tally` skips because it's pre-set, `fold_losers` has no losers) against the actual code — it holds up. CI (`cargo make check`) is green on this PR.\n\n**Correctness**\n\n- One real bug, flagged inline on `src/graph.rs:1255`: the fixer-agent fallback (`self.roles.implementers[winner.index].clone()`) is unreachable in the normal graph (a real candidate's `winner.agent` always resolves via `config.agent(...)`), but a review-only run's `winner.agent` is always the `\"(existing branch)\"` sentinel, so this fallback now runs on *every* review-only fix that has no dedicated `[roles] fixer`. `graph.candidates` has no lower-bound validation, so a `magi.toml` tuned for review-only use (`candidates = 0`, plausible given this PR's own cost rationale) would panic with an out-of-bounds index the first time a"
5525 }
5526 ]
5527}"####;
5528
5529 const INLINE: &str = r####"[
5531 {
5532 "user": {
5533 "login": "claude[bot]"
5534 },
5535 "path": "src/graph.rs",
5536 "line": 231,
5537 "body": "Minor edge case: unlike `implement()` (which sets `c.empty = commits == 0 || patch.trim().is_empty()`, `src/graph.rs:472`), the seeded review-only candidate always sets `empty: false` once `commits > 0` is confirmed, without checking whether the diff itself is actually empty (e.g. a commit immediately followed by a revert nets zero file changes). Such a branch would pass `Runner::review`'s validation and proceed into a review round with an empty patch, where `implement()`'s equivalent path would"
5538 }
5539]"####;
5540
5541 const CODERABBIT_TRIGGER: &str = r####"<!-- This is an auto-generated comment: summarize by coderabbit.ai -->
5543<!-- This is an auto-generated comment: skip review by coderabbit.ai -->
5544
5545> [!IMPORTANT]
5546> - [ ] <!-- {"checkboxId":"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe"} --> 🔍 Trigger review
5547>
5548> This repository does not receive automatic reviews because it has fewer than 10 stars.
5549>
5550> <details>
5551> <summary>⚙️ Run configuration</summary>
5552>
5553> **Configuration used**: defaults
5554>
5555> **Review profile**: CHILL
5556>
5557> **Plan**: Team
5558>
5559> **Run ID**: `c1e2a68f-87fc-4b35-9ec4-e75c7854966a`
5560>
5561> </details>
5562
5563<!-- end of auto-generated comment: skip review by coderabbit.ai -->
5564
5565<!-- tips_start -->
5566
5567---
5568
5569Thanks for using [CodeRabbit](https://coderabbit.ai?utm_source=oss&utm_medium=github&utm_campaign=yukimemi/magi&utm_content=16)! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
5570
5571<details>
5572<summary>❤️ Share</summary>
5573
5574- [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20off"####;
5575
5576 const CLAUDE_CHECKLIST: &str = r####"**Claude finished @yukimemi's task in 4m 14s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33636587918)
5578
5579---
5580### Reviewing PR #16
5581
5582- [x] Read AGENTS.md conventions
5583- [x] Review `src/daemon.rs` changes
5584- [x] Review `src/main.rs` changes (new `doctor` reporting)
5585- [x] Review `src/web.rs` changes (reuse of unreadable-run count)
5586- [x] Check test coverage for new behavior
5587- [x] Run verification commands (blocked — see note)
5588- [x] Post findings"####;
5589
5590 const CLAUDE_FINDING: &str = r####"**Claude finished @yukimemi's task in 3m 52s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33571212566)
5592
5593---
5594### Review: `magi review <branch>` — cheap-half-only graph
5595
5596Read through `src/graph.rs`, `src/main.rs`, `src/prompt.rs`, and the new/edited tests, and traced the claimed degeneration (`prep` short-circuits on a non-empty candidate list, `implement` skips because `commits != 0`, `judge`/`vote` skip on `viable().len() == 1`, `tally` skips because it's pre-set, `fold_losers` has no losers) against the actual code — it holds up. CI (`cargo make check`) is green on this PR.
5597
5598**Correctness**
5599
5600- One real bug, flagged inline on `src/graph.rs:1255`: the fixer-agent fallback (`self.roles.implementers[winner.index].clone()`) is unreachable in the normal graph (a real candidate's `winner.agent` always resolves via `config.agent(...)`), but a review-only run's `winner.agent` is always the `"(existing branch)"` sentinel, so this fallback now runs on *every* review-only fix that has no dedicated `[roles] fixer`. `graph.candidates` has no lower-bound validation, so a `magi.toml` tuned for review-only use (`candidates = 0`, plausible given this PR's own cost rationale) would panic with an out-of-bounds index the first time a"####;
5601
5602 fn pr(checks: Checks, failing: &[&str], comments: usize) -> PrState {
5603 PrState {
5604 url: "https://github.com/yukimemi/magi/pull/16".to_owned(),
5605 number: 16,
5606 state: PrLifecycle::Open,
5607 checks,
5608 blocking: if matches!(checks, Checks::Red) {
5612 Blocking::Yes
5613 } else {
5614 Blocking::No
5615 },
5616 failing: failing.iter().map(|s| (*s).to_owned()).collect(),
5617 review_comments: (0..comments)
5618 .map(|i| ReviewComment {
5619 author: "coderabbitai".to_owned(),
5620 path: Some("src/graph.rs".to_owned()),
5621 line: Some(231),
5622 body: format!("finding {i}"),
5623 })
5624 .collect(),
5625 }
5626 }
5627
5628 #[test]
5629 fn expected_ci_is_exactly_decide_and_absent_ci_never_waits_for_checks() {
5630 use CiExpectation::{Absent, Expected};
5631 for checks in [Checks::Pending, Checks::Unknown, Checks::Green, Checks::Red] {
5632 let p = pr(checks, &["x"], 0);
5633 for waited in [Duration::ZERO, CHECKS_GRACE] {
5634 assert_eq!(
5635 decide_with(&p, 0, 4, waited, Expected),
5636 decide(&p, 0, 4, waited)
5637 );
5638 }
5639 }
5640 for checks in [Checks::Pending, Checks::Unknown, Checks::Red] {
5642 let p = pr(checks, &["x"], 0);
5643 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Merge);
5644 assert_eq!(decide_with(&p, 4, 4, CHECKS_GRACE, Absent), Step::Merge);
5645 }
5646 let mut p = pr(Checks::Unknown, &[], 0);
5648 p.blocking = Blocking::Conflict;
5649 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Rebase);
5650 p.state = PrLifecycle::Merged;
5652 assert_eq!(
5653 decide_with(&p, 0, 4, Duration::ZERO, Absent),
5654 Step::Done { merged: true }
5655 );
5656 }
5657
5658 #[test]
5659 fn a_green_pull_request_with_nothing_outstanding_parses_as_ready_to_merge() {
5660 let state = parse_pr(GREEN_OPEN).expect("green fixture parses");
5661 assert_eq!(state.number, 10);
5662 assert_eq!(state.state, PrLifecycle::Open);
5663 assert_eq!(state.checks, Checks::Green);
5664 assert!(state.failing.is_empty());
5665 assert!(
5666 state.review_comments.is_empty(),
5667 "the only comment is CodeRabbit's trigger notice: {:?}",
5668 state.review_comments
5669 );
5670 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Merge);
5671 }
5672
5673 #[test]
5674 fn a_failing_check_parses_as_red_and_is_named() {
5675 let state = parse_pr(RED_OPEN).expect("red fixture parses");
5676 assert_eq!(state.checks, Checks::Red);
5677 assert_eq!(state.failing, vec!["editorconfig".to_owned()]);
5678 let mut blocking = state.clone();
5685 blocking.blocking = Blocking::Yes;
5686 match decide(&blocking, 0, 4, Duration::ZERO) {
5687 Step::Fix { reason } => {
5688 assert!(reason.contains("editorconfig"), "reason: {reason}");
5689 assert!(reason.contains("failing"), "reason: {reason}");
5690 }
5691 other => panic!("expected a fix round, got {other:?}"),
5692 }
5693 }
5694
5695 #[test]
5696 fn a_check_still_running_parses_as_pending_and_is_waited_for() {
5697 let state = parse_pr(PENDING_OPEN).expect("pending fixture parses");
5698 assert_eq!(state.checks, Checks::Pending);
5699 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Wait);
5700 }
5701
5702 #[test]
5703 fn a_pull_request_merged_underneath_us_is_done_rather_than_a_failure() {
5704 let state = parse_pr(MERGED).expect("merged fixture parses");
5705 assert_eq!(state.state, PrLifecycle::Merged);
5706 assert_eq!(
5707 decide(&state, 0, 4, Duration::ZERO),
5708 Step::Done { merged: true }
5709 );
5710 }
5711
5712 #[test]
5713 fn a_review_that_found_something_is_outstanding_and_holds_the_merge() {
5714 let state = parse_pr(REVIEWED_OPEN).expect("reviewed fixture parses");
5715 assert_eq!(state.checks, Checks::Green);
5716 let authors: Vec<&str> = state
5717 .review_comments
5718 .iter()
5719 .map(|c| c.author.as_str())
5720 .collect();
5721 assert_eq!(
5722 authors,
5723 vec!["claude"],
5724 "CodeRabbit's walkthrough is machinery; Claude's review is a finding"
5725 );
5726 match decide(&state, 0, 4, Duration::ZERO) {
5727 Step::Fix { reason } => assert!(reason.contains("unresolved"), "reason: {reason}"),
5728 other => panic!("expected a fix round, got {other:?}"),
5729 }
5730 }
5731
5732 #[test]
5733 fn inline_review_comments_keep_their_file_and_line() {
5734 let comments = parse_inline_comments(INLINE).expect("inline fixture parses");
5735 assert_eq!(comments.len(), 1);
5736 assert_eq!(comments[0].author, "claude[bot]");
5737 assert_eq!(comments[0].path.as_deref(), Some("src/graph.rs"));
5738 assert_eq!(comments[0].line, Some(231));
5739 assert!(comments[0].body.contains("empty"), "{}", comments[0].body);
5740 }
5741
5742 #[test]
5743 fn a_status_only_bot_comment_does_not_trigger_a_fix_round() {
5744 assert!(
5745 is_noise(CODERABBIT_TRIGGER),
5746 "CodeRabbit's trigger notice declares itself not a review"
5747 );
5748 assert!(
5749 is_noise(CLAUDE_CHECKLIST),
5750 "a progress checklist asks for nothing"
5751 );
5752 assert!(
5753 !is_noise(CLAUDE_FINDING),
5754 "a review that names a bug is input, not noise"
5755 );
5756
5757 let mut clean = pr(Checks::Green, &[], 0);
5758 clean.review_comments.push(ReviewComment {
5759 author: "coderabbitai".to_owned(),
5760 path: None,
5761 line: None,
5762 body: CODERABBIT_TRIGGER.to_owned(),
5763 });
5764 clean.review_comments.retain(|c| !is_noise(&c.body));
5765 assert_eq!(decide(&clean, 0, 4, Duration::ZERO), Step::Merge);
5766
5767 let mut found = pr(Checks::Green, &[], 0);
5768 found.review_comments.push(ReviewComment {
5769 author: "claude".to_owned(),
5770 path: None,
5771 line: None,
5772 body: CLAUDE_FINDING.to_owned(),
5773 });
5774 found.review_comments.retain(|c| !is_noise(&c.body));
5775 assert!(matches!(
5776 decide(&found, 0, 4, Duration::ZERO),
5777 Step::Fix { .. }
5778 ));
5779 }
5780
5781 #[test]
5782 fn the_policy_table_holds_for_every_combination_that_matters() {
5783 let cases: Vec<(&str, PrState, usize, usize, Duration, Step)> = vec![
5784 (
5785 "pending checks are waited for, even on the last round",
5786 pr(Checks::Pending, &[], 0),
5787 4,
5788 4,
5789 Duration::ZERO,
5790 Step::Wait,
5791 ),
5792 (
5793 "red checks are fixed",
5794 pr(Checks::Red, &["editorconfig"], 0),
5795 0,
5796 4,
5797 Duration::ZERO,
5798 Step::Fix {
5799 reason: "1 check(s) failing: editorconfig".to_owned(),
5800 },
5801 ),
5802 (
5803 "green with comments is fixed, not merged",
5804 pr(Checks::Green, &[], 2),
5805 1,
5806 4,
5807 Duration::ZERO,
5808 Step::Fix {
5809 reason: "checks are green but 2 review comment(s) are unresolved: coderabbitai"
5810 .to_owned(),
5811 },
5812 ),
5813 (
5814 "green and clean merges",
5815 pr(Checks::Green, &[], 0),
5816 3,
5817 4,
5818 Duration::ZERO,
5819 Step::Merge,
5820 ),
5821 (
5822 "an unreadable rollup is waited on while the grace lasts",
5823 pr(Checks::Unknown, &[], 0),
5824 0,
5825 4,
5826 Duration::ZERO,
5827 Step::Wait,
5828 ),
5829 (
5830 "an unreadable rollup is never merged once the grace is spent",
5831 pr(Checks::Unknown, &[], 0),
5832 0,
5833 4,
5834 CHECKS_GRACE,
5835 Step::GiveUp {
5836 reason: "no check status is readable on the pull request after 3 minute(s); \
5837 refusing to merge on a guess"
5838 .to_owned(),
5839 },
5840 ),
5841 ];
5842 for (what, state, round, budget, waited, want) in cases {
5843 assert_eq!(decide(&state, round, budget, waited), want, "{what}");
5844 }
5845 }
5846
5847 #[test]
5848 fn the_forge_verdict_survives_the_round_trip_from_gh() {
5849 let green = parse_pr(GREEN_OPEN).expect("parse");
5853 assert_eq!(green.blocking, Blocking::No);
5854 let red = parse_pr(RED_OPEN).expect("parse");
5855 assert_eq!(
5856 red.blocking,
5857 Blocking::No,
5858 "`UNSTABLE` is mergeable: the red check is one nobody requires"
5859 );
5860 assert_eq!(red.checks, Checks::Red, "and it is still reported as red");
5861 let quiet =
5863 parse_pr(&GREEN_OPEN.replace("\"mergeStateStatus\": \"CLEAN\",", "")).expect("parse");
5864 assert_eq!(quiet.blocking, Blocking::Unsaid);
5865 }
5866
5867 #[test]
5868 fn a_red_check_nobody_requires_does_not_buy_a_fix_round() {
5869 let mut nonblocking = pr(Checks::Red, &["editorconfig", "coverage"], 0);
5875 nonblocking.blocking = Blocking::No;
5876 assert_eq!(
5877 decide(&nonblocking, 0, 4, Duration::ZERO),
5878 Step::Merge,
5879 "the forge says nothing is in the way, so nothing is"
5880 );
5881
5882 let mut blocking = pr(Checks::Red, &["test (ubuntu-latest)"], 0);
5884 blocking.blocking = Blocking::Yes;
5885 assert!(matches!(
5886 decide(&blocking, 0, 4, Duration::ZERO),
5887 Step::Fix { .. }
5888 ));
5889
5890 let mut commented = pr(Checks::Red, &["coverage"], 1);
5893 commented.blocking = Blocking::No;
5894 assert!(matches!(
5895 decide(&commented, 0, 4, Duration::ZERO),
5896 Step::Fix { .. }
5897 ));
5898
5899 let mut unsaid = pr(Checks::Red, &["coverage"], 0);
5901 unsaid.blocking = Blocking::Unsaid;
5902 assert!(matches!(
5903 decide(&unsaid, 0, 4, Duration::ZERO),
5904 Step::Fix { .. }
5905 ));
5906 }
5907
5908 #[test]
5909 fn a_red_merge_is_announced_with_every_failing_check_and_a_green_one_is_not() {
5910 let mut red = pr(Checks::Red, &["test (windows-latest)", "coverage"], 0);
5911 red.blocking = Blocking::No;
5912 assert_eq!(
5913 decide(&red, 0, 4, Duration::ZERO),
5914 Step::Merge,
5915 "announcing must not change the decision"
5916 );
5917 let said = red_merge_summary("yukimemi/magi", &red).expect("red merge is announced");
5918 assert!(said.contains("yukimemi/magi"), "{said}");
5919 assert!(said.contains("#16"), "{said}");
5920 assert!(
5921 said.contains("https://github.com/yukimemi/magi/pull/16"),
5922 "{said}"
5923 );
5924 assert!(
5925 said.contains("test (windows-latest)") && said.contains("coverage"),
5926 "{said}"
5927 );
5928
5929 let green = pr(Checks::Green, &["stale"], 0);
5931 assert_eq!(red_merge_summary("yukimemi/magi", &green), None);
5932 }
5933
5934 #[test]
5935 fn red_merge_notices_omit_empty_check_details() {
5936 for checks in [vec![], vec!["", " "]] {
5937 let red = pr(Checks::Red, &checks, 0);
5938 let summary = red_merge_summary("owner/repo", &red).unwrap();
5939 let notice = crate::notices::merged_red("run-1", &summary);
5940 assert_eq!(
5941 notice.message,
5942 format!("Merged owner/repo PR #16 with red checks ({})", red.url)
5943 );
5944 assert_eq!(notice.severity, crate::notices::Severity::Warn);
5945 }
5946 let red = pr(Checks::Red, &["", " test ", " "], 0);
5947 let summary = red_merge_summary("owner/repo", &red).unwrap();
5948 assert!(summary.contains("with red checks: test ("), "{summary}");
5949 }
5950
5951 #[test]
5952 fn the_repo_label_comes_from_the_pull_request_url() {
5953 let p = Path::new("/tmp/checkout");
5954 assert_eq!(
5955 repo_label(p, "https://github.com/yukimemi/magi/pull/16"),
5956 "yukimemi/magi"
5957 );
5958 assert_eq!(repo_label(p, "not a url"), "checkout");
5959 }
5960
5961 #[test]
5962 fn a_branch_the_base_moved_under_is_rebased_not_fixed() {
5963 let mut conflicted = pr(Checks::Green, &[], 0);
5968 conflicted.blocking = Blocking::Conflict;
5969 assert_eq!(decide(&conflicted, 0, 4, Duration::ZERO), Step::Rebase);
5970
5971 let mut red = pr(Checks::Red, &["test (ubuntu-latest)"], 2);
5975 red.blocking = Blocking::Conflict;
5976 assert_eq!(decide(&red, 4, 4, Duration::ZERO), Step::Rebase);
5977
5978 let mut merged = pr(Checks::Red, &[], 0);
5980 merged.blocking = Blocking::Conflict;
5981 merged.state = PrLifecycle::Merged;
5982 assert_eq!(
5983 decide(&merged, 0, 4, Duration::ZERO),
5984 Step::Done { merged: true }
5985 );
5986 }
5987
5988 #[test]
5989 fn the_forge_verdict_is_read_off_merge_state_status() {
5990 for ok in ["CLEAN", "UNSTABLE", "unstable", "HAS_HOOKS"] {
5993 assert_eq!(Blocking::of(ok), Blocking::No, "{ok}");
5994 assert!(!Blocking::of(ok).stops_a_merge(), "{ok}");
5995 }
5996 assert_eq!(Blocking::of("DIRTY"), Blocking::Conflict);
5997 assert_eq!(Blocking::of("BLOCKED"), Blocking::Yes);
5998 assert_eq!(Blocking::of("BEHIND"), Blocking::Yes);
5999 for quiet in ["", "UNKNOWN"] {
6002 assert_eq!(Blocking::of(quiet), Blocking::Unsaid);
6003 assert!(Blocking::of(quiet).stops_a_merge());
6004 }
6005 }
6006
6007 #[test]
6008 fn a_merge_command_that_failed_after_merging_is_still_a_merge() {
6009 let argv = merge_argv(28, "fix: retry uploads on transient network errors");
6010 let jj = "could not determine current branch: failed to run git: not on any branch";
6012
6013 let landed = merged_after_all(&argv, jj, Some(PrLifecycle::Merged))
6014 .expect("the forge says merged, so it merged");
6015 assert!(landed.ok);
6016 assert!(
6017 landed.detail.contains("but the pull request is merged"),
6018 "the record must not read as a clean success: {}",
6019 landed.detail
6020 );
6021 assert!(
6022 landed.detail.contains("not on any branch"),
6023 "and it must keep what the command actually said: {}",
6024 landed.detail
6025 );
6026
6027 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Open)).is_none());
6029 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Closed)).is_none());
6030 assert!(merged_after_all(&argv, jj, None).is_none());
6032 }
6033
6034 #[test]
6035 fn a_pull_request_closed_underneath_us_is_done_and_not_merged() {
6036 let mut state = pr(Checks::Red, &["editorconfig"], 3);
6037 state.state = PrLifecycle::Closed;
6038 assert_eq!(
6039 decide(&state, 0, 4, Duration::ZERO),
6040 Step::Done { merged: false },
6041 "a human closing the pull request ends the loop, whatever CI says"
6042 );
6043 }
6044
6045 #[test]
6046 fn the_last_round_gives_up_with_a_reason_naming_what_is_still_failing() {
6047 let red = decide(
6048 &pr(Checks::Red, &["editorconfig", "test (macos)"], 0),
6049 4,
6050 4,
6051 Duration::ZERO,
6052 );
6053 match red {
6054 Step::GiveUp { reason } => {
6055 assert!(reason.contains("editorconfig"), "reason: {reason}");
6056 assert!(reason.contains("test (macos)"), "reason: {reason}");
6057 assert!(reason.contains("4 fix round(s)"), "reason: {reason}");
6058 }
6059 other => panic!("expected a give-up, got {other:?}"),
6060 }
6061
6062 let commented = decide(&pr(Checks::Green, &[], 1), 2, 2, Duration::ZERO);
6063 match commented {
6064 Step::GiveUp { reason } => {
6065 assert!(reason.contains("unresolved"), "reason: {reason}");
6066 assert!(reason.contains("2 fix round(s)"), "reason: {reason}");
6067 }
6068 other => panic!("expected a give-up, got {other:?}"),
6069 }
6070 }
6071
6072 #[test]
6073 fn the_merge_command_squashes_deletes_the_branch_and_sets_its_own_subject() {
6074 let candidate_commit = "magi: candidate A (uncommitted work)";
6075 let subject = merge_subject(candidate_commit, "add retries to the uploader");
6076 let argv = merge_argv(16, &subject);
6077
6078 assert!(argv.contains(&"--squash".to_owned()));
6079 assert!(argv.contains(&"--delete-branch".to_owned()));
6080 assert!(argv.contains(&"--subject".to_owned()));
6081 assert_eq!(
6082 argv.last().map(String::as_str),
6083 Some("add retries to the uploader"),
6084 "the subject must not be the candidate commit message"
6085 );
6086 assert_ne!(subject, candidate_commit);
6087 }
6088
6089 #[test]
6090 fn a_real_pull_request_title_is_used_as_the_squash_subject_verbatim() {
6091 assert_eq!(
6092 merge_subject("feat: a queue, an unattended loop, and a phone UI", "task"),
6093 "feat: a queue, an unattended loop, and a phone UI"
6094 );
6095 assert_eq!(
6096 merge_subject("", "# port the retry logic\n\ndetails"),
6097 "port the retry logic",
6098 "an empty title falls back to the task's first line, heading marks stripped"
6099 );
6100 }
6101
6102 #[test]
6103 fn a_failing_checks_details_url_yields_the_job_to_read_logs_from() {
6104 let url = "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572";
6105 assert_eq!(job_of(url).as_deref(), Some("100114323572"));
6106 assert_eq!(run_of(url).as_deref(), Some("33587406996"));
6107 assert_eq!(job_of("https://coderabbit.ai/status"), None);
6108 assert_eq!(run_of(""), None);
6109 }
6110
6111 #[test]
6112 fn magis_own_stop_comment_is_never_read_back_as_a_finding() {
6113 let mut out = Vec::new();
6114 push_if_outstanding(
6115 &mut out,
6116 ReviewComment {
6117 author: "yukimemi".to_owned(),
6118 path: None,
6119 line: None,
6120 body: format!("{MARKER}\nmagi stopped landing this pull request: 1 check failing"),
6121 },
6122 );
6123 assert!(out.is_empty());
6124 }
6125
6126 fn run_state() -> RunState {
6130 let mut state = RunState::new(
6131 std::path::PathBuf::from("/repo/magi"),
6132 "main".to_owned(),
6133 "abcdef1234".to_owned(),
6134 "add retries to the uploader".to_owned(),
6135 crate::config::Config::default(),
6136 );
6137 static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
6142 let nanos = std::time::SystemTime::now()
6143 .duration_since(std::time::UNIX_EPOCH)
6144 .map_or(0, |d| d.subsec_nanos() % 1_000_000);
6145 state.id = format!(
6146 "20261004-{nanos:06}-{:04x}",
6147 NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
6148 );
6149 state
6150 }
6151
6152 fn green_pr() -> PrState {
6153 PrState {
6154 url: "https://github.com/yukimemi/magi/pull/42".to_owned(),
6155 number: 42,
6156 state: PrLifecycle::Open,
6157 checks: Checks::Green,
6158 blocking: Blocking::No,
6160 failing: Vec::new(),
6161 review_comments: vec![ReviewComment {
6162 author: "coderabbitai".to_owned(),
6163 path: Some("src/land.rs".to_owned()),
6164 line: Some(212),
6165 body: "this branch never checks the exit code".to_owned(),
6166 }],
6167 }
6168 }
6169
6170 #[test]
6171 fn land_fixer_defers_review_and_verification_without_a_cache() {
6172 let state = run_state();
6173 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
6174 assert!(p.contains(crate::prompt::child_run_ownership()), "{p}");
6175 assert!(p.contains("Commit in this worktree"), "{p}");
6176 }
6177
6178 #[test]
6179 fn github_facing_land_text_is_english_whatever_the_language() {
6180 let mut state = run_state();
6181 state.config.graph.language = "ja".to_owned();
6182 let comment = stop_comment(&state.id, "checks are still red");
6183 assert!(crate::github_text::check("", &comment).is_empty());
6184 assert!(comment.is_ascii(), "{comment}");
6185 assert!(comment.starts_with(MARKER));
6186
6187 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
6188 let ja_at = p.find("Write all prose in ja").unwrap();
6189 let rule_at = p.find(crate::prompt::GITHUB_ENGLISH_HEADING).unwrap();
6190 assert!(ja_at < rule_at, "{p}");
6191 assert!(p.contains("stays in Japanese"), "{p}");
6192
6193 state.config.graph.language = "en".to_owned();
6194 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
6195 assert!(p.contains(crate::prompt::GITHUB_ENGLISH_HEADING), "{p}");
6196 assert!(!p.contains("does not apply"), "{p}");
6197 }
6198
6199 const NUMSTAT: &str = "12\t3\tsrc/land.rs\n40\t1\tsrc/web.rs\n-\t-\tassets/logo.png";
6200
6201 fn panel() -> String {
6202 approval_panel(
6203 &run_state(),
6204 &green_pr(),
6205 NUMSTAT,
6206 "diff --git a/src/land.rs b/src/land.rs\n@@ -1,2 +1,2 @@\n-old line\n+new line\n context",
6207 &[
6208 "land: ask before merging".to_owned(),
6209 "land: colour the diff".to_owned(),
6210 ],
6211 "feat: merge approval from the phone",
6212 )
6213 }
6214
6215 #[test]
6216 fn the_approval_panel_carries_the_whole_case_for_the_merge() {
6217 let html = panel();
6218 for needle in [
6219 "42",
6220 "main",
6221 "src/land.rs",
6222 "src/web.rs",
6223 "assets/logo.png",
6224 "feat: merge approval from the phone",
6225 "land: ask before merging",
6226 "land: colour the diff",
6227 "coderabbitai",
6228 "this branch never checks the exit code",
6229 "green",
6230 ] {
6231 assert!(html.contains(needle), "the panel must state `{needle}`");
6232 }
6233 }
6234
6235 fn winning_candidate(summary: &str) -> Candidate {
6238 Candidate {
6239 index: 0,
6240 label: 'A',
6241 agent: "opus".to_owned(),
6242 branch: "magi/x/A".to_owned(),
6243 worktree: PathBuf::from("/wt/A"),
6244 summary: summary.to_owned(),
6245 stat: String::new(),
6246 files: 1,
6247 commits: 1,
6248 empty: false,
6249 failed: None,
6250 verified_noop: None,
6251 duration_ms: 0,
6252 folded: false,
6253 }
6254 }
6255
6256 fn uncontested_tally() -> Tally {
6257 Tally {
6258 first_choice: BTreeMap::from([('A', 1)]),
6259 borda: BTreeMap::new(),
6260 winner: 'A',
6261 rankings: 1,
6262 unanimous_initial: true,
6263 deliberated: false,
6264 changed_votes: 0,
6265 unanimous_final: true,
6266 tie_break: None,
6267 judges: 1,
6268 present: 1,
6269 quorum: 1,
6270 met_quorum: true,
6271 uncontested: None,
6272 }
6273 }
6274
6275 fn review_record(reviewer: usize, agent: &str, summary: &str) -> ReviewRecord {
6276 ReviewRecord {
6277 attempts: 0,
6278 reviewer,
6279 agent: agent.to_owned(),
6280 summary: summary.to_owned(),
6281 findings: Vec::new(),
6282 vote: None,
6283 failed: None,
6284 duration_ms: 0,
6285 }
6286 }
6287
6288 fn review_round(round: usize, reviews: Vec<ReviewRecord>) -> ReviewRound {
6289 let answered = reviews.len();
6290 ReviewRound {
6291 round,
6292 head: "abc1234".to_owned(),
6293 verified_head: None,
6294 verified_at: None,
6295 reviews,
6296 e2e: Vec::new(),
6297 verify_retried: false,
6298 e2e_deferred: false,
6299 e2e_defer_reason: None,
6300 fix: None,
6301 blocking: 0,
6302 answered,
6303 expected: answered,
6304 clean: true,
6305 progressed: false,
6306 vote_split: false,
6307 reconsideration: Vec::new(),
6308 verdict: None,
6309 }
6310 }
6311
6312 #[test]
6313 fn the_approval_panel_states_the_task_verbatim_in_either_language() {
6314 let en = panel();
6315 assert!(en.contains("Task"), "{en}");
6316 assert!(en.contains("add retries to the uploader"), "{en}");
6317
6318 let mut state = run_state();
6319 state.config.graph.language = "ja".to_owned();
6320 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6321 assert!(ja.contains("タスク"), "{ja}");
6322 assert!(
6323 ja.contains("add retries to the uploader"),
6324 "the task itself is not translated: {ja}"
6325 );
6326 }
6327
6328 #[test]
6329 fn the_approval_panel_omits_what_changed_and_review_verdict_with_no_data() {
6330 let html = panel();
6334 assert!(!html.contains("What changed"), "{html}");
6335 assert!(!html.contains("Review verdict"), "{html}");
6336 }
6337
6338 #[test]
6339 fn the_approval_panel_omits_what_changed_when_the_winners_summary_is_empty() {
6340 let mut state = run_state();
6341 state.candidates = vec![winning_candidate("")];
6342 state.tally = Some(uncontested_tally());
6343 let html = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6344 assert!(
6345 !html.contains("What changed"),
6346 "an empty summary must not render an empty box: {html}"
6347 );
6348 }
6349
6350 #[test]
6351 fn the_approval_panel_shows_the_winners_own_account_in_either_language() {
6352 let mut state = run_state();
6353 state.candidates = vec![winning_candidate(
6354 "Added a retry loop around the uploader PUT call.",
6355 )];
6356 state.tally = Some(uncontested_tally());
6357 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6358 assert!(en.contains("What changed"), "{en}");
6359 assert!(
6360 en.contains("Added a retry loop around the uploader PUT call."),
6361 "{en}"
6362 );
6363
6364 state.config.graph.language = "ja".to_owned();
6365 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6366 assert!(ja.contains("変更内容"), "{ja}");
6367 assert!(
6368 ja.contains("Added a retry loop around the uploader PUT call."),
6369 "{ja}"
6370 );
6371 }
6372
6373 #[test]
6374 fn the_approval_panel_shows_only_the_last_review_rounds_verdict() {
6375 let mut state = run_state();
6376 state.reviews = vec![
6377 review_round(
6378 1,
6379 vec![review_record(1, "alpha", "found a race, sent back")],
6380 ),
6381 review_round(2, vec![review_record(1, "alpha", "race is fixed, clean")]),
6382 ];
6383 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6384 assert!(en.contains("Review verdict"), "{en}");
6385 assert!(en.contains("race is fixed, clean"), "{en}");
6386 assert!(
6387 !en.contains("found a race, sent back"),
6388 "only the round that actually cleared the merge should show: {en}"
6389 );
6390
6391 state.config.graph.language = "ja".to_owned();
6392 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6393 assert!(ja.contains("レビューの結論"), "{ja}");
6394 assert!(ja.contains("レビュアー"), "{ja}");
6395 assert!(ja.contains("race is fixed, clean"), "{ja}");
6396 }
6397
6398 fn unanswered_review_record(reviewer: usize, agent: &str, reason: &str) -> ReviewRecord {
6404 ReviewRecord {
6405 attempts: 0,
6406 reviewer,
6407 agent: agent.to_owned(),
6408 summary: String::new(),
6409 findings: Vec::new(),
6410 vote: None,
6411 failed: Some(reason.to_owned()),
6412 duration_ms: 0,
6413 }
6414 }
6415
6416 #[test]
6417 fn the_approval_panel_never_shows_an_unanswered_seat_as_a_blank_verdict() {
6418 let mut state = run_state();
6419 state.reviews = vec![review_round(
6420 1,
6421 vec![
6422 review_record(1, "alpha", "clean, nothing to add"),
6423 unanswered_review_record(2, "beta", "timed out"),
6424 ],
6425 )];
6426 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6427 assert!(en.contains("clean, nothing to add"), "{en}");
6428 assert!(
6429 en.contains("produced no answer: timed out"),
6430 "a seat that never answered must say so, not render a blank box: {en}"
6431 );
6432 assert!(
6433 !en.contains("<div style=\"white-space:pre-wrap;font-size:13px\"></div>"),
6434 "no reviewer box may be left empty: {en}"
6435 );
6436
6437 state.config.graph.language = "ja".to_owned();
6438 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6439 assert!(ja.contains("回答なし: timed out"), "{ja}");
6440 }
6441
6442 #[test]
6443 fn the_approval_panel_contains_nothing_the_frames_policy_would_block() {
6444 let html = panel();
6445 assert!(!html.contains("<script"), "no script survives the csp");
6446 assert!(!html.contains("<form"), "form-action is 'none'");
6447 let pr = green_pr();
6448 assert_eq!(
6449 html.matches("http").count(),
6450 html.matches(pr.url.as_str()).count(),
6451 "the only http url in the panel is the pull request's own link"
6452 );
6453 assert!(
6454 html.contains("target=\"_blank\""),
6455 "the PR link must open in a new tab so it escapes the iframe"
6456 );
6457 assert!(
6458 html.contains("rel=\"noopener noreferrer\""),
6459 "external links opening in new tabs must carry noopener noreferrer"
6460 );
6461 }
6462
6463 #[test]
6464 fn added_and_removed_diff_lines_are_distinguishable_without_colour() {
6465 let html = panel();
6466 assert!(
6467 html.contains(">+</span>"),
6468 "an added line carries a `+` in the gutter, not only a background"
6469 );
6470 assert!(
6471 html.contains(">-</span>"),
6472 "a removed line carries a `-` in the gutter, not only a background"
6473 );
6474 assert!(
6475 html.contains(">new line</span>"),
6476 "the marker is moved to the gutter, so the body is printed once without it"
6477 );
6478 }
6479
6480 #[test]
6481 fn a_diff_past_the_threshold_is_cut_with_an_honest_count() {
6482 let total = DIFF_MAX_LINES + 100;
6483 let diff: String = (0..total).map(|i| format!("+line {i}\n")).collect();
6484 let html = approval_panel(
6485 &run_state(),
6486 &green_pr(),
6487 NUMSTAT,
6488 &diff,
6489 &[],
6490 "feat: something long",
6491 );
6492 assert!(
6493 html.contains(&format!("100 of {total} diff lines omitted")),
6494 "the note must say exactly how much was cut"
6495 );
6496 assert!(html.contains(&format!("line {}", DIFF_MAX_LINES - 1)));
6497 assert!(
6498 !html.contains(&format!("line {DIFF_MAX_LINES}")),
6499 "nothing past the threshold is rendered"
6500 );
6501 assert!(
6502 html.contains("/repo/magi"),
6503 "the note says where the rest is"
6504 );
6505 }
6506
6507 #[test]
6508 fn a_path_with_html_metacharacters_is_escaped_rather_than_rendered() {
6509 let html = approval_panel(
6510 &run_state(),
6511 &green_pr(),
6512 "1\t2\tsrc/<b>&\"x\"'.rs",
6513 "",
6514 &[],
6515 "subject",
6516 );
6517 assert!(html.contains("src/<b>&"x"'.rs"));
6518 assert!(
6519 !html.contains("<b>"),
6520 "an agent-influenced path must never become markup"
6521 );
6522 }
6523
6524 #[tokio::test]
6525 async fn the_merge_lock_serialises_one_repository_but_never_a_different_one() {
6526 let a = std::path::PathBuf::from("/repo/a");
6527 let b = std::path::PathBuf::from("/repo/b");
6528
6529 let held = repo_merge_lock(&a).lock_owned().await;
6530
6531 assert!(
6534 repo_merge_lock(&a).try_lock().is_err(),
6535 "a second merge into the same repository must not proceed concurrently"
6536 );
6537
6538 assert!(
6542 repo_merge_lock(&b).try_lock().is_ok(),
6543 "a different repository's merge lock must be independent"
6544 );
6545
6546 drop(held);
6547 assert!(
6548 repo_merge_lock(&a).try_lock().is_ok(),
6549 "the lock is released once the holder is done"
6550 );
6551 }
6552
6553 pub(crate) fn repair_state(major: bool, reject: bool) -> RunState {
6554 let mut state = landing_state();
6555 let mut rec = review_record(1, "alpha", "precise rejection reason");
6556 rec.vote = Some(if reject {
6557 crate::verdict::ReviewVote::Reject
6558 } else {
6559 crate::verdict::ReviewVote::Approve
6560 });
6561 if major {
6562 rec.findings = contested().findings;
6563 }
6564 let mut round = review_round(1, vec![rec]);
6565 round.clean = false;
6566 round.blocking = usize::from(major);
6567 state.reviews.push(round);
6568 state.config.graph.review_rounds = 1;
6569 state
6570 }
6571
6572 #[test]
6573 fn merge_repair_choice_covers_major_only_and_reject_only_without_contested_and() {
6574 for (major, reject) in [(true, false), (false, true), (true, true)] {
6575 let state = repair_state(major, reject);
6576 assert!(repair_available(&state));
6577 assert_eq!(&approval_choices(&state)[..3], [APPROVE, HOLD, REPAIR]);
6578 }
6579 assert!(!repair_available(&repair_state(false, false)));
6580 let mut clean = repair_state(true, false);
6581 clean.reviews[0].clean = true;
6582 assert_eq!(&approval_choices(&clean)[..3], [APPROVE, HOLD, REPAIR]);
6583 assert_eq!(approval(Some(REPAIR)), Approval::Repair);
6584 }
6585
6586 #[tokio::test]
6587 async fn merge_repair_upgrades_legacy_questions_and_snapshots_exact_evidence_once() {
6588 let mut state = repair_state(true, false);
6589 let pr = green_pr();
6590 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6591 .await
6592 .unwrap();
6593 let store = ask::Questions::open();
6594 let id = state.land_approval.as_ref().unwrap().question.clone();
6595 store
6597 .update(&id, |q| {
6598 q.choices = vec![APPROVE.into(), HOLD.into()];
6599 Ok(())
6600 })
6601 .unwrap();
6602 let upgraded = store.get(&id).unwrap();
6603 assert_eq!(upgraded.choices, approval_choices(&state));
6604 assert!(!upgraded.actions.contains_key(HOLD));
6605 assert_eq!(store.get(&id).unwrap().choices, upgraded.choices);
6606 assert!(
6607 store
6608 .list()
6609 .iter()
6610 .any(|q| q.id == id && q.choices == upgraded.choices)
6611 );
6612 assert!(
6613 crate::prompt::chat_consult(&upgraded).contains("--reply 'fix findings and re-review'")
6614 );
6615 assert!(deputy_brief(&upgraded, Some(&state)).contains("never approves a merge"));
6616 store
6617 .update(&id, |q| q.answer(ask::Answer::Choice(REPAIR.into())))
6618 .unwrap();
6619 store
6622 .update(&id, |q| {
6623 q.actions.clear();
6624 Ok(())
6625 })
6626 .unwrap();
6627 assert_eq!(
6628 store.get(&id).unwrap().chosen_action(),
6629 Some(&ask::ChoiceAction::Resume {
6630 run: state.id.clone()
6631 })
6632 );
6633 let binding = state.land_approval.clone();
6634 assert_eq!(
6635 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6636 .await
6637 .unwrap(),
6638 ApprovalGate::Repair
6639 );
6640 assert!(state.land_approval.is_none());
6641 assert_eq!(state.merge_repairs.len(), 1);
6642 let request = &state.merge_repairs[0];
6643 assert_eq!(request.question, id);
6644 assert_eq!(request.head, "abc");
6645 assert_eq!(request.pr, pr.url);
6646 assert_eq!(
6647 request.reviews[0].reviews[0].summary,
6648 "precise rejection reason"
6649 );
6650 assert_eq!(request.reviews[0].reviews[0].findings[0].id, "R3-1-1");
6651 assert_eq!(
6652 request.reviews[0].reviews[0].findings[0].detail,
6653 state.reviews[0].reviews[0].findings[0].detail
6654 );
6655 state.land_approval = binding;
6657 assert_eq!(
6658 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6659 .await
6660 .unwrap(),
6661 ApprovalGate::Repair
6662 );
6663 assert_eq!(state.merge_repairs.len(), 1);
6664 }
6665
6666 #[tokio::test]
6667 async fn merge_repair_answer_never_merges_and_hold_never_requests_repair() {
6668 for choice in [REPAIR, HOLD] {
6669 let mut state = repair_state(false, true);
6670 let observed = seen("abc", Checks::Green, "CLEAN", false);
6671 approval_gate(&mut state, &observed.pr, "feat: x", None, "abc")
6672 .await
6673 .unwrap();
6674 let id = state.land_approval.as_ref().unwrap().question.clone();
6675 ask::Questions::open()
6676 .update(&id, |q| q.answer(ask::Answer::Choice(choice.into())))
6677 .unwrap();
6678 let forge = Scripted::new(vec![observed], vec![(true, "")]);
6679 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
6680 .await
6681 .unwrap();
6682 assert!(
6683 forge
6684 .argvs()
6685 .iter()
6686 .all(|a| a.iter().any(|s| s == "--disable-auto"))
6687 );
6688 assert!(!forge.calls().contains(&"fix"));
6689 assert_eq!(state.merge_repairs.len(), usize::from(choice == REPAIR));
6690 assert_ne!(state.status, RunStatus::Merged);
6691 }
6692 }
6693
6694 #[test]
6695 fn only_the_merge_choice_merges_and_silence_holds() {
6696 let table = [
6697 (None, Approval::Hold),
6698 (Some("merge"), Approval::Merge),
6699 (Some(" merge\n"), Approval::Merge),
6700 (Some("hold"), Approval::Hold),
6701 (Some(""), Approval::Hold),
6702 (Some("yes"), Approval::Hold),
6703 ];
6704 for (answer, want) in table {
6705 assert_eq!(
6706 approval(answer),
6707 want,
6708 "answer {answer:?} must resolve to {want:?}"
6709 );
6710 }
6711 }
6712
6713 #[tokio::test]
6714 async fn a_first_visit_to_the_merge_gate_files_a_question_and_returns_pending_at_once() {
6715 let mut state = landing_state();
6716 state.config.graph.land_approval = true;
6717 let pr = green_pr();
6718
6719 let gate = approval_gate(&mut state, &pr, "feat: x", None, "abc")
6720 .await
6721 .unwrap();
6722 assert_eq!(gate, ApprovalGate::Pending, "nobody has answered yet");
6723 assert!(
6724 !state.parked,
6725 "approval_gate itself never sets `parked`; only its caller does"
6726 );
6727
6728 let store = ask::Questions::open();
6729 let filed: Vec<_> = store
6730 .list()
6731 .into_iter()
6732 .filter(|q| q.run == state.id)
6733 .collect();
6734 assert_eq!(filed.len(), 1, "exactly one question is filed");
6735 assert_eq!(filed[0].node, APPROVAL_NODE);
6736 assert_eq!(filed[0].choices, approval_choices(&state));
6737 assert!(filed[0].status.open());
6738
6739 let again = approval_gate(&mut state, &pr, "feat: x", None, "abc")
6743 .await
6744 .unwrap();
6745 assert_eq!(again, ApprovalGate::Pending);
6746 let still_one = store
6747 .list()
6748 .into_iter()
6749 .filter(|q| q.run == state.id)
6750 .count();
6751 assert_eq!(
6752 still_one, 1,
6753 "asking twice must not double-file the question"
6754 );
6755 }
6756
6757 #[tokio::test]
6758 async fn approving_the_existing_question_is_read_back_as_approved() {
6759 crate::run::pin_test_home();
6760 let mut state = run_state();
6761 state.config.graph.land_approval = true;
6762 let pr = green_pr();
6763 assert_eq!(
6764 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6765 .await
6766 .unwrap(),
6767 ApprovalGate::Pending
6768 );
6769
6770 let store = ask::Questions::open();
6771 let mut q = store
6772 .list()
6773 .into_iter()
6774 .find(|q| q.run == state.id)
6775 .expect("filed above");
6776 let talks = crate::talk::Talks::open();
6777 let cfg = crate::config::Config {
6778 agents: vec![crate::config::AgentSpec {
6779 id: "mock".into(),
6780 kind: crate::config::AgentKind::Command,
6781 model: None,
6782 command: vec!["true".into()],
6783 extra_args: Vec::new(),
6784 env: Default::default(),
6785 prompt_delivery: None,
6786 }],
6787 ..crate::config::Config::default()
6788 };
6789 let mut talk = crate::talk::begin(&talks, &cfg, state.repo.clone(), Some("mock")).unwrap();
6790 crate::consult::begin(&store, &talks, &q, &talk).unwrap();
6791 crate::talk::drain(&mut talk, &talks).unwrap();
6792 assert_eq!(
6793 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6794 .await
6795 .unwrap(),
6796 ApprovalGate::Pending,
6797 "consultation cannot approve or hold the merge"
6798 );
6799 q = store.get(&q.id).unwrap();
6800 assert!(q.answer.is_none());
6801 talk.turns.push(crate::talk::Turn {
6802 sender: None,
6803 breaks: Some(Vec::new()),
6804 messages: Vec::new(),
6805 posted_by: None,
6806 who: crate::talk::Who::Operator,
6807 body: "merge abc".into(),
6808 at: Timestamp::now(),
6809 attachments: Vec::new(),
6810 usage: None,
6811 });
6812 talks.put(&mut talk).unwrap();
6813 crate::consult::validate_answer(
6814 &q,
6815 &talks,
6816 &talk.id,
6817 crate::queue::CHAT_NODE,
6818 APPROVE,
6819 Some("merge abc"),
6820 )
6821 .unwrap();
6822 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
6823 store.put(&mut q).unwrap();
6824
6825 assert_eq!(
6826 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6827 .await
6828 .unwrap(),
6829 ApprovalGate::Approved
6830 );
6831 }
6832
6833 #[tokio::test]
6834 async fn legacy_hold_actions_are_removed_on_get_and_list_before_answering() {
6835 crate::run::pin_test_home();
6836 let store = ask::Questions::open();
6837 for via_list in [false, true] {
6838 let mut state = repair_state(false, true);
6839 let pr = green_pr();
6840 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6841 .await
6842 .unwrap();
6843 let id = state.land_approval.as_ref().unwrap().question.clone();
6844 store
6845 .update(&id, |q| {
6846 q.actions.insert(
6847 HOLD.to_owned(),
6848 ask::ChoiceAction::Resume {
6849 run: state.id.clone(),
6850 },
6851 );
6852 Ok(())
6853 })
6854 .unwrap();
6855 let q = if via_list {
6856 store.list().into_iter().find(|q| q.id == id).unwrap()
6857 } else {
6858 store.get(&id).unwrap()
6859 };
6860 assert!(!q.actions.contains_key(HOLD));
6861 store
6862 .update(&id, |q| {
6863 assert!(!q.actions.contains_key(HOLD));
6865 assert!(!upgrade_repair_choice(q, &state));
6866 q.answer(ask::Answer::Choice(HOLD.to_owned()))
6867 })
6868 .unwrap();
6869 assert!(store.get(&id).unwrap().chosen_action().is_none());
6870 assert_eq!(
6871 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6872 .await
6873 .unwrap(),
6874 ApprovalGate::Held
6875 );
6876 }
6877 }
6878
6879 #[tokio::test]
6880 async fn holding_or_abandoning_the_existing_question_is_read_back_as_held() {
6881 crate::run::pin_test_home();
6882 let store = ask::Questions::open();
6883
6884 let mut held_state = run_state();
6885 held_state.config.graph.land_approval = true;
6886 let pr = green_pr();
6887 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
6888 .await
6889 .unwrap();
6890 let mut q = store
6891 .list()
6892 .into_iter()
6893 .find(|q| q.run == held_state.id)
6894 .expect("filed above");
6895 q.answer(ask::Answer::Choice(HOLD.to_owned())).unwrap();
6896 store.put(&mut q).unwrap();
6897 assert_eq!(
6898 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
6899 .await
6900 .unwrap(),
6901 ApprovalGate::Held
6902 );
6903
6904 let mut abandoned_state = run_state();
6905 abandoned_state.config.graph.land_approval = true;
6906 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
6907 .await
6908 .unwrap();
6909 let mut q = store
6910 .list()
6911 .into_iter()
6912 .find(|q| q.run == abandoned_state.id)
6913 .expect("filed above");
6914 q.abandon("no answer within the timeout");
6915 store.put(&mut q).unwrap();
6916 assert_eq!(
6917 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
6918 .await
6919 .unwrap(),
6920 ApprovalGate::Held,
6921 "silence must never merge"
6922 );
6923 }
6924
6925 fn contested() -> ContestedHandoff {
6926 let finding = |id: &str, n: u32| crate::verdict::Finding {
6927 id: id.to_owned(),
6928 severity: crate::verdict::Severity::Major,
6929 file: Some("src/a.rs".to_owned()),
6930 line: Some(n),
6931 title: format!("problem {id}"),
6932 detail: String::new(),
6933 };
6934 ContestedHandoff {
6935 findings: (1..=7).map(|n| finding(&format!("R3-1-{n}"), n)).collect(),
6936 rejecters: vec![(1, "alpha".to_owned())],
6937 }
6938 }
6939
6940 #[test]
6941 fn the_contested_record_is_asked_about_unless_the_switch_is_off() {
6942 let mut state = run_state();
6943 assert!(contested_to_ask(&state).is_none(), "nothing recorded");
6944 state.contested_handoff = Some(contested());
6945 assert!(contested_to_ask(&state).is_some());
6946 state.config.graph.hold_contested_merge = false;
6947 assert!(
6948 contested_to_ask(&state).is_none(),
6949 "the switch restores today"
6950 );
6951 }
6952
6953 #[test]
6954 fn the_deputy_brief_carries_the_pr_the_findings_and_names_what_is_missing() {
6955 let q = ask::Question::new(
6956 "run-1".to_owned(),
6957 APPROVAL_NODE.to_owned(),
6958 "land".to_owned(),
6959 "Merge?".to_owned(),
6960 String::new(),
6961 vec![APPROVE.to_owned(), HOLD.to_owned()],
6962 );
6963 let none = deputy_brief(&q, None);
6964 assert!(none.contains("could not be read"), "{none}");
6965 assert!(none.contains("Silence is a hold"), "{none}");
6966
6967 let mut state = run_state();
6968 state.pr = Some(crate::run::PrRecord {
6969 url: "https://example.test/pull/7".to_owned(),
6970 number: 7,
6971 state: "open".to_owned(),
6972 checks: "green".to_owned(),
6973 round: 0,
6974 rounds: 3,
6975 red_at_merge: Vec::new(),
6976 });
6977 state.contested_handoff = Some(contested());
6978 let b = deputy_brief(&q, Some(&state));
6979 assert!(b.contains("https://example.test/pull/7"), "{b}");
6980 assert!(b.contains("[R3-1-1] major (src/a.rs:1)"), "{b}");
6981 assert!(b.contains("#1"), "the rejecting seat: {b}");
6982 state.contested_handoff = None;
6983 assert!(deputy_brief(&q, Some(&state)).contains("not recorded as contested"));
6984 }
6985
6986 #[test]
6987 fn the_contested_question_names_the_pr_the_findings_and_the_rejecter() {
6988 for lang in ["en", "ja"] {
6989 let mut cfg = crate::config::Config::default();
6990 cfg.graph.language = lang.to_owned();
6991 let w = words(&cfg.graph.language);
6992 let text = w.approval_detail(
6993 "https://github.com/yukimemi/magi/pull/42",
6994 "main",
6995 "feat: x",
6996 Some(&contested()),
6997 );
6998 assert!(text.contains("pull/42"), "{text}");
6999 assert!(
7000 text.contains("R3-1-1 major src/a.rs:1: problem R3-1-1"),
7001 "{text}"
7002 );
7003 assert!(text.contains("R3-1-5"), "{text}");
7004 assert!(!text.contains("R3-1-6"), "the list is capped: {text}");
7005 assert!(text.contains("2"), "the rest are counted: {text}");
7006 assert!(text.contains("#1 (alpha)"), "{text}");
7007 }
7008 let plain = words("en").approval_detail("u", "main", "s", None);
7009 assert!(!plain.contains("reject"), "{plain}");
7010 }
7011
7012 #[tokio::test]
7013 async fn a_contested_question_is_filed_once_and_a_resume_finds_the_same_one() {
7014 crate::run::pin_test_home();
7015 let mut state = run_state();
7016 state.config.graph.land_approval = false;
7017 state.contested_handoff = Some(contested());
7018 let pr = green_pr();
7019 let c = contested_to_ask(&state);
7020 assert_eq!(
7021 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
7022 .await
7023 .unwrap(),
7024 ApprovalGate::Pending,
7025 "silence is a hold"
7026 );
7027 let store = ask::Questions::open();
7028 let filed: Vec<_> = store
7029 .list()
7030 .into_iter()
7031 .filter(|q| q.run == state.id)
7032 .collect();
7033 assert_eq!(filed.len(), 1);
7034 assert!(filed[0].detail.contains("R3-1-1"), "{}", filed[0].detail);
7035
7036 assert_eq!(
7037 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
7038 .await
7039 .unwrap(),
7040 ApprovalGate::Pending
7041 );
7042 let mut q = store
7043 .list()
7044 .into_iter()
7045 .find(|q| q.run == state.id)
7046 .unwrap();
7047 assert_eq!(q.id, filed[0].id, "the same question after a resume");
7048 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
7049 store.put(&mut q).unwrap();
7050 assert_eq!(
7051 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
7052 .await
7053 .unwrap(),
7054 ApprovalGate::Approved
7055 );
7056 }
7057
7058 #[test]
7059 fn the_diffstat_table_is_ordered_by_churn_with_binaries_last() {
7060 let rows = parse_numstat(NUMSTAT);
7061 assert_eq!(
7062 rows.iter().map(|r| r.path.as_str()).collect::<Vec<_>>(),
7063 ["src/web.rs", "src/land.rs", "assets/logo.png"]
7064 );
7065 assert_eq!(rows[2].added, None, "a binary file has no line counts");
7066 }
7067 #[test]
7068 fn the_approval_speaks_the_language_the_repository_is_configured_for() {
7069 let mut state = run_state();
7073 state.config.graph.language = "ja".to_owned();
7074 let pr = green_pr();
7075 let commits = ["c1".to_owned()];
7076
7077 let ja = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
7078 assert!(ja.contains("lang=\"ja\""), "the document must declare it");
7079 assert!(ja.contains("squash されるコミット"), "{ja}");
7080 assert!(ja.contains("レビューコメント"), "{ja}");
7081 assert!(ja.contains("差分"), "{ja}");
7082 assert!(
7083 !ja.contains("Commits being squashed"),
7084 "no English left over"
7085 );
7086
7087 let w = words("ja");
7088 assert!(w.approval_summary(17, "feat: x").contains("マージ"));
7089 assert!(
7090 w.approval_detail("http://x/1", "main", "feat: x", None)
7091 .contains("パネル")
7092 );
7093
7094 assert!(ja.contains("src/a.rs"), "the diffstat is not prose");
7096 assert!(ja.contains("feat: x"), "nor is the merge subject");
7097
7098 state.config.graph.language = "en".to_owned();
7101 let en = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
7102 assert!(en.contains("Commits being squashed"), "{en}");
7103 assert_eq!(words("Klingon").html_lang, "en");
7104 }
7105
7106 #[test]
7110 fn pick_open_pr_classifies_by_count_and_base() {
7111 let one = r#"[{"number":58,"url":"https://x/pull/58","title":"t","baseRefName":"main"}]"#;
7112 assert_eq!(
7113 pick_open_pr(one, "main").unwrap(),
7114 OpenPr::One {
7115 url: "https://x/pull/58".into(),
7116 title: "t".into()
7117 }
7118 );
7119 assert_eq!(pick_open_pr("[]", "main").unwrap(), OpenPr::None);
7120 assert_eq!(pick_open_pr(one, "dev").unwrap(), OpenPr::None);
7121 let two = r#"[{"number":1,"url":"u1","title":"","baseRefName":"main"},
7122 {"number":2,"url":"u2","title":"","baseRefName":"main"}]"#;
7123 assert_eq!(
7124 pick_open_pr(two, "main").unwrap(),
7125 OpenPr::Many(vec!["u1".into(), "u2".into()])
7126 );
7127 let fork = r#"[{"url":"f","baseRefName":"main","isCrossRepository":true}]"#;
7129 assert_eq!(pick_open_pr(fork, "main").unwrap(), OpenPr::None);
7130 assert!(pick_open_pr("not json", "main").is_err());
7131 assert!(pick_open_pr(r#"[{"url":"u","title":"t"}]"#, "main").is_err());
7133 assert!(pick_open_pr(r#"[{"title":"t","baseRefName":"main"}]"#, "main").is_err());
7134 }
7135
7136 #[test]
7137 fn pick_merged_pr_picks_the_unique_match() {
7138 let json = r#"[
7139 {"url": "https://github.com/o/r/pull/42", "number": 42,
7140 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"}
7141 ]"#;
7142 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7143 let found = pick_merged_pr(json, "main", created_at)
7144 .expect("valid json")
7145 .expect("one unambiguous match");
7146 assert_eq!(found.url, "https://github.com/o/r/pull/42");
7147 assert_eq!(found.number, 42);
7148 }
7149
7150 #[test]
7154 fn pick_merged_pr_refuses_when_more_than_one_candidate_survives() {
7155 let json = r#"[
7156 {"url": "https://github.com/o/r/pull/42", "number": 42,
7157 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"},
7158 {"url": "https://github.com/o/r/pull/43", "number": 43,
7159 "mergedAt": "2026-09-21T10:00:00Z", "baseRefName": "main"}
7160 ]"#;
7161 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7162 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
7163 }
7164
7165 #[test]
7169 fn pick_merged_pr_ignores_a_different_base_branch() {
7170 let json = r#"[
7171 {"url": "https://github.com/o/r/pull/42", "number": 42,
7172 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "release"}
7173 ]"#;
7174 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7175 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
7176 }
7177
7178 #[test]
7181 fn pick_merged_pr_ignores_a_merge_that_predates_the_run() {
7182 let json = r#"[
7183 {"url": "https://github.com/o/r/pull/42", "number": 42,
7184 "mergedAt": "2026-09-18T10:00:00Z", "baseRefName": "main"}
7185 ]"#;
7186 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7187 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
7188 }
7189
7190 #[test]
7191 fn slug_of_pr_url_reads_host_owner_and_repo() {
7192 assert_eq!(
7193 slug_of_pr_url("https://github.com/yukimemi/shun/pull/272").as_deref(),
7194 Some("github.com/yukimemi/shun")
7195 );
7196 }
7197
7198 #[test]
7199 fn slug_of_pr_url_refuses_a_url_with_no_pull_segment() {
7200 assert_eq!(slug_of_pr_url("https://github.com/yukimemi/shun"), None);
7201 assert_eq!(slug_of_pr_url("not a url at all"), None);
7202 assert_eq!(slug_of_pr_url("https://github.com"), None);
7203 }
7204
7205 #[test]
7206 fn slug_of_repo_url_reads_host_owner_and_repo() {
7207 assert_eq!(
7208 slug_of_repo_url("https://github.com/yukimemi/magi").as_deref(),
7209 Some("github.com/yukimemi/magi")
7210 );
7211 assert_eq!(slug_of_repo_url("https://github.com"), None);
7212 }
7213
7214 #[test]
7215 fn ensure_same_repo_accepts_a_matching_slug_regardless_of_case() {
7216 ensure_same_repo("github.com/yukimemi/magi", "GitHub.Com/YukiMemi/Magi")
7217 .expect("same repo, different case");
7218 }
7219
7220 #[test]
7225 fn ensure_same_repo_refuses_a_different_repo() {
7226 let err =
7227 ensure_same_repo("github.com/yukimemi/magi", "github.com/yukimemi/shun").unwrap_err();
7228 let msg = format!("{err:#}");
7229 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
7230 assert!(msg.contains("github.com/yukimemi/shun"), "{msg}");
7231 }
7232
7233 #[test]
7238 fn ensure_same_repo_refuses_the_same_slug_on_a_different_host() {
7239 let err = ensure_same_repo(
7240 "github.com/yukimemi/magi",
7241 "github.example.com/yukimemi/magi",
7242 )
7243 .unwrap_err();
7244 let msg = format!("{err:#}");
7245 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
7246 assert!(msg.contains("github.example.com/yukimemi/magi"), "{msg}");
7247 }
7248
7249 #[tokio::test]
7254 async fn find_external_merge_returns_none_without_a_winner() {
7255 let state = RunState::new(
7256 PathBuf::from("/no/such/repo"),
7257 "main".to_owned(),
7258 "0000000000000000000000000000000000000000".to_owned(),
7259 "irrelevant".to_owned(),
7260 crate::config::Config::default(),
7261 );
7262 assert_eq!(find_external_merge(&state).await.unwrap(), None);
7263 }
7264
7265 fn pr_run(home: &Path, id: &str, repo: &str, status: RunStatus, url: &str, state: &str) {
7266 let mut run = RunState::new(
7267 PathBuf::from(repo),
7268 "main".to_owned(),
7269 "abcdef1234".to_owned(),
7270 "x".to_owned(),
7271 crate::config::Config::default(),
7272 );
7273 run.id = id.to_owned();
7274 run.status = status;
7275 run.driver_exited = true;
7276 run.pr = Some(crate::run::PrRecord {
7277 number: url.rsplit('/').next().unwrap().parse().unwrap(),
7278 url: url.to_owned(),
7279 state: state.to_owned(),
7280 checks: "red".to_owned(),
7281 round: 0,
7282 rounds: 2,
7283 red_at_merge: Vec::new(),
7284 });
7285 run.save_under(home).unwrap();
7286 }
7287
7288 fn recorded(home: &Path, id: &str) -> String {
7289 let body = std::fs::read_to_string(home.join("runs").join(id).join("run.json")).unwrap();
7290 serde_json::from_str::<RunState>(&body)
7291 .unwrap()
7292 .pr
7293 .unwrap()
7294 .state
7295 }
7296
7297 const PR: &str = "https://github.com/o/r/pull/7";
7298
7299 #[test]
7300 fn write_through_updates_predecessors_and_siblings_only() {
7301 let tmp = tempfile::tempdir().unwrap();
7302 let h = tmp.path();
7303 pr_run(
7304 h,
7305 "20261004-100000-aaaa",
7306 "/repo/r",
7307 RunStatus::Superseded,
7308 PR,
7309 "open",
7310 );
7311 pr_run(
7312 h,
7313 "20261004-100100-bbbb",
7314 "/repo/r",
7315 RunStatus::Blocked,
7316 PR,
7317 "open",
7318 );
7319 pr_run(
7321 h,
7322 "20261004-100200-cccc",
7323 "/repo/r",
7324 RunStatus::Landing,
7325 PR,
7326 "open",
7327 );
7328 pr_run(
7330 h,
7331 "20261004-100300-dddd",
7332 "/repo/other",
7333 RunStatus::Blocked,
7334 "https://github.com/o/other/pull/7",
7335 "open",
7336 );
7337 pr_run(
7339 h,
7340 "20261004-100400-eeee",
7341 "/repo/r",
7342 RunStatus::Blocked,
7343 "https://github.com/o/r/pull/8",
7344 "open",
7345 );
7346 pr_run(
7347 h,
7348 "20261004-100500-ffff",
7349 "/repo/r",
7350 RunStatus::Merged,
7351 PR,
7352 "open",
7353 );
7354 let source = RunState::load_under("20261004-100500-ffff", h).unwrap();
7355
7356 assert_eq!(
7357 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
7358 2
7359 );
7360 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
7361 assert_eq!(recorded(h, "20261004-100100-bbbb"), "merged");
7362 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
7363 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
7364 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
7365 assert_eq!(recorded(h, "20261004-100500-ffff"), "open");
7367 assert_eq!(
7369 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
7370 0
7371 );
7372 let hit = RunState::load_under("20261004-100000-aaaa", h).unwrap();
7373 assert!(hit.events.iter().any(|e| e.message.contains("merged")));
7374 }
7375
7376 #[test]
7377 fn lifecycle_updates_preserve_live_and_unknown_terminal_drivers() {
7378 let home = tempfile::tempdir().unwrap();
7379 let live_id = "20261004-100000-aaaa";
7380 let unknown_id = "20261004-100100-bbbb";
7381 for id in [live_id, unknown_id] {
7382 pr_run(home.path(), id, "repo", RunStatus::Ready, PR, "open");
7383 let mut s = RunState::load_under(id, home.path()).unwrap();
7384 s.driver_exited = false;
7385 if id == live_id {
7386 s.driver_pid = Some(std::process::id());
7387 s.driver_started_at = crate::proc::process_started_at(std::process::id());
7388 }
7389 s.save_under(home.path()).unwrap();
7390 }
7391 let known = BTreeMap::from([(PR.to_owned(), PrLifecycle::Merged)]);
7392 assert_eq!(apply_pr_states(home.path(), &known), 0);
7393 for id in [live_id, unknown_id] {
7394 assert_eq!(recorded(home.path(), id), "open");
7395 }
7396 }
7397
7398 #[test]
7399 fn repair_rewrites_merged_and_closed_and_leaves_open_and_unknown() {
7400 let tmp = tempfile::tempdir().unwrap();
7401 let h = tmp.path();
7402 let url = |n: u32| format!("https://github.com/o/r/pull/{n}");
7403 pr_run(
7404 h,
7405 "20261004-100000-aaaa",
7406 "/repo/r",
7407 RunStatus::Superseded,
7408 &url(1),
7409 "open",
7410 );
7411 pr_run(
7412 h,
7413 "20261004-100100-bbbb",
7414 "/repo/r",
7415 RunStatus::Blocked,
7416 &url(2),
7417 "open",
7418 );
7419 pr_run(
7420 h,
7421 "20261004-100200-cccc",
7422 "/repo/r",
7423 RunStatus::Ready,
7424 &url(3),
7425 "open",
7426 );
7427 pr_run(
7428 h,
7429 "20261004-100300-dddd",
7430 "/repo/r",
7431 RunStatus::Ready,
7432 &url(4),
7433 "open",
7434 );
7435 pr_run(
7436 h,
7437 "20261004-100400-eeee",
7438 "/repo/r",
7439 RunStatus::Implementing,
7440 &url(1),
7441 "open",
7442 );
7443 assert_eq!(stale_open_prs(h).len(), 4);
7444
7445 let mut known = BTreeMap::new();
7446 known.insert(url(1), PrLifecycle::Merged);
7447 known.insert(url(2), PrLifecycle::Closed);
7448 known.insert(url(3), PrLifecycle::Open);
7449 assert_eq!(apply_pr_states(h, &known), 2);
7451 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
7452 assert_eq!(recorded(h, "20261004-100100-bbbb"), "closed");
7453 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
7454 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
7455 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
7456 assert_eq!(apply_pr_states(h, &known), 0);
7457 }
7458
7459 use std::collections::VecDeque;
7462 use std::sync::Mutex;
7463
7464 struct Scripted {
7467 views: Mutex<VecDeque<Seen>>,
7468 merges: Mutex<VecDeque<(bool, String)>>,
7469 fix: Mutex<Option<Fixed>>,
7470 log: Mutex<Vec<&'static str>>,
7471 argvs: Mutex<Vec<Vec<String>>>,
7472 required: Mutex<Option<BTreeSet<String>>>,
7473 merged: Mutex<bool>,
7476 queued: Mutex<bool>,
7477 unreadable_after_merge: Mutex<bool>,
7479 reruns: Mutex<Vec<String>>,
7481 rerun_fails: Mutex<bool>,
7482 clock: Mutex<i64>,
7484 }
7485
7486 impl Scripted {
7487 fn new(views: Vec<Seen>, merges: Vec<(bool, &str)>) -> Self {
7488 Self {
7489 views: Mutex::new(views.into()),
7490 merges: Mutex::new(
7491 merges
7492 .into_iter()
7493 .map(|(ok, m)| (ok, m.to_owned()))
7494 .collect(),
7495 ),
7496 fix: Mutex::new(None),
7497 log: Mutex::new(Vec::new()),
7498 argvs: Mutex::new(Vec::new()),
7499 required: Mutex::new(None),
7500 merged: Mutex::new(false),
7501 queued: Mutex::new(false),
7502 unreadable_after_merge: Mutex::new(false),
7503 reruns: Mutex::new(Vec::new()),
7504 rerun_fails: Mutex::new(false),
7505 clock: Mutex::new(1_000),
7506 }
7507 }
7508 fn argvs(&self) -> Vec<Vec<String>> {
7509 self.argvs.lock().unwrap().clone()
7510 }
7511 fn calls(&self) -> Vec<&'static str> {
7512 self.log.lock().unwrap().clone()
7513 }
7514 }
7515
7516 impl Forge for Scripted {
7517 async fn view(&self, _repo: &Path, _url: &str) -> Result<Seen> {
7518 self.log.lock().unwrap().push("view");
7519 if *self.unreadable_after_merge.lock().unwrap()
7520 && !self.argvs.lock().unwrap().is_empty()
7521 {
7522 anyhow::bail!("forge unreachable");
7523 }
7524 let mut v = self.views.lock().unwrap();
7525 let mut seen = if v.len() > 1 {
7526 v.pop_front().unwrap()
7527 } else {
7528 v[0].clone()
7529 };
7530 if *self.merged.lock().unwrap() {
7531 seen.pr.state = PrLifecycle::Merged;
7532 }
7533 Ok(seen)
7534 }
7535 async fn merge(&self, _repo: &Path, argv: &[String]) -> Result<(bool, String)> {
7536 self.log.lock().unwrap().push("merge");
7537 self.argvs.lock().unwrap().push(argv.to_vec());
7538 let out = self
7539 .merges
7540 .lock()
7541 .unwrap()
7542 .pop_front()
7543 .expect("unscripted merge");
7544 if out.0 && !*self.queued.lock().unwrap() && !argv.iter().any(|a| a == "--disable-auto")
7545 {
7546 *self.merged.lock().unwrap() = true;
7547 }
7548 Ok(out)
7549 }
7550 async fn poll(&self) {
7551 self.log.lock().unwrap().push("poll");
7552 *self.clock.lock().unwrap() += POLL.as_secs() as i64;
7553 }
7554 async fn rerun(&self, _repo: &Path, run: &str) -> Result<()> {
7555 self.log.lock().unwrap().push("rerun");
7556 self.reruns.lock().unwrap().push(run.to_owned());
7557 if *self.rerun_fails.lock().unwrap() {
7558 anyhow::bail!("gh run rerun: no");
7559 }
7560 Ok(())
7561 }
7562 fn now(&self) -> i64 {
7563 *self.clock.lock().unwrap()
7564 }
7565 async fn required_contexts(&self, _repo: &Path, _base: &str) -> Option<BTreeSet<String>> {
7566 self.required.lock().unwrap().clone()
7567 }
7568 async fn fix(
7569 &self,
7570 _state: &mut RunState,
7571 _pr: &PrState,
7572 _round: usize,
7573 _budget: usize,
7574 _reason: &str,
7575 _logs: &str,
7576 ) -> Result<Fixed> {
7577 self.log.lock().unwrap().push("fix");
7578 Ok(self.fix.lock().unwrap().take().expect("unscripted fix"))
7579 }
7580 }
7581
7582 const REFUSED: &str =
7583 "X Pull request #42 is not mergeable: the base branch policy prohibits the merge.";
7584
7585 fn seen(head: &str, checks: Checks, merge_state: &str, comments: bool) -> Seen {
7586 let mut pr = green_pr();
7587 pr.checks = checks;
7588 pr.blocking = Blocking::of(merge_state);
7589 if !comments {
7590 pr.review_comments.clear();
7591 }
7592 Seen {
7593 pr,
7594 title: "feat: x".to_owned(),
7595 failing_urls: Vec::new(),
7596 head: head.to_owned(),
7597 rollup_head: head.to_owned(),
7598 merge_state: merge_state.to_owned(),
7599 contexts: Vec::new(),
7600 base: "main".to_owned(),
7601 }
7602 }
7603
7604 fn landing_state() -> RunState {
7605 crate::run::pin_test_home();
7606 let mut state = run_state();
7607 state.config.graph.land_approval = false;
7608 state
7609 }
7610
7611 #[test]
7612 fn a_pushed_head_is_awaited_case_insensitively_and_an_unreadable_one_is_not_a_match() {
7613 assert!(!awaiting_new_head(None, "aaa"));
7614 assert!(!awaiting_new_head(Some("abc123"), "ABC123"));
7615 assert!(awaiting_new_head(Some("abc123"), "def456"));
7616 assert!(awaiting_new_head(Some("abc123"), ""));
7617 }
7618
7619 #[test]
7620 fn a_refusal_is_judged_by_the_pull_requests_state_not_by_its_wording() {
7621 let open = |c, m: &str| seen("a", c, m, false);
7622 let table = [
7623 (None, false, Refused::Pending),
7624 (
7625 Some(open(Checks::Pending, "BLOCKED")),
7626 false,
7627 Refused::Pending,
7628 ),
7629 (
7630 Some(open(Checks::Unknown, "BLOCKED")),
7631 false,
7632 Refused::Pending,
7633 ),
7634 (
7635 Some(open(Checks::Green, "UNKNOWN")),
7636 false,
7637 Refused::Pending,
7638 ),
7639 (Some(open(Checks::Green, "")), false, Refused::Pending),
7640 (
7641 Some(open(Checks::Green, "BLOCKED")),
7642 false,
7643 Refused::Recheck,
7644 ),
7645 (Some(open(Checks::Green, "BLOCKED")), true, Refused::Final),
7646 ];
7647 for (after, rechecked, want) in table {
7648 assert_eq!(classify_refusal(after.as_ref(), rechecked, "a"), want);
7649 }
7650 let mut closed = open(Checks::Green, "CLEAN");
7651 closed.pr.state = PrLifecycle::Closed;
7652 assert_eq!(classify_refusal(Some(&closed), false, "a"), Refused::Final);
7653 }
7654
7655 #[tokio::test]
7656 async fn a_normal_landing_merges_on_the_first_look() {
7657 let mut state = landing_state();
7658 let forge = Scripted::new(
7659 vec![seen("a", Checks::Green, "CLEAN", false)],
7660 vec![(true, "")],
7661 );
7662 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7663 .await
7664 .unwrap();
7665 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
7667 assert_eq!(state.status, RunStatus::Merged);
7668 }
7669
7670 #[tokio::test]
7671 async fn a_successful_merge_command_that_only_queued_is_not_a_merge() {
7672 let mut state = landing_state();
7673 let forge = Scripted::new(
7674 vec![seen("a", Checks::Green, "CLEAN", false)],
7675 std::iter::repeat_n((true, ""), 100).collect(),
7676 );
7677 *forge.queued.lock().unwrap() = true;
7678 let task = async {
7679 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7680 .await
7681 .unwrap();
7682 };
7683 task.await;
7686 assert_ne!(state.status, RunStatus::Merged);
7687 }
7688
7689 #[tokio::test]
7690 async fn an_unreadable_forge_after_a_merge_command_is_not_a_confirmation() {
7691 let mut state = landing_state();
7692 let forge = Scripted::new(
7693 vec![seen("a", Checks::Green, "CLEAN", false)],
7694 std::iter::repeat_n((true, ""), 100).collect(),
7695 );
7696 *forge.unreadable_after_merge.lock().unwrap() = true;
7697 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7698 .await
7699 .ok();
7700 assert_ne!(state.status, RunStatus::Merged);
7701 }
7702
7703 #[tokio::test]
7704 async fn a_task_public_head_is_awaited_on_land_entry() {
7705 let mut state = landing_state();
7706 state.pr_head = Some("magi/task-abcd-1234".into());
7707 state.pr_pushed_head = Some("new".into());
7708 let forge = Scripted::new(
7709 vec![
7710 seen("old", Checks::Green, "CLEAN", false),
7711 seen("new", Checks::Green, "CLEAN", false),
7712 ],
7713 vec![(true, "")],
7714 );
7715 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7716 .await
7717 .unwrap();
7718 assert_eq!(
7719 forge.calls(),
7720 ["view", "poll", "view", "view", "merge", "view"]
7721 );
7722 assert_eq!(state.status, RunStatus::Merged);
7723 }
7724
7725 #[tokio::test]
7726 async fn a_superseded_public_head_owner_cannot_reenter_land() {
7727 let mut state = landing_state();
7728 state.pr_taken_over_by = Some("next".into());
7729 let forge = Scripted::new(vec![seen("a", Checks::Green, "CLEAN", false)], vec![]);
7730 assert!(
7731 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7732 .await
7733 .is_err()
7734 );
7735 assert!(forge.calls().is_empty());
7736 }
7737
7738 #[tokio::test]
7739 async fn after_a_pushed_fix_no_merge_is_tried_until_the_head_matches() {
7740 let mut state = landing_state();
7741 let forge = Scripted::new(
7742 vec![
7743 seen("old", Checks::Green, "CLEAN", true),
7744 seen("old", Checks::Green, "CLEAN", true),
7746 seen("new", Checks::Pending, "BLOCKED", true),
7747 seen("new", Checks::Green, "CLEAN", true),
7748 ],
7749 vec![(true, "")],
7750 );
7751 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
7752 head: "NEW".to_owned(),
7753 });
7754 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7755 .await
7756 .unwrap();
7757 assert_eq!(
7758 forge.calls(),
7759 [
7760 "view", "fix", "poll", "view", "poll", "view", "poll", "view", "view", "merge",
7761 "view"
7762 ]
7763 );
7764 assert_eq!(state.status, RunStatus::Merged);
7765 }
7766
7767 #[tokio::test]
7768 async fn a_head_that_never_arrives_stops_naming_both_commits() {
7769 let mut state = landing_state();
7770 let forge = Scripted::new(
7771 vec![
7772 seen("old", Checks::Green, "CLEAN", true),
7773 seen("someone-elses", Checks::Green, "CLEAN", true),
7774 ],
7775 vec![],
7776 );
7777 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
7778 head: "mine".to_owned(),
7779 });
7780 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7781 .await
7782 .unwrap();
7783 assert!(!forge.calls().contains(&"merge"));
7784 let why = state.merge.as_ref().unwrap().detail.clone();
7785 assert!(
7786 why.contains("mine") && why.contains("someone-elses"),
7787 "{why}"
7788 );
7789 assert_eq!(state.status, RunStatus::Blocked);
7790 }
7791
7792 #[tokio::test]
7793 async fn a_policy_refusal_while_checks_run_waits_and_then_merges() {
7794 let mut state = landing_state();
7795 let forge = Scripted::new(
7796 vec![
7797 seen("a", Checks::Green, "CLEAN", false),
7798 seen("a", Checks::Green, "CLEAN", false),
7799 seen("a", Checks::Pending, "BLOCKED", false),
7800 seen("a", Checks::Pending, "BLOCKED", false),
7801 seen("a", Checks::Green, "CLEAN", false),
7802 ],
7803 vec![(false, REFUSED), (true, "")],
7804 );
7805 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7806 .await
7807 .unwrap();
7808 assert_eq!(
7809 forge.calls(),
7810 [
7811 "view", "view", "merge", "view", "poll", "view", "poll", "view", "view", "merge",
7812 "view"
7813 ]
7814 );
7815 assert_eq!(state.status, RunStatus::Merged);
7816 }
7817
7818 #[tokio::test]
7819 async fn a_refusal_that_outlives_settled_checks_stops_with_the_merge_state() {
7820 let mut state = landing_state();
7821 let forge = Scripted::new(
7822 vec![
7823 seen("a", Checks::Green, "CLEAN", false),
7824 seen("a", Checks::Green, "BLOCKED", false),
7825 ],
7826 vec![(false, REFUSED), (false, REFUSED)],
7827 );
7828 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7829 .await
7830 .unwrap();
7831 assert_eq!(forge.calls().iter().filter(|c| **c == "merge").count(), 2);
7833 let why = state.merge.as_ref().unwrap().detail.clone();
7834 assert!(
7835 why.contains("policy prohibits") && why.contains("BLOCKED") && why.contains("refused"),
7836 "{why}"
7837 );
7838 assert_eq!(state.status, RunStatus::Blocked);
7839 }
7840
7841 #[test]
7842 fn a_decision_is_bound_to_a_head_only_when_every_signal_agrees() {
7843 assert_eq!(bound_head("abc", "abc", None), Some("abc"));
7844 assert_eq!(bound_head("abc", "ABC", Some("abc")), Some("abc"));
7845 assert_eq!(bound_head("old", "old", Some("new")), None);
7847 assert_eq!(bound_head("new", "old", Some("new")), None);
7849 assert_eq!(bound_head("new", "old", None), None);
7850 assert_eq!(bound_head("", "", None), None);
7852 assert_eq!(bound_head("", "", Some("new")), None);
7853 assert_eq!(bound_head("abc", "", None), None);
7854 }
7855
7856 fn view_json(head: &str) -> String {
7857 format!(
7858 r#"{{"url":"https://github.com/o/r/pull/42","number":42,"state":"OPEN",
7859 "title":"t","headRefOid":"{head}","mergeStateStatus":"CLEAN",
7860 "reviews":[],"comments":[]}}"#
7861 )
7862 }
7863
7864 fn node_json(oid: &str, check: &str, has_next: bool) -> String {
7865 format!(
7866 r#"{{"data":{{"repository":{{"pullRequest":{{"commits":{{"nodes":[{{"commit":
7867 {{"oid":"{oid}","statusCheckRollup":{{"contexts":{{"pageInfo":{{"hasNextPage":{has_next}}},
7868 "nodes":[{{"__typename":"CheckRun","name":"ci","status":"COMPLETED",
7869 "conclusion":"{check}","detailsUrl":"https://example.test/1"}}]}}}}}}}}]}}}}}}}}}}"#
7870 )
7871 }
7872
7873 #[test]
7874 fn rollup_is_bound_to_the_commit_in_the_same_node() {
7875 let s = seen_from(&view_json("new"), Some(&node_json("old", "FAILURE", false))).unwrap();
7878 assert_eq!(s.rollup_head, "old");
7879 assert_eq!(s.pr.checks, Checks::Red);
7880 assert_eq!(bound_head(&s.head, &s.rollup_head, Some("new")), None);
7881 assert_eq!(s.failing_urls.len(), 1);
7882 }
7883
7884 #[test]
7885 fn checks_come_from_the_node_not_the_view() {
7886 let view = view_json("new").replace(
7887 r#""reviews""#,
7888 r#""statusCheckRollup":[{"name":"ci","status":"COMPLETED","conclusion":"FAILURE"}],"reviews""#,
7889 );
7890 let s = seen_from(&view, Some(&node_json("new", "SUCCESS", false))).unwrap();
7891 assert_eq!(s.pr.checks, Checks::Green);
7892 assert!(s.pr.failing.is_empty());
7893 assert_eq!(
7894 bound_head(&s.head, &s.rollup_head, Some("new")),
7895 Some("new")
7896 );
7897 }
7898
7899 #[test]
7900 fn an_unreadable_or_paged_node_leaves_the_head_unbound() {
7901 for node in [
7902 None,
7903 Some("not json".to_owned()),
7904 Some(r#"{"errors":[{"message":"x"}]}"#.to_owned()),
7905 Some(node_json("new", "SUCCESS", true)),
7906 ] {
7907 let s = seen_from(&view_json("new"), node.as_deref()).unwrap();
7908 assert!(s.rollup_head.is_empty());
7909 assert_eq!(s.pr.checks, Checks::Unknown);
7910 assert_eq!(bound_head(&s.head, &s.rollup_head, None), None);
7911 }
7912 }
7913
7914 #[test]
7915 fn the_merge_command_is_pinned_to_the_observed_head() {
7916 let argv = merge_argv_at(7, "feat: x", "deadbeef");
7917 let at = argv
7918 .iter()
7919 .position(|a| a == "--match-head-commit")
7920 .unwrap();
7921 assert_eq!(argv[at + 1], "deadbeef");
7922 }
7923
7924 #[tokio::test]
7925 async fn stale_checks_after_a_fix_push_never_reach_a_merge() {
7926 let mut state = landing_state();
7927 let mut stale = seen("new", Checks::Red, "CLEAN", false);
7930 stale.rollup_head = "old".to_owned();
7931 let forge = Scripted::new(
7932 vec![seen("old", Checks::Green, "CLEAN", true), stale],
7933 vec![],
7934 );
7935 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
7936 head: "new".to_owned(),
7937 });
7938 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7939 .await
7940 .unwrap();
7941 assert!(!forge.calls().contains(&"merge"));
7942 assert_eq!(state.status, RunStatus::Blocked);
7943 let why = state.merge.as_ref().unwrap().detail.clone();
7944 assert!(why.contains("new") && why.contains("old"), "{why}");
7945 }
7946
7947 #[test]
7948 fn a_refusal_read_against_another_commits_checks_is_pending() {
7949 let mut after = seen("a", Checks::Green, "BLOCKED", false);
7950 after.rollup_head = "old".to_owned();
7951 assert_eq!(classify_refusal(Some(&after), true, "a"), Refused::Pending);
7952 }
7953
7954 #[tokio::test]
7955 async fn a_matching_head_with_red_non_required_checks_still_merges() {
7956 let mut state = landing_state();
7957 let forge = Scripted::new(
7958 vec![seen("a", Checks::Red, "CLEAN", false)],
7959 vec![(true, "")],
7960 );
7961 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7962 .await
7963 .unwrap();
7964 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
7965 assert_eq!(state.status, RunStatus::Merged);
7966 }
7967
7968 #[tokio::test]
7969 async fn a_merge_refused_because_the_head_moved_looks_again_instead_of_failing() {
7970 let mut state = landing_state();
7971 let forge = Scripted::new(
7972 vec![
7973 seen("a", Checks::Green, "CLEAN", false),
7974 seen("a", Checks::Green, "CLEAN", false),
7975 seen("b", Checks::Green, "BLOCKED", false),
7977 seen("b", Checks::Green, "CLEAN", false),
7978 ],
7979 vec![(false, REFUSED), (true, "")],
7980 );
7981 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7982 .await
7983 .unwrap();
7984 assert_eq!(
7985 forge.calls(),
7986 [
7987 "view", "view", "merge", "view", "poll", "view", "view", "merge", "view"
7988 ]
7989 );
7990 assert_eq!(state.status, RunStatus::Merged);
7991 }
7992
7993 fn merged_view(head: &str) -> Seen {
7994 let mut m = seen(head, Checks::Green, "CLEAN", false);
7995 m.pr.state = PrLifecycle::Merged;
7996 m
7997 }
7998
7999 fn has(argv: &[String], flag: &str) -> bool {
8000 argv.iter().any(|a| a == flag)
8001 }
8002
8003 fn value_of<'a>(argv: &'a [String], flag: &str) -> Option<&'a str> {
8004 let at = argv.iter().position(|a| a == flag)?;
8005 argv.get(at + 1).map(String::as_str)
8006 }
8007
8008 const URL: &str = "https://github.com/o/r/pull/42";
8009
8010 #[tokio::test]
8011 async fn the_merge_step_merges_directly_on_the_observed_head_and_never_arms() {
8012 let mut state = landing_state();
8013 let forge = Scripted::new(
8014 vec![
8015 seen("abc", Checks::Green, "CLEAN", false),
8016 seen("abc", Checks::Green, "CLEAN", false),
8017 ],
8018 vec![(true, "")],
8019 );
8020 land_with(&mut state, URL, &forge).await.unwrap();
8021 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
8022 let argv = &forge.argvs()[0];
8023 assert!(has(argv, "--squash") && has(argv, "--subject"));
8024 assert!(!has(argv, "--auto") && !has(argv, "--admin"));
8025 assert_eq!(value_of(argv, "--match-head-commit"), Some("abc"));
8026 assert_eq!(state.status, RunStatus::Merged);
8027 assert!(state.land_armed_head.is_none());
8028 }
8029
8030 #[tokio::test]
8031 async fn a_resume_disables_an_arm_left_by_an_older_build_before_merging() {
8032 let mut state = landing_state();
8033 state.land_armed_head = Some("a".to_owned());
8034 let forge = Scripted::new(
8035 vec![seen("a", Checks::Green, "CLEAN", false)],
8036 vec![(true, ""), (true, "")],
8037 );
8038 land_with(&mut state, URL, &forge).await.unwrap();
8039 let argvs = forge.argvs();
8040 assert!(has(&argvs[0], "--disable-auto"));
8041 assert!(!has(&argvs[1], "--auto"));
8042 assert_eq!(value_of(&argvs[1], "--match-head-commit"), Some("a"));
8043 assert_eq!(state.status, RunStatus::Merged);
8044 assert!(state.land_armed_head.is_none());
8045 }
8046
8047 #[tokio::test]
8048 async fn an_approval_never_carries_over_to_a_new_head() {
8049 crate::run::pin_test_home();
8050 let mut state = run_state();
8051 state.config.graph.land_approval = true;
8052 let pr = green_pr();
8053 let store = ask::Questions::open();
8054
8055 approval_gate(&mut state, &pr, "feat: x", None, "aaa")
8056 .await
8057 .unwrap();
8058 let mut q = store
8059 .list()
8060 .into_iter()
8061 .find(|q| q.run == state.id)
8062 .unwrap();
8063 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
8064 store.put(&mut q).unwrap();
8065 assert_eq!(
8066 approval_gate(&mut state, &pr, "feat: x", None, "AAA")
8067 .await
8068 .unwrap(),
8069 ApprovalGate::Approved,
8070 "the same head keeps its approval"
8071 );
8072
8073 assert_eq!(
8075 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
8076 .await
8077 .unwrap(),
8078 ApprovalGate::Pending
8079 );
8080 let all: Vec<_> = store
8081 .list()
8082 .into_iter()
8083 .filter(|q| q.run == state.id)
8084 .collect();
8085 assert_eq!(all.len(), 2);
8086
8087 state.land_approval = None;
8089 assert_eq!(
8090 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
8091 .await
8092 .unwrap(),
8093 ApprovalGate::Pending
8094 );
8095 let open = store
8096 .list()
8097 .into_iter()
8098 .filter(|q| q.run == state.id && q.status.open())
8099 .count();
8100 assert_eq!(open, 1, "the superseded question was retired");
8101 }
8102
8103 #[tokio::test]
8104 async fn the_merge_is_bound_to_the_head_it_was_decided_on() {
8105 let mut state = landing_state();
8106 let forge = Scripted::new(
8107 vec![
8108 seen("a", Checks::Green, "CLEAN", false),
8109 seen("b", Checks::Green, "CLEAN", false),
8111 ],
8112 vec![(true, "")],
8113 );
8114 land_with(&mut state, URL, &forge).await.unwrap();
8115 let argvs = forge.argvs();
8116 assert_eq!(argvs.len(), 1, "no merge was tried on the moved head");
8117 assert!(!has(&argvs[0], "--auto"));
8118 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("b"));
8119 assert_eq!(state.status, RunStatus::Merged);
8120 }
8121
8122 fn passing(label: &str) -> CheckInfo {
8123 CheckInfo {
8124 label: label.to_owned(),
8125 verdict: Verdict::Pass,
8126 required: Some(false),
8127 run: None,
8128 }
8129 }
8130
8131 fn failing(label: &str, run: Option<&str>) -> (String, Option<String>) {
8132 (label.to_owned(), run.map(str::to_owned))
8133 }
8134
8135 fn reran(head: &str, runs: &[(&str, i64)]) -> LandReruns {
8136 LandReruns {
8137 head: head.to_owned(),
8138 runs: runs.iter().map(|(r, at)| ((*r).to_owned(), *at)).collect(),
8139 }
8140 }
8141
8142 #[test]
8143 fn a_failed_run_is_rerun_once_then_waited_on_then_left_to_the_fixer() {
8144 let f = [failing("test (macos)", Some("7"))];
8145 assert_eq!(
8146 rerun_step(&f, None, "h", 100),
8147 RerunStep::Rerun(vec!["7".to_owned()])
8148 );
8149 let rec = reran("h", &[("7", 100)]);
8150 let grace = crate::release_watch::RERUN_GRACE;
8151 assert_eq!(
8152 rerun_step(&f, Some(&rec), "h", 100 + grace - 1),
8153 RerunStep::Grace
8154 );
8155 assert_eq!(rerun_step(&f, Some(&rec), "h", 100 + grace), RerunStep::Fix);
8156 }
8157
8158 #[test]
8159 fn a_failure_without_a_run_id_goes_to_the_fixer() {
8160 let f = [failing("a", Some("7")), failing("ci/external", None)];
8161 assert_eq!(rerun_step(&f, None, "h", 0), RerunStep::Fix);
8162 assert_eq!(rerun_step(&[], None, "h", 0), RerunStep::Fix);
8163 }
8164
8165 #[test]
8166 fn a_moved_head_forgets_the_reruns() {
8167 let f = [failing("a", Some("7"))];
8168 let rec = reran("old", &[("7", 100)]);
8169 assert_eq!(
8170 rerun_step(&f, Some(&rec), "new", 101),
8171 RerunStep::Rerun(vec!["7".to_owned()])
8172 );
8173 }
8174
8175 #[test]
8176 fn only_unrerun_runs_are_rerun_and_duplicates_collapse() {
8177 let f = [
8178 failing("a", Some("7")),
8179 failing("b", Some("7")),
8180 failing("c", Some("8")),
8181 ];
8182 assert_eq!(
8183 rerun_step(&f, None, "h", 0),
8184 RerunStep::Rerun(vec!["7".to_owned(), "8".to_owned()])
8185 );
8186 let rec = reran("h", &[("7", 0)]);
8187 assert_eq!(
8188 rerun_step(&f, Some(&rec), "h", 1),
8189 RerunStep::Rerun(vec!["8".to_owned()])
8190 );
8191 }
8192
8193 #[test]
8194 fn only_blocking_failures_are_candidates_for_a_rerun() {
8195 let check = |label: &str, verdict, required, run: &str| CheckInfo {
8196 label: label.to_owned(),
8197 verdict,
8198 required,
8199 run: Some(run.to_owned()),
8200 };
8201 let got = rerunnable(&[
8202 check("passed", Verdict::Pass, Some(true), "1"),
8203 check("optional", Verdict::Fail, Some(false), "2"),
8204 check("required", Verdict::Fail, Some(true), "3"),
8205 check("unknown", Verdict::Fail, None, "4"),
8206 ]);
8207 let labels: Vec<_> = got.iter().map(|(l, _)| l.as_str()).collect();
8208 assert_eq!(labels, ["required", "unknown"]);
8209 }
8210
8211 fn red(head: &str, run: Option<&str>) -> Seen {
8212 let mut s = seen(head, Checks::Red, "BLOCKED", false);
8213 s.pr.failing = vec!["test (macos)".to_owned()];
8214 s.contexts = vec![CheckInfo {
8215 label: "test (macos)".to_owned(),
8216 verdict: Verdict::Fail,
8217 required: Some(true),
8218 run: run.map(str::to_owned),
8219 }];
8220 s
8221 }
8222
8223 const RERUN_PR: &str = "https://github.com/o/r/pull/42";
8224
8225 #[tokio::test]
8226 async fn a_flaky_red_check_is_rerun_without_a_fix_round_and_then_merges() {
8227 let mut state = landing_state();
8228 let forge = Scripted::new(
8229 vec![
8230 red("a", Some("7")),
8231 seen("a", Checks::Pending, "BLOCKED", false),
8232 seen("a", Checks::Green, "CLEAN", false),
8233 ],
8234 vec![(true, "")],
8235 );
8236 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8237 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8238 assert!(!forge.calls().contains(&"fix"));
8239 assert_eq!(state.status, RunStatus::Merged);
8240 assert_eq!(state.pr.as_ref().unwrap().round, 0);
8241 let argvs = forge.argvs();
8242 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("a"));
8243 assert!(
8244 state
8245 .events
8246 .iter()
8247 .any(|e| e.message.contains("test (macos)") && e.message.contains("run 7"))
8248 );
8249 }
8250
8251 #[tokio::test]
8252 async fn still_red_after_the_grace_goes_to_the_fixer_and_a_run_is_not_rerun_twice() {
8253 let mut state = landing_state();
8254 let forge = Scripted::new(
8255 vec![
8256 red("a", Some("7")),
8257 seen("a", Checks::Green, "CLEAN", false),
8258 ],
8259 vec![(true, "")],
8260 );
8261 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8262 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8264 assert_eq!(forge.reruns.lock().unwrap().len(), 1);
8265 let calls = forge.calls();
8266 let rerun_at = calls.iter().position(|c| *c == "rerun").unwrap();
8267 let fix_at = calls.iter().position(|c| *c == "fix");
8268 assert!(fix_at.is_none_or(|f| f > rerun_at));
8269 }
8270
8271 #[tokio::test]
8272 async fn a_failed_run_is_rerun_while_another_run_is_still_pending() {
8273 let mut state = landing_state();
8274 let mut v = red("a", Some("7"));
8275 v.pr.checks = Checks::Pending;
8276 v.contexts.push(CheckInfo {
8277 label: "slow".to_owned(),
8278 verdict: Verdict::Pending,
8279 required: Some(true),
8280 run: Some("8".to_owned()),
8281 });
8282 let forge = Scripted::new(
8283 vec![v, seen("a", Checks::Green, "CLEAN", false)],
8284 vec![(true, "")],
8285 );
8286 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8287 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8288 assert_eq!(state.status, RunStatus::Merged);
8289 }
8290
8291 #[test]
8292 fn a_run_with_a_job_still_going_is_not_rerun_yet() {
8293 let mut v = red("a", Some("7"));
8294 v.contexts.push(CheckInfo {
8295 label: "same run, still going".to_owned(),
8296 verdict: Verdict::Pending,
8297 required: Some(true),
8298 run: Some("7".to_owned()),
8299 });
8300 assert!(rerunnable(&v.contexts).is_empty());
8301 }
8302
8303 #[tokio::test]
8304 async fn the_rerun_is_made_even_when_the_fix_budget_is_spent() {
8305 let mut state = landing_state();
8306 state.config.graph.land_rounds = 0;
8307 let forge = Scripted::new(
8308 vec![
8309 red("a", Some("7")),
8310 seen("a", Checks::Green, "CLEAN", false),
8311 ],
8312 vec![(true, "")],
8313 );
8314 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8315 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8316 assert_eq!(state.status, RunStatus::Merged);
8317 assert!(!forge.calls().contains(&"fix"));
8318 assert_eq!(state.pr.as_ref().unwrap().round, 0);
8319 }
8320
8321 #[tokio::test]
8322 async fn the_last_fix_rounds_new_head_gets_its_rerun() {
8323 let mut state = landing_state();
8324 state.config.graph.land_rounds = 1;
8325 let forge = Scripted::new(
8326 vec![
8327 seen("a", Checks::Green, "CLEAN", true),
8328 red("b", Some("7")),
8329 seen("b", Checks::Green, "CLEAN", false),
8330 ],
8331 vec![(true, "")],
8332 );
8333 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
8334 head: "b".to_owned(),
8335 });
8336 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8337 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8338 assert_eq!(forge.calls().iter().filter(|c| **c == "fix").count(), 1);
8339 assert_eq!(state.pr.as_ref().unwrap().round, 1);
8340 assert_eq!(state.status, RunStatus::Merged);
8341 assert_eq!(state.land_reruns.as_ref().unwrap().head, "b");
8342 assert_eq!(
8343 value_of(&forge.argvs()[0], "--match-head-commit"),
8344 Some("b")
8345 );
8346 }
8347
8348 #[tokio::test]
8349 async fn a_failed_rerun_call_falls_through_to_the_fix_in_the_same_lap() {
8350 let mut state = landing_state();
8351 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
8352 *forge.rerun_fails.lock().unwrap() = true;
8353 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8354 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8355 assert_eq!(forge.reruns.lock().unwrap().len(), 1, "never retried");
8356 assert_eq!(
8357 forge.calls().iter().filter(|c| **c == "fix").count(),
8358 1,
8359 "{:?}",
8360 forge.calls()
8361 );
8362 }
8363
8364 #[tokio::test]
8365 async fn a_saved_rerun_record_stops_a_restart_from_rerunning() {
8366 let mut state = landing_state();
8367 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
8368 state.land_reruns = Some(reran("a", &[("7", *forge.clock.lock().unwrap())]));
8370 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8371 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8372 assert!(forge.reruns.lock().unwrap().is_empty());
8373 }
8374
8375 #[tokio::test]
8376 async fn the_switch_off_and_a_missing_run_id_go_straight_to_the_fixer() {
8377 let mut state = landing_state();
8378 state.config.graph.rerun_flaky_checks = false;
8379 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
8380 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8381 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8382 assert!(forge.reruns.lock().unwrap().is_empty());
8383 assert!(forge.calls().contains(&"fix"));
8384
8385 let mut state = landing_state();
8386 let forge = Scripted::new(vec![red("a", None)], vec![]);
8387 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8388 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8389 assert!(forge.reruns.lock().unwrap().is_empty());
8390 assert!(forge.calls().contains(&"fix"));
8391 }
8392
8393 fn names(xs: &[&str]) -> BTreeSet<String> {
8394 xs.iter().map(|x| (*x).to_owned()).collect()
8395 }
8396
8397 #[test]
8398 fn a_required_check_the_rollup_never_listed_is_named() {
8399 let req = names(&["build"]);
8400 let why = waiting_on("BLOCKED", &[passing("review")], Some(&req));
8401 assert!(why.contains("never reported: build"), "{why}");
8402 assert!(!why.contains("probably waiting for a review"), "{why}");
8403 }
8404
8405 #[test]
8406 fn an_unreadable_required_list_is_not_read_as_a_review_wait() {
8407 let why = waiting_on("BLOCKED", &[passing("review")], None);
8408 assert!(why.contains("could not be read"), "{why}");
8409 assert!(!why.contains("probably waiting for a review"), "{why}");
8410 }
8411
8412 #[test]
8413 fn all_required_reported_keeps_the_review_guess() {
8414 let req = names(&["build"]);
8415 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
8416 assert!(why.contains("probably waiting for a review"), "{why}");
8417 assert!(!why.contains("never reported"), "{why}");
8418 }
8419
8420 #[test]
8421 fn required_names_match_the_rollup_ignoring_case_only() {
8422 let req = names(&["Build"]);
8423 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
8424 assert!(!why.contains("never reported"), "{why}");
8425 }
8426
8427 #[test]
8428 fn required_contexts_are_read_from_protection_and_rulesets() {
8429 let classic = r#"{"contexts":["build"],"checks":[{"context":"lint","app_id":1}]}"#;
8430 assert_eq!(
8431 parse_classic_required(classic),
8432 Some(names(&["build", "lint"]))
8433 );
8434 let rules = r#"[{"type":"pull_request","parameters":{}},
8435 {"type":"required_status_checks","parameters":{"required_status_checks":[{"context":"test"}]}}]"#;
8436 assert_eq!(parse_ruleset_required(rules), Some(names(&["test"])));
8437 assert_eq!(parse_ruleset_required("nope"), None);
8438 assert_eq!(encode_path_segment("release/1.x"), "release%2F1.x");
8439 }
8440
8441 #[test]
8442 fn the_direct_merge_guard_needs_the_approved_head_bound_to_its_checks() {
8443 let shown = BTreeSet::new();
8444 let ok = seen("a", Checks::Green, "CLEAN", false);
8445 let guard = |s: Option<&Seen>| direct_merge_is_safe(s, "A", &shown, 0, 4, Duration::ZERO);
8446 assert!(guard(Some(&ok)));
8447 assert!(!guard(None));
8448 assert!(!guard(Some(&seen("b", Checks::Green, "CLEAN", false))));
8449 let mut stale = ok.clone();
8450 stale.rollup_head = "old".to_owned();
8451 assert!(!guard(Some(&stale)));
8452 assert!(!guard(Some(&seen("a", Checks::Pending, "BLOCKED", false))));
8453 assert!(!guard(Some(&merged_view("a"))));
8454 }
8455
8456 #[test]
8457 fn the_rollup_node_carries_whether_each_check_is_required() {
8458 let node = node_json("new", "SUCCESS", false)
8459 .replace(r#""name":"ci","#, r#""name":"ci","isRequired":true,"#);
8460 let s = seen_from(&view_json("new"), Some(&node)).unwrap();
8461 assert_eq!(s.contexts.len(), 1);
8462 assert_eq!(s.contexts[0].required, Some(true));
8463 let s = seen_from(&view_json("new"), Some(&node_json("new", "SUCCESS", false))).unwrap();
8464 assert_eq!(s.contexts[0].required, None);
8465 }
8466
8467 #[tokio::test]
8468 async fn a_resume_that_cannot_disable_a_recorded_arm_stops_and_keeps_the_record() {
8469 let mut state = landing_state();
8470 state.land_armed_head = Some("a".to_owned());
8471 let forge = Scripted::new(
8472 vec![seen("a", Checks::Green, "CLEAN", true)],
8473 vec![(false, "disable exploded")],
8474 );
8475 land_with(&mut state, URL, &forge).await.unwrap();
8476 assert!(!forge.calls().contains(&"fix"));
8477 assert_eq!(state.status, RunStatus::Blocked);
8478 assert_eq!(state.land_armed_head.as_deref(), Some("a"));
8479 let why = state.merge.as_ref().unwrap().detail.clone();
8480 assert!(why.contains("disable exploded"), "{why}");
8481 }
8482}