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 cwd: &winner.worktree,
4651 prompt: &prompt,
4652 timeout: Duration::from_secs(state.config.graph.timeout_fix),
4653 allow_write: true,
4654 unsandboxed: false,
4655 sessions: state.config.graph.sessions,
4656 artifacts: &artifacts,
4657 stem: &stem,
4658 run: &state.id,
4659 node: "land",
4660 cache_dir: state.config.cache_dir().as_deref(),
4661 attachments: &[],
4662 writable: &[],
4663 },
4664 )
4665 .await;
4666 state.seats.insert(seat.key.clone(), seat);
4667 if let Some(next) = ids.get(i + 1)
4668 && agent::chain_advances(&out)
4669 {
4670 let (class, why) = crate::fixer::failure_of(&out);
4671 crate::graph::record_handover(state, "land", &seat_key, &spec.id, next, &class, &why);
4672 continue;
4673 }
4674 last = Some(out);
4675 break;
4676 }
4677 let out = last.expect("the fixer chain always has an entry");
4678
4679 match out {
4680 Ok(o) if o.quota_exhausted() => {
4681 return Ok(Fixed::Failed(
4682 "rate limited (quota); the fixer could not run".to_owned(),
4683 ));
4684 }
4685 Ok(o) if !o.usable() => {
4686 return Ok(Fixed::Failed(format!(
4687 "the fixer produced nothing usable ({}{})",
4688 crate::notices::exit_status(o.exit_code),
4689 if o.timed_out {
4690 "; the turn timed out"
4691 } else {
4692 ""
4693 }
4694 )));
4695 }
4696 Ok(_) => {}
4697 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
4698 Err(e) => return Ok(Fixed::Failed(format!("{e:#}"))),
4699 }
4700
4701 if owner_requested_stop(state)? {
4702 return Ok(Fixed::Declined);
4703 }
4704
4705 let wait = crate::repo_lock::WaitPolicy::new(
4708 Duration::from_secs(state.config.graph.timeout_resource_wait),
4709 || false,
4710 );
4711 let coordination = crate::repo_lock::SeatLease::operation_with(
4712 &winner.worktree,
4713 state.config.coordination.as_ref(),
4714 &wait,
4715 )
4716 .await?;
4717 match git::rescue_commit(
4718 &winner.worktree,
4719 &format!("magi: land round {round} fixes (uncommitted work)"),
4720 )
4721 .await
4722 {
4723 Ok(r) => state.note_withheld("land", &r.withheld),
4724 Err(e)
4725 if state
4726 .merge_repairs
4727 .last()
4728 .is_some_and(|r| r.phase == crate::run::MergeRepairPhase::Fixing) =>
4729 {
4730 return Ok(Fixed::Failed(format!("saving repair commit failed: {e:#}")));
4731 }
4732 Err(_) => {}
4733 }
4734 let after = git::rev_parse(&winner.worktree, "HEAD").await?;
4735 drop(coordination);
4736 if after == before {
4737 return Ok(Fixed::Declined);
4738 }
4739
4740 if owner_requested_stop(state)? {
4741 return Ok(Fixed::Declined);
4742 }
4743 crate::pr_head::ensure_owner(state)?;
4744 let remote = state.config.merge.remote.clone();
4745 let public_head = state.pr_branch().unwrap_or(&winner.branch).to_owned();
4746 let push = if state.pr_head.is_some() {
4747 let expected = state
4748 .pr_pushed_head
4749 .as_deref()
4750 .context("missing public head lease")?;
4751 git::push_as(
4752 &winner.worktree,
4753 &remote,
4754 &winner.branch,
4755 &public_head,
4756 expected,
4757 )
4758 .await?
4759 } else {
4760 git::push(&winner.worktree, &remote, &winner.branch).await?
4761 };
4762 if !push.ok() {
4763 return Ok(Fixed::Failed(format!(
4764 "pushing {} to {remote} failed: {}",
4765 public_head, push.stderr
4766 )));
4767 }
4768 state.event(
4769 "land",
4770 format!("round {round}: pushed a fix to {public_head}"),
4771 );
4772 state.pr_pushed_head = Some(after.clone());
4773 state.save()?;
4774 Ok(Fixed::Committed { head: after })
4775}
4776
4777pub(crate) fn seat_of(state: &mut RunState, key: &str, agent: &str) -> SeatState {
4779 crate::fixer::seat_for(state, key, agent)
4780}
4781
4782pub(crate) async fn repair_preflight(state: &RunState, url: &str, head: &str) -> Result<PrState> {
4785 let seen = observe(&state.repo, url).await?;
4786 let winner = state.winner().context("no winning branch to repair")?;
4787 if seen.pr.state != PrLifecycle::Open || seen.head != head {
4788 anyhow::bail!(
4789 "PR is closed or its head changed; review the current head before requesting repair again"
4790 );
4791 }
4792 if git::rev_parse(&winner.worktree, "HEAD").await? != head
4793 || !git::is_clean(&winner.worktree).await?
4794 {
4795 anyhow::bail!(
4796 "repair worktree is missing, dirty or at a different head; restore the reviewed branch and resume this run"
4797 );
4798 }
4799 let view = gh(
4802 &state.repo,
4803 &[
4804 "pr".into(),
4805 "view".into(),
4806 url.into(),
4807 "--json".into(),
4808 "autoMergeRequest,headRefOid,state,headRefName,baseRefName,isCrossRepository".into(),
4809 ],
4810 )
4811 .await?;
4812 if !view.0 {
4813 bail!("cannot check auto-merge: {}", view.1);
4814 }
4815 let live: serde_json::Value = serde_json::from_str(&view.1)?;
4816 let public = state.pr_branch().unwrap_or(&winner.branch);
4817 if live["state"] != "OPEN"
4818 || live["headRefOid"] != head
4819 || live["headRefName"] != public
4820 || live["baseRefName"] != state.base_branch
4821 || live["isCrossRepository"] != false
4822 {
4823 bail!("PR changed during repair preflight; review its current head explicitly");
4824 }
4825 let auto_merge = live
4826 .get("autoMergeRequest")
4827 .context("cannot read the PR auto-merge reservation; repair held")?;
4828 if !auto_merge.is_null() {
4829 let out = gh(&state.repo, &disable_automerge_argv(seen.pr.number)).await?;
4830 if !out.0 {
4831 bail!("cannot disable auto-merge; repair held: {}", out.1);
4832 }
4833 }
4834 Ok(seen.pr)
4835}
4836
4837fn fix_prompt(
4839 state: &RunState,
4840 pr: &PrState,
4841 round: usize,
4842 budget: usize,
4843 reason: &str,
4844 logs: &str,
4845) -> String {
4846 let mut s = format!(
4847 "Your patch is open as a pull request and it is not landing. Land round \
4848 {round} of {budget}.\n\n\
4849 Pull request: {}\n\n\
4850 What is holding it: {reason}\n\n\
4851 # The task\n\n{}\n",
4852 pr.url, state.instruction
4853 );
4854
4855 if pr.failing.is_empty() {
4856 s.push_str("\n# Failing checks\n\n(none)\n");
4857 } else {
4858 let _ = write!(s, "\n# Failing checks\n\n- {}\n", pr.failing.join("\n- "));
4859 if logs.trim().is_empty() {
4860 s.push_str("\nNo log could be read; reproduce the failure locally.\n");
4861 } else {
4862 let _ = write!(s, "\n## Failing log tails\n\n{logs}\n");
4863 }
4864 }
4865
4866 if pr.review_comments.is_empty() {
4867 s.push_str("\n# Review comments\n\n(none)\n");
4868 } else {
4869 s.push_str("\n# Review comments\n");
4870 for c in &pr.review_comments {
4871 let where_ = match (&c.path, c.line) {
4872 (Some(p), Some(l)) => format!(" ({p}:{l})"),
4873 (Some(p), None) => format!(" ({p})"),
4874 _ => String::new(),
4875 };
4876 let _ = write!(s, "\n## {}{where_}\n\n{}\n", c.author, c.body.trim());
4877 }
4878 }
4879
4880 s.push_str(
4881 "\n# Rules\n\n\
4882 1. Fix the cause, never the symptom. Do not delete, skip, or weaken a \
4883 failing test; do not silence a lint with an allow attribute; do not \
4884 stretch a timeout to hide a race. If the check is right, the code is \
4885 wrong.\n\
4886 2. Change nothing the checks and the comments did not raise. A \
4887 drive-by refactor turns a one-line fix into a pull request that \
4888 needs reviewing again.\n\
4889 3. If a comment is wrong, say so with a checkable argument and change \
4890 nothing for it. A declined comment with a reason is a correct \
4891 outcome; a change made to appease a reviewer is not.\n\
4892 4. Commit in this worktree. magi pushes to the pull request's branch \
4893 for you; do not push, merge, or close anything yourself.\n\
4894 5. Never name yourself, your vendor, or your model, anywhere.\n\n\
4895 # Output\n\n\
4896 Say what you changed and why, and what you declined and why.",
4897 );
4898
4899 let language = &state.config.graph.language;
4900 if !(language.trim().is_empty() || language.eq_ignore_ascii_case("en")) {
4901 let _ = write!(s, "\n\nWrite all prose in {language}.");
4902 }
4903 s.push_str(&crate::prompt::github_rule(
4905 language,
4906 &state.config.graph.github_language,
4907 ));
4908 if let Some(overlay) = state.config.prompts.overlay("fix") {
4909 let _ = write!(s, "\n\n{overlay}");
4910 }
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
5055#[derive(Debug, Deserialize)]
5056#[serde(rename_all = "camelCase")]
5057struct GhPr {
5058 #[serde(default)]
5059 url: String,
5060 #[serde(default)]
5061 number: u64,
5062 #[serde(default)]
5063 state: String,
5064 #[serde(default)]
5065 title: String,
5066 #[serde(default)]
5067 status_check_rollup: Vec<GhCheck>,
5068 #[serde(default)]
5075 merge_state_status: String,
5076 #[serde(default)]
5080 head_ref_oid: String,
5081 #[serde(default)]
5082 base_ref_name: String,
5083 #[serde(default)]
5084 reviews: Vec<GhReview>,
5085 #[serde(default)]
5086 comments: Vec<GhComment>,
5087}
5088
5089#[derive(Debug, Deserialize)]
5094#[serde(rename_all = "camelCase")]
5095struct GhCheck {
5096 #[serde(default)]
5097 name: Option<String>,
5098 #[serde(default)]
5099 context: Option<String>,
5100 #[serde(default)]
5101 status: Option<String>,
5102 #[serde(default)]
5103 conclusion: Option<String>,
5104 #[serde(default)]
5105 state: Option<String>,
5106 #[serde(default)]
5107 details_url: Option<String>,
5108 #[serde(default)]
5109 target_url: Option<String>,
5110 #[serde(default)]
5113 is_required: Option<bool>,
5114}
5115
5116impl GhCheck {
5117 fn label(&self) -> String {
5119 self.name
5120 .clone()
5121 .or_else(|| self.context.clone())
5122 .unwrap_or_else(|| "(unnamed check)".to_owned())
5123 }
5124
5125 fn url(&self) -> Option<&str> {
5127 self.details_url
5128 .as_deref()
5129 .or(self.target_url.as_deref())
5130 .filter(|u| !u.is_empty())
5131 }
5132
5133 fn verdict(&self) -> Verdict {
5141 if let Some(status) = self.status.as_deref() {
5142 if !status.eq_ignore_ascii_case("COMPLETED") {
5143 return Verdict::Pending;
5144 }
5145 }
5146 let outcome = self
5147 .conclusion
5148 .as_deref()
5149 .or(self.state.as_deref())
5150 .unwrap_or("");
5151 match outcome.to_ascii_uppercase().as_str() {
5152 "SUCCESS" | "SKIPPED" | "NEUTRAL" => Verdict::Pass,
5153 "FAILURE" | "ERROR" | "TIMED_OUT" | "CANCELLED" | "STARTUP_FAILURE"
5154 | "ACTION_REQUIRED" => Verdict::Fail,
5155 "PENDING" | "EXPECTED" | "QUEUED" | "IN_PROGRESS" | "WAITING" | "REQUESTED" => {
5156 Verdict::Pending
5157 }
5158 _ => Verdict::Unknown,
5159 }
5160 }
5161}
5162
5163#[derive(Debug, Deserialize)]
5164struct GhAuthor {
5165 #[serde(default)]
5166 login: String,
5167}
5168
5169#[derive(Debug, Deserialize)]
5170struct GhReview {
5171 #[serde(default)]
5172 author: GhAuthor,
5173 #[serde(default)]
5174 body: String,
5175}
5176
5177#[derive(Debug, Deserialize)]
5178struct GhComment {
5179 #[serde(default)]
5180 author: GhAuthor,
5181 #[serde(default)]
5182 body: String,
5183}
5184
5185#[derive(Debug, Deserialize)]
5186struct GhUser {
5187 #[serde(default)]
5188 login: String,
5189}
5190
5191#[derive(Debug, Deserialize)]
5192struct GhInline {
5193 #[serde(default)]
5194 user: GhUser,
5195 #[serde(default)]
5196 path: Option<String>,
5197 #[serde(default)]
5198 line: Option<u64>,
5199 #[serde(default)]
5200 body: String,
5201}
5202
5203impl Default for GhAuthor {
5204 fn default() -> Self {
5205 Self {
5206 login: "(unknown)".to_owned(),
5207 }
5208 }
5209}
5210
5211impl Default for GhUser {
5212 fn default() -> Self {
5213 Self {
5214 login: "(unknown)".to_owned(),
5215 }
5216 }
5217}
5218
5219#[cfg(test)]
5220pub(crate) mod tests {
5221 use super::*;
5222 use crate::run::{Candidate, ReviewRecord, ReviewRound, Tally};
5223
5224 fn head_json(head: &str, base: &str, state: &str, cross: bool) -> String {
5225 format!(
5226 r#"{{"headRefName":"{head}","headRefOid":"aaa","baseRefName":"{base}","state":"{state}","isCrossRepository":{cross}}}"#
5227 )
5228 }
5229
5230 #[test]
5231 fn a_pull_request_is_closed_only_when_its_head_is_exactly_the_runs_branch() {
5232 let ok = head_json("magi/27b2/A", "main", "OPEN", false);
5233 assert_eq!(
5234 closable(&ok, "magi/27b2/A", "main", &["aaa".to_owned()]),
5235 Ok(())
5236 );
5237 for (json, why) in [
5238 (head_json("magi/27b2/B", "main", "OPEN", false), "head"),
5239 (head_json("magi/27b2/A-2", "main", "OPEN", false), "head"),
5240 (head_json("magi/27b2/A", "main", "OPEN", true), "fork"),
5241 (head_json("magi/27b2/A", "dev", "OPEN", false), "targets"),
5242 (head_json("magi/27b2/A", "main", "MERGED", false), "already"),
5243 (head_json("magi/27b2/A", "main", "CLOSED", false), "already"),
5244 ] {
5245 let err = closable(&json, "magi/27b2/A", "main", &["aaa".to_owned()])
5246 .unwrap_err()
5247 .why;
5248 assert!(err.contains(why), "{json}: {err}");
5249 }
5250 let moved = head_json("magi/27b2/A", "main", "OPEN", false);
5252 let err = closable(&moved, "magi/27b2/A", "main", &["bbb".to_owned()]).unwrap_err();
5253 assert!(err.retry && err.why.contains("not a commit"), "{err:?}");
5254 assert!(
5255 !closable(
5256 &head_json("x", "main", "OPEN", false),
5257 "magi/27b2/A",
5258 "main",
5259 &[]
5260 )
5261 .unwrap_err()
5262 .retry
5263 );
5264 assert!(is_forge_url("https://github.com/o/r.git"));
5265 assert!(is_forge_url("git@github.com:o/r.git"));
5266 assert!(!is_forge_url("/tmp/origin.git"));
5267 assert!(!is_forge_url("C:\\work\\origin.git"));
5268 assert!(!is_forge_url("file:///tmp/origin.git"));
5269 assert!(forge_unavailable(
5270 "gh pr list failed: none of the git remotes configured for this repository point to a known GitHub host."
5271 ));
5272 assert!(!forge_unavailable(
5273 "gh pr list failed: error connecting to api.github.com"
5274 ));
5275 assert!(closable("not json", "magi/27b2/A", "main", &[]).is_err());
5276 assert!(
5278 closable(
5279 r#"{"headRefName":"b","headRefOid":"aaa","baseRefName":"main","state":"OPEN"}"#,
5280 "b",
5281 "main",
5282 &["aaa".to_owned()]
5283 )
5284 .is_err()
5285 );
5286 }
5287
5288 #[test]
5289 fn the_close_comment_names_the_commit_on_the_base() {
5290 let e = crate::already::Evidence {
5291 proof: crate::already::Proof::PatchId,
5292 tip: "1234567890".to_owned(),
5293 commits: vec!["0e368de0000".to_owned()],
5294 };
5295 let c = superseded_comment("main", &e);
5296 assert!(c.contains("0e368de") && c.contains("`main`"), "{c}");
5297 }
5298
5299 const GREEN_OPEN: &str = r####"{
5301 "url": "https://github.com/yukimemi/magi/pull/10",
5302 "number": 10,
5303 "state": "OPEN",
5304 "mergeStateStatus": "CLEAN",
5305 "statusCheckRollup": [
5306 {
5307 "__typename": "CheckRun",
5308 "conclusion": "SKIPPED",
5309 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278334/job/99378963755",
5310 "name": "review",
5311 "status": "COMPLETED",
5312 "workflowName": "claude-review"
5313 },
5314 {
5315 "__typename": "CheckRun",
5316 "conclusion": "SUCCESS",
5317 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963144",
5318 "name": "check (ubuntu-latest)",
5319 "status": "COMPLETED",
5320 "workflowName": "CI"
5321 },
5322 {
5323 "__typename": "CheckRun",
5324 "conclusion": "SUCCESS",
5325 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963095",
5326 "name": "rustfmt",
5327 "status": "COMPLETED",
5328 "workflowName": "CI"
5329 },
5330 {
5331 "__typename": "StatusContext",
5332 "context": "CodeRabbit",
5333 "state": "SUCCESS",
5334 "targetUrl": ""
5335 }
5336 ],
5337 "reviews": [],
5338 "comments": [
5339 {
5340 "author": {
5341 "login": "coderabbitai"
5342 },
5343 "authorAssociation": "NONE",
5344 "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"
5345 }
5346 ]
5347}"####;
5348
5349 const RED_OPEN: &str = r####"{
5351 "url": "https://github.com/yukimemi/magi/pull/9",
5352 "number": 9,
5353 "state": "OPEN",
5354 "mergeStateStatus": "UNSTABLE",
5355 "statusCheckRollup": [
5356 {
5357 "__typename": "CheckRun",
5358 "conclusion": "SUCCESS",
5359 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
5360 "name": "check (ubuntu-latest)",
5361 "status": "COMPLETED",
5362 "workflowName": "CI"
5363 },
5364 {
5365 "__typename": "CheckRun",
5366 "conclusion": "SUCCESS",
5367 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
5368 "name": "rustfmt",
5369 "status": "COMPLETED",
5370 "workflowName": "CI"
5371 },
5372 {
5373 "__typename": "CheckRun",
5374 "conclusion": "FAILURE",
5375 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
5376 "name": "editorconfig",
5377 "status": "COMPLETED",
5378 "workflowName": "CI"
5379 },
5380 {
5381 "__typename": "StatusContext",
5382 "context": "CodeRabbit",
5383 "state": "SUCCESS",
5384 "targetUrl": ""
5385 }
5386 ],
5387 "reviews": [],
5388 "comments": [
5389 {
5390 "author": {
5391 "login": "coderabbitai"
5392 },
5393 "authorAssociation": "NONE",
5394 "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"
5395 }
5396 ]
5397}"####;
5398
5399 const PENDING_OPEN: &str = r####"{
5401 "url": "https://github.com/yukimemi/magi/pull/9",
5402 "number": 9,
5403 "state": "OPEN",
5404 "statusCheckRollup": [
5405 {
5406 "__typename": "CheckRun",
5407 "conclusion": "SUCCESS",
5408 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
5409 "name": "check (ubuntu-latest)",
5410 "status": "COMPLETED",
5411 "workflowName": "CI"
5412 },
5413 {
5414 "__typename": "CheckRun",
5415 "conclusion": "SUCCESS",
5416 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
5417 "name": "rustfmt",
5418 "status": "COMPLETED",
5419 "workflowName": "CI"
5420 },
5421 {
5422 "__typename": "CheckRun",
5423 "conclusion": null,
5424 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
5425 "name": "editorconfig",
5426 "status": "IN_PROGRESS",
5427 "workflowName": "CI"
5428 },
5429 {
5430 "__typename": "StatusContext",
5431 "context": "CodeRabbit",
5432 "state": "SUCCESS",
5433 "targetUrl": ""
5434 }
5435 ],
5436 "reviews": [],
5437 "comments": []
5438}"####;
5439
5440 const MERGED: &str = r####"{
5442 "url": "https://github.com/yukimemi/magi/pull/16",
5443 "number": 16,
5444 "state": "MERGED",
5445 "statusCheckRollup": [
5446 {
5447 "__typename": "CheckRun",
5448 "conclusion": "SUCCESS",
5449 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587933/job/100268878095",
5450 "name": "check (ubuntu-latest)",
5451 "status": "COMPLETED",
5452 "workflowName": "CI"
5453 },
5454 {
5455 "__typename": "CheckRun",
5456 "conclusion": "SUCCESS",
5457 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587918/job/100268876427",
5458 "name": "review",
5459 "status": "COMPLETED",
5460 "workflowName": "claude-review"
5461 }
5462 ],
5463 "reviews": [],
5464 "comments": []
5465}"####;
5466
5467 const REVIEWED_OPEN: &str = r####"{
5469 "url": "https://github.com/yukimemi/magi/pull/12",
5470 "number": 12,
5471 "state": "OPEN",
5472 "statusCheckRollup": [
5473 {
5474 "__typename": "CheckRun",
5475 "conclusion": "SUCCESS",
5476 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212506/job/100065355258",
5477 "name": "check (ubuntu-latest)",
5478 "status": "COMPLETED",
5479 "workflowName": "CI"
5480 },
5481 {
5482 "__typename": "CheckRun",
5483 "conclusion": "SUCCESS",
5484 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212566/job/100065355810",
5485 "name": "review",
5486 "status": "COMPLETED",
5487 "workflowName": "claude-review"
5488 }
5489 ],
5490 "reviews": [
5491 {
5492 "author": {
5493 "login": "claude"
5494 },
5495 "state": "COMMENTED",
5496 "body": ""
5497 }
5498 ],
5499 "comments": [
5500 {
5501 "author": {
5502 "login": "coderabbitai"
5503 },
5504 "authorAssociation": "NONE",
5505 "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"
5506 },
5507 {
5508 "author": {
5509 "login": "claude"
5510 },
5511 "authorAssociation": "NONE",
5512 "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"
5513 }
5514 ]
5515}"####;
5516
5517 const INLINE: &str = r####"[
5519 {
5520 "user": {
5521 "login": "claude[bot]"
5522 },
5523 "path": "src/graph.rs",
5524 "line": 231,
5525 "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"
5526 }
5527]"####;
5528
5529 const CODERABBIT_TRIGGER: &str = r####"<!-- This is an auto-generated comment: summarize by coderabbit.ai -->
5531<!-- This is an auto-generated comment: skip review by coderabbit.ai -->
5532
5533> [!IMPORTANT]
5534> - [ ] <!-- {"checkboxId":"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe"} --> 🔍 Trigger review
5535>
5536> This repository does not receive automatic reviews because it has fewer than 10 stars.
5537>
5538> <details>
5539> <summary>⚙️ Run configuration</summary>
5540>
5541> **Configuration used**: defaults
5542>
5543> **Review profile**: CHILL
5544>
5545> **Plan**: Team
5546>
5547> **Run ID**: `c1e2a68f-87fc-4b35-9ec4-e75c7854966a`
5548>
5549> </details>
5550
5551<!-- end of auto-generated comment: skip review by coderabbit.ai -->
5552
5553<!-- tips_start -->
5554
5555---
5556
5557Thanks 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.
5558
5559<details>
5560<summary>❤️ Share</summary>
5561
5562- [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"####;
5563
5564 const CLAUDE_CHECKLIST: &str = r####"**Claude finished @yukimemi's task in 4m 14s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33636587918)
5566
5567---
5568### Reviewing PR #16
5569
5570- [x] Read AGENTS.md conventions
5571- [x] Review `src/daemon.rs` changes
5572- [x] Review `src/main.rs` changes (new `doctor` reporting)
5573- [x] Review `src/web.rs` changes (reuse of unreadable-run count)
5574- [x] Check test coverage for new behavior
5575- [x] Run verification commands (blocked — see note)
5576- [x] Post findings"####;
5577
5578 const CLAUDE_FINDING: &str = r####"**Claude finished @yukimemi's task in 3m 52s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33571212566)
5580
5581---
5582### Review: `magi review <branch>` — cheap-half-only graph
5583
5584Read 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.
5585
5586**Correctness**
5587
5588- 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"####;
5589
5590 fn pr(checks: Checks, failing: &[&str], comments: usize) -> PrState {
5591 PrState {
5592 url: "https://github.com/yukimemi/magi/pull/16".to_owned(),
5593 number: 16,
5594 state: PrLifecycle::Open,
5595 checks,
5596 blocking: if matches!(checks, Checks::Red) {
5600 Blocking::Yes
5601 } else {
5602 Blocking::No
5603 },
5604 failing: failing.iter().map(|s| (*s).to_owned()).collect(),
5605 review_comments: (0..comments)
5606 .map(|i| ReviewComment {
5607 author: "coderabbitai".to_owned(),
5608 path: Some("src/graph.rs".to_owned()),
5609 line: Some(231),
5610 body: format!("finding {i}"),
5611 })
5612 .collect(),
5613 }
5614 }
5615
5616 #[test]
5617 fn expected_ci_is_exactly_decide_and_absent_ci_never_waits_for_checks() {
5618 use CiExpectation::{Absent, Expected};
5619 for checks in [Checks::Pending, Checks::Unknown, Checks::Green, Checks::Red] {
5620 let p = pr(checks, &["x"], 0);
5621 for waited in [Duration::ZERO, CHECKS_GRACE] {
5622 assert_eq!(
5623 decide_with(&p, 0, 4, waited, Expected),
5624 decide(&p, 0, 4, waited)
5625 );
5626 }
5627 }
5628 for checks in [Checks::Pending, Checks::Unknown, Checks::Red] {
5630 let p = pr(checks, &["x"], 0);
5631 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Merge);
5632 assert_eq!(decide_with(&p, 4, 4, CHECKS_GRACE, Absent), Step::Merge);
5633 }
5634 let mut p = pr(Checks::Unknown, &[], 0);
5636 p.blocking = Blocking::Conflict;
5637 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Rebase);
5638 p.state = PrLifecycle::Merged;
5640 assert_eq!(
5641 decide_with(&p, 0, 4, Duration::ZERO, Absent),
5642 Step::Done { merged: true }
5643 );
5644 }
5645
5646 #[test]
5647 fn a_green_pull_request_with_nothing_outstanding_parses_as_ready_to_merge() {
5648 let state = parse_pr(GREEN_OPEN).expect("green fixture parses");
5649 assert_eq!(state.number, 10);
5650 assert_eq!(state.state, PrLifecycle::Open);
5651 assert_eq!(state.checks, Checks::Green);
5652 assert!(state.failing.is_empty());
5653 assert!(
5654 state.review_comments.is_empty(),
5655 "the only comment is CodeRabbit's trigger notice: {:?}",
5656 state.review_comments
5657 );
5658 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Merge);
5659 }
5660
5661 #[test]
5662 fn a_failing_check_parses_as_red_and_is_named() {
5663 let state = parse_pr(RED_OPEN).expect("red fixture parses");
5664 assert_eq!(state.checks, Checks::Red);
5665 assert_eq!(state.failing, vec!["editorconfig".to_owned()]);
5666 let mut blocking = state.clone();
5673 blocking.blocking = Blocking::Yes;
5674 match decide(&blocking, 0, 4, Duration::ZERO) {
5675 Step::Fix { reason } => {
5676 assert!(reason.contains("editorconfig"), "reason: {reason}");
5677 assert!(reason.contains("failing"), "reason: {reason}");
5678 }
5679 other => panic!("expected a fix round, got {other:?}"),
5680 }
5681 }
5682
5683 #[test]
5684 fn a_check_still_running_parses_as_pending_and_is_waited_for() {
5685 let state = parse_pr(PENDING_OPEN).expect("pending fixture parses");
5686 assert_eq!(state.checks, Checks::Pending);
5687 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Wait);
5688 }
5689
5690 #[test]
5691 fn a_pull_request_merged_underneath_us_is_done_rather_than_a_failure() {
5692 let state = parse_pr(MERGED).expect("merged fixture parses");
5693 assert_eq!(state.state, PrLifecycle::Merged);
5694 assert_eq!(
5695 decide(&state, 0, 4, Duration::ZERO),
5696 Step::Done { merged: true }
5697 );
5698 }
5699
5700 #[test]
5701 fn a_review_that_found_something_is_outstanding_and_holds_the_merge() {
5702 let state = parse_pr(REVIEWED_OPEN).expect("reviewed fixture parses");
5703 assert_eq!(state.checks, Checks::Green);
5704 let authors: Vec<&str> = state
5705 .review_comments
5706 .iter()
5707 .map(|c| c.author.as_str())
5708 .collect();
5709 assert_eq!(
5710 authors,
5711 vec!["claude"],
5712 "CodeRabbit's walkthrough is machinery; Claude's review is a finding"
5713 );
5714 match decide(&state, 0, 4, Duration::ZERO) {
5715 Step::Fix { reason } => assert!(reason.contains("unresolved"), "reason: {reason}"),
5716 other => panic!("expected a fix round, got {other:?}"),
5717 }
5718 }
5719
5720 #[test]
5721 fn inline_review_comments_keep_their_file_and_line() {
5722 let comments = parse_inline_comments(INLINE).expect("inline fixture parses");
5723 assert_eq!(comments.len(), 1);
5724 assert_eq!(comments[0].author, "claude[bot]");
5725 assert_eq!(comments[0].path.as_deref(), Some("src/graph.rs"));
5726 assert_eq!(comments[0].line, Some(231));
5727 assert!(comments[0].body.contains("empty"), "{}", comments[0].body);
5728 }
5729
5730 #[test]
5731 fn a_status_only_bot_comment_does_not_trigger_a_fix_round() {
5732 assert!(
5733 is_noise(CODERABBIT_TRIGGER),
5734 "CodeRabbit's trigger notice declares itself not a review"
5735 );
5736 assert!(
5737 is_noise(CLAUDE_CHECKLIST),
5738 "a progress checklist asks for nothing"
5739 );
5740 assert!(
5741 !is_noise(CLAUDE_FINDING),
5742 "a review that names a bug is input, not noise"
5743 );
5744
5745 let mut clean = pr(Checks::Green, &[], 0);
5746 clean.review_comments.push(ReviewComment {
5747 author: "coderabbitai".to_owned(),
5748 path: None,
5749 line: None,
5750 body: CODERABBIT_TRIGGER.to_owned(),
5751 });
5752 clean.review_comments.retain(|c| !is_noise(&c.body));
5753 assert_eq!(decide(&clean, 0, 4, Duration::ZERO), Step::Merge);
5754
5755 let mut found = pr(Checks::Green, &[], 0);
5756 found.review_comments.push(ReviewComment {
5757 author: "claude".to_owned(),
5758 path: None,
5759 line: None,
5760 body: CLAUDE_FINDING.to_owned(),
5761 });
5762 found.review_comments.retain(|c| !is_noise(&c.body));
5763 assert!(matches!(
5764 decide(&found, 0, 4, Duration::ZERO),
5765 Step::Fix { .. }
5766 ));
5767 }
5768
5769 #[test]
5770 fn the_policy_table_holds_for_every_combination_that_matters() {
5771 let cases: Vec<(&str, PrState, usize, usize, Duration, Step)> = vec![
5772 (
5773 "pending checks are waited for, even on the last round",
5774 pr(Checks::Pending, &[], 0),
5775 4,
5776 4,
5777 Duration::ZERO,
5778 Step::Wait,
5779 ),
5780 (
5781 "red checks are fixed",
5782 pr(Checks::Red, &["editorconfig"], 0),
5783 0,
5784 4,
5785 Duration::ZERO,
5786 Step::Fix {
5787 reason: "1 check(s) failing: editorconfig".to_owned(),
5788 },
5789 ),
5790 (
5791 "green with comments is fixed, not merged",
5792 pr(Checks::Green, &[], 2),
5793 1,
5794 4,
5795 Duration::ZERO,
5796 Step::Fix {
5797 reason: "checks are green but 2 review comment(s) are unresolved: coderabbitai"
5798 .to_owned(),
5799 },
5800 ),
5801 (
5802 "green and clean merges",
5803 pr(Checks::Green, &[], 0),
5804 3,
5805 4,
5806 Duration::ZERO,
5807 Step::Merge,
5808 ),
5809 (
5810 "an unreadable rollup is waited on while the grace lasts",
5811 pr(Checks::Unknown, &[], 0),
5812 0,
5813 4,
5814 Duration::ZERO,
5815 Step::Wait,
5816 ),
5817 (
5818 "an unreadable rollup is never merged once the grace is spent",
5819 pr(Checks::Unknown, &[], 0),
5820 0,
5821 4,
5822 CHECKS_GRACE,
5823 Step::GiveUp {
5824 reason: "no check status is readable on the pull request after 3 minute(s); \
5825 refusing to merge on a guess"
5826 .to_owned(),
5827 },
5828 ),
5829 ];
5830 for (what, state, round, budget, waited, want) in cases {
5831 assert_eq!(decide(&state, round, budget, waited), want, "{what}");
5832 }
5833 }
5834
5835 #[test]
5836 fn the_forge_verdict_survives_the_round_trip_from_gh() {
5837 let green = parse_pr(GREEN_OPEN).expect("parse");
5841 assert_eq!(green.blocking, Blocking::No);
5842 let red = parse_pr(RED_OPEN).expect("parse");
5843 assert_eq!(
5844 red.blocking,
5845 Blocking::No,
5846 "`UNSTABLE` is mergeable: the red check is one nobody requires"
5847 );
5848 assert_eq!(red.checks, Checks::Red, "and it is still reported as red");
5849 let quiet =
5851 parse_pr(&GREEN_OPEN.replace("\"mergeStateStatus\": \"CLEAN\",", "")).expect("parse");
5852 assert_eq!(quiet.blocking, Blocking::Unsaid);
5853 }
5854
5855 #[test]
5856 fn a_red_check_nobody_requires_does_not_buy_a_fix_round() {
5857 let mut nonblocking = pr(Checks::Red, &["editorconfig", "coverage"], 0);
5863 nonblocking.blocking = Blocking::No;
5864 assert_eq!(
5865 decide(&nonblocking, 0, 4, Duration::ZERO),
5866 Step::Merge,
5867 "the forge says nothing is in the way, so nothing is"
5868 );
5869
5870 let mut blocking = pr(Checks::Red, &["test (ubuntu-latest)"], 0);
5872 blocking.blocking = Blocking::Yes;
5873 assert!(matches!(
5874 decide(&blocking, 0, 4, Duration::ZERO),
5875 Step::Fix { .. }
5876 ));
5877
5878 let mut commented = pr(Checks::Red, &["coverage"], 1);
5881 commented.blocking = Blocking::No;
5882 assert!(matches!(
5883 decide(&commented, 0, 4, Duration::ZERO),
5884 Step::Fix { .. }
5885 ));
5886
5887 let mut unsaid = pr(Checks::Red, &["coverage"], 0);
5889 unsaid.blocking = Blocking::Unsaid;
5890 assert!(matches!(
5891 decide(&unsaid, 0, 4, Duration::ZERO),
5892 Step::Fix { .. }
5893 ));
5894 }
5895
5896 #[test]
5897 fn a_red_merge_is_announced_with_every_failing_check_and_a_green_one_is_not() {
5898 let mut red = pr(Checks::Red, &["test (windows-latest)", "coverage"], 0);
5899 red.blocking = Blocking::No;
5900 assert_eq!(
5901 decide(&red, 0, 4, Duration::ZERO),
5902 Step::Merge,
5903 "announcing must not change the decision"
5904 );
5905 let said = red_merge_summary("yukimemi/magi", &red).expect("red merge is announced");
5906 assert!(said.contains("yukimemi/magi"), "{said}");
5907 assert!(said.contains("#16"), "{said}");
5908 assert!(
5909 said.contains("https://github.com/yukimemi/magi/pull/16"),
5910 "{said}"
5911 );
5912 assert!(
5913 said.contains("test (windows-latest)") && said.contains("coverage"),
5914 "{said}"
5915 );
5916
5917 let green = pr(Checks::Green, &["stale"], 0);
5919 assert_eq!(red_merge_summary("yukimemi/magi", &green), None);
5920 }
5921
5922 #[test]
5923 fn red_merge_notices_omit_empty_check_details() {
5924 for checks in [vec![], vec!["", " "]] {
5925 let red = pr(Checks::Red, &checks, 0);
5926 let summary = red_merge_summary("owner/repo", &red).unwrap();
5927 let notice = crate::notices::merged_red("run-1", &summary);
5928 assert_eq!(
5929 notice.message,
5930 format!("Merged owner/repo PR #16 with red checks ({})", red.url)
5931 );
5932 assert_eq!(notice.severity, crate::notices::Severity::Warn);
5933 }
5934 let red = pr(Checks::Red, &["", " test ", " "], 0);
5935 let summary = red_merge_summary("owner/repo", &red).unwrap();
5936 assert!(summary.contains("with red checks: test ("), "{summary}");
5937 }
5938
5939 #[test]
5940 fn the_repo_label_comes_from_the_pull_request_url() {
5941 let p = Path::new("/tmp/checkout");
5942 assert_eq!(
5943 repo_label(p, "https://github.com/yukimemi/magi/pull/16"),
5944 "yukimemi/magi"
5945 );
5946 assert_eq!(repo_label(p, "not a url"), "checkout");
5947 }
5948
5949 #[test]
5950 fn a_branch_the_base_moved_under_is_rebased_not_fixed() {
5951 let mut conflicted = pr(Checks::Green, &[], 0);
5956 conflicted.blocking = Blocking::Conflict;
5957 assert_eq!(decide(&conflicted, 0, 4, Duration::ZERO), Step::Rebase);
5958
5959 let mut red = pr(Checks::Red, &["test (ubuntu-latest)"], 2);
5963 red.blocking = Blocking::Conflict;
5964 assert_eq!(decide(&red, 4, 4, Duration::ZERO), Step::Rebase);
5965
5966 let mut merged = pr(Checks::Red, &[], 0);
5968 merged.blocking = Blocking::Conflict;
5969 merged.state = PrLifecycle::Merged;
5970 assert_eq!(
5971 decide(&merged, 0, 4, Duration::ZERO),
5972 Step::Done { merged: true }
5973 );
5974 }
5975
5976 #[test]
5977 fn the_forge_verdict_is_read_off_merge_state_status() {
5978 for ok in ["CLEAN", "UNSTABLE", "unstable", "HAS_HOOKS"] {
5981 assert_eq!(Blocking::of(ok), Blocking::No, "{ok}");
5982 assert!(!Blocking::of(ok).stops_a_merge(), "{ok}");
5983 }
5984 assert_eq!(Blocking::of("DIRTY"), Blocking::Conflict);
5985 assert_eq!(Blocking::of("BLOCKED"), Blocking::Yes);
5986 assert_eq!(Blocking::of("BEHIND"), Blocking::Yes);
5987 for quiet in ["", "UNKNOWN"] {
5990 assert_eq!(Blocking::of(quiet), Blocking::Unsaid);
5991 assert!(Blocking::of(quiet).stops_a_merge());
5992 }
5993 }
5994
5995 #[test]
5996 fn a_merge_command_that_failed_after_merging_is_still_a_merge() {
5997 let argv = merge_argv(28, "fix: retry uploads on transient network errors");
5998 let jj = "could not determine current branch: failed to run git: not on any branch";
6000
6001 let landed = merged_after_all(&argv, jj, Some(PrLifecycle::Merged))
6002 .expect("the forge says merged, so it merged");
6003 assert!(landed.ok);
6004 assert!(
6005 landed.detail.contains("but the pull request is merged"),
6006 "the record must not read as a clean success: {}",
6007 landed.detail
6008 );
6009 assert!(
6010 landed.detail.contains("not on any branch"),
6011 "and it must keep what the command actually said: {}",
6012 landed.detail
6013 );
6014
6015 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Open)).is_none());
6017 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Closed)).is_none());
6018 assert!(merged_after_all(&argv, jj, None).is_none());
6020 }
6021
6022 #[test]
6023 fn a_pull_request_closed_underneath_us_is_done_and_not_merged() {
6024 let mut state = pr(Checks::Red, &["editorconfig"], 3);
6025 state.state = PrLifecycle::Closed;
6026 assert_eq!(
6027 decide(&state, 0, 4, Duration::ZERO),
6028 Step::Done { merged: false },
6029 "a human closing the pull request ends the loop, whatever CI says"
6030 );
6031 }
6032
6033 #[test]
6034 fn the_last_round_gives_up_with_a_reason_naming_what_is_still_failing() {
6035 let red = decide(
6036 &pr(Checks::Red, &["editorconfig", "test (macos)"], 0),
6037 4,
6038 4,
6039 Duration::ZERO,
6040 );
6041 match red {
6042 Step::GiveUp { reason } => {
6043 assert!(reason.contains("editorconfig"), "reason: {reason}");
6044 assert!(reason.contains("test (macos)"), "reason: {reason}");
6045 assert!(reason.contains("4 fix round(s)"), "reason: {reason}");
6046 }
6047 other => panic!("expected a give-up, got {other:?}"),
6048 }
6049
6050 let commented = decide(&pr(Checks::Green, &[], 1), 2, 2, Duration::ZERO);
6051 match commented {
6052 Step::GiveUp { reason } => {
6053 assert!(reason.contains("unresolved"), "reason: {reason}");
6054 assert!(reason.contains("2 fix round(s)"), "reason: {reason}");
6055 }
6056 other => panic!("expected a give-up, got {other:?}"),
6057 }
6058 }
6059
6060 #[test]
6061 fn the_merge_command_squashes_deletes_the_branch_and_sets_its_own_subject() {
6062 let candidate_commit = "magi: candidate A (uncommitted work)";
6063 let subject = merge_subject(candidate_commit, "add retries to the uploader");
6064 let argv = merge_argv(16, &subject);
6065
6066 assert!(argv.contains(&"--squash".to_owned()));
6067 assert!(argv.contains(&"--delete-branch".to_owned()));
6068 assert!(argv.contains(&"--subject".to_owned()));
6069 assert_eq!(
6070 argv.last().map(String::as_str),
6071 Some("add retries to the uploader"),
6072 "the subject must not be the candidate commit message"
6073 );
6074 assert_ne!(subject, candidate_commit);
6075 }
6076
6077 #[test]
6078 fn a_real_pull_request_title_is_used_as_the_squash_subject_verbatim() {
6079 assert_eq!(
6080 merge_subject("feat: a queue, an unattended loop, and a phone UI", "task"),
6081 "feat: a queue, an unattended loop, and a phone UI"
6082 );
6083 assert_eq!(
6084 merge_subject("", "# port the retry logic\n\ndetails"),
6085 "port the retry logic",
6086 "an empty title falls back to the task's first line, heading marks stripped"
6087 );
6088 }
6089
6090 #[test]
6091 fn a_failing_checks_details_url_yields_the_job_to_read_logs_from() {
6092 let url = "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572";
6093 assert_eq!(job_of(url).as_deref(), Some("100114323572"));
6094 assert_eq!(run_of(url).as_deref(), Some("33587406996"));
6095 assert_eq!(job_of("https://coderabbit.ai/status"), None);
6096 assert_eq!(run_of(""), None);
6097 }
6098
6099 #[test]
6100 fn magis_own_stop_comment_is_never_read_back_as_a_finding() {
6101 let mut out = Vec::new();
6102 push_if_outstanding(
6103 &mut out,
6104 ReviewComment {
6105 author: "yukimemi".to_owned(),
6106 path: None,
6107 line: None,
6108 body: format!("{MARKER}\nmagi stopped landing this pull request: 1 check failing"),
6109 },
6110 );
6111 assert!(out.is_empty());
6112 }
6113
6114 fn run_state() -> RunState {
6118 let mut state = RunState::new(
6119 std::path::PathBuf::from("/repo/magi"),
6120 "main".to_owned(),
6121 "abcdef1234".to_owned(),
6122 "add retries to the uploader".to_owned(),
6123 crate::config::Config::default(),
6124 );
6125 static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
6130 let nanos = std::time::SystemTime::now()
6131 .duration_since(std::time::UNIX_EPOCH)
6132 .map_or(0, |d| d.subsec_nanos() % 1_000_000);
6133 state.id = format!(
6134 "20261004-{nanos:06}-{:04x}",
6135 NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
6136 );
6137 state
6138 }
6139
6140 fn green_pr() -> PrState {
6141 PrState {
6142 url: "https://github.com/yukimemi/magi/pull/42".to_owned(),
6143 number: 42,
6144 state: PrLifecycle::Open,
6145 checks: Checks::Green,
6146 blocking: Blocking::No,
6148 failing: Vec::new(),
6149 review_comments: vec![ReviewComment {
6150 author: "coderabbitai".to_owned(),
6151 path: Some("src/land.rs".to_owned()),
6152 line: Some(212),
6153 body: "this branch never checks the exit code".to_owned(),
6154 }],
6155 }
6156 }
6157
6158 #[test]
6159 fn github_facing_land_text_is_english_whatever_the_language() {
6160 let mut state = run_state();
6161 state.config.graph.language = "ja".to_owned();
6162 let comment = stop_comment(&state.id, "checks are still red");
6163 assert!(crate::github_text::check("", &comment).is_empty());
6164 assert!(comment.is_ascii(), "{comment}");
6165 assert!(comment.starts_with(MARKER));
6166
6167 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
6168 let ja_at = p.find("Write all prose in ja").unwrap();
6169 let rule_at = p.find(crate::prompt::GITHUB_ENGLISH_HEADING).unwrap();
6170 assert!(ja_at < rule_at, "{p}");
6171 assert!(p.contains("stays in Japanese"), "{p}");
6172
6173 state.config.graph.language = "en".to_owned();
6174 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
6175 assert!(p.contains(crate::prompt::GITHUB_ENGLISH_HEADING), "{p}");
6176 assert!(!p.contains("does not apply"), "{p}");
6177 }
6178
6179 const NUMSTAT: &str = "12\t3\tsrc/land.rs\n40\t1\tsrc/web.rs\n-\t-\tassets/logo.png";
6180
6181 fn panel() -> String {
6182 approval_panel(
6183 &run_state(),
6184 &green_pr(),
6185 NUMSTAT,
6186 "diff --git a/src/land.rs b/src/land.rs\n@@ -1,2 +1,2 @@\n-old line\n+new line\n context",
6187 &[
6188 "land: ask before merging".to_owned(),
6189 "land: colour the diff".to_owned(),
6190 ],
6191 "feat: merge approval from the phone",
6192 )
6193 }
6194
6195 #[test]
6196 fn the_approval_panel_carries_the_whole_case_for_the_merge() {
6197 let html = panel();
6198 for needle in [
6199 "42",
6200 "main",
6201 "src/land.rs",
6202 "src/web.rs",
6203 "assets/logo.png",
6204 "feat: merge approval from the phone",
6205 "land: ask before merging",
6206 "land: colour the diff",
6207 "coderabbitai",
6208 "this branch never checks the exit code",
6209 "green",
6210 ] {
6211 assert!(html.contains(needle), "the panel must state `{needle}`");
6212 }
6213 }
6214
6215 fn winning_candidate(summary: &str) -> Candidate {
6218 Candidate {
6219 index: 0,
6220 label: 'A',
6221 agent: "opus".to_owned(),
6222 branch: "magi/x/A".to_owned(),
6223 worktree: PathBuf::from("/wt/A"),
6224 summary: summary.to_owned(),
6225 stat: String::new(),
6226 files: 1,
6227 commits: 1,
6228 empty: false,
6229 failed: None,
6230 verified_noop: None,
6231 duration_ms: 0,
6232 folded: false,
6233 }
6234 }
6235
6236 fn uncontested_tally() -> Tally {
6237 Tally {
6238 first_choice: BTreeMap::from([('A', 1)]),
6239 borda: BTreeMap::new(),
6240 winner: 'A',
6241 rankings: 1,
6242 unanimous_initial: true,
6243 deliberated: false,
6244 changed_votes: 0,
6245 unanimous_final: true,
6246 tie_break: None,
6247 judges: 1,
6248 present: 1,
6249 quorum: 1,
6250 met_quorum: true,
6251 uncontested: None,
6252 }
6253 }
6254
6255 fn review_record(reviewer: usize, agent: &str, summary: &str) -> ReviewRecord {
6256 ReviewRecord {
6257 attempts: 0,
6258 reviewer,
6259 agent: agent.to_owned(),
6260 summary: summary.to_owned(),
6261 findings: Vec::new(),
6262 vote: None,
6263 failed: None,
6264 duration_ms: 0,
6265 }
6266 }
6267
6268 fn review_round(round: usize, reviews: Vec<ReviewRecord>) -> ReviewRound {
6269 let answered = reviews.len();
6270 ReviewRound {
6271 round,
6272 head: "abc1234".to_owned(),
6273 verified_head: None,
6274 verified_at: None,
6275 reviews,
6276 e2e: Vec::new(),
6277 verify_retried: false,
6278 e2e_deferred: false,
6279 e2e_defer_reason: None,
6280 fix: None,
6281 blocking: 0,
6282 answered,
6283 expected: answered,
6284 clean: true,
6285 progressed: false,
6286 vote_split: false,
6287 reconsideration: Vec::new(),
6288 verdict: None,
6289 }
6290 }
6291
6292 #[test]
6293 fn the_approval_panel_states_the_task_verbatim_in_either_language() {
6294 let en = panel();
6295 assert!(en.contains("Task"), "{en}");
6296 assert!(en.contains("add retries to the uploader"), "{en}");
6297
6298 let mut state = run_state();
6299 state.config.graph.language = "ja".to_owned();
6300 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6301 assert!(ja.contains("タスク"), "{ja}");
6302 assert!(
6303 ja.contains("add retries to the uploader"),
6304 "the task itself is not translated: {ja}"
6305 );
6306 }
6307
6308 #[test]
6309 fn the_approval_panel_omits_what_changed_and_review_verdict_with_no_data() {
6310 let html = panel();
6314 assert!(!html.contains("What changed"), "{html}");
6315 assert!(!html.contains("Review verdict"), "{html}");
6316 }
6317
6318 #[test]
6319 fn the_approval_panel_omits_what_changed_when_the_winners_summary_is_empty() {
6320 let mut state = run_state();
6321 state.candidates = vec![winning_candidate("")];
6322 state.tally = Some(uncontested_tally());
6323 let html = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6324 assert!(
6325 !html.contains("What changed"),
6326 "an empty summary must not render an empty box: {html}"
6327 );
6328 }
6329
6330 #[test]
6331 fn the_approval_panel_shows_the_winners_own_account_in_either_language() {
6332 let mut state = run_state();
6333 state.candidates = vec![winning_candidate(
6334 "Added a retry loop around the uploader PUT call.",
6335 )];
6336 state.tally = Some(uncontested_tally());
6337 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6338 assert!(en.contains("What changed"), "{en}");
6339 assert!(
6340 en.contains("Added a retry loop around the uploader PUT call."),
6341 "{en}"
6342 );
6343
6344 state.config.graph.language = "ja".to_owned();
6345 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6346 assert!(ja.contains("変更内容"), "{ja}");
6347 assert!(
6348 ja.contains("Added a retry loop around the uploader PUT call."),
6349 "{ja}"
6350 );
6351 }
6352
6353 #[test]
6354 fn the_approval_panel_shows_only_the_last_review_rounds_verdict() {
6355 let mut state = run_state();
6356 state.reviews = vec![
6357 review_round(
6358 1,
6359 vec![review_record(1, "alpha", "found a race, sent back")],
6360 ),
6361 review_round(2, vec![review_record(1, "alpha", "race is fixed, clean")]),
6362 ];
6363 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6364 assert!(en.contains("Review verdict"), "{en}");
6365 assert!(en.contains("race is fixed, clean"), "{en}");
6366 assert!(
6367 !en.contains("found a race, sent back"),
6368 "only the round that actually cleared the merge should show: {en}"
6369 );
6370
6371 state.config.graph.language = "ja".to_owned();
6372 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6373 assert!(ja.contains("レビューの結論"), "{ja}");
6374 assert!(ja.contains("レビュアー"), "{ja}");
6375 assert!(ja.contains("race is fixed, clean"), "{ja}");
6376 }
6377
6378 fn unanswered_review_record(reviewer: usize, agent: &str, reason: &str) -> ReviewRecord {
6384 ReviewRecord {
6385 attempts: 0,
6386 reviewer,
6387 agent: agent.to_owned(),
6388 summary: String::new(),
6389 findings: Vec::new(),
6390 vote: None,
6391 failed: Some(reason.to_owned()),
6392 duration_ms: 0,
6393 }
6394 }
6395
6396 #[test]
6397 fn the_approval_panel_never_shows_an_unanswered_seat_as_a_blank_verdict() {
6398 let mut state = run_state();
6399 state.reviews = vec![review_round(
6400 1,
6401 vec![
6402 review_record(1, "alpha", "clean, nothing to add"),
6403 unanswered_review_record(2, "beta", "timed out"),
6404 ],
6405 )];
6406 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6407 assert!(en.contains("clean, nothing to add"), "{en}");
6408 assert!(
6409 en.contains("produced no answer: timed out"),
6410 "a seat that never answered must say so, not render a blank box: {en}"
6411 );
6412 assert!(
6413 !en.contains("<div style=\"white-space:pre-wrap;font-size:13px\"></div>"),
6414 "no reviewer box may be left empty: {en}"
6415 );
6416
6417 state.config.graph.language = "ja".to_owned();
6418 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
6419 assert!(ja.contains("回答なし: timed out"), "{ja}");
6420 }
6421
6422 #[test]
6423 fn the_approval_panel_contains_nothing_the_frames_policy_would_block() {
6424 let html = panel();
6425 assert!(!html.contains("<script"), "no script survives the csp");
6426 assert!(!html.contains("<form"), "form-action is 'none'");
6427 let pr = green_pr();
6428 assert_eq!(
6429 html.matches("http").count(),
6430 html.matches(pr.url.as_str()).count(),
6431 "the only http url in the panel is the pull request's own link"
6432 );
6433 assert!(
6434 html.contains("target=\"_blank\""),
6435 "the PR link must open in a new tab so it escapes the iframe"
6436 );
6437 assert!(
6438 html.contains("rel=\"noopener noreferrer\""),
6439 "external links opening in new tabs must carry noopener noreferrer"
6440 );
6441 }
6442
6443 #[test]
6444 fn added_and_removed_diff_lines_are_distinguishable_without_colour() {
6445 let html = panel();
6446 assert!(
6447 html.contains(">+</span>"),
6448 "an added line carries a `+` in the gutter, not only a background"
6449 );
6450 assert!(
6451 html.contains(">-</span>"),
6452 "a removed line carries a `-` in the gutter, not only a background"
6453 );
6454 assert!(
6455 html.contains(">new line</span>"),
6456 "the marker is moved to the gutter, so the body is printed once without it"
6457 );
6458 }
6459
6460 #[test]
6461 fn a_diff_past_the_threshold_is_cut_with_an_honest_count() {
6462 let total = DIFF_MAX_LINES + 100;
6463 let diff: String = (0..total).map(|i| format!("+line {i}\n")).collect();
6464 let html = approval_panel(
6465 &run_state(),
6466 &green_pr(),
6467 NUMSTAT,
6468 &diff,
6469 &[],
6470 "feat: something long",
6471 );
6472 assert!(
6473 html.contains(&format!("100 of {total} diff lines omitted")),
6474 "the note must say exactly how much was cut"
6475 );
6476 assert!(html.contains(&format!("line {}", DIFF_MAX_LINES - 1)));
6477 assert!(
6478 !html.contains(&format!("line {DIFF_MAX_LINES}")),
6479 "nothing past the threshold is rendered"
6480 );
6481 assert!(
6482 html.contains("/repo/magi"),
6483 "the note says where the rest is"
6484 );
6485 }
6486
6487 #[test]
6488 fn a_path_with_html_metacharacters_is_escaped_rather_than_rendered() {
6489 let html = approval_panel(
6490 &run_state(),
6491 &green_pr(),
6492 "1\t2\tsrc/<b>&\"x\"'.rs",
6493 "",
6494 &[],
6495 "subject",
6496 );
6497 assert!(html.contains("src/<b>&"x"'.rs"));
6498 assert!(
6499 !html.contains("<b>"),
6500 "an agent-influenced path must never become markup"
6501 );
6502 }
6503
6504 #[tokio::test]
6505 async fn the_merge_lock_serialises_one_repository_but_never_a_different_one() {
6506 let a = std::path::PathBuf::from("/repo/a");
6507 let b = std::path::PathBuf::from("/repo/b");
6508
6509 let held = repo_merge_lock(&a).lock_owned().await;
6510
6511 assert!(
6514 repo_merge_lock(&a).try_lock().is_err(),
6515 "a second merge into the same repository must not proceed concurrently"
6516 );
6517
6518 assert!(
6522 repo_merge_lock(&b).try_lock().is_ok(),
6523 "a different repository's merge lock must be independent"
6524 );
6525
6526 drop(held);
6527 assert!(
6528 repo_merge_lock(&a).try_lock().is_ok(),
6529 "the lock is released once the holder is done"
6530 );
6531 }
6532
6533 pub(crate) fn repair_state(major: bool, reject: bool) -> RunState {
6534 let mut state = landing_state();
6535 let mut rec = review_record(1, "alpha", "precise rejection reason");
6536 rec.vote = Some(if reject {
6537 crate::verdict::ReviewVote::Reject
6538 } else {
6539 crate::verdict::ReviewVote::Approve
6540 });
6541 if major {
6542 rec.findings = contested().findings;
6543 }
6544 let mut round = review_round(1, vec![rec]);
6545 round.clean = false;
6546 round.blocking = usize::from(major);
6547 state.reviews.push(round);
6548 state.config.graph.review_rounds = 1;
6549 state
6550 }
6551
6552 #[test]
6553 fn merge_repair_choice_covers_major_only_and_reject_only_without_contested_and() {
6554 for (major, reject) in [(true, false), (false, true), (true, true)] {
6555 let state = repair_state(major, reject);
6556 assert!(repair_available(&state));
6557 assert_eq!(&approval_choices(&state)[..3], [APPROVE, HOLD, REPAIR]);
6558 }
6559 assert!(!repair_available(&repair_state(false, false)));
6560 let mut clean = repair_state(true, false);
6561 clean.reviews[0].clean = true;
6562 assert_eq!(&approval_choices(&clean)[..3], [APPROVE, HOLD, REPAIR]);
6563 assert_eq!(approval(Some(REPAIR)), Approval::Repair);
6564 }
6565
6566 #[tokio::test]
6567 async fn merge_repair_upgrades_legacy_questions_and_snapshots_exact_evidence_once() {
6568 let mut state = repair_state(true, false);
6569 let pr = green_pr();
6570 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6571 .await
6572 .unwrap();
6573 let store = ask::Questions::open();
6574 let id = state.land_approval.as_ref().unwrap().question.clone();
6575 store
6577 .update(&id, |q| {
6578 q.choices = vec![APPROVE.into(), HOLD.into()];
6579 Ok(())
6580 })
6581 .unwrap();
6582 let upgraded = store.get(&id).unwrap();
6583 assert_eq!(upgraded.choices, approval_choices(&state));
6584 assert!(!upgraded.actions.contains_key(HOLD));
6585 assert_eq!(store.get(&id).unwrap().choices, upgraded.choices);
6586 assert!(
6587 store
6588 .list()
6589 .iter()
6590 .any(|q| q.id == id && q.choices == upgraded.choices)
6591 );
6592 assert!(
6593 crate::prompt::chat_consult(&upgraded).contains("--reply 'fix findings and re-review'")
6594 );
6595 assert!(deputy_brief(&upgraded, Some(&state)).contains("never approves a merge"));
6596 store
6597 .update(&id, |q| q.answer(ask::Answer::Choice(REPAIR.into())))
6598 .unwrap();
6599 store
6602 .update(&id, |q| {
6603 q.actions.clear();
6604 Ok(())
6605 })
6606 .unwrap();
6607 assert_eq!(
6608 store.get(&id).unwrap().chosen_action(),
6609 Some(&ask::ChoiceAction::Resume {
6610 run: state.id.clone()
6611 })
6612 );
6613 let binding = state.land_approval.clone();
6614 assert_eq!(
6615 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6616 .await
6617 .unwrap(),
6618 ApprovalGate::Repair
6619 );
6620 assert!(state.land_approval.is_none());
6621 assert_eq!(state.merge_repairs.len(), 1);
6622 let request = &state.merge_repairs[0];
6623 assert_eq!(request.question, id);
6624 assert_eq!(request.head, "abc");
6625 assert_eq!(request.pr, pr.url);
6626 assert_eq!(
6627 request.reviews[0].reviews[0].summary,
6628 "precise rejection reason"
6629 );
6630 assert_eq!(request.reviews[0].reviews[0].findings[0].id, "R3-1-1");
6631 assert_eq!(
6632 request.reviews[0].reviews[0].findings[0].detail,
6633 state.reviews[0].reviews[0].findings[0].detail
6634 );
6635 state.land_approval = binding;
6637 assert_eq!(
6638 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6639 .await
6640 .unwrap(),
6641 ApprovalGate::Repair
6642 );
6643 assert_eq!(state.merge_repairs.len(), 1);
6644 }
6645
6646 #[tokio::test]
6647 async fn merge_repair_answer_never_merges_and_hold_never_requests_repair() {
6648 for choice in [REPAIR, HOLD] {
6649 let mut state = repair_state(false, true);
6650 let observed = seen("abc", Checks::Green, "CLEAN", false);
6651 approval_gate(&mut state, &observed.pr, "feat: x", None, "abc")
6652 .await
6653 .unwrap();
6654 let id = state.land_approval.as_ref().unwrap().question.clone();
6655 ask::Questions::open()
6656 .update(&id, |q| q.answer(ask::Answer::Choice(choice.into())))
6657 .unwrap();
6658 let forge = Scripted::new(vec![observed], vec![(true, "")]);
6659 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
6660 .await
6661 .unwrap();
6662 assert!(
6663 forge
6664 .argvs()
6665 .iter()
6666 .all(|a| a.iter().any(|s| s == "--disable-auto"))
6667 );
6668 assert!(!forge.calls().contains(&"fix"));
6669 assert_eq!(state.merge_repairs.len(), usize::from(choice == REPAIR));
6670 assert_ne!(state.status, RunStatus::Merged);
6671 }
6672 }
6673
6674 #[test]
6675 fn only_the_merge_choice_merges_and_silence_holds() {
6676 let table = [
6677 (None, Approval::Hold),
6678 (Some("merge"), Approval::Merge),
6679 (Some(" merge\n"), Approval::Merge),
6680 (Some("hold"), Approval::Hold),
6681 (Some(""), Approval::Hold),
6682 (Some("yes"), Approval::Hold),
6683 ];
6684 for (answer, want) in table {
6685 assert_eq!(
6686 approval(answer),
6687 want,
6688 "answer {answer:?} must resolve to {want:?}"
6689 );
6690 }
6691 }
6692
6693 #[tokio::test]
6694 async fn a_first_visit_to_the_merge_gate_files_a_question_and_returns_pending_at_once() {
6695 let mut state = landing_state();
6696 state.config.graph.land_approval = true;
6697 let pr = green_pr();
6698
6699 let gate = approval_gate(&mut state, &pr, "feat: x", None, "abc")
6700 .await
6701 .unwrap();
6702 assert_eq!(gate, ApprovalGate::Pending, "nobody has answered yet");
6703 assert!(
6704 !state.parked,
6705 "approval_gate itself never sets `parked`; only its caller does"
6706 );
6707
6708 let store = ask::Questions::open();
6709 let filed: Vec<_> = store
6710 .list()
6711 .into_iter()
6712 .filter(|q| q.run == state.id)
6713 .collect();
6714 assert_eq!(filed.len(), 1, "exactly one question is filed");
6715 assert_eq!(filed[0].node, APPROVAL_NODE);
6716 assert_eq!(filed[0].choices, approval_choices(&state));
6717 assert!(filed[0].status.open());
6718
6719 let again = approval_gate(&mut state, &pr, "feat: x", None, "abc")
6723 .await
6724 .unwrap();
6725 assert_eq!(again, ApprovalGate::Pending);
6726 let still_one = store
6727 .list()
6728 .into_iter()
6729 .filter(|q| q.run == state.id)
6730 .count();
6731 assert_eq!(
6732 still_one, 1,
6733 "asking twice must not double-file the question"
6734 );
6735 }
6736
6737 #[tokio::test]
6738 async fn approving_the_existing_question_is_read_back_as_approved() {
6739 crate::run::pin_test_home();
6740 let mut state = run_state();
6741 state.config.graph.land_approval = true;
6742 let pr = green_pr();
6743 assert_eq!(
6744 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6745 .await
6746 .unwrap(),
6747 ApprovalGate::Pending
6748 );
6749
6750 let store = ask::Questions::open();
6751 let mut q = store
6752 .list()
6753 .into_iter()
6754 .find(|q| q.run == state.id)
6755 .expect("filed above");
6756 let talks = crate::talk::Talks::open();
6757 let cfg = crate::config::Config {
6758 agents: vec![crate::config::AgentSpec {
6759 id: "mock".into(),
6760 kind: crate::config::AgentKind::Command,
6761 model: None,
6762 command: vec!["true".into()],
6763 extra_args: Vec::new(),
6764 env: Default::default(),
6765 prompt_delivery: None,
6766 }],
6767 ..crate::config::Config::default()
6768 };
6769 let mut talk = crate::talk::begin(&talks, &cfg, state.repo.clone(), Some("mock")).unwrap();
6770 crate::consult::begin(&store, &talks, &q, &talk).unwrap();
6771 crate::talk::drain(&mut talk, &talks).unwrap();
6772 assert_eq!(
6773 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6774 .await
6775 .unwrap(),
6776 ApprovalGate::Pending,
6777 "consultation cannot approve or hold the merge"
6778 );
6779 q = store.get(&q.id).unwrap();
6780 assert!(q.answer.is_none());
6781 talk.turns.push(crate::talk::Turn {
6782 sender: None,
6783 breaks: Some(Vec::new()),
6784 messages: Vec::new(),
6785 posted_by: None,
6786 who: crate::talk::Who::Operator,
6787 body: "merge abc".into(),
6788 at: Timestamp::now(),
6789 attachments: Vec::new(),
6790 usage: None,
6791 });
6792 talks.put(&mut talk).unwrap();
6793 crate::consult::validate_answer(
6794 &q,
6795 &talks,
6796 &talk.id,
6797 crate::queue::CHAT_NODE,
6798 APPROVE,
6799 Some("merge abc"),
6800 )
6801 .unwrap();
6802 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
6803 store.put(&mut q).unwrap();
6804
6805 assert_eq!(
6806 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6807 .await
6808 .unwrap(),
6809 ApprovalGate::Approved
6810 );
6811 }
6812
6813 #[tokio::test]
6814 async fn legacy_hold_actions_are_removed_on_get_and_list_before_answering() {
6815 crate::run::pin_test_home();
6816 let store = ask::Questions::open();
6817 for via_list in [false, true] {
6818 let mut state = repair_state(false, true);
6819 let pr = green_pr();
6820 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6821 .await
6822 .unwrap();
6823 let id = state.land_approval.as_ref().unwrap().question.clone();
6824 store
6825 .update(&id, |q| {
6826 q.actions.insert(
6827 HOLD.to_owned(),
6828 ask::ChoiceAction::Resume {
6829 run: state.id.clone(),
6830 },
6831 );
6832 Ok(())
6833 })
6834 .unwrap();
6835 let q = if via_list {
6836 store.list().into_iter().find(|q| q.id == id).unwrap()
6837 } else {
6838 store.get(&id).unwrap()
6839 };
6840 assert!(!q.actions.contains_key(HOLD));
6841 store
6842 .update(&id, |q| {
6843 assert!(!q.actions.contains_key(HOLD));
6845 assert!(!upgrade_repair_choice(q, &state));
6846 q.answer(ask::Answer::Choice(HOLD.to_owned()))
6847 })
6848 .unwrap();
6849 assert!(store.get(&id).unwrap().chosen_action().is_none());
6850 assert_eq!(
6851 approval_gate(&mut state, &pr, "feat: x", None, "abc")
6852 .await
6853 .unwrap(),
6854 ApprovalGate::Held
6855 );
6856 }
6857 }
6858
6859 #[tokio::test]
6860 async fn holding_or_abandoning_the_existing_question_is_read_back_as_held() {
6861 crate::run::pin_test_home();
6862 let store = ask::Questions::open();
6863
6864 let mut held_state = run_state();
6865 held_state.config.graph.land_approval = true;
6866 let pr = green_pr();
6867 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
6868 .await
6869 .unwrap();
6870 let mut q = store
6871 .list()
6872 .into_iter()
6873 .find(|q| q.run == held_state.id)
6874 .expect("filed above");
6875 q.answer(ask::Answer::Choice(HOLD.to_owned())).unwrap();
6876 store.put(&mut q).unwrap();
6877 assert_eq!(
6878 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
6879 .await
6880 .unwrap(),
6881 ApprovalGate::Held
6882 );
6883
6884 let mut abandoned_state = run_state();
6885 abandoned_state.config.graph.land_approval = true;
6886 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
6887 .await
6888 .unwrap();
6889 let mut q = store
6890 .list()
6891 .into_iter()
6892 .find(|q| q.run == abandoned_state.id)
6893 .expect("filed above");
6894 q.abandon("no answer within the timeout");
6895 store.put(&mut q).unwrap();
6896 assert_eq!(
6897 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
6898 .await
6899 .unwrap(),
6900 ApprovalGate::Held,
6901 "silence must never merge"
6902 );
6903 }
6904
6905 fn contested() -> ContestedHandoff {
6906 let finding = |id: &str, n: u32| crate::verdict::Finding {
6907 id: id.to_owned(),
6908 severity: crate::verdict::Severity::Major,
6909 file: Some("src/a.rs".to_owned()),
6910 line: Some(n),
6911 title: format!("problem {id}"),
6912 detail: String::new(),
6913 };
6914 ContestedHandoff {
6915 findings: (1..=7).map(|n| finding(&format!("R3-1-{n}"), n)).collect(),
6916 rejecters: vec![(1, "alpha".to_owned())],
6917 }
6918 }
6919
6920 #[test]
6921 fn the_contested_record_is_asked_about_unless_the_switch_is_off() {
6922 let mut state = run_state();
6923 assert!(contested_to_ask(&state).is_none(), "nothing recorded");
6924 state.contested_handoff = Some(contested());
6925 assert!(contested_to_ask(&state).is_some());
6926 state.config.graph.hold_contested_merge = false;
6927 assert!(
6928 contested_to_ask(&state).is_none(),
6929 "the switch restores today"
6930 );
6931 }
6932
6933 #[test]
6934 fn the_deputy_brief_carries_the_pr_the_findings_and_names_what_is_missing() {
6935 let q = ask::Question::new(
6936 "run-1".to_owned(),
6937 APPROVAL_NODE.to_owned(),
6938 "land".to_owned(),
6939 "Merge?".to_owned(),
6940 String::new(),
6941 vec![APPROVE.to_owned(), HOLD.to_owned()],
6942 );
6943 let none = deputy_brief(&q, None);
6944 assert!(none.contains("could not be read"), "{none}");
6945 assert!(none.contains("Silence is a hold"), "{none}");
6946
6947 let mut state = run_state();
6948 state.pr = Some(crate::run::PrRecord {
6949 url: "https://example.test/pull/7".to_owned(),
6950 number: 7,
6951 state: "open".to_owned(),
6952 checks: "green".to_owned(),
6953 round: 0,
6954 rounds: 3,
6955 red_at_merge: Vec::new(),
6956 });
6957 state.contested_handoff = Some(contested());
6958 let b = deputy_brief(&q, Some(&state));
6959 assert!(b.contains("https://example.test/pull/7"), "{b}");
6960 assert!(b.contains("[R3-1-1] major (src/a.rs:1)"), "{b}");
6961 assert!(b.contains("#1"), "the rejecting seat: {b}");
6962 state.contested_handoff = None;
6963 assert!(deputy_brief(&q, Some(&state)).contains("not recorded as contested"));
6964 }
6965
6966 #[test]
6967 fn the_contested_question_names_the_pr_the_findings_and_the_rejecter() {
6968 for lang in ["en", "ja"] {
6969 let mut cfg = crate::config::Config::default();
6970 cfg.graph.language = lang.to_owned();
6971 let w = words(&cfg.graph.language);
6972 let text = w.approval_detail(
6973 "https://github.com/yukimemi/magi/pull/42",
6974 "main",
6975 "feat: x",
6976 Some(&contested()),
6977 );
6978 assert!(text.contains("pull/42"), "{text}");
6979 assert!(
6980 text.contains("R3-1-1 major src/a.rs:1: problem R3-1-1"),
6981 "{text}"
6982 );
6983 assert!(text.contains("R3-1-5"), "{text}");
6984 assert!(!text.contains("R3-1-6"), "the list is capped: {text}");
6985 assert!(text.contains("2"), "the rest are counted: {text}");
6986 assert!(text.contains("#1 (alpha)"), "{text}");
6987 }
6988 let plain = words("en").approval_detail("u", "main", "s", None);
6989 assert!(!plain.contains("reject"), "{plain}");
6990 }
6991
6992 #[tokio::test]
6993 async fn a_contested_question_is_filed_once_and_a_resume_finds_the_same_one() {
6994 crate::run::pin_test_home();
6995 let mut state = run_state();
6996 state.config.graph.land_approval = false;
6997 state.contested_handoff = Some(contested());
6998 let pr = green_pr();
6999 let c = contested_to_ask(&state);
7000 assert_eq!(
7001 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
7002 .await
7003 .unwrap(),
7004 ApprovalGate::Pending,
7005 "silence is a hold"
7006 );
7007 let store = ask::Questions::open();
7008 let filed: Vec<_> = store
7009 .list()
7010 .into_iter()
7011 .filter(|q| q.run == state.id)
7012 .collect();
7013 assert_eq!(filed.len(), 1);
7014 assert!(filed[0].detail.contains("R3-1-1"), "{}", filed[0].detail);
7015
7016 assert_eq!(
7017 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
7018 .await
7019 .unwrap(),
7020 ApprovalGate::Pending
7021 );
7022 let mut q = store
7023 .list()
7024 .into_iter()
7025 .find(|q| q.run == state.id)
7026 .unwrap();
7027 assert_eq!(q.id, filed[0].id, "the same question after a resume");
7028 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
7029 store.put(&mut q).unwrap();
7030 assert_eq!(
7031 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
7032 .await
7033 .unwrap(),
7034 ApprovalGate::Approved
7035 );
7036 }
7037
7038 #[test]
7039 fn the_diffstat_table_is_ordered_by_churn_with_binaries_last() {
7040 let rows = parse_numstat(NUMSTAT);
7041 assert_eq!(
7042 rows.iter().map(|r| r.path.as_str()).collect::<Vec<_>>(),
7043 ["src/web.rs", "src/land.rs", "assets/logo.png"]
7044 );
7045 assert_eq!(rows[2].added, None, "a binary file has no line counts");
7046 }
7047 #[test]
7048 fn the_approval_speaks_the_language_the_repository_is_configured_for() {
7049 let mut state = run_state();
7053 state.config.graph.language = "ja".to_owned();
7054 let pr = green_pr();
7055 let commits = ["c1".to_owned()];
7056
7057 let ja = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
7058 assert!(ja.contains("lang=\"ja\""), "the document must declare it");
7059 assert!(ja.contains("squash されるコミット"), "{ja}");
7060 assert!(ja.contains("レビューコメント"), "{ja}");
7061 assert!(ja.contains("差分"), "{ja}");
7062 assert!(
7063 !ja.contains("Commits being squashed"),
7064 "no English left over"
7065 );
7066
7067 let w = words("ja");
7068 assert!(w.approval_summary(17, "feat: x").contains("マージ"));
7069 assert!(
7070 w.approval_detail("http://x/1", "main", "feat: x", None)
7071 .contains("パネル")
7072 );
7073
7074 assert!(ja.contains("src/a.rs"), "the diffstat is not prose");
7076 assert!(ja.contains("feat: x"), "nor is the merge subject");
7077
7078 state.config.graph.language = "en".to_owned();
7081 let en = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
7082 assert!(en.contains("Commits being squashed"), "{en}");
7083 assert_eq!(words("Klingon").html_lang, "en");
7084 }
7085
7086 #[test]
7090 fn pick_open_pr_classifies_by_count_and_base() {
7091 let one = r#"[{"number":58,"url":"https://x/pull/58","title":"t","baseRefName":"main"}]"#;
7092 assert_eq!(
7093 pick_open_pr(one, "main").unwrap(),
7094 OpenPr::One {
7095 url: "https://x/pull/58".into(),
7096 title: "t".into()
7097 }
7098 );
7099 assert_eq!(pick_open_pr("[]", "main").unwrap(), OpenPr::None);
7100 assert_eq!(pick_open_pr(one, "dev").unwrap(), OpenPr::None);
7101 let two = r#"[{"number":1,"url":"u1","title":"","baseRefName":"main"},
7102 {"number":2,"url":"u2","title":"","baseRefName":"main"}]"#;
7103 assert_eq!(
7104 pick_open_pr(two, "main").unwrap(),
7105 OpenPr::Many(vec!["u1".into(), "u2".into()])
7106 );
7107 let fork = r#"[{"url":"f","baseRefName":"main","isCrossRepository":true}]"#;
7109 assert_eq!(pick_open_pr(fork, "main").unwrap(), OpenPr::None);
7110 assert!(pick_open_pr("not json", "main").is_err());
7111 assert!(pick_open_pr(r#"[{"url":"u","title":"t"}]"#, "main").is_err());
7113 assert!(pick_open_pr(r#"[{"title":"t","baseRefName":"main"}]"#, "main").is_err());
7114 }
7115
7116 #[test]
7117 fn pick_merged_pr_picks_the_unique_match() {
7118 let json = r#"[
7119 {"url": "https://github.com/o/r/pull/42", "number": 42,
7120 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"}
7121 ]"#;
7122 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7123 let found = pick_merged_pr(json, "main", created_at)
7124 .expect("valid json")
7125 .expect("one unambiguous match");
7126 assert_eq!(found.url, "https://github.com/o/r/pull/42");
7127 assert_eq!(found.number, 42);
7128 }
7129
7130 #[test]
7134 fn pick_merged_pr_refuses_when_more_than_one_candidate_survives() {
7135 let json = r#"[
7136 {"url": "https://github.com/o/r/pull/42", "number": 42,
7137 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"},
7138 {"url": "https://github.com/o/r/pull/43", "number": 43,
7139 "mergedAt": "2026-09-21T10:00:00Z", "baseRefName": "main"}
7140 ]"#;
7141 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7142 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
7143 }
7144
7145 #[test]
7149 fn pick_merged_pr_ignores_a_different_base_branch() {
7150 let json = r#"[
7151 {"url": "https://github.com/o/r/pull/42", "number": 42,
7152 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "release"}
7153 ]"#;
7154 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7155 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
7156 }
7157
7158 #[test]
7161 fn pick_merged_pr_ignores_a_merge_that_predates_the_run() {
7162 let json = r#"[
7163 {"url": "https://github.com/o/r/pull/42", "number": 42,
7164 "mergedAt": "2026-09-18T10:00:00Z", "baseRefName": "main"}
7165 ]"#;
7166 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
7167 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
7168 }
7169
7170 #[test]
7171 fn slug_of_pr_url_reads_host_owner_and_repo() {
7172 assert_eq!(
7173 slug_of_pr_url("https://github.com/yukimemi/shun/pull/272").as_deref(),
7174 Some("github.com/yukimemi/shun")
7175 );
7176 }
7177
7178 #[test]
7179 fn slug_of_pr_url_refuses_a_url_with_no_pull_segment() {
7180 assert_eq!(slug_of_pr_url("https://github.com/yukimemi/shun"), None);
7181 assert_eq!(slug_of_pr_url("not a url at all"), None);
7182 assert_eq!(slug_of_pr_url("https://github.com"), None);
7183 }
7184
7185 #[test]
7186 fn slug_of_repo_url_reads_host_owner_and_repo() {
7187 assert_eq!(
7188 slug_of_repo_url("https://github.com/yukimemi/magi").as_deref(),
7189 Some("github.com/yukimemi/magi")
7190 );
7191 assert_eq!(slug_of_repo_url("https://github.com"), None);
7192 }
7193
7194 #[test]
7195 fn ensure_same_repo_accepts_a_matching_slug_regardless_of_case() {
7196 ensure_same_repo("github.com/yukimemi/magi", "GitHub.Com/YukiMemi/Magi")
7197 .expect("same repo, different case");
7198 }
7199
7200 #[test]
7205 fn ensure_same_repo_refuses_a_different_repo() {
7206 let err =
7207 ensure_same_repo("github.com/yukimemi/magi", "github.com/yukimemi/shun").unwrap_err();
7208 let msg = format!("{err:#}");
7209 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
7210 assert!(msg.contains("github.com/yukimemi/shun"), "{msg}");
7211 }
7212
7213 #[test]
7218 fn ensure_same_repo_refuses_the_same_slug_on_a_different_host() {
7219 let err = ensure_same_repo(
7220 "github.com/yukimemi/magi",
7221 "github.example.com/yukimemi/magi",
7222 )
7223 .unwrap_err();
7224 let msg = format!("{err:#}");
7225 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
7226 assert!(msg.contains("github.example.com/yukimemi/magi"), "{msg}");
7227 }
7228
7229 #[tokio::test]
7234 async fn find_external_merge_returns_none_without_a_winner() {
7235 let state = RunState::new(
7236 PathBuf::from("/no/such/repo"),
7237 "main".to_owned(),
7238 "0000000000000000000000000000000000000000".to_owned(),
7239 "irrelevant".to_owned(),
7240 crate::config::Config::default(),
7241 );
7242 assert_eq!(find_external_merge(&state).await.unwrap(), None);
7243 }
7244
7245 fn pr_run(home: &Path, id: &str, repo: &str, status: RunStatus, url: &str, state: &str) {
7246 let mut run = RunState::new(
7247 PathBuf::from(repo),
7248 "main".to_owned(),
7249 "abcdef1234".to_owned(),
7250 "x".to_owned(),
7251 crate::config::Config::default(),
7252 );
7253 run.id = id.to_owned();
7254 run.status = status;
7255 run.driver_exited = true;
7256 run.pr = Some(crate::run::PrRecord {
7257 number: url.rsplit('/').next().unwrap().parse().unwrap(),
7258 url: url.to_owned(),
7259 state: state.to_owned(),
7260 checks: "red".to_owned(),
7261 round: 0,
7262 rounds: 2,
7263 red_at_merge: Vec::new(),
7264 });
7265 run.save_under(home).unwrap();
7266 }
7267
7268 fn recorded(home: &Path, id: &str) -> String {
7269 let body = std::fs::read_to_string(home.join("runs").join(id).join("run.json")).unwrap();
7270 serde_json::from_str::<RunState>(&body)
7271 .unwrap()
7272 .pr
7273 .unwrap()
7274 .state
7275 }
7276
7277 const PR: &str = "https://github.com/o/r/pull/7";
7278
7279 #[test]
7280 fn write_through_updates_predecessors_and_siblings_only() {
7281 let tmp = tempfile::tempdir().unwrap();
7282 let h = tmp.path();
7283 pr_run(
7284 h,
7285 "20261004-100000-aaaa",
7286 "/repo/r",
7287 RunStatus::Superseded,
7288 PR,
7289 "open",
7290 );
7291 pr_run(
7292 h,
7293 "20261004-100100-bbbb",
7294 "/repo/r",
7295 RunStatus::Blocked,
7296 PR,
7297 "open",
7298 );
7299 pr_run(
7301 h,
7302 "20261004-100200-cccc",
7303 "/repo/r",
7304 RunStatus::Landing,
7305 PR,
7306 "open",
7307 );
7308 pr_run(
7310 h,
7311 "20261004-100300-dddd",
7312 "/repo/other",
7313 RunStatus::Blocked,
7314 "https://github.com/o/other/pull/7",
7315 "open",
7316 );
7317 pr_run(
7319 h,
7320 "20261004-100400-eeee",
7321 "/repo/r",
7322 RunStatus::Blocked,
7323 "https://github.com/o/r/pull/8",
7324 "open",
7325 );
7326 pr_run(
7327 h,
7328 "20261004-100500-ffff",
7329 "/repo/r",
7330 RunStatus::Merged,
7331 PR,
7332 "open",
7333 );
7334 let source = RunState::load_under("20261004-100500-ffff", h).unwrap();
7335
7336 assert_eq!(
7337 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
7338 2
7339 );
7340 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
7341 assert_eq!(recorded(h, "20261004-100100-bbbb"), "merged");
7342 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
7343 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
7344 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
7345 assert_eq!(recorded(h, "20261004-100500-ffff"), "open");
7347 assert_eq!(
7349 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
7350 0
7351 );
7352 let hit = RunState::load_under("20261004-100000-aaaa", h).unwrap();
7353 assert!(hit.events.iter().any(|e| e.message.contains("merged")));
7354 }
7355
7356 #[test]
7357 fn lifecycle_updates_preserve_live_and_unknown_terminal_drivers() {
7358 let home = tempfile::tempdir().unwrap();
7359 let live_id = "20261004-100000-aaaa";
7360 let unknown_id = "20261004-100100-bbbb";
7361 for id in [live_id, unknown_id] {
7362 pr_run(home.path(), id, "repo", RunStatus::Ready, PR, "open");
7363 let mut s = RunState::load_under(id, home.path()).unwrap();
7364 s.driver_exited = false;
7365 if id == live_id {
7366 s.driver_pid = Some(std::process::id());
7367 s.driver_started_at = crate::proc::process_started_at(std::process::id());
7368 }
7369 s.save_under(home.path()).unwrap();
7370 }
7371 let known = BTreeMap::from([(PR.to_owned(), PrLifecycle::Merged)]);
7372 assert_eq!(apply_pr_states(home.path(), &known), 0);
7373 for id in [live_id, unknown_id] {
7374 assert_eq!(recorded(home.path(), id), "open");
7375 }
7376 }
7377
7378 #[test]
7379 fn repair_rewrites_merged_and_closed_and_leaves_open_and_unknown() {
7380 let tmp = tempfile::tempdir().unwrap();
7381 let h = tmp.path();
7382 let url = |n: u32| format!("https://github.com/o/r/pull/{n}");
7383 pr_run(
7384 h,
7385 "20261004-100000-aaaa",
7386 "/repo/r",
7387 RunStatus::Superseded,
7388 &url(1),
7389 "open",
7390 );
7391 pr_run(
7392 h,
7393 "20261004-100100-bbbb",
7394 "/repo/r",
7395 RunStatus::Blocked,
7396 &url(2),
7397 "open",
7398 );
7399 pr_run(
7400 h,
7401 "20261004-100200-cccc",
7402 "/repo/r",
7403 RunStatus::Ready,
7404 &url(3),
7405 "open",
7406 );
7407 pr_run(
7408 h,
7409 "20261004-100300-dddd",
7410 "/repo/r",
7411 RunStatus::Ready,
7412 &url(4),
7413 "open",
7414 );
7415 pr_run(
7416 h,
7417 "20261004-100400-eeee",
7418 "/repo/r",
7419 RunStatus::Implementing,
7420 &url(1),
7421 "open",
7422 );
7423 assert_eq!(stale_open_prs(h).len(), 4);
7424
7425 let mut known = BTreeMap::new();
7426 known.insert(url(1), PrLifecycle::Merged);
7427 known.insert(url(2), PrLifecycle::Closed);
7428 known.insert(url(3), PrLifecycle::Open);
7429 assert_eq!(apply_pr_states(h, &known), 2);
7431 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
7432 assert_eq!(recorded(h, "20261004-100100-bbbb"), "closed");
7433 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
7434 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
7435 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
7436 assert_eq!(apply_pr_states(h, &known), 0);
7437 }
7438
7439 use std::collections::VecDeque;
7442 use std::sync::Mutex;
7443
7444 struct Scripted {
7447 views: Mutex<VecDeque<Seen>>,
7448 merges: Mutex<VecDeque<(bool, String)>>,
7449 fix: Mutex<Option<Fixed>>,
7450 log: Mutex<Vec<&'static str>>,
7451 argvs: Mutex<Vec<Vec<String>>>,
7452 required: Mutex<Option<BTreeSet<String>>>,
7453 merged: Mutex<bool>,
7456 queued: Mutex<bool>,
7457 unreadable_after_merge: Mutex<bool>,
7459 reruns: Mutex<Vec<String>>,
7461 rerun_fails: Mutex<bool>,
7462 clock: Mutex<i64>,
7464 }
7465
7466 impl Scripted {
7467 fn new(views: Vec<Seen>, merges: Vec<(bool, &str)>) -> Self {
7468 Self {
7469 views: Mutex::new(views.into()),
7470 merges: Mutex::new(
7471 merges
7472 .into_iter()
7473 .map(|(ok, m)| (ok, m.to_owned()))
7474 .collect(),
7475 ),
7476 fix: Mutex::new(None),
7477 log: Mutex::new(Vec::new()),
7478 argvs: Mutex::new(Vec::new()),
7479 required: Mutex::new(None),
7480 merged: Mutex::new(false),
7481 queued: Mutex::new(false),
7482 unreadable_after_merge: Mutex::new(false),
7483 reruns: Mutex::new(Vec::new()),
7484 rerun_fails: Mutex::new(false),
7485 clock: Mutex::new(1_000),
7486 }
7487 }
7488 fn argvs(&self) -> Vec<Vec<String>> {
7489 self.argvs.lock().unwrap().clone()
7490 }
7491 fn calls(&self) -> Vec<&'static str> {
7492 self.log.lock().unwrap().clone()
7493 }
7494 }
7495
7496 impl Forge for Scripted {
7497 async fn view(&self, _repo: &Path, _url: &str) -> Result<Seen> {
7498 self.log.lock().unwrap().push("view");
7499 if *self.unreadable_after_merge.lock().unwrap()
7500 && !self.argvs.lock().unwrap().is_empty()
7501 {
7502 anyhow::bail!("forge unreachable");
7503 }
7504 let mut v = self.views.lock().unwrap();
7505 let mut seen = if v.len() > 1 {
7506 v.pop_front().unwrap()
7507 } else {
7508 v[0].clone()
7509 };
7510 if *self.merged.lock().unwrap() {
7511 seen.pr.state = PrLifecycle::Merged;
7512 }
7513 Ok(seen)
7514 }
7515 async fn merge(&self, _repo: &Path, argv: &[String]) -> Result<(bool, String)> {
7516 self.log.lock().unwrap().push("merge");
7517 self.argvs.lock().unwrap().push(argv.to_vec());
7518 let out = self
7519 .merges
7520 .lock()
7521 .unwrap()
7522 .pop_front()
7523 .expect("unscripted merge");
7524 if out.0 && !*self.queued.lock().unwrap() && !argv.iter().any(|a| a == "--disable-auto")
7525 {
7526 *self.merged.lock().unwrap() = true;
7527 }
7528 Ok(out)
7529 }
7530 async fn poll(&self) {
7531 self.log.lock().unwrap().push("poll");
7532 *self.clock.lock().unwrap() += POLL.as_secs() as i64;
7533 }
7534 async fn rerun(&self, _repo: &Path, run: &str) -> Result<()> {
7535 self.log.lock().unwrap().push("rerun");
7536 self.reruns.lock().unwrap().push(run.to_owned());
7537 if *self.rerun_fails.lock().unwrap() {
7538 anyhow::bail!("gh run rerun: no");
7539 }
7540 Ok(())
7541 }
7542 fn now(&self) -> i64 {
7543 *self.clock.lock().unwrap()
7544 }
7545 async fn required_contexts(&self, _repo: &Path, _base: &str) -> Option<BTreeSet<String>> {
7546 self.required.lock().unwrap().clone()
7547 }
7548 async fn fix(
7549 &self,
7550 _state: &mut RunState,
7551 _pr: &PrState,
7552 _round: usize,
7553 _budget: usize,
7554 _reason: &str,
7555 _logs: &str,
7556 ) -> Result<Fixed> {
7557 self.log.lock().unwrap().push("fix");
7558 Ok(self.fix.lock().unwrap().take().expect("unscripted fix"))
7559 }
7560 }
7561
7562 const REFUSED: &str =
7563 "X Pull request #42 is not mergeable: the base branch policy prohibits the merge.";
7564
7565 fn seen(head: &str, checks: Checks, merge_state: &str, comments: bool) -> Seen {
7566 let mut pr = green_pr();
7567 pr.checks = checks;
7568 pr.blocking = Blocking::of(merge_state);
7569 if !comments {
7570 pr.review_comments.clear();
7571 }
7572 Seen {
7573 pr,
7574 title: "feat: x".to_owned(),
7575 failing_urls: Vec::new(),
7576 head: head.to_owned(),
7577 rollup_head: head.to_owned(),
7578 merge_state: merge_state.to_owned(),
7579 contexts: Vec::new(),
7580 base: "main".to_owned(),
7581 }
7582 }
7583
7584 fn landing_state() -> RunState {
7585 crate::run::pin_test_home();
7586 let mut state = run_state();
7587 state.config.graph.land_approval = false;
7588 state
7589 }
7590
7591 #[test]
7592 fn a_pushed_head_is_awaited_case_insensitively_and_an_unreadable_one_is_not_a_match() {
7593 assert!(!awaiting_new_head(None, "aaa"));
7594 assert!(!awaiting_new_head(Some("abc123"), "ABC123"));
7595 assert!(awaiting_new_head(Some("abc123"), "def456"));
7596 assert!(awaiting_new_head(Some("abc123"), ""));
7597 }
7598
7599 #[test]
7600 fn a_refusal_is_judged_by_the_pull_requests_state_not_by_its_wording() {
7601 let open = |c, m: &str| seen("a", c, m, false);
7602 let table = [
7603 (None, false, Refused::Pending),
7604 (
7605 Some(open(Checks::Pending, "BLOCKED")),
7606 false,
7607 Refused::Pending,
7608 ),
7609 (
7610 Some(open(Checks::Unknown, "BLOCKED")),
7611 false,
7612 Refused::Pending,
7613 ),
7614 (
7615 Some(open(Checks::Green, "UNKNOWN")),
7616 false,
7617 Refused::Pending,
7618 ),
7619 (Some(open(Checks::Green, "")), false, Refused::Pending),
7620 (
7621 Some(open(Checks::Green, "BLOCKED")),
7622 false,
7623 Refused::Recheck,
7624 ),
7625 (Some(open(Checks::Green, "BLOCKED")), true, Refused::Final),
7626 ];
7627 for (after, rechecked, want) in table {
7628 assert_eq!(classify_refusal(after.as_ref(), rechecked, "a"), want);
7629 }
7630 let mut closed = open(Checks::Green, "CLEAN");
7631 closed.pr.state = PrLifecycle::Closed;
7632 assert_eq!(classify_refusal(Some(&closed), false, "a"), Refused::Final);
7633 }
7634
7635 #[tokio::test]
7636 async fn a_normal_landing_merges_on_the_first_look() {
7637 let mut state = landing_state();
7638 let forge = Scripted::new(
7639 vec![seen("a", Checks::Green, "CLEAN", false)],
7640 vec![(true, "")],
7641 );
7642 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7643 .await
7644 .unwrap();
7645 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
7647 assert_eq!(state.status, RunStatus::Merged);
7648 }
7649
7650 #[tokio::test]
7651 async fn a_successful_merge_command_that_only_queued_is_not_a_merge() {
7652 let mut state = landing_state();
7653 let forge = Scripted::new(
7654 vec![seen("a", Checks::Green, "CLEAN", false)],
7655 std::iter::repeat_n((true, ""), 100).collect(),
7656 );
7657 *forge.queued.lock().unwrap() = true;
7658 let task = async {
7659 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7660 .await
7661 .unwrap();
7662 };
7663 task.await;
7666 assert_ne!(state.status, RunStatus::Merged);
7667 }
7668
7669 #[tokio::test]
7670 async fn an_unreadable_forge_after_a_merge_command_is_not_a_confirmation() {
7671 let mut state = landing_state();
7672 let forge = Scripted::new(
7673 vec![seen("a", Checks::Green, "CLEAN", false)],
7674 std::iter::repeat_n((true, ""), 100).collect(),
7675 );
7676 *forge.unreadable_after_merge.lock().unwrap() = true;
7677 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7678 .await
7679 .ok();
7680 assert_ne!(state.status, RunStatus::Merged);
7681 }
7682
7683 #[tokio::test]
7684 async fn a_task_public_head_is_awaited_on_land_entry() {
7685 let mut state = landing_state();
7686 state.pr_head = Some("magi/task-abcd-1234".into());
7687 state.pr_pushed_head = Some("new".into());
7688 let forge = Scripted::new(
7689 vec![
7690 seen("old", Checks::Green, "CLEAN", false),
7691 seen("new", Checks::Green, "CLEAN", false),
7692 ],
7693 vec![(true, "")],
7694 );
7695 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7696 .await
7697 .unwrap();
7698 assert_eq!(
7699 forge.calls(),
7700 ["view", "poll", "view", "view", "merge", "view"]
7701 );
7702 assert_eq!(state.status, RunStatus::Merged);
7703 }
7704
7705 #[tokio::test]
7706 async fn a_superseded_public_head_owner_cannot_reenter_land() {
7707 let mut state = landing_state();
7708 state.pr_taken_over_by = Some("next".into());
7709 let forge = Scripted::new(vec![seen("a", Checks::Green, "CLEAN", false)], vec![]);
7710 assert!(
7711 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7712 .await
7713 .is_err()
7714 );
7715 assert!(forge.calls().is_empty());
7716 }
7717
7718 #[tokio::test]
7719 async fn after_a_pushed_fix_no_merge_is_tried_until_the_head_matches() {
7720 let mut state = landing_state();
7721 let forge = Scripted::new(
7722 vec![
7723 seen("old", Checks::Green, "CLEAN", true),
7724 seen("old", Checks::Green, "CLEAN", true),
7726 seen("new", Checks::Pending, "BLOCKED", true),
7727 seen("new", Checks::Green, "CLEAN", true),
7728 ],
7729 vec![(true, "")],
7730 );
7731 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
7732 head: "NEW".to_owned(),
7733 });
7734 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7735 .await
7736 .unwrap();
7737 assert_eq!(
7738 forge.calls(),
7739 [
7740 "view", "fix", "poll", "view", "poll", "view", "poll", "view", "view", "merge",
7741 "view"
7742 ]
7743 );
7744 assert_eq!(state.status, RunStatus::Merged);
7745 }
7746
7747 #[tokio::test]
7748 async fn a_head_that_never_arrives_stops_naming_both_commits() {
7749 let mut state = landing_state();
7750 let forge = Scripted::new(
7751 vec![
7752 seen("old", Checks::Green, "CLEAN", true),
7753 seen("someone-elses", Checks::Green, "CLEAN", true),
7754 ],
7755 vec![],
7756 );
7757 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
7758 head: "mine".to_owned(),
7759 });
7760 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7761 .await
7762 .unwrap();
7763 assert!(!forge.calls().contains(&"merge"));
7764 let why = state.merge.as_ref().unwrap().detail.clone();
7765 assert!(
7766 why.contains("mine") && why.contains("someone-elses"),
7767 "{why}"
7768 );
7769 assert_eq!(state.status, RunStatus::Blocked);
7770 }
7771
7772 #[tokio::test]
7773 async fn a_policy_refusal_while_checks_run_waits_and_then_merges() {
7774 let mut state = landing_state();
7775 let forge = Scripted::new(
7776 vec![
7777 seen("a", Checks::Green, "CLEAN", false),
7778 seen("a", Checks::Green, "CLEAN", false),
7779 seen("a", Checks::Pending, "BLOCKED", false),
7780 seen("a", Checks::Pending, "BLOCKED", false),
7781 seen("a", Checks::Green, "CLEAN", false),
7782 ],
7783 vec![(false, REFUSED), (true, "")],
7784 );
7785 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7786 .await
7787 .unwrap();
7788 assert_eq!(
7789 forge.calls(),
7790 [
7791 "view", "view", "merge", "view", "poll", "view", "poll", "view", "view", "merge",
7792 "view"
7793 ]
7794 );
7795 assert_eq!(state.status, RunStatus::Merged);
7796 }
7797
7798 #[tokio::test]
7799 async fn a_refusal_that_outlives_settled_checks_stops_with_the_merge_state() {
7800 let mut state = landing_state();
7801 let forge = Scripted::new(
7802 vec![
7803 seen("a", Checks::Green, "CLEAN", false),
7804 seen("a", Checks::Green, "BLOCKED", false),
7805 ],
7806 vec![(false, REFUSED), (false, REFUSED)],
7807 );
7808 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7809 .await
7810 .unwrap();
7811 assert_eq!(forge.calls().iter().filter(|c| **c == "merge").count(), 2);
7813 let why = state.merge.as_ref().unwrap().detail.clone();
7814 assert!(
7815 why.contains("policy prohibits") && why.contains("BLOCKED") && why.contains("refused"),
7816 "{why}"
7817 );
7818 assert_eq!(state.status, RunStatus::Blocked);
7819 }
7820
7821 #[test]
7822 fn a_decision_is_bound_to_a_head_only_when_every_signal_agrees() {
7823 assert_eq!(bound_head("abc", "abc", None), Some("abc"));
7824 assert_eq!(bound_head("abc", "ABC", Some("abc")), Some("abc"));
7825 assert_eq!(bound_head("old", "old", Some("new")), None);
7827 assert_eq!(bound_head("new", "old", Some("new")), None);
7829 assert_eq!(bound_head("new", "old", None), None);
7830 assert_eq!(bound_head("", "", None), None);
7832 assert_eq!(bound_head("", "", Some("new")), None);
7833 assert_eq!(bound_head("abc", "", None), None);
7834 }
7835
7836 fn view_json(head: &str) -> String {
7837 format!(
7838 r#"{{"url":"https://github.com/o/r/pull/42","number":42,"state":"OPEN",
7839 "title":"t","headRefOid":"{head}","mergeStateStatus":"CLEAN",
7840 "reviews":[],"comments":[]}}"#
7841 )
7842 }
7843
7844 fn node_json(oid: &str, check: &str, has_next: bool) -> String {
7845 format!(
7846 r#"{{"data":{{"repository":{{"pullRequest":{{"commits":{{"nodes":[{{"commit":
7847 {{"oid":"{oid}","statusCheckRollup":{{"contexts":{{"pageInfo":{{"hasNextPage":{has_next}}},
7848 "nodes":[{{"__typename":"CheckRun","name":"ci","status":"COMPLETED",
7849 "conclusion":"{check}","detailsUrl":"https://example.test/1"}}]}}}}}}}}]}}}}}}}}}}"#
7850 )
7851 }
7852
7853 #[test]
7854 fn rollup_is_bound_to_the_commit_in_the_same_node() {
7855 let s = seen_from(&view_json("new"), Some(&node_json("old", "FAILURE", false))).unwrap();
7858 assert_eq!(s.rollup_head, "old");
7859 assert_eq!(s.pr.checks, Checks::Red);
7860 assert_eq!(bound_head(&s.head, &s.rollup_head, Some("new")), None);
7861 assert_eq!(s.failing_urls.len(), 1);
7862 }
7863
7864 #[test]
7865 fn checks_come_from_the_node_not_the_view() {
7866 let view = view_json("new").replace(
7867 r#""reviews""#,
7868 r#""statusCheckRollup":[{"name":"ci","status":"COMPLETED","conclusion":"FAILURE"}],"reviews""#,
7869 );
7870 let s = seen_from(&view, Some(&node_json("new", "SUCCESS", false))).unwrap();
7871 assert_eq!(s.pr.checks, Checks::Green);
7872 assert!(s.pr.failing.is_empty());
7873 assert_eq!(
7874 bound_head(&s.head, &s.rollup_head, Some("new")),
7875 Some("new")
7876 );
7877 }
7878
7879 #[test]
7880 fn an_unreadable_or_paged_node_leaves_the_head_unbound() {
7881 for node in [
7882 None,
7883 Some("not json".to_owned()),
7884 Some(r#"{"errors":[{"message":"x"}]}"#.to_owned()),
7885 Some(node_json("new", "SUCCESS", true)),
7886 ] {
7887 let s = seen_from(&view_json("new"), node.as_deref()).unwrap();
7888 assert!(s.rollup_head.is_empty());
7889 assert_eq!(s.pr.checks, Checks::Unknown);
7890 assert_eq!(bound_head(&s.head, &s.rollup_head, None), None);
7891 }
7892 }
7893
7894 #[test]
7895 fn the_merge_command_is_pinned_to_the_observed_head() {
7896 let argv = merge_argv_at(7, "feat: x", "deadbeef");
7897 let at = argv
7898 .iter()
7899 .position(|a| a == "--match-head-commit")
7900 .unwrap();
7901 assert_eq!(argv[at + 1], "deadbeef");
7902 }
7903
7904 #[tokio::test]
7905 async fn stale_checks_after_a_fix_push_never_reach_a_merge() {
7906 let mut state = landing_state();
7907 let mut stale = seen("new", Checks::Red, "CLEAN", false);
7910 stale.rollup_head = "old".to_owned();
7911 let forge = Scripted::new(
7912 vec![seen("old", Checks::Green, "CLEAN", true), stale],
7913 vec![],
7914 );
7915 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
7916 head: "new".to_owned(),
7917 });
7918 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7919 .await
7920 .unwrap();
7921 assert!(!forge.calls().contains(&"merge"));
7922 assert_eq!(state.status, RunStatus::Blocked);
7923 let why = state.merge.as_ref().unwrap().detail.clone();
7924 assert!(why.contains("new") && why.contains("old"), "{why}");
7925 }
7926
7927 #[test]
7928 fn a_refusal_read_against_another_commits_checks_is_pending() {
7929 let mut after = seen("a", Checks::Green, "BLOCKED", false);
7930 after.rollup_head = "old".to_owned();
7931 assert_eq!(classify_refusal(Some(&after), true, "a"), Refused::Pending);
7932 }
7933
7934 #[tokio::test]
7935 async fn a_matching_head_with_red_non_required_checks_still_merges() {
7936 let mut state = landing_state();
7937 let forge = Scripted::new(
7938 vec![seen("a", Checks::Red, "CLEAN", false)],
7939 vec![(true, "")],
7940 );
7941 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7942 .await
7943 .unwrap();
7944 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
7945 assert_eq!(state.status, RunStatus::Merged);
7946 }
7947
7948 #[tokio::test]
7949 async fn a_merge_refused_because_the_head_moved_looks_again_instead_of_failing() {
7950 let mut state = landing_state();
7951 let forge = Scripted::new(
7952 vec![
7953 seen("a", Checks::Green, "CLEAN", false),
7954 seen("a", Checks::Green, "CLEAN", false),
7955 seen("b", Checks::Green, "BLOCKED", false),
7957 seen("b", Checks::Green, "CLEAN", false),
7958 ],
7959 vec![(false, REFUSED), (true, "")],
7960 );
7961 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
7962 .await
7963 .unwrap();
7964 assert_eq!(
7965 forge.calls(),
7966 [
7967 "view", "view", "merge", "view", "poll", "view", "view", "merge", "view"
7968 ]
7969 );
7970 assert_eq!(state.status, RunStatus::Merged);
7971 }
7972
7973 fn merged_view(head: &str) -> Seen {
7974 let mut m = seen(head, Checks::Green, "CLEAN", false);
7975 m.pr.state = PrLifecycle::Merged;
7976 m
7977 }
7978
7979 fn has(argv: &[String], flag: &str) -> bool {
7980 argv.iter().any(|a| a == flag)
7981 }
7982
7983 fn value_of<'a>(argv: &'a [String], flag: &str) -> Option<&'a str> {
7984 let at = argv.iter().position(|a| a == flag)?;
7985 argv.get(at + 1).map(String::as_str)
7986 }
7987
7988 const URL: &str = "https://github.com/o/r/pull/42";
7989
7990 #[tokio::test]
7991 async fn the_merge_step_merges_directly_on_the_observed_head_and_never_arms() {
7992 let mut state = landing_state();
7993 let forge = Scripted::new(
7994 vec![
7995 seen("abc", Checks::Green, "CLEAN", false),
7996 seen("abc", Checks::Green, "CLEAN", false),
7997 ],
7998 vec![(true, "")],
7999 );
8000 land_with(&mut state, URL, &forge).await.unwrap();
8001 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
8002 let argv = &forge.argvs()[0];
8003 assert!(has(argv, "--squash") && has(argv, "--subject"));
8004 assert!(!has(argv, "--auto") && !has(argv, "--admin"));
8005 assert_eq!(value_of(argv, "--match-head-commit"), Some("abc"));
8006 assert_eq!(state.status, RunStatus::Merged);
8007 assert!(state.land_armed_head.is_none());
8008 }
8009
8010 #[tokio::test]
8011 async fn a_resume_disables_an_arm_left_by_an_older_build_before_merging() {
8012 let mut state = landing_state();
8013 state.land_armed_head = Some("a".to_owned());
8014 let forge = Scripted::new(
8015 vec![seen("a", Checks::Green, "CLEAN", false)],
8016 vec![(true, ""), (true, "")],
8017 );
8018 land_with(&mut state, URL, &forge).await.unwrap();
8019 let argvs = forge.argvs();
8020 assert!(has(&argvs[0], "--disable-auto"));
8021 assert!(!has(&argvs[1], "--auto"));
8022 assert_eq!(value_of(&argvs[1], "--match-head-commit"), Some("a"));
8023 assert_eq!(state.status, RunStatus::Merged);
8024 assert!(state.land_armed_head.is_none());
8025 }
8026
8027 #[tokio::test]
8028 async fn an_approval_never_carries_over_to_a_new_head() {
8029 crate::run::pin_test_home();
8030 let mut state = run_state();
8031 state.config.graph.land_approval = true;
8032 let pr = green_pr();
8033 let store = ask::Questions::open();
8034
8035 approval_gate(&mut state, &pr, "feat: x", None, "aaa")
8036 .await
8037 .unwrap();
8038 let mut q = store
8039 .list()
8040 .into_iter()
8041 .find(|q| q.run == state.id)
8042 .unwrap();
8043 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
8044 store.put(&mut q).unwrap();
8045 assert_eq!(
8046 approval_gate(&mut state, &pr, "feat: x", None, "AAA")
8047 .await
8048 .unwrap(),
8049 ApprovalGate::Approved,
8050 "the same head keeps its approval"
8051 );
8052
8053 assert_eq!(
8055 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
8056 .await
8057 .unwrap(),
8058 ApprovalGate::Pending
8059 );
8060 let all: Vec<_> = store
8061 .list()
8062 .into_iter()
8063 .filter(|q| q.run == state.id)
8064 .collect();
8065 assert_eq!(all.len(), 2);
8066
8067 state.land_approval = None;
8069 assert_eq!(
8070 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
8071 .await
8072 .unwrap(),
8073 ApprovalGate::Pending
8074 );
8075 let open = store
8076 .list()
8077 .into_iter()
8078 .filter(|q| q.run == state.id && q.status.open())
8079 .count();
8080 assert_eq!(open, 1, "the superseded question was retired");
8081 }
8082
8083 #[tokio::test]
8084 async fn the_merge_is_bound_to_the_head_it_was_decided_on() {
8085 let mut state = landing_state();
8086 let forge = Scripted::new(
8087 vec![
8088 seen("a", Checks::Green, "CLEAN", false),
8089 seen("b", Checks::Green, "CLEAN", false),
8091 ],
8092 vec![(true, "")],
8093 );
8094 land_with(&mut state, URL, &forge).await.unwrap();
8095 let argvs = forge.argvs();
8096 assert_eq!(argvs.len(), 1, "no merge was tried on the moved head");
8097 assert!(!has(&argvs[0], "--auto"));
8098 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("b"));
8099 assert_eq!(state.status, RunStatus::Merged);
8100 }
8101
8102 fn passing(label: &str) -> CheckInfo {
8103 CheckInfo {
8104 label: label.to_owned(),
8105 verdict: Verdict::Pass,
8106 required: Some(false),
8107 run: None,
8108 }
8109 }
8110
8111 fn failing(label: &str, run: Option<&str>) -> (String, Option<String>) {
8112 (label.to_owned(), run.map(str::to_owned))
8113 }
8114
8115 fn reran(head: &str, runs: &[(&str, i64)]) -> LandReruns {
8116 LandReruns {
8117 head: head.to_owned(),
8118 runs: runs.iter().map(|(r, at)| ((*r).to_owned(), *at)).collect(),
8119 }
8120 }
8121
8122 #[test]
8123 fn a_failed_run_is_rerun_once_then_waited_on_then_left_to_the_fixer() {
8124 let f = [failing("test (macos)", Some("7"))];
8125 assert_eq!(
8126 rerun_step(&f, None, "h", 100),
8127 RerunStep::Rerun(vec!["7".to_owned()])
8128 );
8129 let rec = reran("h", &[("7", 100)]);
8130 let grace = crate::release_watch::RERUN_GRACE;
8131 assert_eq!(
8132 rerun_step(&f, Some(&rec), "h", 100 + grace - 1),
8133 RerunStep::Grace
8134 );
8135 assert_eq!(rerun_step(&f, Some(&rec), "h", 100 + grace), RerunStep::Fix);
8136 }
8137
8138 #[test]
8139 fn a_failure_without_a_run_id_goes_to_the_fixer() {
8140 let f = [failing("a", Some("7")), failing("ci/external", None)];
8141 assert_eq!(rerun_step(&f, None, "h", 0), RerunStep::Fix);
8142 assert_eq!(rerun_step(&[], None, "h", 0), RerunStep::Fix);
8143 }
8144
8145 #[test]
8146 fn a_moved_head_forgets_the_reruns() {
8147 let f = [failing("a", Some("7"))];
8148 let rec = reran("old", &[("7", 100)]);
8149 assert_eq!(
8150 rerun_step(&f, Some(&rec), "new", 101),
8151 RerunStep::Rerun(vec!["7".to_owned()])
8152 );
8153 }
8154
8155 #[test]
8156 fn only_unrerun_runs_are_rerun_and_duplicates_collapse() {
8157 let f = [
8158 failing("a", Some("7")),
8159 failing("b", Some("7")),
8160 failing("c", Some("8")),
8161 ];
8162 assert_eq!(
8163 rerun_step(&f, None, "h", 0),
8164 RerunStep::Rerun(vec!["7".to_owned(), "8".to_owned()])
8165 );
8166 let rec = reran("h", &[("7", 0)]);
8167 assert_eq!(
8168 rerun_step(&f, Some(&rec), "h", 1),
8169 RerunStep::Rerun(vec!["8".to_owned()])
8170 );
8171 }
8172
8173 #[test]
8174 fn only_blocking_failures_are_candidates_for_a_rerun() {
8175 let check = |label: &str, verdict, required, run: &str| CheckInfo {
8176 label: label.to_owned(),
8177 verdict,
8178 required,
8179 run: Some(run.to_owned()),
8180 };
8181 let got = rerunnable(&[
8182 check("passed", Verdict::Pass, Some(true), "1"),
8183 check("optional", Verdict::Fail, Some(false), "2"),
8184 check("required", Verdict::Fail, Some(true), "3"),
8185 check("unknown", Verdict::Fail, None, "4"),
8186 ]);
8187 let labels: Vec<_> = got.iter().map(|(l, _)| l.as_str()).collect();
8188 assert_eq!(labels, ["required", "unknown"]);
8189 }
8190
8191 fn red(head: &str, run: Option<&str>) -> Seen {
8192 let mut s = seen(head, Checks::Red, "BLOCKED", false);
8193 s.pr.failing = vec!["test (macos)".to_owned()];
8194 s.contexts = vec![CheckInfo {
8195 label: "test (macos)".to_owned(),
8196 verdict: Verdict::Fail,
8197 required: Some(true),
8198 run: run.map(str::to_owned),
8199 }];
8200 s
8201 }
8202
8203 const RERUN_PR: &str = "https://github.com/o/r/pull/42";
8204
8205 #[tokio::test]
8206 async fn a_flaky_red_check_is_rerun_without_a_fix_round_and_then_merges() {
8207 let mut state = landing_state();
8208 let forge = Scripted::new(
8209 vec![
8210 red("a", Some("7")),
8211 seen("a", Checks::Pending, "BLOCKED", false),
8212 seen("a", Checks::Green, "CLEAN", false),
8213 ],
8214 vec![(true, "")],
8215 );
8216 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8217 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8218 assert!(!forge.calls().contains(&"fix"));
8219 assert_eq!(state.status, RunStatus::Merged);
8220 assert_eq!(state.pr.as_ref().unwrap().round, 0);
8221 let argvs = forge.argvs();
8222 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("a"));
8223 assert!(
8224 state
8225 .events
8226 .iter()
8227 .any(|e| e.message.contains("test (macos)") && e.message.contains("run 7"))
8228 );
8229 }
8230
8231 #[tokio::test]
8232 async fn still_red_after_the_grace_goes_to_the_fixer_and_a_run_is_not_rerun_twice() {
8233 let mut state = landing_state();
8234 let forge = Scripted::new(
8235 vec![
8236 red("a", Some("7")),
8237 seen("a", Checks::Green, "CLEAN", false),
8238 ],
8239 vec![(true, "")],
8240 );
8241 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8242 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8244 assert_eq!(forge.reruns.lock().unwrap().len(), 1);
8245 let calls = forge.calls();
8246 let rerun_at = calls.iter().position(|c| *c == "rerun").unwrap();
8247 let fix_at = calls.iter().position(|c| *c == "fix");
8248 assert!(fix_at.is_none_or(|f| f > rerun_at));
8249 }
8250
8251 #[tokio::test]
8252 async fn a_failed_run_is_rerun_while_another_run_is_still_pending() {
8253 let mut state = landing_state();
8254 let mut v = red("a", Some("7"));
8255 v.pr.checks = Checks::Pending;
8256 v.contexts.push(CheckInfo {
8257 label: "slow".to_owned(),
8258 verdict: Verdict::Pending,
8259 required: Some(true),
8260 run: Some("8".to_owned()),
8261 });
8262 let forge = Scripted::new(
8263 vec![v, seen("a", Checks::Green, "CLEAN", false)],
8264 vec![(true, "")],
8265 );
8266 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8267 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8268 assert_eq!(state.status, RunStatus::Merged);
8269 }
8270
8271 #[test]
8272 fn a_run_with_a_job_still_going_is_not_rerun_yet() {
8273 let mut v = red("a", Some("7"));
8274 v.contexts.push(CheckInfo {
8275 label: "same run, still going".to_owned(),
8276 verdict: Verdict::Pending,
8277 required: Some(true),
8278 run: Some("7".to_owned()),
8279 });
8280 assert!(rerunnable(&v.contexts).is_empty());
8281 }
8282
8283 #[tokio::test]
8284 async fn the_rerun_is_made_even_when_the_fix_budget_is_spent() {
8285 let mut state = landing_state();
8286 state.config.graph.land_rounds = 0;
8287 let forge = Scripted::new(
8288 vec![
8289 red("a", Some("7")),
8290 seen("a", Checks::Green, "CLEAN", false),
8291 ],
8292 vec![(true, "")],
8293 );
8294 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8295 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8296 assert_eq!(state.status, RunStatus::Merged);
8297 assert!(!forge.calls().contains(&"fix"));
8298 assert_eq!(state.pr.as_ref().unwrap().round, 0);
8299 }
8300
8301 #[tokio::test]
8302 async fn the_last_fix_rounds_new_head_gets_its_rerun() {
8303 let mut state = landing_state();
8304 state.config.graph.land_rounds = 1;
8305 let forge = Scripted::new(
8306 vec![
8307 seen("a", Checks::Green, "CLEAN", true),
8308 red("b", Some("7")),
8309 seen("b", Checks::Green, "CLEAN", false),
8310 ],
8311 vec![(true, "")],
8312 );
8313 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
8314 head: "b".to_owned(),
8315 });
8316 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8317 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
8318 assert_eq!(forge.calls().iter().filter(|c| **c == "fix").count(), 1);
8319 assert_eq!(state.pr.as_ref().unwrap().round, 1);
8320 assert_eq!(state.status, RunStatus::Merged);
8321 assert_eq!(state.land_reruns.as_ref().unwrap().head, "b");
8322 assert_eq!(
8323 value_of(&forge.argvs()[0], "--match-head-commit"),
8324 Some("b")
8325 );
8326 }
8327
8328 #[tokio::test]
8329 async fn a_failed_rerun_call_falls_through_to_the_fix_in_the_same_lap() {
8330 let mut state = landing_state();
8331 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
8332 *forge.rerun_fails.lock().unwrap() = true;
8333 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8334 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8335 assert_eq!(forge.reruns.lock().unwrap().len(), 1, "never retried");
8336 assert_eq!(
8337 forge.calls().iter().filter(|c| **c == "fix").count(),
8338 1,
8339 "{:?}",
8340 forge.calls()
8341 );
8342 }
8343
8344 #[tokio::test]
8345 async fn a_saved_rerun_record_stops_a_restart_from_rerunning() {
8346 let mut state = landing_state();
8347 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
8348 state.land_reruns = Some(reran("a", &[("7", *forge.clock.lock().unwrap())]));
8350 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8351 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8352 assert!(forge.reruns.lock().unwrap().is_empty());
8353 }
8354
8355 #[tokio::test]
8356 async fn the_switch_off_and_a_missing_run_id_go_straight_to_the_fixer() {
8357 let mut state = landing_state();
8358 state.config.graph.rerun_flaky_checks = false;
8359 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
8360 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8361 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8362 assert!(forge.reruns.lock().unwrap().is_empty());
8363 assert!(forge.calls().contains(&"fix"));
8364
8365 let mut state = landing_state();
8366 let forge = Scripted::new(vec![red("a", None)], vec![]);
8367 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
8368 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
8369 assert!(forge.reruns.lock().unwrap().is_empty());
8370 assert!(forge.calls().contains(&"fix"));
8371 }
8372
8373 fn names(xs: &[&str]) -> BTreeSet<String> {
8374 xs.iter().map(|x| (*x).to_owned()).collect()
8375 }
8376
8377 #[test]
8378 fn a_required_check_the_rollup_never_listed_is_named() {
8379 let req = names(&["build"]);
8380 let why = waiting_on("BLOCKED", &[passing("review")], Some(&req));
8381 assert!(why.contains("never reported: build"), "{why}");
8382 assert!(!why.contains("probably waiting for a review"), "{why}");
8383 }
8384
8385 #[test]
8386 fn an_unreadable_required_list_is_not_read_as_a_review_wait() {
8387 let why = waiting_on("BLOCKED", &[passing("review")], None);
8388 assert!(why.contains("could not be read"), "{why}");
8389 assert!(!why.contains("probably waiting for a review"), "{why}");
8390 }
8391
8392 #[test]
8393 fn all_required_reported_keeps_the_review_guess() {
8394 let req = names(&["build"]);
8395 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
8396 assert!(why.contains("probably waiting for a review"), "{why}");
8397 assert!(!why.contains("never reported"), "{why}");
8398 }
8399
8400 #[test]
8401 fn required_names_match_the_rollup_ignoring_case_only() {
8402 let req = names(&["Build"]);
8403 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
8404 assert!(!why.contains("never reported"), "{why}");
8405 }
8406
8407 #[test]
8408 fn required_contexts_are_read_from_protection_and_rulesets() {
8409 let classic = r#"{"contexts":["build"],"checks":[{"context":"lint","app_id":1}]}"#;
8410 assert_eq!(
8411 parse_classic_required(classic),
8412 Some(names(&["build", "lint"]))
8413 );
8414 let rules = r#"[{"type":"pull_request","parameters":{}},
8415 {"type":"required_status_checks","parameters":{"required_status_checks":[{"context":"test"}]}}]"#;
8416 assert_eq!(parse_ruleset_required(rules), Some(names(&["test"])));
8417 assert_eq!(parse_ruleset_required("nope"), None);
8418 assert_eq!(encode_path_segment("release/1.x"), "release%2F1.x");
8419 }
8420
8421 #[test]
8422 fn the_direct_merge_guard_needs_the_approved_head_bound_to_its_checks() {
8423 let shown = BTreeSet::new();
8424 let ok = seen("a", Checks::Green, "CLEAN", false);
8425 let guard = |s: Option<&Seen>| direct_merge_is_safe(s, "A", &shown, 0, 4, Duration::ZERO);
8426 assert!(guard(Some(&ok)));
8427 assert!(!guard(None));
8428 assert!(!guard(Some(&seen("b", Checks::Green, "CLEAN", false))));
8429 let mut stale = ok.clone();
8430 stale.rollup_head = "old".to_owned();
8431 assert!(!guard(Some(&stale)));
8432 assert!(!guard(Some(&seen("a", Checks::Pending, "BLOCKED", false))));
8433 assert!(!guard(Some(&merged_view("a"))));
8434 }
8435
8436 #[test]
8437 fn the_rollup_node_carries_whether_each_check_is_required() {
8438 let node = node_json("new", "SUCCESS", false)
8439 .replace(r#""name":"ci","#, r#""name":"ci","isRequired":true,"#);
8440 let s = seen_from(&view_json("new"), Some(&node)).unwrap();
8441 assert_eq!(s.contexts.len(), 1);
8442 assert_eq!(s.contexts[0].required, Some(true));
8443 let s = seen_from(&view_json("new"), Some(&node_json("new", "SUCCESS", false))).unwrap();
8444 assert_eq!(s.contexts[0].required, None);
8445 }
8446
8447 #[tokio::test]
8448 async fn a_resume_that_cannot_disable_a_recorded_arm_stops_and_keeps_the_record() {
8449 let mut state = landing_state();
8450 state.land_armed_head = Some("a".to_owned());
8451 let forge = Scripted::new(
8452 vec![seen("a", Checks::Green, "CLEAN", true)],
8453 vec![(false, "disable exploded")],
8454 );
8455 land_with(&mut state, URL, &forge).await.unwrap();
8456 assert!(!forge.calls().contains(&"fix"));
8457 assert_eq!(state.status, RunStatus::Blocked);
8458 assert_eq!(state.land_armed_head.as_deref(), Some("a"));
8459 let why = state.merge.as_ref().unwrap().detail.clone();
8460 assert!(why.contains("disable exploded"), "{why}");
8461 }
8462}