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,
349}
350
351pub fn decide_with(
354 pr: &PrState,
355 round: usize,
356 budget: usize,
357 waited: Duration,
358 ci: CiExpectation,
359) -> Step {
360 match pr.state {
361 PrLifecycle::Merged => return Step::Done { merged: true },
362 PrLifecycle::Closed => return Step::Done { merged: false },
363 PrLifecycle::Open => {}
364 }
365
366 if pr.blocking == Blocking::Conflict {
369 return Step::Rebase;
370 }
371
372 let spent = round >= budget;
373 let checks = match ci {
374 CiExpectation::Expected => pr.checks,
375 CiExpectation::Absent => Checks::Green,
376 };
377 match checks {
378 Checks::Pending => Step::Wait,
379 Checks::Unknown if waited < CHECKS_GRACE => Step::Wait,
380 Checks::Unknown => Step::GiveUp {
381 reason: format!(
382 "no check status is readable on the pull request after {} minute(s); \
383 refusing to merge on a guess",
384 CHECKS_GRACE.as_secs() / 60
385 ),
386 },
387 Checks::Red if pr.blocking == Blocking::Unsaid && waited < CHECKS_GRACE => Step::Wait,
394 Checks::Red if !pr.blocking.stops_a_merge() && pr.review_comments.is_empty() => Step::Merge,
395 Checks::Red => {
396 let what = format!(
397 "{} check(s) failing: {}",
398 pr.failing.len(),
399 pr.failing.join(", ")
400 );
401 if spent {
402 Step::GiveUp {
403 reason: format!("{what} — still red after {budget} fix round(s)"),
404 }
405 } else {
406 Step::Fix { reason: what }
407 }
408 }
409 Checks::Green if pr.review_comments.is_empty() => Step::Merge,
410 Checks::Green => {
411 let what = format!(
412 "{} but {} review comment(s) are unresolved: {}",
413 if ci == CiExpectation::Absent {
414 "CI is not expected"
415 } else {
416 "checks are green"
417 },
418 pr.review_comments.len(),
419 authors(&pr.review_comments)
420 );
421 if spent {
422 Step::GiveUp {
423 reason: format!("{what} — still unresolved after {budget} fix round(s)"),
424 }
425 } else {
426 Step::Fix { reason: what }
427 }
428 }
429 }
430}
431
432fn authors(comments: &[ReviewComment]) -> String {
434 let mut seen: Vec<&str> = Vec::new();
435 for c in comments {
436 if !seen.contains(&c.author.as_str()) {
437 seen.push(&c.author);
438 }
439 }
440 seen.join(", ")
441}
442
443pub fn merge_argv(number: u64, subject: &str) -> Vec<String> {
447 vec![
448 "pr".to_owned(),
449 "merge".to_owned(),
450 number.to_string(),
451 "--squash".to_owned(),
452 "--delete-branch".to_owned(),
453 "--subject".to_owned(),
454 subject.to_owned(),
455 ]
456}
457
458pub fn merge_argv_at(number: u64, subject: &str, head: &str) -> Vec<String> {
464 let mut argv = merge_argv(number, subject);
465 argv.push("--match-head-commit".to_owned());
466 argv.push(head.to_owned());
467 argv
468}
469
470pub fn disable_automerge_argv(number: u64) -> Vec<String> {
475 ["pr", "merge", &number.to_string(), "--disable-auto"]
476 .map(str::to_owned)
477 .to_vec()
478}
479
480fn direct_merge_is_safe(
486 fresh: Option<&Seen>,
487 approved_head: &str,
488 shown: &BTreeSet<String>,
489 round: usize,
490 budget: usize,
491 waited: Duration,
492 ci: CiExpectation,
493) -> bool {
494 let Some(fresh) = fresh else {
495 return false;
496 };
497 if fresh.pr.state != PrLifecycle::Open {
498 return false;
499 }
500 let Some(bound) = bound_head(&fresh.head, &fresh.rollup_head, None) else {
501 return false;
502 };
503 if !bound.eq_ignore_ascii_case(approved_head) {
504 return false;
505 }
506 let mut pr = fresh.pr.clone();
507 pr.review_comments.retain(|c| !shown.contains(&c.body));
508 decide_with(&pr, round, budget, waited, ci) == Step::Merge
509}
510
511fn waiting_on(
518 merge_state: &str,
519 contexts: &[CheckInfo],
520 required_set: Option<&BTreeSet<String>>,
521) -> String {
522 let state = if merge_state.is_empty() {
523 "unknown"
524 } else {
525 merge_state
526 };
527 let tag = |c: &CheckInfo| match c.verdict {
528 Verdict::Fail => "failed",
529 _ => "pending",
530 };
531 let unsettled: Vec<&CheckInfo> = contexts
532 .iter()
533 .filter(|c| c.verdict != Verdict::Pass)
534 .collect();
535 let required: Vec<String> = unsettled
536 .iter()
537 .filter(|c| c.required == Some(true))
538 .map(|c| format!("{} ({})", c.label, tag(c)))
539 .collect();
540 let unknown: Vec<String> = unsettled
541 .iter()
542 .filter(|c| c.required.is_none())
543 .map(|c| format!("{} ({})", c.label, tag(c)))
544 .collect();
545 let never: Vec<&str> = required_set
549 .map(|set| {
550 set.iter()
551 .filter(|name| !contexts.iter().any(|c| c.label.eq_ignore_ascii_case(name)))
552 .map(String::as_str)
553 .collect()
554 })
555 .unwrap_or_default();
556 let mut out = format!("merge state: {state}");
557 if !never.is_empty() {
558 let _ = write!(
559 out,
560 "; required checks never reported: {}",
561 never.join(", ")
562 );
563 }
564 if !required.is_empty() {
565 let _ = write!(
566 out,
567 "; required checks not passing: {}",
568 required.join(", ")
569 );
570 }
571 if !unknown.is_empty() {
572 let _ = write!(
573 out,
574 "; whether these are required could not be read, so they may be: {}",
575 unknown.join(", ")
576 );
577 }
578 if required.is_empty() && unknown.is_empty() && never.is_empty() {
579 if required_set.is_some() {
580 out.push_str(
581 "; no required check is pending, failing or unreported, so GitHub is probably \
582 waiting for a review or another branch rule",
583 );
584 } else {
585 out.push_str(
586 "; the required check list could not be read, so a required check that was \
587 never reported cannot be ruled out",
588 );
589 }
590 }
591 out
592}
593
594pub fn merge_subject(pr_title: &str, instruction: &str) -> String {
601 let title = pr_title.trim();
602 if !title.is_empty() && !title.starts_with("magi: candidate") {
603 return title.to_owned();
604 }
605 let first = instruction
606 .lines()
607 .map(str::trim)
608 .find(|l| !l.is_empty())
609 .unwrap_or("magi: land the winning candidate");
610 first.trim_start_matches(['#', ' ']).to_owned()
611}
612
613pub const APPROVE: &str = "merge";
615
616pub const HOLD: &str = "hold";
618
619pub const REPAIR: &str = "fix findings and re-review";
621
622pub fn repair_available(state: &RunState) -> bool {
625 state.reviews.last().is_some_and(|r| {
626 state.open_findings().iter().any(|f| f.severity.blocks())
627 || r.final_votes()
628 .iter()
629 .any(|(_, _, v)| *v == crate::verdict::ReviewVote::Reject)
630 })
631}
632
633#[derive(Debug, Clone, Copy, PartialEq, Eq)]
635pub enum ApprovalReason {
636 EveryMerge,
638 OpenBlockingFindings,
640 FinalReject,
642 ExistingDecision,
644 AfterRepair,
646}
647
648pub fn approval_reasons(state: &RunState) -> Vec<ApprovalReason> {
651 let mut reasons = Vec::new();
652 if state.owner_hold(crate::config::OwnerHold::LandApproval) {
653 reasons.push(ApprovalReason::EveryMerge);
654 }
655 if state.owner_hold(crate::config::OwnerHold::HoldContestedMerge) {
656 if state.open_findings().iter().any(|f| f.severity.blocks()) {
657 reasons.push(ApprovalReason::OpenBlockingFindings);
658 }
659 if state.reviews.last().is_some_and(|r| {
660 r.final_votes()
661 .iter()
662 .any(|(_, _, v)| *v == crate::verdict::ReviewVote::Reject)
663 }) {
664 reasons.push(ApprovalReason::FinalReject);
665 }
666 }
667 if state.land_approval.is_some() {
668 reasons.push(ApprovalReason::ExistingDecision);
669 }
670 if !state.merge_repairs.is_empty() || !state.repair_grants.is_empty() {
671 reasons.push(ApprovalReason::AfterRepair);
672 }
673 reasons
674}
675
676fn approval_excerpt(text: &str, max_chars: usize) -> String {
679 if text.chars().count() <= max_chars {
680 text.to_owned()
681 } else {
682 let mut excerpt: String = text.chars().take(max_chars.saturating_sub(1)).collect();
683 excerpt.push('…');
684 excerpt
685 }
686}
687
688fn approval_evidence(state: &RunState) -> String {
692 const TITLE_CHARS: usize = 100;
693 const REASON_CHARS: usize = 300;
694 let reason = |text: &str| approval_excerpt(text, REASON_CHARS);
695 let ja = words(&state.config.graph.language).html_lang == "ja";
696 let mut s = if ja {
697 "承認が必要な理由:\n"
698 } else {
699 "Approval required because:\n"
700 }
701 .to_owned();
702 for reason in approval_reasons(state) {
703 let label = match (reason, ja) {
704 (ApprovalReason::EveryMerge, false) => {
705 "land_approval=true: owner approval for every merge"
706 }
707 (ApprovalReason::EveryMerge, true) => {
708 "land_approval=true: すべてのマージに所有者の承認が必要"
709 }
710 (ApprovalReason::OpenBlockingFindings, false) => {
711 "hold_contested_merge=true: open Major-or-above internal findings"
712 }
713 (ApprovalReason::OpenBlockingFindings, true) => {
714 "hold_contested_merge=true: Major 以上の内部指摘が未解決"
715 }
716 (ApprovalReason::FinalReject, false) => {
717 "hold_contested_merge=true: final reviewer reject after reconsideration (even without Major findings)"
718 }
719 (ApprovalReason::FinalReject, true) => {
720 "hold_contested_merge=true: 再考後の最終票が reject(Major 指摘がなくても承認が必要)"
721 }
722 (ApprovalReason::ExistingDecision, false) => {
723 "existing owner decision: changing controls cannot bypass it"
724 }
725 (ApprovalReason::ExistingDecision, true) => {
726 "既存の所有者判断: 設定変更では迂回できません"
727 }
728 (ApprovalReason::AfterRepair, false) => {
729 "fresh owner approval after merge repair, even with an unchanged head"
730 }
731 (ApprovalReason::AfterRepair, true) => {
732 "マージ修復後の新しい所有者承認(head に変更がなくても必要)"
733 }
734 };
735 let control = match reason {
736 ApprovalReason::EveryMerge => Some(crate::config::OwnerHold::LandApproval),
737 ApprovalReason::OpenBlockingFindings | ApprovalReason::FinalReject => {
738 Some(crate::config::OwnerHold::HoldContestedMerge)
739 }
740 _ => None,
741 };
742 let source = control
743 .filter(|c| !c.base_value(&state.config.graph))
744 .and_then(|c| state.branch_owner_holds.iter().find(|h| h.control == c));
745 if let Some(source) = source {
746 if ja {
747 let _ = writeln!(
748 s,
749 "- {}=true(レビュー対象ブランチの {} 由来, {})",
750 source.control.key(),
751 source.file,
752 source.head
753 );
754 } else {
755 let _ = writeln!(
756 s,
757 "- {}=true from the reviewed branch's {} ({})",
758 source.control.key(),
759 source.file,
760 source.head
761 );
762 }
763 }
764 let _ = writeln!(s, "- {label}");
765 }
766 s.push_str(if ja {
767 "\n再考後の各レビュアーの最終票:\n"
768 } else {
769 "\nFinal reviewer votes after reconsideration:\n"
770 });
771 if let Some(round) = state.reviews.last() {
772 let votes = round.final_votes();
773 for r in &round.reviews {
774 let vote = votes
775 .iter()
776 .find(|(seat, _, _)| *seat == r.reviewer)
777 .map(|(_, _, v)| v.label())
778 .unwrap_or(if ja { "記録なし" } else { "not recorded" });
779 let _ = writeln!(s, "#{} ({}): {vote}", r.reviewer, r.agent);
780 let rv = round
781 .reconsideration
782 .iter()
783 .find(|rv| rv.reviewer == r.reviewer);
784 if let Some(rv) = rv.filter(|rv| rv.vote.is_some()) {
785 let initial = r.vote.map(|v| v.label()).unwrap_or("?");
786 let _ = writeln!(
787 s,
788 " {}: {initial} → {vote}",
789 if ja { "再考" } else { "reconsideration" }
790 );
791 let _ = writeln!(
792 s,
793 " {}: {}",
794 if ja { "理由" } else { "reason" },
795 reason(if rv.reason.trim().is_empty() {
796 if ja { "記録なし" } else { "not recorded" }
797 } else {
798 &rv.reason
799 })
800 );
801 } else {
802 let _ = writeln!(
803 s,
804 " {}: {}",
805 if ja {
806 "初回票を保持・理由"
807 } else {
808 "initial vote retained; reason"
809 },
810 reason(if r.summary.trim().is_empty() {
811 if ja { "記録なし" } else { "not recorded" }
812 } else {
813 &r.summary
814 })
815 );
816 if let Some(rv) = rv {
817 let _ = writeln!(
818 s,
819 " {}: {}",
820 if ja {
821 "再投票の回答なし"
822 } else {
823 "no reconsideration vote"
824 },
825 reason(rv.failed.as_deref().unwrap_or(if ja {
826 "理由の記録なし"
827 } else {
828 "reason not recorded"
829 }))
830 );
831 }
832 }
833 if let Some(failed) = &r.failed {
834 let _ = writeln!(
835 s,
836 " {}: {}",
837 if ja { "回答なし" } else { "no answer" },
838 reason(failed)
839 );
840 }
841 }
842 } else {
843 s.push_str(if ja {
844 "レビュー記録なし\n"
845 } else {
846 "No review recorded\n"
847 });
848 }
849 s.push_str(if ja { "\n内部レビュー指摘(最終ラウンド): 採用申告や gate 成功だけでは個別指摘の解決確認にはなりません。\n" } else { "\nInternal review findings (last round): adoption claims or a passing gate alone do not confirm individual resolution.\n" });
850 let findings = state.last_round_findings();
851 for f in &findings {
852 let _ = writeln!(
853 s,
854 "[{}] {} {}:{}: {}\n{}",
855 f.id,
856 f.severity,
857 f.file.as_deref().unwrap_or("?"),
858 f.line.map(|l| l.to_string()).unwrap_or_else(|| "?".into()),
859 approval_excerpt(&f.title, TITLE_CHARS),
860 reason(&f.detail)
861 );
862 let mut evidence = false;
863 for fix in state.reviews.iter().filter_map(|r| r.fix.as_ref()).chain(
864 state
865 .operator_fixes
866 .iter()
867 .filter_map(|request| request.fix.as_ref()),
868 ) {
869 if fix.addressed.contains(&f.id) {
870 evidence = true;
871 let _ = writeln!(
872 s,
873 " {} ({}): {}",
874 if ja {
875 "採用申告(解決未確認)"
876 } else {
877 "claimed addressed (resolution unconfirmed)"
878 },
879 fix.agent,
880 reason(&fix.notes)
881 );
882 }
883 for rejection in fix.rejected.iter().filter(|r| r.id == f.id) {
884 evidence = true;
885 let _ = writeln!(
886 s,
887 " {}: {}",
888 if ja { "不採用理由" } else { "declined" },
889 reason(&rejection.why)
890 );
891 }
892 }
893 if !evidence {
894 s.push_str(if ja {
895 " 採用・解決確認の記録なし\n"
896 } else {
897 " No adoption or resolution evidence recorded\n"
898 });
899 }
900 }
901 if findings.is_empty() {
902 s.push_str(if ja {
903 "最終ラウンドに指摘の記録なし\n"
904 } else {
905 "No findings recorded in the last round\n"
906 });
907 }
908 s
909}
910
911pub fn approval_choices(state: &RunState) -> Vec<String> {
913 let mut choices = vec![
914 APPROVE.to_owned(),
915 HOLD.to_owned(),
916 REPAIR.to_owned(),
917 crate::merge_decision::WITHDRAW.to_owned(),
918 crate::merge_decision::DISMISS.to_owned(),
919 ];
920 choices.extend(
921 state
922 .config
923 .agents
924 .iter()
925 .map(|a| format!("{}{id}", crate::merge_decision::REIMPLEMENT, id = a.id)),
926 );
927 choices
928}
929
930pub fn upgrade_repair_choice(q: &mut ask::Question, state: &RunState) -> bool {
933 if q.node != APPROVAL_NODE
934 || !state
935 .land_approval
936 .as_ref()
937 .is_some_and(|a| a.question == q.id)
938 {
939 return false;
940 }
941 let before = (q.choices.clone(), q.actions.clone(), q.merge_target.clone());
942 if q.status.open() {
943 q.actions.remove(HOLD);
946 for choice in approval_choices(state) {
947 if !q.choices.contains(&choice) {
948 q.choices.push(choice);
949 }
950 }
951 if q.merge_target.is_none() {
952 q.merge_target = state.pr.as_ref().map(|pr| crate::merge_decision::Target {
953 pr: pr.url.clone(),
954 head: state.land_approval.as_ref().unwrap().head.clone(),
955 language: state.config.graph.language.clone(),
956 });
957 }
958 }
959 for choice in q.choices.clone() {
960 if (q.status.open()
961 && crate::merge_decision::stops(&choice)
962 && choice != HOLD
963 && choice != crate::merge_decision::DISMISS)
964 || (choice == REPAIR && (q.status.open() || q.resolution().as_deref() == Some(REPAIR)))
965 {
966 q.actions.insert(
967 choice,
968 ask::ChoiceAction::Resume {
969 run: state.id.clone(),
970 },
971 );
972 }
973 }
974 before != (q.choices.clone(), q.actions.clone(), q.merge_target.clone())
975}
976
977pub const APPROVAL_NODE: &str = "land-approval";
983
984pub const DIFF_MAX_LINES: usize = 400;
992
993#[derive(Debug, Clone, Copy, PartialEq, Eq)]
995pub enum Approval {
996 Merge,
998 Repair,
1000 Hold,
1002}
1003
1004pub fn approval(answer: Option<&str>) -> Approval {
1012 match answer {
1013 Some(a) if a.trim().eq_ignore_ascii_case(APPROVE) => Approval::Merge,
1014 Some(a) if a.trim() == REPAIR => Approval::Repair,
1015 _ => Approval::Hold,
1016 }
1017}
1018
1019#[derive(Debug, Clone, Copy, PartialEq, Eq)]
1021enum ApprovalGate {
1022 Approved,
1024 Repair,
1026 Held,
1029 Pending,
1031}
1032
1033fn esc(s: &str) -> String {
1043 let mut out = String::with_capacity(s.len());
1044 for c in s.chars() {
1045 match c {
1046 '&' => out.push_str("&"),
1047 '<' => out.push_str("<"),
1048 '>' => out.push_str(">"),
1049 '"' => out.push_str("""),
1050 '\'' => out.push_str("'"),
1051 _ => out.push(c),
1052 }
1053 }
1054 out
1055}
1056
1057#[derive(Debug, Clone, PartialEq, Eq)]
1059struct StatRow {
1060 path: String,
1061 added: Option<u64>,
1063 removed: Option<u64>,
1064}
1065
1066impl StatRow {
1067 fn churn(&self) -> u64 {
1070 self.added.unwrap_or(0) + self.removed.unwrap_or(0)
1071 }
1072}
1073
1074fn parse_numstat(numstat: &str) -> Vec<StatRow> {
1080 let mut rows: Vec<StatRow> = numstat
1081 .lines()
1082 .filter_map(|line| {
1083 let mut parts = line.splitn(3, '\t');
1084 let added = parts.next()?.trim();
1085 let removed = parts.next()?.trim();
1086 let path = parts.next()?.trim();
1087 if path.is_empty() {
1088 return None;
1089 }
1090 Some(StatRow {
1091 path: path.to_owned(),
1092 added: added.parse().ok(),
1093 removed: removed.parse().ok(),
1094 })
1095 })
1096 .collect();
1097 rows.sort_by(|a, b| b.churn().cmp(&a.churn()).then_with(|| a.path.cmp(&b.path)));
1100 rows
1101}
1102
1103fn diff_row(line: &str) -> (&'static str, &'static str, &str) {
1112 if line.starts_with("+++") || line.starts_with("---") {
1113 (" ", "color:#57606a;font-weight:600", line)
1114 } else if let Some(body) = line.strip_prefix('+') {
1115 ("+", "background:#e6ffec;color:#0a3622", body)
1116 } else if let Some(body) = line.strip_prefix('-') {
1117 ("-", "background:#ffebe9;color:#5c1a17", body)
1118 } else if line.starts_with("@@") {
1119 ("~", "background:#eef2ff;color:#3730a3", line)
1120 } else if let Some(body) = line.strip_prefix(' ') {
1121 (" ", "", body)
1122 } else {
1123 (" ", "color:#57606a;font-weight:600", line)
1124 }
1125}
1126
1127struct Words {
1136 html_lang: &'static str,
1137 task: &'static str,
1138 what_changed: &'static str,
1139 review_verdict: &'static str,
1140 reviewer: &'static str,
1141 reviewer_no_answer: &'static str,
1142 checks: &'static str,
1143 nothing_failing: &'static str,
1144 files_changed: &'static str,
1145 commits: &'static str,
1146 no_commits: &'static str,
1147 comments: &'static str,
1148 no_comments: &'static str,
1149 diff: &'static str,
1150 truncated: &'static str,
1151 lands_as: &'static str,
1152}
1153
1154const EN: Words = Words {
1155 html_lang: "en",
1156 task: "Task",
1157 what_changed: "What changed",
1158 review_verdict: "Review verdict",
1159 reviewer: "Reviewer",
1160 reviewer_no_answer: "produced no answer",
1161 checks: "Checks",
1162 nothing_failing: "Nothing failing.",
1163 files_changed: "file(s) changed",
1164 commits: "Commits being squashed",
1165 no_commits: "No commit subjects could be read from the branch.",
1166 comments: "External PR review comments",
1167 no_comments: "No unaddressed external PR comments at this observation. This does not mean internal findings are resolved.",
1168 diff: "Diff",
1169 truncated: "Truncated",
1170 lands_as: "They land as one commit titled",
1171};
1172
1173const JA: Words = Words {
1174 html_lang: "ja",
1175 task: "タスク",
1176 what_changed: "変更内容",
1177 review_verdict: "レビューの結論",
1178 reviewer: "レビュアー",
1179 reviewer_no_answer: "回答なし",
1180 checks: "チェック",
1181 nothing_failing: "失敗しているものはありません。",
1182 files_changed: "ファイル変更",
1183 commits: "squash されるコミット",
1184 no_commits: "ブランチからコミット件名を読めませんでした。",
1185 comments: "外部 PR レビューコメント",
1186 no_comments: "この時点で未対応の外部 PR コメントはありません。内部指摘の解決を意味するものではありません。",
1187 diff: "差分",
1188 truncated: "省略",
1189 lands_as: "これらは次の件名の1コミットとして入ります:",
1190};
1191
1192impl Words {
1193 fn lands_as_tail(&self) -> &'static str {
1197 if self.html_lang == "ja" {
1198 "。この件名も承認の対象です。"
1199 } else {
1200 ", which you are approving too."
1201 }
1202 }
1203
1204 fn approval_summary(&self, number: u64, subject: &str) -> String {
1206 if self.html_lang == "ja" {
1207 format!("プルリクエスト #{number} をマージ: {subject}")
1208 } else {
1209 format!("merge pull request #{number}: {subject}")
1210 }
1211 }
1212
1213 fn approval_detail(
1215 &self,
1216 url: &str,
1217 base: &str,
1218 subject: &str,
1219 contested: Option<&ContestedHandoff>,
1220 ) -> String {
1221 let body = if self.html_lang == "ja" {
1222 format!(
1223 "{url} はチェックが緑で、`{base}` へ `{subject}` として squash \
1224 できる状態です。差分の要約・パッチ・squash されるコミットは\
1225 下のパネルにあります。"
1226 )
1227 } else {
1228 format!(
1229 "{url} is green and ready to squash into `{base}` as `{subject}`. \
1230 The panel holds the diffstat, the patch and the commits being squashed."
1231 )
1232 };
1233 match contested {
1234 Some(c) => format!("{}\n\n{body}", self.contested_reason(url, c)),
1235 None => body,
1236 }
1237 }
1238
1239 fn contested_reason(&self, url: &str, c: &ContestedHandoff) -> String {
1242 const SHOWN: usize = 5;
1243 const TITLE_CHARS: usize = 100;
1244 let ja = self.html_lang == "ja";
1245 let mut out = if ja {
1246 format!(
1247 "{url} は、マージ承認がオフでも保留しています。レビューが予算切れで終わった\
1248 時点で、却下票を伴う重大な未解決の指摘が残っているためです。\n"
1249 )
1250 } else {
1251 format!(
1252 "{url} is held for approval although merge approvals are off: the \
1253 review ended with blocking findings still open and a reviewer \
1254 voting reject.\n"
1255 )
1256 };
1257 for f in c.findings.iter().take(SHOWN) {
1258 let at = match (&f.file, f.line) {
1259 (Some(file), Some(line)) => format!("{file}:{line}"),
1260 (Some(file), None) => file.clone(),
1261 _ => (if ja { "場所未指定" } else { "no location" }).to_owned(),
1262 };
1263 let title: String = f.title.chars().take(TITLE_CHARS).collect();
1264 let _ = writeln!(out, "- {} {} {at}: {title}", f.id, f.severity);
1265 }
1266 if c.findings.len() > SHOWN {
1267 let more = c.findings.len() - SHOWN;
1268 let _ = writeln!(
1269 out,
1270 "{}",
1271 if ja {
1272 format!("- ほか {more} 件")
1273 } else {
1274 format!("- and {more} more")
1275 }
1276 );
1277 }
1278 let seats: Vec<String> = c
1279 .rejecters
1280 .iter()
1281 .map(|(seat, agent)| format!("#{seat} ({agent})"))
1282 .collect();
1283 let _ = write!(
1284 out,
1285 "{} {}",
1286 if ja {
1287 "却下したレビュアー:"
1288 } else {
1289 "Rejected by reviewer:"
1290 },
1291 seats.join(", ")
1292 );
1293 out
1294 }
1295
1296 fn truncated_note(
1298 &self,
1299 omitted: usize,
1300 total: usize,
1301 shown: usize,
1302 where_: &str,
1303 base: &str,
1304 head: &str,
1305 ) -> String {
1306 if self.html_lang == "ja" {
1307 format!(
1308 "先頭 {shown} 行のあと、差分 {total} 行のうち {omitted} 行を省略しました。\
1309 全体は <code>{where_}</code>(<code>git diff {base}...{head}</code>)と\
1310 プルリクエストにあります。"
1311 )
1312 } else {
1313 format!(
1314 "{omitted} of {total} diff lines omitted after the first {shown}. \
1315 The whole patch is in <code>{where_}</code> \
1316 (<code>git diff {base}...{head}</code>) and on the pull request."
1317 )
1318 }
1319 }
1320}
1321
1322fn words(language: &str) -> &'static Words {
1325 if crate::lang::is_japanese(language) {
1326 &JA
1327 } else {
1328 &EN
1329 }
1330}
1331
1332pub fn approval_panel(
1344 state: &RunState,
1345 pr: &PrState,
1346 diffstat: &str,
1347 diff: &str,
1348 commits: &[String],
1349 subject: &str,
1350) -> String {
1351 let rows = parse_numstat(diffstat);
1352 let w = words(&state.config.graph.language);
1353 let mut h = String::with_capacity(4_096 + diff.len().min(200_000));
1354
1355 let _ = writeln!(
1356 h,
1357 "<!doctype html>\n<html lang=\"{}\">\n<head>\n<meta charset=\"utf-8\">\n\
1358 <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">",
1359 w.html_lang
1360 );
1361 let _ = writeln!(
1362 h,
1363 "<title>merge #{} — {}</title>\n</head>",
1364 pr.number,
1365 esc(subject)
1366 );
1367 h.push_str(
1368 "<body style=\"margin:0;padding:12px;font:15px/1.5 -apple-system,\
1369 'Segoe UI',system-ui,sans-serif;color:#1f2328;background:#fff;\
1370 word-break:break-word\">\n",
1371 );
1372
1373 let _ = writeln!(
1375 h,
1376 "<h1 style=\"margin:0 0 4px;font-size:19px\">Merge #{} into \
1377 <code style=\"background:#f6f8fa;padding:1px 4px;border-radius:4px\">{}</code></h1>\n\
1378 <p style=\"margin:0 0 4px;font-size:17px;font-weight:600\">{}</p>\n\
1379 <p style=\"margin:0 0 12px;font-size:13px;color:#57606a\">squash merge · run {} · \
1380 <a href=\"{}\" target=\"_blank\" rel=\"noopener noreferrer\" style=\"color:#0969da\">{}</a></p>",
1381 pr.number,
1382 esc(&state.base_branch),
1383 esc(subject),
1384 esc(&state.id),
1385 esc(&pr.url),
1386 esc(&pr.url),
1387 );
1388
1389 let _ = writeln!(
1390 h,
1391 "<section style=\"padding:12px;background:#fff8c5;border:1px solid #9a6700;border-radius:6px;white-space:pre-wrap\">{}</section>",
1392 esc(&approval_evidence(state))
1393 );
1394
1395 let _ = writeln!(
1398 h,
1399 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>\n\
1400 <p style=\"margin:0;font-size:13px;white-space:pre-wrap\">{}</p>",
1401 w.task,
1402 esc(&state.instruction)
1403 );
1404
1405 if let Some(summary) = state
1407 .winner()
1408 .map(|c| c.summary.as_str())
1409 .filter(|s| !s.is_empty())
1410 {
1411 let _ = writeln!(
1412 h,
1413 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>\n\
1414 <p style=\"margin:0;font-size:13px;white-space:pre-wrap\">{}</p>",
1415 w.what_changed,
1416 esc(summary)
1417 );
1418 }
1419
1420 if let Some(round) = state.reviews.last() {
1423 let _ = writeln!(
1424 h,
1425 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1426 w.review_verdict
1427 );
1428 for r in &round.reviews {
1429 let body = match &r.failed {
1436 Some(reason) => format!("{}: {}", w.reviewer_no_answer, esc(reason)),
1437 None => esc(&r.summary),
1438 };
1439 let _ = writeln!(
1440 h,
1441 "<div style=\"margin:0 0 8px;padding:8px;background:#f6f8fa;\
1442 border-radius:6px\">\
1443 <div style=\"font-size:12px;color:#57606a\">{} {} · {}</div>\
1444 <div style=\"white-space:pre-wrap;font-size:13px\">{}</div></div>",
1445 w.reviewer,
1446 r.reviewer,
1447 esc(&r.agent),
1448 body,
1449 );
1450 }
1451 }
1452
1453 let _ = writeln!(
1454 h,
1455 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}: {}</h2>",
1456 w.checks,
1457 esc(pr.checks.as_str())
1458 );
1459 if pr.failing.is_empty() {
1460 let _ = writeln!(
1461 h,
1462 "<p style=\"margin:0;font-size:13px;color:#57606a\">{}</p>",
1463 w.nothing_failing
1464 );
1465 } else {
1466 h.push_str("<ul style=\"margin:0;padding-left:20px;font-size:13px\">\n");
1467 for f in &pr.failing {
1468 let _ = writeln!(h, "<li>{}</li>", esc(f));
1469 }
1470 h.push_str("</ul>\n");
1471 }
1472
1473 let _ = writeln!(
1476 h,
1477 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{} {}</h2>",
1478 rows.len(),
1479 w.files_changed
1480 );
1481 h.push_str(
1482 "<table style=\"width:100%;border-collapse:collapse;font-size:13px\">\n\
1483 <thead><tr>\
1484 <th style=\"text-align:left;border-bottom:1px solid #d0d7de;padding:4px 2px\">file</th>\
1485 <th style=\"text-align:right;border-bottom:1px solid #d0d7de;padding:4px 2px\">added</th>\
1486 <th style=\"text-align:right;border-bottom:1px solid #d0d7de;padding:4px 2px\">removed\
1487 </th></tr></thead>\n<tbody>\n",
1488 );
1489 let mut total_added = 0u64;
1490 let mut total_removed = 0u64;
1491 for r in &rows {
1492 total_added += r.added.unwrap_or(0);
1493 total_removed += r.removed.unwrap_or(0);
1494 let cell = |n: Option<u64>| match n {
1495 Some(n) => n.to_string(),
1496 None => "bin".to_owned(),
1497 };
1498 let _ = writeln!(
1499 h,
1500 "<tr>\
1501 <td style=\"padding:4px 2px;border-bottom:1px solid #eaeef2;\
1502 font-family:ui-monospace,monospace\">{}</td>\
1503 <td style=\"padding:4px 2px;border-bottom:1px solid #eaeef2;text-align:right;\
1504 color:#0a3622\">{}</td>\
1505 <td style=\"padding:4px 2px;border-bottom:1px solid #eaeef2;text-align:right;\
1506 color:#5c1a17\">{}</td></tr>",
1507 esc(&r.path),
1508 cell(r.added),
1509 cell(r.removed),
1510 );
1511 }
1512 let _ = writeln!(
1513 h,
1514 "</tbody>\n<tfoot><tr style=\"font-weight:600\">\
1515 <td style=\"padding:4px 2px\">total</td>\
1516 <td style=\"padding:4px 2px;text-align:right\">{total_added}</td>\
1517 <td style=\"padding:4px 2px;text-align:right\">{total_removed}</td>\
1518 </tr></tfoot>\n</table>"
1519 );
1520
1521 let _ = writeln!(
1523 h,
1524 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1525 w.commits
1526 );
1527 if commits.is_empty() {
1528 h.push_str(&format!(
1529 "<p style=\"margin:0;font-size:13px;color:#57606a\">{}</p>\n",
1530 w.no_commits
1531 ));
1532 } else {
1533 h.push_str("<ol style=\"margin:0;padding-left:20px;font-size:13px\">\n");
1534 for c in commits {
1535 let _ = writeln!(h, "<li>{}</li>", esc(c));
1536 }
1537 h.push_str("</ol>\n");
1538 }
1539 let _ = writeln!(
1540 h,
1541 "<p style=\"margin:8px 0 0;font-size:13px\">{} <strong>{}</strong>{}</p>",
1542 w.lands_as,
1543 esc(subject),
1544 w.lands_as_tail()
1545 );
1546
1547 let _ = writeln!(
1549 h,
1550 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1551 w.comments
1552 );
1553 if pr.review_comments.is_empty() {
1554 h.push_str(&format!(
1555 "<p style=\"margin:0;font-size:13px;color:#57606a\">{}</p>\n",
1556 w.no_comments
1557 ));
1558 } else {
1559 for c in &pr.review_comments {
1560 let anchor = match (&c.path, c.line) {
1561 (Some(p), Some(l)) => format!("{p}:{l}"),
1562 (Some(p), None) => p.clone(),
1563 _ => "pull request thread".to_owned(),
1564 };
1565 let _ = writeln!(
1566 h,
1567 "<div style=\"margin:0 0 8px;padding:8px;background:#f6f8fa;border-radius:6px\">\
1568 <div style=\"font-size:12px;color:#57606a\">{} · {}</div>\
1569 <div style=\"white-space:pre-wrap;font-size:13px\">{}</div></div>",
1570 esc(&c.author),
1571 esc(&anchor),
1572 esc(&tail(&c.body, 800)),
1573 );
1574 }
1575 }
1576
1577 let total = diff.lines().count();
1579 let shown = total.min(DIFF_MAX_LINES);
1580 let _ = writeln!(
1581 h,
1582 "<h2 style=\"margin:16px 0 6px;font-size:15px\">{}</h2>",
1583 w.diff
1584 );
1585 h.push_str(
1586 "<div style=\"font:12px/1.45 ui-monospace,SFMono-Regular,Menlo,monospace;\
1587 border:1px solid #d0d7de;border-radius:6px;overflow-x:auto\">\n",
1588 );
1589 for line in diff.lines().take(shown) {
1590 let (gutter, style, body) = diff_row(line);
1591 let _ = writeln!(
1592 h,
1593 "<div style=\"display:flex;{style}\">\
1594 <span style=\"flex:0 0 1.4em;text-align:center;user-select:none;\
1595 border-right:1px solid #d0d7de\">{gutter}</span>\
1596 <span style=\"white-space:pre;padding-left:6px\">{}</span></div>",
1597 esc(body),
1598 );
1599 }
1600 h.push_str("</div>\n");
1601 if total > shown {
1602 let omitted = total - shown;
1603 let head = state.winner().map_or("HEAD", |w| w.branch.as_str());
1604 let where_ = state.winner().map_or_else(
1605 || state.repo.display().to_string(),
1606 |w| w.worktree.display().to_string(),
1607 );
1608 let _ = writeln!(
1609 h,
1610 "<p style=\"margin:8px 0 0;padding:8px;background:#fff8c5;border-radius:6px;\
1611 font-size:13px\">{}: {}</p>",
1612 w.truncated,
1613 w.truncated_note(
1614 omitted,
1615 total,
1616 shown,
1617 &esc(&where_),
1618 &esc(&state.base_branch),
1619 &esc(head),
1620 ),
1621 );
1622 }
1623
1624 h.push_str("</body>\n</html>\n");
1625 h
1626}
1627
1628fn contested_to_ask(state: &RunState) -> Option<ContestedHandoff> {
1631 if state.owner_hold(crate::config::OwnerHold::HoldContestedMerge) {
1632 state.contested_handoff.clone()
1633 } else {
1634 None
1635 }
1636}
1637
1638pub fn deputy_brief(q: &ask::Question, state: Option<&RunState>) -> String {
1646 let mut s = format!(
1647 "This is the merge approval for run {run} (`magi show {run}`). The question's \
1648 own text above names the pull request. Answering `{APPROVE}` squash-merges \
1649 it into the base branch; `{HOLD}` leaves the pull request open. Silence is a \
1650 hold: the owner not answering never merges. When the owner tells you to \
1651 merge, in whatever words, settle `{APPROVE}`; when they ask for what another \
1652 offered choice does, settle that one. If you cannot tell what they want, ask \
1653 with `magi ask --thread`.\n\n\
1654 This brief is a snapshot from when your turn started: check `magi show {run}` \
1655 and `gh pr view` (read-only) before telling the owner anything current. The \
1656 driver carries out the merge, repair, withdrawal or replacement: do not \
1657 change files, branches or the pull request yourself.",
1658 run = q.run
1659 );
1660 if let Some(target) = &q.merge_target {
1661 s.push_str(&format!("\n\nThis decision names PR {} at head `{}`. A settled `{APPROVE}` merges exactly that head; a newer head is never merged on this answer. 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 for it yourself.", target.pr, target.head));
1662 }
1663 if q.choices.iter().any(|c| c == REPAIR) {
1664 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. The driver performs the repair; do not edit or queue another task for it. Updated review and gate results require a fresh merge decision.");
1665 }
1666 if q.detail.contains("Approval required because:") || q.detail.contains("承認が必要な理由:")
1667 {
1668 s.push_str("\n\nSaved approval evidence (at question creation):\n");
1669 s.push_str(&q.detail);
1670 } else {
1671 s.push_str("\n\nApproval reasons and final review evidence were not recorded in this legacy question. Do not infer its original trigger from current settings; consult the saved panel and review history.");
1672 }
1673 let Some(state) = state else {
1674 s.push_str(
1675 "\n\nThe run's record could not be read, so the pull request, the panel \
1676 summary and any contested findings are not known to you beyond the \
1677 question's own text. Say so to the owner rather than guessing.",
1678 );
1679 return s;
1680 };
1681 if let Some(pr) = &state.pr {
1682 s.push_str(&format!(
1683 "\n\nPull request #{} {} (recorded state: {}, last seen).",
1684 pr.number, pr.url, pr.state
1685 ));
1686 }
1687 s.push_str(&format!("\nBase branch: `{}`.", state.base_branch));
1688 if let Some(w) = state.winner() {
1689 s.push_str(&format!("\nWinning branch: `{}`.", w.branch));
1690 }
1691
1692 s
1693}
1694
1695fn merge_consent_superseded(state: &RunState, question: &ask::Question) -> Result<bool> {
1699 if !question.status.open() && approval(question.resolution().as_deref()) != Approval::Merge {
1700 return Ok(false);
1701 }
1702 let Some(task_id) = state
1703 .origin
1704 .as_ref()
1705 .and_then(|origin| origin.task.as_ref())
1706 else {
1707 return Ok(false);
1708 };
1709 let task = crate::queue::Queue::open()
1710 .get(task_id)
1711 .context("cannot verify operator decisions for the merge approval")?;
1712 Ok(task
1713 .operator_decided_at
1714 .is_some_and(|at| at > question.answered_at.unwrap_or(question.asked_at)))
1715}
1716
1717async fn approval_gate(
1737 state: &mut RunState,
1738 pr: &PrState,
1739 subject: &str,
1740 contested: Option<&ContestedHandoff>,
1741 head: &str,
1742) -> Result<ApprovalGate> {
1743 let _chat_merge = crate::chat_merge::target_lock_wait(&crate::run::home(), &pr.url).await?;
1744 let store = ask::Questions::open();
1745 let reusable = state.land_approval.as_ref().and_then(|a| {
1750 store
1751 .list()
1752 .into_iter()
1753 .find(|q| q.id == a.question)
1754 .filter(|q| {
1755 q.status != ask::QuestionStatus::Abandoned
1756 && state
1757 .repair_grants
1758 .last()
1759 .is_none_or(|g| q.asked_at > g.receipt.at)
1760 && (a.head.eq_ignore_ascii_case(head)
1761 || q.resolution()
1762 .as_deref()
1763 .is_some_and(crate::merge_decision::stops))
1764 })
1765 });
1766 let reusable = match reusable {
1767 Some(q) if merge_consent_superseded(state, &q)? => None,
1768 other => other,
1769 };
1770 if reusable.is_none() {
1771 for stale in store
1772 .list()
1773 .into_iter()
1774 .filter(|q| q.run == state.id && q.node == APPROVAL_NODE && q.status.open())
1775 {
1776 let why =
1777 "the pull request head or operator decision changed; asked again for approval";
1778 if let Err(e) = store.update(&stale.id, |q| {
1779 q.abandon(why);
1780 Ok(())
1781 }) {
1782 tracing::warn!("could not retire the superseded approval question: {e:#}");
1783 }
1784 }
1785 }
1786
1787 let q = match reusable {
1788 Some(mut q) => {
1789 if upgrade_repair_choice(&mut q, state) {
1790 q = store
1791 .update(&q.id, |current| {
1792 upgrade_repair_choice(current, state);
1793 Ok(())
1794 })?
1795 .0;
1796 }
1797 q
1798 }
1799 None => {
1800 let worktree = match state.winner() {
1801 Some(w) => w.worktree.clone(),
1802 None => state.repo.clone(),
1803 };
1804 let head = if head.is_empty() {
1807 state
1808 .winner()
1809 .map_or_else(|| "HEAD".to_owned(), |w| w.branch.clone())
1810 } else {
1811 head.to_owned()
1812 };
1813 let remote = &state.config.merge.remote;
1816 let tracking = format!("{remote}/{}", state.base_branch);
1817 let base = if git::rev_exists(&worktree, &tracking).await {
1818 tracking
1819 } else {
1820 String::new()
1821 };
1822 let range = format!("{base}...{head}");
1823 let numstat = if base.is_empty() {
1827 String::new()
1828 } else {
1829 git::git_raw(&worktree, &["diff", "--numstat", "-M", &range])
1830 .await
1831 .map(|o| o.stdout)
1832 .unwrap_or_default()
1833 };
1834 let diff = if base.is_empty() {
1835 String::new()
1836 } else {
1837 git::diff(&worktree, &base, &head).await.unwrap_or_default()
1838 };
1839 let commits: Vec<String> = if base.is_empty() {
1840 Vec::new()
1841 } else {
1842 git::git_raw(
1843 &worktree,
1844 &[
1845 "log",
1846 "--reverse",
1847 "--format=%s",
1848 &format!("{base}..{head}"),
1849 ],
1850 )
1851 .await
1852 .map(|o| o.stdout)
1853 .unwrap_or_default()
1854 .lines()
1855 .filter(|l| !l.trim().is_empty())
1856 .map(str::to_owned)
1857 .collect()
1858 };
1859
1860 let w = words(&state.config.graph.language);
1861 let html = approval_panel(state, pr, &numstat, &diff, &commits, subject);
1862 let mut fresh = ask::Question::new(
1863 state.id.clone(),
1864 APPROVAL_NODE.to_owned(),
1865 "land".to_owned(),
1866 w.approval_summary(pr.number, subject),
1867 format!(
1868 "{}\n\n{}",
1869 approval_evidence(state),
1870 w.approval_detail(&pr.url, &state.base_branch, subject, contested)
1871 ),
1872 approval_choices(state),
1873 );
1874 fresh.merge_target = Some(crate::merge_decision::Target {
1875 pr: pr.url.clone(),
1876 head: head.clone(),
1877 language: state.config.graph.language.clone(),
1878 });
1879 if fresh.choices.iter().any(|c| c == REPAIR) {
1880 fresh.actions.insert(
1881 REPAIR.to_owned(),
1882 ask::ChoiceAction::Resume {
1883 run: state.id.clone(),
1884 },
1885 );
1886 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.");
1887 }
1888 for choice in fresh.choices.clone() {
1889 if crate::merge_decision::stops(&choice)
1890 && choice != HOLD
1891 && choice != crate::merge_decision::DISMISS
1892 {
1893 fresh.actions.insert(
1894 choice,
1895 ask::ChoiceAction::Resume {
1896 run: state.id.clone(),
1897 },
1898 );
1899 }
1900 }
1901 store
1902 .put_panel(&mut fresh, &html, &[])
1903 .context("write the merge approval panel")?;
1904 store
1905 .put_executable(&mut fresh)
1906 .context("file the merge approval question")?;
1907 state.land_approval = Some(LandApproval {
1908 question: fresh.id.clone(),
1909 head: head.clone(),
1910 });
1911 state.event(
1912 "land",
1913 format!("asking for merge approval ({})", fresh.short()),
1914 );
1915 state.save()?;
1916 if let Err(e) = ask::notify(&state.config.notify, &fresh).await {
1917 tracing::warn!(
1921 "could not notify about merge approval question {}: {e:#} - \
1922 the web UI is the only surface for it now",
1923 fresh.short()
1924 );
1925 }
1926 fresh
1927 }
1928 };
1929
1930 Ok(match q.status {
1931 ask::QuestionStatus::Open => ApprovalGate::Pending,
1932 ask::QuestionStatus::Abandoned => ApprovalGate::Held,
1936 ask::QuestionStatus::Answered => match approval(q.resolution().as_deref()) {
1940 Approval::Merge => ApprovalGate::Approved,
1941 Approval::Repair if !state.reviews.is_empty() => {
1942 if !state.merge_repairs.iter().any(|r| r.question == q.id) {
1943 state.merge_repairs.push(crate::run::MergeRepair {
1944 question: q.id.clone(),
1945 head: head.to_owned(),
1946 pr: pr.url.clone(),
1947 reviews: state.reviews.clone(),
1948 gate: state.gate.clone(),
1949 gate_head: state.gate_head.clone(),
1950 gate_fixes: state.gate_fixes.clone(),
1951 pre_gate: state.pre_gate.clone(),
1952 phase: crate::run::MergeRepairPhase::Requested,
1953 failure: None,
1954 });
1955 state.land_approval = None;
1956 state.event(
1957 "repair",
1958 "owner requested fix findings and re-review; merge is not approved",
1959 );
1960 state.save()?;
1961 }
1962 ApprovalGate::Repair
1963 }
1964 Approval::Repair | Approval::Hold => ApprovalGate::Held,
1965 },
1966 })
1967}
1968
1969fn rollup_verdict(rollup: &[GhCheck]) -> (Checks, Vec<String>) {
1972 let mut failing = Vec::new();
1973 let mut pending = false;
1974 let mut unknown = false;
1975 for check in rollup {
1976 match check.verdict() {
1977 Verdict::Pass => {}
1978 Verdict::Pending => pending = true,
1979 Verdict::Fail => failing.push(check.label()),
1980 Verdict::Unknown => unknown = true,
1981 }
1982 }
1983 let checks = if rollup.is_empty() {
1984 Checks::Unknown
1985 } else if pending {
1986 Checks::Pending
1987 } else if !failing.is_empty() {
1988 Checks::Red
1989 } else if unknown {
1990 Checks::Unknown
1991 } else {
1992 Checks::Green
1993 };
1994 (checks, failing)
1995}
1996
1997pub fn parse_pr(json: &str) -> Result<PrState> {
2000 let raw: GhPr = serde_json::from_str(json).context("parse `gh pr view --json ...` output")?;
2001 let state = match raw.state.to_ascii_uppercase().as_str() {
2002 "OPEN" => PrLifecycle::Open,
2003 "MERGED" => PrLifecycle::Merged,
2004 "CLOSED" => PrLifecycle::Closed,
2005 other => bail!("unknown pull request state `{other}`"),
2006 };
2007
2008 let (checks, failing) = rollup_verdict(&raw.status_check_rollup);
2009
2010 let mut review_comments = Vec::new();
2011 for r in raw.reviews {
2012 push_if_outstanding(
2013 &mut review_comments,
2014 ReviewComment {
2015 author: r.author.login,
2016 path: None,
2017 line: None,
2018 body: r.body,
2019 },
2020 );
2021 }
2022 for c in raw.comments {
2023 push_if_outstanding(
2024 &mut review_comments,
2025 ReviewComment {
2026 author: c.author.login,
2027 path: None,
2028 line: None,
2029 body: c.body,
2030 },
2031 );
2032 }
2033
2034 Ok(PrState {
2035 url: raw.url,
2036 number: raw.number,
2037 state,
2038 checks,
2039 failing,
2040 review_comments,
2041 blocking: Blocking::of(&raw.merge_state_status),
2042 })
2043}
2044
2045#[derive(Debug, Clone, PartialEq, Eq)]
2047pub(crate) struct CheckView {
2048 pub name: String,
2049 pub verdict: Verdict,
2050 pub run: Option<String>,
2052 pub url: Option<String>,
2053}
2054
2055#[derive(Debug, Clone, PartialEq, Eq)]
2059pub(crate) struct RollupView {
2060 pub url: String,
2061 pub number: u64,
2062 pub state: PrLifecycle,
2063 pub head: String,
2064 pub checks: Vec<CheckView>,
2065}
2066
2067pub(crate) fn parse_rollup(json: &str) -> Result<RollupView> {
2070 let raw: GhPr = serde_json::from_str(json).context("parse `gh pr view --json ...` output")?;
2071 let state = match raw.state.to_ascii_uppercase().as_str() {
2072 "OPEN" => PrLifecycle::Open,
2073 "MERGED" => PrLifecycle::Merged,
2074 "CLOSED" => PrLifecycle::Closed,
2075 other => bail!("unknown pull request state `{other}`"),
2076 };
2077 let checks = raw
2078 .status_check_rollup
2079 .iter()
2080 .map(|c| CheckView {
2081 name: c.label(),
2082 verdict: c.verdict(),
2083 run: c.url().and_then(run_of),
2084 url: c.url().map(str::to_owned),
2085 })
2086 .collect();
2087 Ok(RollupView {
2088 url: raw.url,
2089 number: raw.number,
2090 state,
2091 head: raw.head_ref_oid,
2092 checks,
2093 })
2094}
2095
2096pub async fn lifecycle(repo: &Path, pr_url: &str) -> Result<PrLifecycle> {
2106 let view = gh(
2107 repo,
2108 &[
2109 "pr".to_owned(),
2110 "view".to_owned(),
2111 pr_url.to_owned(),
2112 "--json".to_owned(),
2113 "state".to_owned(),
2114 ],
2115 )
2116 .await?;
2117 if !view.0 {
2118 bail!("gh pr view {pr_url}: {}", view.1);
2119 }
2120 Ok(parse_pr(&view.1)?.state)
2124}
2125
2126#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
2130pub struct ExternalMerge {
2131 pub url: String,
2133 pub number: u64,
2135}
2136
2137#[derive(Debug, Deserialize)]
2138#[serde(rename_all = "camelCase")]
2139struct GhMergedPr {
2140 url: String,
2141 number: u64,
2142 merged_at: String,
2143 base_ref_name: String,
2144}
2145
2146fn pick_merged_pr(
2160 json: &str,
2161 base_branch: &str,
2162 created_at: Timestamp,
2163) -> Result<Option<ExternalMerge>> {
2164 let raw: Vec<GhMergedPr> =
2165 serde_json::from_str(json).context("parse `gh pr list ... --json ...` output")?;
2166 let mut matches: Vec<ExternalMerge> = Vec::new();
2167 for pr in raw {
2168 if pr.base_ref_name != base_branch {
2169 continue;
2170 }
2171 let Ok(merged_at) = pr.merged_at.parse::<Timestamp>() else {
2172 continue;
2173 };
2174 if merged_at < created_at {
2175 continue;
2176 }
2177 matches.push(ExternalMerge {
2178 url: pr.url,
2179 number: pr.number,
2180 });
2181 }
2182 if matches.len() == 1 {
2183 Ok(matches.pop())
2184 } else {
2185 Ok(None)
2186 }
2187}
2188
2189#[derive(Debug, Clone, PartialEq, Eq)]
2191pub enum OpenPr {
2192 None,
2194 One {
2196 url: String,
2198 title: String,
2200 },
2201 Many(Vec<String>),
2203}
2204
2205#[derive(Debug, Deserialize)]
2206#[serde(rename_all = "camelCase")]
2207struct GhOpenPr {
2208 url: String,
2212 #[serde(default)]
2213 title: String,
2214 base_ref_name: String,
2215 #[serde(default)]
2218 is_cross_repository: bool,
2219}
2220
2221pub fn pick_open_pr(json: &str, base: &str) -> Result<OpenPr> {
2227 let raw: Vec<GhOpenPr> =
2228 serde_json::from_str(json).context("parse `gh pr list ... --json ...` output")?;
2229 let mut hits: Vec<GhOpenPr> = raw
2230 .into_iter()
2231 .filter(|p| p.base_ref_name == base && !p.is_cross_repository)
2232 .collect();
2233 Ok(match hits.len() {
2234 0 => OpenPr::None,
2235 1 => {
2236 let p = hits.remove(0);
2237 OpenPr::One {
2238 url: p.url,
2239 title: p.title,
2240 }
2241 }
2242 _ => OpenPr::Many(hits.into_iter().map(|p| p.url).collect()),
2243 })
2244}
2245
2246pub async fn find_open_pr(repo: &Path, branch: &str, base: &str) -> Result<OpenPr> {
2250 let (ok, out) = gh(
2251 repo,
2252 &[
2253 "pr".to_owned(),
2254 "list".to_owned(),
2255 "--head".to_owned(),
2256 branch.to_owned(),
2257 "--base".to_owned(),
2258 base.to_owned(),
2259 "--state".to_owned(),
2260 "open".to_owned(),
2261 "--json".to_owned(),
2262 "number,url,title,baseRefName,isCrossRepository".to_owned(),
2263 ],
2264 )
2265 .await?;
2266 if !ok {
2267 bail!("gh pr list failed: {out}");
2268 }
2269 pick_open_pr(&out, base)
2270}
2271
2272#[derive(Debug, Deserialize)]
2273#[serde(rename_all = "camelCase")]
2274struct GhPrHead {
2275 head_ref_name: String,
2276 base_ref_name: String,
2277 state: String,
2278 is_cross_repository: bool,
2281 head_ref_oid: String,
2284}
2285
2286#[derive(Debug, Clone, PartialEq, Eq)]
2288pub struct Refusal {
2289 pub retry: bool,
2292 pub why: String,
2294}
2295
2296impl Refusal {
2297 fn final_(why: String) -> Self {
2298 Self { retry: false, why }
2299 }
2300}
2301
2302pub fn closable(
2311 json: &str,
2312 branch: &str,
2313 base: &str,
2314 verified: &[String],
2315) -> std::result::Result<(), Refusal> {
2316 let pr: GhPrHead = serde_json::from_str(json).map_err(|e| Refusal {
2317 retry: true,
2318 why: format!("could not read the pull request ({e})"),
2319 })?;
2320 if pr.head_ref_name != branch {
2321 return Err(Refusal::final_(format!(
2322 "its head is `{}`, not this run's `{branch}`",
2323 pr.head_ref_name
2324 )));
2325 }
2326 if pr.is_cross_repository {
2327 return Err(Refusal::final_("its head lives in a fork".to_owned()));
2328 }
2329 if pr.base_ref_name != base {
2330 return Err(Refusal::final_(format!(
2331 "it targets `{}`, not `{base}`",
2332 pr.base_ref_name
2333 )));
2334 }
2335 if !pr.state.eq_ignore_ascii_case("open") {
2336 return Err(Refusal::final_(format!(
2337 "it is already {}",
2338 pr.state.to_ascii_lowercase()
2339 )));
2340 }
2341 if !verified.contains(&pr.head_ref_oid) {
2345 return Err(Refusal {
2346 retry: true,
2347 why: format!(
2348 "its head {} is not a commit this run checked against the base",
2349 crate::already::short_sha(&pr.head_ref_oid)
2350 ),
2351 });
2352 }
2353 Ok(())
2354}
2355
2356async fn remote_is_forge(repo: &Path, remote: &str) -> bool {
2361 let Ok(url) = git::git(repo, &["remote", "get-url", remote]).await else {
2362 return false;
2363 };
2364 is_forge_url(url.trim())
2365}
2366
2367fn is_forge_url(url: &str) -> bool {
2368 url.contains("://") && !url.starts_with("file://")
2369 || url
2370 .split_once(':')
2371 .is_some_and(|(host, _)| host.contains('@') && !host.contains(['/', '\\']))
2372}
2373
2374fn forge_unavailable(message: &str) -> bool {
2377 message.contains("known GitHub host") || message.contains("spawn gh")
2378}
2379
2380pub fn superseded_comment(base: &str, evidence: &crate::already::Evidence) -> String {
2383 let how = match evidence.proof {
2384 crate::already::Proof::PatchId => format!(
2385 "carried by commit {} on `{base}` with the same patch",
2386 evidence.names()
2387 ),
2388 crate::already::Proof::Ancestry => {
2389 format!("already in the history of `{base}` as {}", evidence.names())
2390 }
2391 crate::already::Proof::Tree => format!(
2392 "already part of `{base}` (merging this branch changes nothing at {})",
2393 crate::already::short_sha(&evidence.tip)
2394 ),
2395 };
2396 format!(
2397 "Closing: everything this branch adds is {how}, so there is nothing left to \
2398 land. This pull request was closed automatically after that was verified; \
2399 reopen it if you disagree."
2400 )
2401}
2402
2403pub async fn close_superseded_pr(
2415 state: &mut RunState,
2416 branch: &str,
2417 evidence: &crate::already::Evidence,
2418 verified: &[String],
2419) -> Result<std::result::Result<String, String>> {
2420 let repo = state.repo.clone();
2421 let base = state.base_branch.clone();
2422 let url = match state.pr.as_ref().filter(|p| p.state == "open") {
2423 Some(p) => p.url.clone(),
2424 None if !remote_is_forge(&repo, &state.config.merge.remote).await => {
2429 return Ok(Err(
2430 "the remote is not a forge, so there is no pull request".to_owned(),
2431 ));
2432 }
2433 None => match find_open_pr(&repo, branch, &base).await {
2434 Err(e) if forge_unavailable(&format!("{e:#}")) => {
2435 return Ok(Err(format!("no forge to ask: {e:#}")));
2436 }
2437 Err(e) => return Err(e),
2438 Ok(OpenPr::One { url, .. }) => url,
2439 Ok(OpenPr::None) => return Ok(Err("no open pull request".to_owned())),
2440 Ok(OpenPr::Many(urls)) => {
2441 return Ok(Err(format!(
2442 "{} open pull requests name it; not choosing between them",
2443 urls.len()
2444 )));
2445 }
2446 },
2447 };
2448 let (ok, view) = gh(
2449 &repo,
2450 &[
2451 "pr".to_owned(),
2452 "view".to_owned(),
2453 url.clone(),
2454 "--json".to_owned(),
2455 "headRefName,headRefOid,baseRefName,state,isCrossRepository".to_owned(),
2456 ],
2457 )
2458 .await?;
2459 if !ok {
2460 bail!("gh pr view {url} failed: {view}");
2461 }
2462 if let Err(refusal) = closable(&view, branch, &base, verified) {
2463 if refusal.retry {
2466 bail!("left {url} open: {}", refusal.why);
2467 }
2468 return Ok(Err(format!("left {url} open: {}", refusal.why)));
2469 }
2470 let (ok, out) = gh(
2471 &repo,
2472 &[
2473 "pr".to_owned(),
2474 "close".to_owned(),
2475 url.clone(),
2476 "--comment".to_owned(),
2477 superseded_comment(&base, evidence),
2478 ],
2479 )
2480 .await?;
2481 if !ok {
2482 bail!("gh pr close {url} failed: {out}");
2483 }
2484 if let Some(p) = state.pr.as_mut().filter(|p| p.url == url) {
2485 p.state = "closed".to_owned();
2486 }
2487 Ok(Ok(url))
2488}
2489
2490pub async fn set_pr_title(state: &mut RunState, repo: &Path, url: &str, title: &str) -> Result<()> {
2494 let (title, _) = crate::github_text::prepare(state, title, "");
2495 edit_pr_title(repo, url, &title).await
2496}
2497
2498pub async fn set_pr_title_verbatim(repo: &Path, url: &str, title: &str) -> Result<()> {
2502 edit_pr_title(repo, url, title).await
2503}
2504
2505pub async fn set_pr_text_verbatim(repo: &Path, url: &str, title: &str, body: &str) -> Result<()> {
2508 let (ok, _) = gh(
2509 repo,
2510 &[
2511 "pr".to_owned(),
2512 "edit".to_owned(),
2513 url.to_owned(),
2514 "--title".to_owned(),
2515 title.to_owned(),
2516 "--body".to_owned(),
2517 body.to_owned(),
2518 ],
2519 )
2520 .await
2521 .map_err(|_| anyhow::anyhow!("could not run gh pr edit for the chosen rewrite"))?;
2522 if !ok {
2523 bail!("gh pr edit failed while posting the chosen rewrite");
2525 }
2526 Ok(())
2527}
2528
2529async fn edit_pr_title(repo: &Path, url: &str, title: &str) -> Result<()> {
2530 let (ok, out) = gh(
2531 repo,
2532 &[
2533 "pr".to_owned(),
2534 "edit".to_owned(),
2535 url.to_owned(),
2536 "--title".to_owned(),
2537 title.to_owned(),
2538 ],
2539 )
2540 .await?;
2541 if !ok {
2542 bail!("gh pr edit failed: {out}");
2543 }
2544 Ok(())
2545}
2546
2547pub async fn find_external_merge(state: &RunState) -> Result<Option<ExternalMerge>> {
2560 let Some(winner) = state.winner() else {
2561 return Ok(None);
2562 };
2563 let branch = state.pr_branch().unwrap_or(&winner.branch).to_owned();
2564 let out = gh(
2565 &state.repo,
2566 &[
2567 "pr".to_owned(),
2568 "list".to_owned(),
2569 "--head".to_owned(),
2570 branch.clone(),
2571 "--state".to_owned(),
2572 "merged".to_owned(),
2573 "--json".to_owned(),
2574 "url,number,mergedAt,baseRefName".to_owned(),
2575 ],
2576 )
2577 .await?;
2578 if !out.0 {
2579 bail!("gh pr list --head {branch}: {}", out.1);
2580 }
2581 pick_merged_pr(&out.1, &state.base_branch, state.created_at)
2582}
2583
2584pub async fn branch_is_ancestor(repo: &Path, branch: &str, base_branch: &str) -> Result<bool> {
2596 let out = tokio::process::Command::new("git")
2597 .args(["merge-base", "--is-ancestor", branch, base_branch])
2598 .current_dir(repo)
2599 .quiet()
2600 .stdin(std::process::Stdio::null())
2601 .output()
2602 .await
2603 .context("spawn git merge-base --is-ancestor")?;
2604 Ok(out.status.success())
2605}
2606
2607fn forge_slug(url: &str) -> Option<(String, &str)> {
2615 let rest = url.rsplit("://").next()?;
2616 let (host, path) = rest.split_once('/')?;
2617 if host.is_empty() {
2618 return None;
2619 }
2620 Some((host.to_ascii_lowercase(), path))
2621}
2622
2623pub(crate) fn slug_of_pr_url(url: &str) -> Option<String> {
2631 let (host, path) = forge_slug(url)?;
2632 let mut segments = path.split('/');
2633 let owner = segments.next()?;
2634 let repo = segments.next()?;
2635 let kind = segments.next()?;
2636 if owner.is_empty() || repo.is_empty() || kind != "pull" {
2637 return None;
2638 }
2639 Some(format!("{host}/{owner}/{repo}"))
2640}
2641
2642fn slug_of_repo_url(url: &str) -> Option<String> {
2646 let (host, path) = forge_slug(url)?;
2647 let mut segments = path.split('/');
2648 let owner = segments.next()?;
2649 let repo = segments.next()?;
2650 if owner.is_empty() || repo.is_empty() {
2651 return None;
2652 }
2653 Some(format!("{host}/{owner}/{repo}"))
2654}
2655
2656pub(crate) fn ensure_same_repo(run_repo_slug: &str, pr_repo_slug: &str) -> Result<()> {
2677 if run_repo_slug.eq_ignore_ascii_case(pr_repo_slug) {
2678 return Ok(());
2679 }
2680 bail!(
2681 "refusing to correct this run: it is recorded against {run_repo_slug}, but the pull \
2682 request URL belongs to {pr_repo_slug} - pass the run id whose repository the URL \
2683 actually belongs to (or, if `origin` is a fork opened against a different upstream, \
2684 verify by hand before treating this as a false positive)"
2685 );
2686}
2687
2688async fn repo_slug(repo: &Path) -> Result<String> {
2699 let out = gh(
2700 repo,
2701 &[
2702 "repo".to_owned(),
2703 "view".to_owned(),
2704 "--json".to_owned(),
2705 "url".to_owned(),
2706 ],
2707 )
2708 .await?;
2709 if !out.0 {
2710 bail!("gh repo view --json url: {}", out.1);
2711 }
2712 #[derive(Debug, Deserialize)]
2713 struct GhRepo {
2714 url: String,
2715 }
2716 let parsed: GhRepo = serde_json::from_str(&out.1)
2717 .with_context(|| format!("parse `gh repo view` output: {}", out.1))?;
2718 slug_of_repo_url(&parsed.url)
2719 .with_context(|| format!("could not parse a host/owner/repo out of {}", parsed.url))
2720}
2721
2722pub async fn correct_manual_merge(
2770 state: &mut RunState,
2771 url: &str,
2772) -> Result<(RunStatus, RunStatus)> {
2773 let Some(pr_slug) = slug_of_pr_url(url) else {
2774 bail!(
2775 "could not parse an owner/repo out of {url}; refusing to guess which repository \
2776 this pull request belongs to"
2777 );
2778 };
2779 let run_slug = repo_slug(&state.repo).await?;
2780 ensure_same_repo(&run_slug, &pr_slug)?;
2781 correct_merge(state, url).await
2782}
2783
2784pub(crate) async fn correct_confirmed_external_merge(
2795 state: &mut RunState,
2796 url: &str,
2797) -> Result<(RunStatus, RunStatus)> {
2798 correct_merge(state, url).await
2799}
2800
2801fn names_same_pr(a: &RunState, url: &str, number: u64, repo: &Path) -> bool {
2803 let Some(pr) = a.pr.as_ref() else {
2804 return false;
2805 };
2806 if !url.is_empty()
2807 && pr
2808 .url
2809 .trim_end_matches('/')
2810 .eq_ignore_ascii_case(url.trim_end_matches('/'))
2811 {
2812 return true;
2813 }
2814 number > 0
2815 && pr.number == number
2816 && match (a.repo.canonicalize(), repo.canonicalize()) {
2817 (Ok(x), Ok(y)) => x == y,
2818 _ => a.repo == repo,
2819 }
2820}
2821
2822fn rewrite_open_prs(
2836 home: &Path,
2837 decide: &mut dyn FnMut(&RunState) -> Option<PrLifecycle>,
2838) -> usize {
2839 let now = Timestamp::now();
2840 let mut changed = 0;
2841 for id in crate::run::list_ids_in(&home.join("runs")) {
2842 let Ok(_owner) = crate::pr_head::owner_lock(home, &id) else {
2843 continue;
2844 };
2845 let path = home.join("runs").join(&id).join("run.json");
2846 let Ok(body) = std::fs::read_to_string(&path) else {
2847 continue;
2848 };
2849 let Ok(mut state) = serde_json::from_str::<RunState>(&body) else {
2850 continue;
2851 };
2852 if !state.status.done()
2853 || state.pr.as_ref().is_none_or(|p| p.state != "open")
2854 || state.liveness_under(home, crate::daemon::is_working_on(home, &id, now))
2855 != crate::run::Liveness::Dead
2856 {
2857 continue;
2858 }
2859 let Some(to @ (PrLifecycle::Merged | PrLifecycle::Closed)) = decide(&state) else {
2860 continue;
2861 };
2862 if let Some(pr) = state.pr.as_mut() {
2863 pr.state = to.as_str().to_owned();
2864 }
2865 let url = state.pr.as_ref().map(|p| p.url.clone()).unwrap_or_default();
2866 state.event(
2867 "land",
2868 format!("recorded {url} as {}: another run settled it", to.as_str()),
2869 );
2870 match state.save_under(home) {
2871 Ok(()) => changed += 1,
2872 Err(e) => tracing::warn!("write pr state through to run {id}: {e:#}"),
2873 }
2874 }
2875 changed
2876}
2877
2878pub(crate) fn write_pr_state_through(run: &RunState, to: PrLifecycle) {
2883 if to == PrLifecycle::Open {
2884 return;
2885 }
2886 let Some(home) = crate::run::try_home() else {
2887 return;
2888 };
2889 write_pr_state_through_in(&home, run, to);
2890}
2891
2892pub(crate) fn write_pr_state_through_in(home: &Path, run: &RunState, to: PrLifecycle) -> usize {
2893 let Some(pr) = run.pr.as_ref() else {
2894 return 0;
2895 };
2896 let (url, number) = (pr.url.clone(), pr.number);
2897 rewrite_open_prs(home, &mut |other| {
2898 (other.id != run.id && names_same_pr(other, &url, number, &run.repo)).then_some(to)
2899 })
2900}
2901
2902pub(crate) fn stale_open_prs(home: &Path) -> Vec<(String, PathBuf, String)> {
2905 let now = Timestamp::now();
2906 let mut out = Vec::new();
2907 for id in crate::run::list_ids_in(&home.join("runs")) {
2908 let path = home.join("runs").join(&id).join("run.json");
2909 let Ok(body) = std::fs::read_to_string(&path) else {
2910 continue;
2911 };
2912 let Ok(state) = serde_json::from_str::<RunState>(&body) else {
2913 continue;
2914 };
2915 if let Some(pr) = state.pr.as_ref()
2916 && state.status.done()
2917 && pr.state == "open"
2918 && !pr.url.is_empty()
2919 && !crate::daemon::is_working_on(home, &id, now)
2920 {
2921 out.push((id, state.repo.clone(), pr.url.clone()));
2922 }
2923 }
2924 out
2925}
2926
2927pub(crate) fn apply_pr_states(home: &Path, known: &BTreeMap<String, PrLifecycle>) -> usize {
2930 rewrite_open_prs(home, &mut |s| {
2931 s.pr.as_ref().and_then(|p| known.get(&p.url)).copied()
2932 })
2933}
2934
2935pub async fn repair_stale_pr_states(home: &Path, max_lookups: usize) -> (usize, usize) {
2942 let mut known = BTreeMap::new();
2943 let mut failed = 0;
2944 let mut seen = BTreeSet::new();
2945 for (_, repo, url) in stale_open_prs(home) {
2946 if known.len() + failed >= max_lookups || !seen.insert(url.clone()) {
2947 continue;
2948 }
2949 match lifecycle(&repo, &url).await {
2950 Ok(state) => {
2951 known.insert(url, state);
2952 }
2953 Err(e) => {
2954 tracing::warn!("repair pr state of {url}: {e:#}");
2955 failed += 1;
2956 }
2957 }
2958 }
2959 (apply_pr_states(home, &known), failed)
2960}
2961
2962async fn correct_merge(state: &mut RunState, url: &str) -> Result<(RunStatus, RunStatus)> {
2963 match lifecycle(&state.repo, url).await? {
2964 PrLifecycle::Merged => {}
2965 other => bail!(
2966 "{url} is {}, not merged; refusing to record {} as merged on a guess",
2967 other.as_str(),
2968 state.id
2969 ),
2970 }
2971 let before = state.status;
2972 if let Err(e) = land(state, url).await {
2973 state.status = RunStatus::Blocked;
2980 state.event("fold", format!("manual-merge correction failed: {e:#}"));
2981 state.save()?;
2982 return Err(e).context(format!("confirming the merge of {url}"));
2983 }
2984 state.event(
2985 "fold",
2986 "operator recorded this pull request as a manual merge; this run never \
2987 re-entered `land`, so `bump::after_merge` did not run for it - a release \
2988 bump this change might warrant has to be filed by hand",
2989 );
2990 if state.status == RunStatus::Merged {
2993 crate::followup::after_merge(state, url).await;
2994 }
2995 state.save()?;
2996 Ok((before, state.status))
2997}
2998
2999pub fn parse_inline_comments(json: &str) -> Result<Vec<ReviewComment>> {
3006 let raw: Vec<GhInline> =
3007 serde_json::from_str(json).context("parse `gh api .../pulls/<n>/comments` output")?;
3008 let mut out = Vec::new();
3009 for c in raw {
3010 push_if_outstanding(
3011 &mut out,
3012 ReviewComment {
3013 author: c.user.login,
3014 path: c.path,
3015 line: c.line,
3016 body: c.body,
3017 },
3018 );
3019 }
3020 Ok(out)
3021}
3022
3023fn push_if_outstanding(out: &mut Vec<ReviewComment>, comment: ReviewComment) {
3029 if comment.body.trim().is_empty() || comment.body.contains(MARKER) {
3030 return;
3031 }
3032 if comment.path.is_none() && is_noise(&comment.body) {
3033 return;
3034 }
3035 out.push(comment);
3036}
3037
3038pub fn is_noise(body: &str) -> bool {
3056 if NOT_A_REVIEW.iter().any(|m| body.contains(m)) {
3057 return true;
3058 }
3059 let mut content = false;
3060 for line in strip_blocks(body).lines() {
3061 let line = unquote(line);
3062 if line.is_empty() || is_checklist(line) || is_decoration(line) || is_banner(line) {
3063 continue;
3064 }
3065 content = true;
3066 break;
3067 }
3068 !content
3069}
3070
3071fn strip_blocks(body: &str) -> String {
3073 let mut out = String::with_capacity(body.len());
3074 let mut rest = body;
3075 loop {
3076 let open = ["<!--", "<details>"]
3077 .iter()
3078 .filter_map(|tag| rest.find(tag).map(|i| (i, *tag)))
3079 .min_by_key(|(i, _)| *i);
3080 let Some((at, tag)) = open else {
3081 out.push_str(rest);
3082 return out;
3083 };
3084 out.push_str(&rest[..at]);
3085 let after = &rest[at + tag.len()..];
3086 let close = if tag == "<!--" { "-->" } else { "</details>" };
3087 match after.find(close) {
3088 Some(end) => rest = &after[end + close.len()..],
3089 None => return out,
3091 }
3092 }
3093}
3094
3095fn unquote(line: &str) -> &str {
3097 let mut s = line.trim();
3098 while let Some(rest) = s.strip_prefix('>') {
3099 s = rest.trim_start();
3100 }
3101 s.trim()
3102}
3103
3104fn is_checklist(line: &str) -> bool {
3106 let rest = line
3107 .strip_prefix("- ")
3108 .or_else(|| line.strip_prefix("* "))
3109 .unwrap_or("");
3110 let rest = rest.trim_start();
3111 matches!(
3112 rest.get(..3),
3113 Some("[ ]") | Some("[x]") | Some("[X]") | Some("[*]")
3114 )
3115}
3116
3117fn is_decoration(line: &str) -> bool {
3119 line.starts_with('#')
3120 || line.starts_with("[!")
3121 || (line.len() >= 3 && line.chars().all(|c| matches!(c, '-' | '=' | '*' | '_')))
3122}
3123
3124fn is_banner(line: &str) -> bool {
3131 let plain = drop_spans(line, "**", "**");
3132 let plain = if plain.contains("](") {
3133 drop_spans(&plain, "[", ")")
3134 } else {
3135 plain
3136 };
3137 !plain.chars().any(char::is_alphanumeric)
3138}
3139
3140fn drop_spans(s: &str, open: &str, close: &str) -> String {
3144 let mut out = String::with_capacity(s.len());
3145 let mut rest = s;
3146 while let Some(at) = rest.find(open) {
3147 out.push_str(&rest[..at]);
3148 let after = &rest[at + open.len()..];
3149 match after.find(close) {
3150 Some(end) => rest = &after[end + close.len()..],
3151 None => return out,
3152 }
3153 }
3154 out.push_str(rest);
3155 out
3156}
3157
3158fn repo_merge_lock(repo: &Path) -> Arc<tokio::sync::Mutex<()>> {
3176 static LOCKS: std::sync::LazyLock<
3177 std::sync::Mutex<BTreeMap<PathBuf, Arc<tokio::sync::Mutex<()>>>>,
3178 > = std::sync::LazyLock::new(|| std::sync::Mutex::new(BTreeMap::new()));
3179 LOCKS
3180 .lock()
3181 .unwrap_or_else(std::sync::PoisonError::into_inner)
3182 .entry(repo.to_path_buf())
3183 .or_insert_with(|| Arc::new(tokio::sync::Mutex::new(())))
3184 .clone()
3185}
3186
3187fn repo_label(repo: &Path, pr_url: &str) -> String {
3190 let parts: Vec<&str> = pr_url.split('/').collect();
3191 if let Some(at) = parts.iter().rposition(|p| *p == "pull")
3192 && at >= 2
3193 && !parts[at - 1].is_empty()
3194 && !parts[at - 2].is_empty()
3195 {
3196 return format!("{}/{}", parts[at - 2], parts[at - 1]);
3197 }
3198 repo.file_name()
3199 .map(|n| n.to_string_lossy().into_owned())
3200 .unwrap_or_default()
3201}
3202
3203fn red_merge_summary(repo_name: &str, pr: &PrState) -> Option<String> {
3207 (pr.checks == Checks::Red).then(|| {
3208 let details = crate::notices::format_list(&pr.failing)
3209 .map(|names| format!(": {names}"))
3210 .unwrap_or_default();
3211 format!(
3212 "Merged {repo_name} PR #{} with red checks{details} ({})",
3213 pr.number, pr.url
3214 )
3215 })
3216}
3217
3218async fn announce_red_merge(state: &mut RunState, pr: &PrState) {
3222 let repo_name = repo_label(&state.repo, &pr.url);
3223 let Some(summary) = red_merge_summary(&repo_name, pr) else {
3224 return;
3225 };
3226 if let Some(rec) = state.pr.as_mut() {
3227 rec.red_at_merge = pr.failing.clone();
3228 }
3229 state.event("land", summary.clone());
3230 crate::notices::raise_with(
3233 crate::notices::merged_red(&state.id, &summary),
3234 &state.config.notify,
3235 );
3236}
3237
3238pub async fn land(state: &mut RunState, pr_url: &str) -> Result<PrState> {
3245 land_with(state, pr_url, &GhForge).await
3246}
3247
3248trait Forge {
3252 async fn close(&self, repo: &Path, pr_url: &str, comment: &str) -> Result<()> {
3253 let (ok, out) = gh(
3254 repo,
3255 &[
3256 "pr".into(),
3257 "close".into(),
3258 pr_url.into(),
3259 "--comment".into(),
3260 comment.into(),
3261 ],
3262 )
3263 .await?;
3264 if !ok {
3265 bail!("PR closure failed: {out}");
3266 }
3267 Ok(())
3268 }
3269 async fn attribution(&self, _state: &RunState, _seen: &Seen) -> Option<CiEvidence> {
3270 None
3271 }
3272 async fn view(&self, repo: &Path, pr_url: &str) -> Result<Seen>;
3273 async fn merge(&self, repo: &Path, argv: &[String]) -> Result<(bool, String)>;
3274 async fn poll(&self);
3275 async fn rerun(&self, repo: &Path, run: &str) -> Result<()>;
3277 fn now(&self) -> i64;
3279 async fn required_contexts(&self, repo: &Path, base: &str) -> Option<BTreeSet<String>>;
3282 #[allow(clippy::too_many_arguments)]
3283 async fn fix(
3284 &self,
3285 state: &mut RunState,
3286 pr: &PrState,
3287 round: usize,
3288 budget: usize,
3289 reason: &str,
3290 logs: &str,
3291 ) -> Result<Fixed>;
3292}
3293
3294struct GhForge;
3295
3296impl Forge for GhForge {
3297 async fn attribution(&self, state: &RunState, seen: &Seen) -> Option<CiEvidence> {
3298 collect_ci_evidence(state, seen).await
3299 }
3300 async fn view(&self, repo: &Path, pr_url: &str) -> Result<Seen> {
3301 observe(repo, pr_url).await
3302 }
3303 async fn merge(&self, repo: &Path, argv: &[String]) -> Result<(bool, String)> {
3304 gh(repo, argv).await
3305 }
3306 async fn poll(&self) {
3307 tokio::time::sleep(POLL).await;
3308 }
3309 async fn rerun(&self, repo: &Path, run: &str) -> Result<()> {
3310 let args = [
3311 "run".to_owned(),
3312 "rerun".to_owned(),
3313 run.to_owned(),
3314 "--failed".to_owned(),
3315 ];
3316 let (ok, out) = gh(repo, &args).await?;
3317 if !ok {
3318 bail!("gh run rerun {run}: {out}");
3319 }
3320 Ok(())
3321 }
3322 fn now(&self) -> i64 {
3323 jiff::Timestamp::now().as_second()
3324 }
3325 async fn required_contexts(&self, repo: &Path, base: &str) -> Option<BTreeSet<String>> {
3326 required_contexts_of(repo, base).await
3327 }
3328 async fn fix(
3329 &self,
3330 state: &mut RunState,
3331 pr: &PrState,
3332 round: usize,
3333 budget: usize,
3334 reason: &str,
3335 logs: &str,
3336 ) -> Result<Fixed> {
3337 fix_round(state, pr, round, budget, reason, logs).await
3338 }
3339}
3340
3341fn encode_path_segment(s: &str) -> String {
3343 let mut out = String::new();
3344 for b in s.bytes() {
3345 if b.is_ascii_alphanumeric() || matches!(b, b'-' | b'_' | b'.' | b'~') {
3346 out.push(b as char);
3347 } else {
3348 let _ = write!(out, "%{b:02X}");
3349 }
3350 }
3351 out
3352}
3353
3354async fn required_contexts_of(repo: &Path, base: &str) -> Option<BTreeSet<String>> {
3359 let enc = encode_path_segment(base);
3360 let mut all = BTreeSet::new();
3361 let classic = gh(
3364 repo,
3365 &[
3366 "api".to_owned(),
3367 format!("repos/{{owner}}/{{repo}}/branches/{enc}/protection/required_status_checks"),
3368 ],
3369 )
3370 .await
3371 .ok()?;
3372 if classic.0 {
3373 all.extend(parse_classic_required(&classic.1)?);
3374 } else if !classic.1.contains("404") {
3375 return None;
3376 }
3377 let rules = gh(
3378 repo,
3379 &[
3380 "api".to_owned(),
3381 format!("repos/{{owner}}/{{repo}}/rules/branches/{enc}"),
3382 ],
3383 )
3384 .await
3385 .ok()?;
3386 if !rules.0 {
3387 return None;
3388 }
3389 all.extend(parse_ruleset_required(&rules.1)?);
3390 Some(all)
3391}
3392
3393fn parse_classic_required(json: &str) -> Option<BTreeSet<String>> {
3396 let v: serde_json::Value = serde_json::from_str(json).ok()?;
3397 let mut out = BTreeSet::new();
3398 for c in v.get("contexts")?.as_array()? {
3399 out.insert(c.as_str()?.to_owned());
3400 }
3401 for c in v
3402 .get("checks")
3403 .and_then(|c| c.as_array())
3404 .into_iter()
3405 .flatten()
3406 {
3407 if let Some(name) = c.get("context").and_then(|n| n.as_str()) {
3408 out.insert(name.to_owned());
3409 }
3410 }
3411 Some(out)
3412}
3413
3414fn parse_ruleset_required(json: &str) -> Option<BTreeSet<String>> {
3416 let v: serde_json::Value = serde_json::from_str(json).ok()?;
3417 let mut out = BTreeSet::new();
3418 for rule in v.as_array()? {
3419 if rule.get("type").and_then(|t| t.as_str()) != Some("required_status_checks") {
3420 continue;
3421 }
3422 let checks = rule
3423 .pointer("/parameters/required_status_checks")?
3424 .as_array()?;
3425 for c in checks {
3426 out.insert(c.get("context")?.as_str()?.to_owned());
3427 }
3428 }
3429 Some(out)
3430}
3431
3432fn awaiting_new_head(awaiting: Option<&str>, observed: &str) -> bool {
3440 awaiting.is_some_and(|want| !observed.eq_ignore_ascii_case(want))
3441}
3442
3443fn bound_head<'a>(
3453 seen_head: &'a str,
3454 rollup_head: &str,
3455 awaiting: Option<&str>,
3456) -> Option<&'a str> {
3457 if seen_head.is_empty()
3458 || awaiting_new_head(awaiting, seen_head)
3459 || !rollup_head.eq_ignore_ascii_case(seen_head)
3460 {
3461 return None;
3462 }
3463 Some(seen_head)
3464}
3465
3466#[derive(Debug, Clone, Copy, PartialEq, Eq)]
3468enum Refused {
3469 Pending,
3471 Recheck,
3475 Final,
3478}
3479
3480fn classify_refusal(
3483 after: Option<&Seen>,
3484 rechecked: bool,
3485 observed_head: &str,
3486 ci: CiExpectation,
3487) -> Refused {
3488 let Some(after) = after else {
3489 return Refused::Pending;
3491 };
3492 if after.pr.state != PrLifecycle::Open {
3493 return Refused::Final;
3494 }
3495 if !after.head.eq_ignore_ascii_case(observed_head) {
3498 return Refused::Pending;
3499 }
3500 if bound_head(&after.head, &after.rollup_head, None).is_none() {
3502 return Refused::Pending;
3503 }
3504 let state = after.merge_state.to_ascii_uppercase();
3505 if (ci == CiExpectation::Expected
3506 && matches!(after.pr.checks, Checks::Pending | Checks::Unknown))
3507 || state.is_empty()
3508 || state == "UNKNOWN"
3509 {
3510 return Refused::Pending;
3511 }
3512 if rechecked {
3513 Refused::Final
3514 } else {
3515 Refused::Recheck
3516 }
3517}
3518
3519async fn disarm<F: Forge>(
3524 forge: &F,
3525 state: &mut RunState,
3526 repo: &Path,
3527 number: u64,
3528) -> std::result::Result<(), String> {
3529 let argv = disable_automerge_argv(number);
3530 let out = {
3531 let merge_lock = repo_merge_lock(repo);
3532 let _merge_slot = merge_lock.lock().await;
3533 forge.merge(repo, &argv).await
3534 };
3535 match out {
3536 Ok((true, _)) => {
3537 state.land_armed_head = None;
3538 state.event("land", "auto-merge disabled");
3539 state.save().map_err(|e| format!("{e:#}"))?;
3540 Ok(())
3541 }
3542 Ok((false, msg)) => Err(msg),
3543 Err(e) => Err(format!("{e:#}")),
3544 }
3545}
3546
3547async fn stop_disarmed<F: Forge>(
3551 forge: &F,
3552 state: &mut RunState,
3553 repo: &Path,
3554 pr: &PrState,
3555 why: &str,
3556) -> Result<()> {
3557 if state.land_armed_head.is_none() {
3558 return stop(state, repo, pr, why).await;
3559 }
3560 match disarm(forge, state, repo, pr.number).await {
3561 Ok(()) => stop(state, repo, pr, why).await,
3562 Err(e) => {
3563 let why = format!("{why} (auto-merge could not be disabled and may still fire: {e})");
3564 stop(state, repo, pr, &why).await
3565 }
3566 }
3567}
3568
3569fn owner_requested_stop(state: &RunState) -> Result<bool> {
3571 let Some(binding) = &state.land_approval else {
3572 return Ok(false);
3573 };
3574 let q = ask::Questions::open().get(&binding.question)?;
3575 Ok(q.run == state.id
3576 && q.node == APPROVAL_NODE
3577 && q.resolution()
3578 .as_deref()
3579 .is_some_and(crate::merge_decision::stops))
3580}
3581
3582async fn owner_stop<F: Forge>(state: &mut RunState, pr: &mut PrState, forge: &F) -> Result<bool> {
3585 use crate::merge_decision as md;
3586 let Some(binding) = &state.land_approval else {
3587 return Ok(false);
3588 };
3589 let q = ask::Questions::open().get(&binding.question)?;
3590 let Some(choice) = q.resolution().filter(|c| md::stops(c)) else {
3591 return Ok(false);
3592 };
3593 if q.run != state.id || q.node != APPROVAL_NODE {
3594 bail!("stop decision names another run");
3595 }
3596 let target = q.merge_target.clone().unwrap_or_else(|| md::Target {
3597 pr: pr.url.clone(),
3598 head: binding.head.clone(),
3599 language: state.config.graph.language.clone(),
3600 });
3601 if target.pr != pr.url {
3602 bail!("stop decision names another PR");
3603 }
3604 if state.merge_decision.is_none() {
3605 state.merge_decision = Some(md::Decision {
3606 question: q.id.clone(),
3607 target,
3608 choice: choice.clone(),
3609 closed: false,
3610 replacement_run: None,
3611 replacement_pr: None,
3612 });
3613 state.save()?;
3614 }
3615 let repo = state.repo.clone();
3616 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
3618 stop(state, &repo, pr, &format!("owner stop requested, but auto-merge could not be disabled: {e}; no repair or replacement started")).await?;
3619 return Ok(true);
3620 }
3621 if choice.eq_ignore_ascii_case(HOLD) {
3622 stop(
3623 state,
3624 &repo,
3625 pr,
3626 "owner held the decision: PR left open; no further repair or merge work",
3627 )
3628 .await?;
3629 return Ok(true);
3630 }
3631 if md::selected_agent(&choice).is_some()
3632 || state
3633 .origin
3634 .as_ref()
3635 .and_then(|o| o.task.as_ref())
3636 .is_some()
3637 {
3638 let owners: Vec<_> = crate::queue::Queue::open()
3639 .list()
3640 .into_iter()
3641 .filter(|task| task.runs.last() == Some(&state.id))
3642 .collect();
3643 let owner = (owners.len() == 1).then(|| &owners[0]);
3644 if !owner.is_some_and(|task| {
3645 task.runs.last() == Some(&state.id)
3646 && (!task
3647 .operator_decided_at
3648 .is_some_and(|at| at > q.answered_at.unwrap_or(q.asked_at))
3649 || task.resumption.as_ref().is_some_and(|release| {
3650 release.question_id.as_deref() == Some(q.id.as_str())
3651 && task.operator_decided_at == Some(release.at)
3652 }))
3653 }) {
3654 stop(state, &repo, pr, "replacement requires the current original queue task owner and an unsuperseded answer; PR left open").await?;
3655 return Ok(true);
3656 }
3657 }
3658 if pr.state == PrLifecycle::Merged {
3659 stop(
3660 state,
3661 &repo,
3662 pr,
3663 "PR already merged; withdrawal/replacement cannot be applied",
3664 )
3665 .await?;
3666 return Ok(true);
3667 }
3668 let comment = format!(
3669 "{MARKER}\nOwner decision on question {}: {}. Previous attempt: `{}`. Original instruction and review history remain in the task record.",
3670 q.id, choice, state.id
3671 );
3672 if pr.state == PrLifecycle::Open {
3673 if let Err(e) = forge.close(&repo, &pr.url, &comment).await {
3674 stop(
3675 state,
3676 &repo,
3677 pr,
3678 &format!(
3679 "owner requested closure but it failed: {e}; task held, no replacement started"
3680 ),
3681 )
3682 .await?;
3683 return Ok(true);
3684 }
3685 }
3686 let confirmed = forge.view(&repo, &pr.url).await?;
3687 if confirmed.pr.state != PrLifecycle::Closed {
3688 stop(
3689 state,
3690 &repo,
3691 pr,
3692 "PR closure was not confirmed; task held, no replacement started",
3693 )
3694 .await?;
3695 return Ok(true);
3696 }
3697 *pr = confirmed.pr;
3698 state.merge_decision.as_mut().unwrap().closed = true;
3699 if let Some(record) = &mut state.pr {
3700 record.state = "closed".into();
3701 }
3702 state.status = RunStatus::Superseded;
3703 state.merge = Some(MergeOutcome {
3704 mode: MergeMode::Pr,
3705 ok: false,
3706 detail: format!("owner decision: {choice}; PR closure confirmed"),
3707 empty: false,
3708 });
3709 state.event(
3710 "land",
3711 format!(
3712 "{} applied: PR closure confirmed; old execution retired",
3713 choice
3714 ),
3715 );
3716 state.save()?;
3717 Ok(true)
3718}
3719
3720fn check_landing_resources(
3722 state: &mut RunState,
3723 node: &str,
3724 outcomes: &[crate::run::CommandOutcome],
3725) -> Result<()> {
3726 if let Some(blocked) = outcomes.iter().find(|outcome| outcome.resource_blocked) {
3727 let detail = format!("{}: {}", blocked.command, blocked.output_tail);
3728 state
3729 .resource_block
3730 .get_or_insert_with(|| crate::run::ResourceBlock {
3731 cause: crate::run::ResourceBlockCause::Other,
3732 node: node.into(),
3733 kind: "shared build cache".into(),
3734 detail: detail.clone(),
3735 at: jiff::Timestamp::now(),
3736 });
3737 state.event("resource", &detail);
3738 state.save()?;
3739 bail!("landing verification could not start: {detail}");
3740 }
3741 Ok(())
3742}
3743
3744async fn publish_landing_head<F: Forge>(
3747 state: &mut RunState,
3748 observed: &str,
3749 pr_url: &str,
3750 forge: &F,
3751) -> Result<String> {
3752 crate::pr_head::ensure_owner(state)?;
3753 let winner = state.winner().cloned().context("landing has no winner")?;
3754 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
3755 let expected = state.pr_pushed_head.as_deref().unwrap_or(observed);
3756 anyhow::ensure!(
3757 observed == expected
3758 || (observed == head
3759 && state.gate_head.as_deref() == Some(&head)
3760 && state.gate_allows_progress()),
3761 "public head moved outside this run; refusing to overwrite it"
3762 );
3763 anyhow::ensure!(
3764 git::is_clean(&winner.worktree).await?,
3765 "landing worktree is dirty"
3766 );
3767 if state.gate_head.as_deref() != Some(&head)
3768 || !state.gate_ran
3769 || !state.gate_commands_allow_progress()
3770 {
3771 state.reconcile_verification_head(&head);
3772 state.gate.clear();
3773 state.gate_head = None;
3774 state.gate_ran = false;
3775 state.pre_gate.clear();
3776 state.pre_gate_commit = None;
3777 state.save()?;
3778 let inherited = crate::repo_lock::WaitPolicy::current();
3779 let wait = crate::repo_lock::WaitPolicy::new(
3780 Duration::from_secs(state.config.graph.timeout_resource_wait),
3781 move || inherited.cancelled(),
3782 );
3783 let mut outcomes = crate::graph::run_landing_gate(state, &winner, &wait).await?;
3784 loop {
3785 if outcomes.iter().any(|outcome| outcome.resource_blocked) {
3786 state.gate = outcomes.clone();
3787 check_landing_resources(state, "gate", &outcomes)?;
3788 }
3789 if outcomes.iter().all(|o| o.ok()) {
3790 break;
3791 }
3792 match Box::pin(crate::graph::repair_landing_gate(state, &winner, &outcomes)).await? {
3793 crate::graph::GateFix::Retry => {
3794 outcomes = crate::graph::run_landing_gate(state, &winner, &wait).await?;
3795 }
3796 crate::graph::GateFix::Stop => break,
3797 crate::graph::GateFix::Defer => {
3798 if let Some(e2e) = &state.gate_repair_e2e {
3802 let outcomes = e2e.outcomes.clone();
3803 check_landing_resources(state, "e2e", &outcomes)?;
3804 }
3805 bail!("landing gate repair deferred");
3806 }
3807 }
3808 }
3809 state.gate = outcomes;
3810 state.gate_ran = true;
3811 state.save()?;
3812 }
3813 let inherited = crate::repo_lock::WaitPolicy::current();
3814 let wait = crate::repo_lock::WaitPolicy::new(
3815 Duration::from_secs(state.config.graph.timeout_resource_wait),
3816 move || inherited.cancelled(),
3817 );
3818 let checked = state
3819 .gate_head
3820 .clone()
3821 .context("landing gate has no checked SHA")?;
3822 anyhow::ensure!(
3823 git::rev_parse(&winner.worktree, "HEAD").await? == checked
3824 && git::is_clean(&winner.worktree).await?,
3825 "landing tree changed after gate"
3826 );
3827 let e2e = crate::graph::check_gate_repair_e2e(state, &winner, &wait).await?;
3828 if matches!(e2e, crate::graph::GateFix::Defer) {
3829 let outcomes = state
3830 .gate_repair_e2e
3831 .as_ref()
3832 .context("deferred landing e2e has no outcomes")?
3833 .outcomes
3834 .clone();
3835 check_landing_resources(state, "e2e", &outcomes)?;
3836 }
3837 anyhow::ensure!(
3838 matches!(e2e, crate::graph::GateFix::Retry),
3839 "post-repair e2e has not passed on the landing head; nothing published"
3840 );
3841 anyhow::ensure!(
3842 git::rev_parse(&winner.worktree, "HEAD").await? == checked
3843 && git::is_clean(&winner.worktree).await?,
3844 "landing tree changed during post-repair e2e"
3845 );
3846 anyhow::ensure!(
3847 crate::graph::verify_current_head(state, &winner, &wait).await?,
3848 "current head e2e has not passed; nothing published"
3849 );
3850 anyhow::ensure!(
3851 state.gate_allows_progress(),
3852 "landing gate failed; nothing published"
3853 );
3854 crate::pr_head::ensure_owner(state)?;
3855 if owner_requested_stop(state)? {
3856 bail!("owner requested stop before publication");
3857 }
3858 let current = forge.view(&state.repo, pr_url).await?;
3859 anyhow::ensure!(
3860 current.pr.state == PrLifecycle::Open,
3861 "PR closed or merged while gating; nothing published"
3862 );
3863 anyhow::ensure!(
3864 current.head == observed || current.head == checked,
3865 "PR head changed while gating; nothing published"
3866 );
3867 anyhow::ensure!(
3868 crate::foreign_checkout::write_back(state, &checked).await?,
3869 "foreign checkout delivery is blocked; see the run events"
3870 );
3871 let public = state.pr_branch().unwrap_or(&winner.branch).to_owned();
3872 let lease = format!("--force-with-lease=refs/heads/{public}:{observed}");
3873 let refspec = format!("{checked}:refs/heads/{public}");
3874 let lock = repo_merge_lock(&state.repo);
3875 let _slot = lock.lock().await;
3876 let pushed = git::git_raw(
3877 &winner.worktree,
3878 &["push", &lease, &state.config.merge.remote, &refspec],
3879 )
3880 .await?;
3881 anyhow::ensure!(
3882 pushed.ok(),
3883 "publishing gated landing head failed: {}",
3884 pushed.stderr
3885 );
3886 state.pr_pushed_head = Some(checked.clone());
3887 state.land_sync_pending = false;
3888 state.save()?;
3889 Ok(checked)
3890}
3891
3892async fn restore_landing_worktree(state: &mut RunState) -> Result<()> {
3895 let winner = state.winner().cloned().context("landing has no winner")?;
3896 let inherited = crate::repo_lock::WaitPolicy::current();
3897 let wait = crate::repo_lock::WaitPolicy::new(
3898 Duration::from_secs(state.config.graph.timeout_resource_wait),
3899 move || inherited.cancelled(),
3900 );
3901 let _coordination = crate::repo_lock::SeatLease::operation_with(
3902 &winner.worktree,
3903 state.config.coordination.as_ref(),
3904 &wait,
3905 )
3906 .await?;
3907 if !git::is_clean(&winner.worktree).await? {
3908 let from = state
3909 .land_rebase_from
3910 .as_deref()
3911 .context("landing worktree is dirty")?;
3912 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
3913 anyhow::ensure!(head != from, "landing worktree is dirty");
3914 for args in [
3915 vec!["diff", "--cached", "--quiet", from],
3916 vec!["diff", "--quiet"],
3917 ] {
3918 anyhow::ensure!(
3919 git::git_raw(&winner.worktree, &args).await?.ok(),
3920 "landing worktree has edits beyond the interrupted rebase"
3921 );
3922 }
3923 let untracked = git::git(&winner.worktree, &["ls-files", "--others", "-z"]).await?;
3927 let tracked = git::git(
3928 &winner.worktree,
3929 &["ls-tree", "-r", "--name-only", "-z", "HEAD"],
3930 )
3931 .await?;
3932 for local in untracked.split('\0').filter(|p| !p.is_empty()) {
3933 anyhow::ensure!(
3934 !tracked.split('\0').filter(|p| !p.is_empty()).any(|path| {
3935 path == local
3936 || path
3937 .strip_prefix(local)
3938 .is_some_and(|rest| rest.starts_with('/'))
3939 || local
3940 .strip_prefix(path)
3941 .is_some_and(|rest| rest.starts_with('/'))
3942 }),
3943 "landing worktree has an untracked or ignored path conflicting with HEAD: {local}"
3944 );
3945 }
3946 git::git(&winner.worktree, &["read-tree", "-m", "-u", "HEAD"]).await?;
3947 }
3948 if let (Some(checkout), Some(from)) = (&state.foreign_checkout, &state.land_rebase_from) {
3949 anyhow::ensure!(
3950 git::is_ancestor(&winner.worktree, &checkout.synced_head, from).await,
3951 "landing synchronization started outside the foreign checkout history"
3952 );
3953 if !git::is_ancestor(&winner.worktree, from, "HEAD").await {
3954 git::git(
3960 &winner.worktree,
3961 &[
3962 "-c",
3963 "core.hooksPath=/dev/null",
3964 "merge",
3965 "--strategy=ours",
3966 "--no-ff",
3967 "--no-autostash",
3968 "--no-edit",
3969 "-m",
3970 "Merge pre-sync history into the repaired landing tree",
3971 from,
3972 ],
3973 )
3974 .await?;
3975 }
3976 }
3977 crate::worktree_setup::prepare(&state.config, &state.repo, &winner.worktree).await?;
3978 state.land_rebase_from = None;
3979 state.save()?;
3980 Ok(())
3981}
3982
3983async fn rebase_landing_worktree(
3984 state: &mut RunState,
3985 onto: &str,
3986) -> Result<crate::rebase::Rebased> {
3987 restore_landing_worktree(state).await?;
3988 let winner = state.winner().cloned().context("landing has no winner")?;
3989 state.land_sync_pending = true;
3990 state.land_rebase_from = Some(git::rev_parse(&winner.worktree, "HEAD").await?);
3991 state.save()?;
3992 let scratch = state.dir().join("rebase");
3993 let result = crate::rebase::rebase_with_fixer(state, &scratch, &winner.branch, onto).await?;
3994 if result == crate::rebase::Rebased::Applied {
3995 restore_landing_worktree(state).await?;
3996 }
3997 Ok(result)
3998}
3999
4000async fn resume_landing_head<F: Forge>(
4003 state: &mut RunState,
4004 observed: &str,
4005 pr_url: &str,
4006 forge: &F,
4007) -> Result<String> {
4008 crate::pr_head::ensure_owner(state)?;
4009 let winner = state.winner().cloned().context("landing has no winner")?;
4010 let local = git::rev_parse(&winner.worktree, "HEAD").await?;
4011 let expected = state
4012 .pr_pushed_head
4013 .as_deref()
4014 .or(state.gate_head.as_deref())
4015 .context("missing public head lease")?;
4016 anyhow::ensure!(
4017 observed == expected
4018 || (observed == local
4019 && ((state.gate_head.as_deref() == Some(&local) && state.gate_allows_progress())
4020 || git::is_ancestor(&winner.worktree, expected, &local).await)),
4021 "public head moved outside this run; refusing to sync"
4022 );
4023 state.pr_pushed_head = Some(observed.to_owned());
4030 state.save()?;
4031 restore_landing_worktree(state).await?;
4032 let remote = state.config.merge.remote.clone();
4033 let base = state.base_branch.clone();
4034 let fetched = git::fetch(&state.repo, &remote, &base).await?;
4035 anyhow::ensure!(
4036 fetched.ok(),
4037 "cannot fetch landing base: {}",
4038 fetched.stderr
4039 );
4040 let onto = format!("{remote}/{base}");
4041 let tip = git::rev_parse(&state.repo, &onto).await?;
4042 if !git::is_ancestor(&state.repo, &tip, &local).await {
4043 match rebase_landing_worktree(state, &onto).await? {
4044 crate::rebase::Rebased::Applied => {}
4045 crate::rebase::Rebased::Stopped(why) => bail!("landing rebase stopped: {why}"),
4046 }
4047 }
4048 publish_landing_head(state, observed, pr_url, forge).await
4049}
4050
4051async fn land_with<F: Forge>(state: &mut RunState, pr_url: &str, forge: &F) -> Result<PrState> {
4052 crate::pr_head::ensure_owner(state)?;
4053 state.land_unrelated = None;
4054 let reopening_hold = crate::merge_decision::resumable_hold(state);
4055 let repo = state.repo.clone();
4056 let budget = state.config.graph.land_rounds;
4057 let mut round = 0usize;
4058 let mut rebases = 0usize;
4061 let ci = state.config.merge.ci.expectation();
4062 if ci == CiExpectation::Absent {
4063 state.event(
4064 "land",
4065 "CI not expected ([merge] ci = \"none\"); check status ignored",
4066 );
4067 }
4068 let mut waited = Duration::ZERO;
4069 let mut shown: BTreeSet<String> = BTreeSet::new();
4074 let mut awaiting_head: Option<String> = state.pr_pushed_head.clone();
4076 let mut rechecked = false;
4078
4079 state.status = RunStatus::Landing;
4087 state.event("land", format!("watching {pr_url}"));
4088 state.save()?;
4089
4090 let mut resumed_armed = state.land_armed_head.is_some();
4094
4095 loop {
4096 let seen = forge.view(&repo, pr_url).await?;
4097 let mut pr = seen.pr.clone();
4098 pr.review_comments.retain(|c| !shown.contains(&c.body));
4099 state.pr = Some(crate::run::PrRecord {
4100 url: pr.url.clone(),
4101 number: pr.number,
4102 state: pr.state.as_str().to_owned(),
4103 checks: pr.checks.as_str().to_owned(),
4104 round,
4105 rounds: budget,
4106 red_at_merge: Vec::new(),
4107 });
4108 state.save()?;
4109
4110 if pr.state == PrLifecycle::Open {
4111 state.observe_branch_owner_holds(&seen.head).await;
4112 state.save()?;
4113 }
4114 crate::pr_head::ensure_owner(state)?;
4115 if reopening_hold {
4116 anyhow::ensure!(
4117 pr.state == PrLifecycle::Open,
4118 "held PR is no longer open; cannot request a fresh decision"
4119 );
4120 disarm(forge, state, &repo, pr.number)
4123 .await
4124 .map_err(anyhow::Error::msg)?;
4125 let previous = state.merge_decision.take();
4126 let binding = state.land_approval.take();
4127 state.config.graph.land_approval = true;
4128 let subject = merge_subject(
4129 crate::graph::landing_title(state, &seen.title),
4130 &crate::graph::landing_subject_source(state),
4131 );
4132 let contested = contested_to_ask(state);
4133 if let Err(error) =
4134 approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head).await
4135 {
4136 state.merge_decision = previous;
4137 state.land_approval = binding;
4138 return Err(error);
4139 }
4140 state.end_pass_parked(crate::run::ParkCause::Question);
4141 state.parked = true;
4142 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()));
4143 state.save()?;
4144 return Ok(pr);
4145 }
4146 if owner_stop(state, &mut pr, forge).await? {
4147 return Ok(pr);
4148 }
4149
4150 if std::mem::take(&mut resumed_armed) && pr.state == PrLifecycle::Open {
4151 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4156 let why = format!(
4157 "a previous pass may have armed auto-merge and it could not be disabled \
4158 on resume: {e}"
4159 );
4160 stop(state, &repo, &pr, &why).await?;
4161 return Ok(pr);
4162 }
4163 }
4164
4165 if pr.state == PrLifecycle::Open
4170 && !seen.head.is_empty()
4171 && state
4172 .land_armed_head
4173 .as_deref()
4174 .is_some_and(|armed| !armed.eq_ignore_ascii_case(&seen.head))
4175 {
4176 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4177 let why = format!(
4178 "the head moved while auto-merge was armed and it could not be disabled: {e}"
4179 );
4180 stop(state, &repo, &pr, &why).await?;
4181 return Ok(pr);
4182 }
4183 }
4184
4185 if state.land_sync_pending && pr.state == PrLifecycle::Open {
4186 if owner_stop(state, &mut pr, forge).await? {
4189 return Ok(pr);
4190 }
4191 let repair_answer = state.land_approval.as_ref().is_some_and(|binding| {
4192 binding.head.eq_ignore_ascii_case(&seen.head)
4193 && ask::Questions::open()
4194 .get(&binding.question)
4195 .is_ok_and(|q| {
4196 q.run == state.id
4197 && q.node == APPROVAL_NODE
4198 && q.status == ask::QuestionStatus::Answered
4199 && matches!(approval(q.resolution().as_deref()), Approval::Repair)
4200 })
4201 });
4202 if repair_answer {
4203 let subject = merge_subject(
4204 crate::graph::landing_title(state, &seen.title),
4205 &crate::graph::landing_subject_source(state),
4206 );
4207 let contested = contested_to_ask(state);
4208 if matches!(
4209 approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head).await?,
4210 ApprovalGate::Repair
4211 ) {
4212 if let Err(why) = disarm(forge, state, &repo, pr.number).await {
4213 state.event("repair", format!("auto-merge could not be disabled: {why}; repair preflight will retry"));
4214 state.save()?;
4215 }
4216 return Ok(pr);
4217 }
4218 }
4219 let synced = resume_landing_head(state, &seen.head, pr_url, forge).await;
4220 if owner_stop(state, &mut pr, forge).await? {
4223 return Ok(pr);
4224 }
4225 let head = synced?;
4226 awaiting_head = Some(head);
4227 waited = Duration::ZERO;
4228 rechecked = false;
4229 continue;
4231 }
4232
4233 if pr.state == PrLifecycle::Open {
4234 if bound_head(&seen.head, &seen.rollup_head, awaiting_head.as_deref()).is_none() {
4235 if waited >= WAIT_CEILING {
4236 let want = awaiting_head.as_deref().unwrap_or_default();
4237 let why = format!(
4238 "the pull request's checks were still not about one readable head after \
4239 {} minutes (expected {}, pull request points at {}, checks are for {}); \
4240 someone may have pushed over it",
4241 WAIT_CEILING.as_secs() / 60,
4242 if want.is_empty() { "any" } else { want },
4243 if seen.head.is_empty() {
4244 "nothing readable"
4245 } else {
4246 &seen.head
4247 },
4248 if seen.rollup_head.is_empty() {
4249 "nothing readable"
4250 } else {
4251 &seen.rollup_head
4252 },
4253 );
4254 stop_disarmed(forge, state, &repo, &pr, &why).await?;
4255 return Ok(pr);
4256 }
4257 waited += POLL;
4258 forge.poll().await;
4259 continue;
4260 }
4261 if awaiting_head.take().is_some() {
4264 waited = Duration::ZERO;
4267 }
4268 }
4269
4270 let decision_wait = if pr.checks == Checks::Red && pr.blocking == Blocking::Unsaid {
4273 let first = state
4274 .land_unsaid
4275 .get_or_insert_with(|| (seen.head.clone(), forge.now()));
4276 if !first.0.eq_ignore_ascii_case(&seen.head) {
4277 *first = (seen.head.clone(), forge.now());
4278 }
4279 let elapsed = Duration::from_secs(forge.now().saturating_sub(first.1).max(0) as u64);
4280 state.save()?;
4281 elapsed
4282 } else {
4283 waited
4284 };
4285 let proposed = decide_with(&pr, round, budget, decision_wait, ci);
4286 if pr.checks == Checks::Red && pr.blocking == Blocking::Unsaid && proposed == Step::Wait {
4287 if waited >= WAIT_CEILING {
4288 stop_disarmed(
4289 forge,
4290 state,
4291 &repo,
4292 &pr,
4293 "merge state remained unreadable; refusing to merge on a guess",
4294 )
4295 .await?;
4296 return Ok(pr);
4297 }
4298 waited += POLL;
4299 forge.poll().await;
4300 continue;
4301 }
4302
4303 if ci == CiExpectation::Expected
4308 && pr.state == PrLifecycle::Open
4309 && state.config.graph.rerun_flaky_checks
4310 {
4311 let include_optional = pr.checks == Checks::Red
4312 && matches!(proposed, Step::Fix { .. } | Step::GiveUp { .. });
4313 let failing = rerunnable_with(&seen.contexts, include_optional);
4314 let now = forge.now();
4315 match rerun_step(&failing, state.land_reruns.as_ref(), &seen.head, now) {
4316 RerunStep::Rerun(runs) => {
4317 let rec = state.land_reruns.get_or_insert_with(Default::default);
4318 if !rec.head.eq_ignore_ascii_case(&seen.head) {
4319 *rec = LandReruns {
4320 head: seen.head.clone(),
4321 runs: BTreeMap::new(),
4322 };
4323 }
4324 for run in &runs {
4325 rec.runs.insert(run.clone(), now);
4326 }
4327 state.save()?;
4331 let mut any = false;
4332 for run in &runs {
4333 let names = failing
4334 .iter()
4335 .filter(|(_, r)| r.as_deref() == Some(run))
4336 .map(|(l, _)| l.as_str())
4337 .collect::<Vec<_>>()
4338 .join(", ");
4339 match forge.rerun(&repo, run).await {
4340 Ok(()) => {
4341 any = true;
4342 state.event(
4343 "land",
4344 format!("reran failed check(s) {names} (run {run})"),
4345 );
4346 }
4347 Err(e) => state.event(
4349 "land",
4350 format!("could not rerun check(s) {names} (run {run}): {e:#}"),
4351 ),
4352 }
4353 }
4354 state.save()?;
4355 if any {
4356 waited = Duration::ZERO;
4357 forge.poll().await;
4358 continue;
4359 }
4360 }
4361 RerunStep::Grace => {
4362 if waited >= WAIT_CEILING {
4363 let why = format!(
4364 "checks were still failing after a rerun and {} minutes",
4365 WAIT_CEILING.as_secs() / 60
4366 );
4367 stop(state, &repo, &pr, &why).await?;
4368 return Ok(pr);
4369 }
4370 waited += POLL;
4371 forge.poll().await;
4372 continue;
4373 }
4374 RerunStep::Fix => {}
4375 }
4376 }
4377
4378 let step = proposed;
4379 let armed_here = state
4384 .land_armed_head
4385 .as_deref()
4386 .is_some_and(|armed| armed.eq_ignore_ascii_case(&seen.head));
4387 if armed_here && matches!(step, Step::Merge | Step::Wait) {
4388 if waited >= WAIT_CEILING {
4389 let required = if seen.base.is_empty() {
4390 None
4391 } else {
4392 forge.required_contexts(&repo, &seen.base).await
4393 };
4394 let why = format!(
4395 "auto-merge was armed on {} but the pull request did not merge within {} \
4396 minutes ({})",
4397 seen.head,
4398 WAIT_CEILING.as_secs() / 60,
4399 waiting_on(&seen.merge_state, &seen.contexts, required.as_ref())
4400 );
4401 stop_disarmed(forge, state, &repo, &pr, &why).await?;
4402 return Ok(pr);
4403 }
4404 waited += POLL;
4405 forge.poll().await;
4406 continue;
4407 }
4408 if armed_here && !matches!(step, Step::Done { .. }) {
4409 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4412 let why = format!("auto-merge could not be disabled: {e}");
4413 stop(state, &repo, &pr, &why).await?;
4414 return Ok(pr);
4415 }
4416 }
4417 if pr.checks == Checks::Red
4418 && matches!(step, Step::Fix { .. } | Step::GiveUp { .. })
4419 && pr.review_comments.is_empty()
4420 && let Some(evidence) = forge.attribution(state, &seen).await
4421 && evidence.unrelated(&seen.head, &pr.failing)
4422 {
4423 if owner_stop(state, &mut pr, forge).await? {
4424 return Ok(pr);
4425 }
4426 let fresh = forge.view(&repo, pr_url).await?;
4428 if fresh.head != seen.head
4429 || fresh.rollup_head != seen.rollup_head
4430 || fresh.pr.state != PrLifecycle::Open
4431 || fresh.pr.checks != Checks::Red
4432 || fresh.pr.failing != pr.failing
4433 || fresh
4434 .pr
4435 .review_comments
4436 .iter()
4437 .any(|c| !shown.contains(&c.body))
4438 {
4439 continue;
4440 }
4441 hold_unrelated(state, &pr, evidence).await?;
4442 return Ok(pr);
4443 }
4444 match step {
4445 Step::Wait => {
4446 if waited >= WAIT_CEILING {
4447 let why = format!(
4448 "checks were still running after {} minutes",
4449 WAIT_CEILING.as_secs() / 60
4450 );
4451 stop(state, &repo, &pr, &why).await?;
4452 return Ok(pr);
4453 }
4454 waited += POLL;
4455 forge.poll().await;
4456 }
4457 Step::Done { merged } => {
4458 if merged {
4459 state.pr_merged_head = (!seen.head.is_empty()).then(|| seen.head.clone());
4460 }
4461 if let Some(armed) = state.land_armed_head.take() {
4466 if merged && !seen.head.is_empty() && !armed.eq_ignore_ascii_case(&seen.head) {
4467 let msg = format!(
4468 "{} merged on {} but the owner approved {armed}; review what landed",
4469 pr.url, seen.head
4470 );
4471 tracing::warn!("{msg}");
4472 state.event("land", msg);
4473 crate::notices::raise_with(
4477 crate::notices::Notice::warn(
4478 &format!("merged-unapproved-head:{}", state.id),
4479 "A pull request merged on a commit the owner did not approve; \
4480 review what landed",
4481 )
4482 .link(crate::notices::Link::Run {
4483 id: state.id.clone(),
4484 }),
4485 &state.config.notify,
4486 );
4487 }
4488 }
4489 state.status = if merged {
4490 RunStatus::Merged
4491 } else {
4492 RunStatus::Ready
4493 };
4494 let detail = if merged {
4495 format!("{} was merged", pr.url)
4496 } else {
4497 format!("{} was closed without merging", pr.url)
4498 };
4499 state.merge = Some(MergeOutcome {
4500 mode: MergeMode::Pr,
4501 ok: merged,
4502 detail: detail.clone(),
4503 empty: false,
4504 });
4505 state.event("land", detail);
4506 state.save()?;
4507 write_pr_state_through(state, pr.state);
4508 return Ok(pr);
4509 }
4510 Step::Merge => {
4511 state.check_delivery_evidence(&seen.head)?;
4512 let subject = merge_subject(
4513 crate::graph::landing_title(state, &seen.title),
4514 &crate::graph::landing_subject_source(state),
4515 );
4516 let contested = contested_to_ask(state);
4522 if !approval_reasons(state).is_empty() {
4523 match approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head)
4524 .await?
4525 {
4526 ApprovalGate::Approved => {}
4527 ApprovalGate::Repair => {
4528 if let Err(why) = disarm(forge, state, &repo, pr.number).await {
4531 state.event("repair", format!("auto-merge could not be disabled: {why}; repair preflight will retry"));
4532 state.save()?;
4533 }
4534 return Ok(pr);
4535 }
4536 ApprovalGate::Held => {
4537 if owner_stop(state, &mut pr, forge).await? {
4540 return Ok(pr);
4541 }
4542 stop(
4543 state,
4544 &repo,
4545 &pr,
4546 "the owner did not approve the merge (held or unanswered)",
4547 )
4548 .await?;
4549 return Ok(pr);
4550 }
4551 ApprovalGate::Pending => {
4559 state.end_pass_parked(crate::run::ParkCause::Question);
4560 state.parked = true;
4561 state.event(
4562 "land",
4563 "parked awaiting merge approval - resumes once answered",
4564 );
4565 state.save()?;
4566 return Ok(pr);
4567 }
4568 }
4569 }
4570 let observed_head = seen.head.clone();
4581 {
4584 let fresh = forge.view(&repo, pr_url).await.ok();
4585 if !direct_merge_is_safe(
4586 fresh.as_ref(),
4587 &observed_head,
4588 &shown,
4589 round,
4590 budget,
4591 waited,
4592 ci,
4593 ) {
4594 if waited >= WAIT_CEILING {
4595 let why = "the pull request did not settle on the approved head \
4596 before it could be merged";
4597 stop(state, &repo, &pr, why).await?;
4598 return Ok(pr);
4599 }
4600 state.event(
4601 "land",
4602 "the pull request changed before merging; looking again",
4603 );
4604 waited += POLL;
4605 forge.poll().await;
4606 continue;
4607 }
4608 }
4609 let argv = merge_argv_at(pr.number, &subject, &observed_head);
4610 let out = {
4611 let merge_lock = repo_merge_lock(&repo);
4612 let _merge_slot = merge_lock.lock().await;
4613 crate::pr_head::ensure_owner(state)?;
4614 if let Some(task_id) = state
4615 .origin
4616 .as_ref()
4617 .and_then(|origin| origin.task.as_ref())
4618 {
4619 let task = crate::queue::Queue::open()
4620 .get(task_id)
4621 .context("cannot verify the task owner immediately before merge")?;
4622 if task.runs.last() != Some(&state.id)
4623 || task.operator_held()
4624 || task.status == crate::queue::TaskStatus::Done
4625 {
4626 bail!(
4627 "task ownership or an operator hold superseded this merge approval"
4628 );
4629 }
4630 }
4631 if let Some(binding) = &state.land_approval {
4632 let current = ask::Questions::open().get(&binding.question)?;
4633 if merge_consent_superseded(state, ¤t)?
4634 || current.run != state.id
4635 || !binding.head.eq_ignore_ascii_case(&observed_head)
4636 || approval(current.resolution().as_deref()) != Approval::Merge
4637 || current.merge_target.as_ref().is_some_and(|t| {
4638 t.pr != pr.url || !t.head.eq_ignore_ascii_case(&observed_head)
4639 })
4640 {
4641 bail!(
4642 "merge decision is stale or no longer authorizes the reviewed head"
4643 );
4644 }
4645 }
4646 forge.merge(&repo, &argv).await?
4647 };
4648 if out.0 {
4649 let confirmed = forge.view(&repo, pr_url).await.is_ok_and(|c| {
4655 if c.pr.state == PrLifecycle::Merged {
4656 state.pr_merged_head = (!c.head.is_empty()).then_some(c.head);
4657 true
4658 } else {
4659 false
4660 }
4661 });
4662 if !confirmed {
4663 if waited >= WAIT_CEILING {
4664 let why = "the merge request succeeded but the pull request \
4665 could not be confirmed merged after waiting";
4666 stop(state, &repo, &pr, why).await?;
4667 return Ok(pr);
4668 }
4669 state.event(
4670 "land",
4671 "merge accepted but the pull request is not confirmed merged yet; waiting",
4672 );
4673 state.save()?;
4674 waited += POLL;
4675 forge.poll().await;
4676 continue;
4677 }
4678 pr.state = PrLifecycle::Merged;
4679 state.status = RunStatus::Merged;
4680 state.merge = Some(MergeOutcome {
4681 mode: MergeMode::Pr,
4682 ok: true,
4683 detail: format!("gh {}", argv.join(" ")),
4684 empty: false,
4685 });
4686 if let Some(pr_record) = state.pr.as_mut() {
4691 pr_record.state = pr.state.as_str().to_owned();
4692 }
4693 state.event("land", format!("merged {} as `{subject}`", pr.url));
4694 announce_red_merge(state, &pr).await;
4695 state.save()?;
4696 write_pr_state_through(state, pr.state);
4697 return Ok(pr);
4698 }
4699 let after_seen = forge.view(&repo, pr_url).await.ok();
4700 let after = after_seen.as_ref().map(|s| s.pr.state);
4701 if let Some(outcome) = merged_after_all(&argv, &out.1, after) {
4702 state.pr_merged_head = after_seen
4703 .as_ref()
4704 .map(|s| s.head.clone())
4705 .filter(|h| !h.is_empty());
4706 pr.state = PrLifecycle::Merged;
4707 state.status = RunStatus::Merged;
4708 state.merge = Some(outcome);
4709 if let Some(pr_record) = state.pr.as_mut() {
4710 pr_record.state = pr.state.as_str().to_owned();
4711 }
4712 state.event("land", format!("merged {} as `{subject}`", pr.url));
4713 announce_red_merge(state, &pr).await;
4714 state.save()?;
4715 write_pr_state_through(state, pr.state);
4716 return Ok(pr);
4717 }
4718 let verdict = classify_refusal(after_seen.as_ref(), rechecked, &observed_head, ci);
4719 match verdict {
4720 Refused::Final => {
4721 let merge_state = after_seen
4722 .as_ref()
4723 .map(|s| s.merge_state.as_str())
4724 .filter(|m| !m.is_empty())
4725 .unwrap_or("unknown");
4726 let why = format!(
4730 "the merge was refused: {} (merge state: {merge_state})",
4731 out.1
4732 );
4733 stop(state, &repo, &pr, &why).await?;
4734 return Ok(pr);
4735 }
4736 verdict => {
4737 if waited >= WAIT_CEILING {
4742 let why = format!(
4743 "the merge was still refused after {} minutes: {}",
4744 WAIT_CEILING.as_secs() / 60,
4745 out.1
4746 );
4747 stop(state, &repo, &pr, &why).await?;
4748 return Ok(pr);
4749 }
4750 if verdict == Refused::Recheck {
4751 rechecked = true;
4752 }
4753 state.event(
4754 "land",
4755 "merge refused while the branch policy is not satisfied yet; waiting",
4756 );
4757 state.save()?;
4758 waited += POLL;
4759 forge.poll().await;
4760 }
4761 }
4762 }
4763 Step::Rebase => {
4764 if rebases >= budget {
4770 let why = format!(
4771 "the base moved under this branch {budget} time(s) and it still does \
4772 not merge; rebasing again would only race it"
4773 );
4774 stop(state, &repo, &pr, &why).await?;
4775 return Ok(pr);
4776 }
4777 rebases += 1;
4778 let Some(branch) = state.winner().map(|w| w.branch.clone()) else {
4779 stop(
4780 state,
4781 &repo,
4782 &pr,
4783 "the pull request conflicts and this run has no winning branch to rebase",
4784 )
4785 .await?;
4786 return Ok(pr);
4787 };
4788 let base = state.base_branch.clone();
4789 state.event(
4790 "land",
4791 format!("{} no longer merges; rebasing onto {base}", pr.url),
4792 );
4793 state.save()?;
4794
4795 let remote = state.config.merge.remote.clone();
4799 git::fetch(&repo, &remote, &base).await.ok();
4800 if owner_stop(state, &mut pr, forge).await? {
4801 return Ok(pr);
4802 }
4803 let onto = format!("{remote}/{base}");
4804 let rebased = match rebase_landing_worktree(state, &onto).await {
4805 Ok(crate::rebase::Rebased::Applied) => Ok(None),
4806 Ok(crate::rebase::Rebased::Stopped(why)) => Ok(Some(why)),
4807 Err(e) => Err(e),
4808 };
4809 if owner_stop(state, &mut pr, forge).await? {
4810 return Ok(pr);
4811 }
4812 match rebased {
4813 Ok(None) => {
4814 let published =
4815 publish_landing_head(state, &seen.head, pr_url, forge).await;
4816 if owner_stop(state, &mut pr, forge).await? {
4817 return Ok(pr);
4818 }
4819 let head = published?;
4820 crate::graph::refresh_reviewed_commits(state, &branch).await;
4821 state.pr_pushed_head = Some(head.clone());
4822 awaiting_head = Some(head);
4823 rechecked = false;
4824 state.event("land", format!("rebased {branch} onto {base}"));
4825 state.save()?;
4826 waited = Duration::ZERO;
4829 tokio::time::sleep(POLL).await;
4830 }
4831 Ok(Some(conflict)) => {
4834 let why = format!(
4835 "{} conflicts with {base} and the rebase did not apply: {}",
4836 pr.url,
4837 conflict.chars().take(600).collect::<String>()
4838 );
4839 stop(state, &repo, &pr, &why).await?;
4840 return Ok(pr);
4841 }
4842 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
4843 Err(e) => {
4844 let why = format!("could not rebase {branch} onto {base}: {e:#}");
4845 stop(state, &repo, &pr, &why).await?;
4846 return Ok(pr);
4847 }
4848 }
4849 }
4850 Step::GiveUp { reason } => {
4851 stop(state, &repo, &pr, &reason).await?;
4852 return Ok(pr);
4853 }
4854 Step::Fix { reason } => {
4855 round += 1;
4856 waited = Duration::ZERO;
4857 for c in &pr.review_comments {
4858 shown.insert(c.body.clone());
4859 }
4860 state.event("land", format!("round {round}: {reason}"));
4861 state.save()?;
4862
4863 let logs = failing_logs(&repo, &seen.failing_urls).await;
4864 let was_red = pr.checks == Checks::Red;
4865 if owner_stop(state, &mut pr, forge).await? {
4866 return Ok(pr);
4867 }
4868 let fixed = forge.fix(state, &pr, round, budget, &reason, &logs).await?;
4869 if owner_stop(state, &mut pr, forge).await? {
4870 return Ok(pr);
4871 }
4872 match fixed {
4873 Fixed::Committed { head } => {
4874 state.pr_pushed_head = Some(head.clone());
4877 awaiting_head = Some(head);
4878 rechecked = false;
4879 waited = Duration::ZERO;
4880 forge.poll().await;
4881 }
4882 Fixed::Declined if was_red => {
4883 if let Some(evidence) = forge.attribution(state, &seen).await
4888 && evidence.unrelated(&seen.head, &pr.failing)
4889 {
4890 let fresh = forge.view(&repo, pr_url).await?;
4891 if fresh.head != seen.head
4892 || fresh.rollup_head != seen.rollup_head
4893 || fresh.pr.state != PrLifecycle::Open
4894 || fresh.pr.checks != Checks::Red
4895 || fresh.pr.failing != pr.failing
4896 || fresh
4897 .pr
4898 .review_comments
4899 .iter()
4900 .any(|c| !shown.contains(&c.body))
4901 {
4902 continue;
4903 }
4904 if owner_stop(state, &mut pr, forge).await? {
4905 return Ok(pr);
4906 }
4907 hold_unrelated(state, &pr, evidence).await?;
4908 return Ok(pr);
4909 }
4910 let why = format!(
4911 "the fixer produced no commit while {} check(s) were failing \
4912 ({}); stopping instead of looping on an unchanged tree",
4913 pr.failing.len(),
4914 pr.failing.join(", ")
4915 );
4916 stop(state, &repo, &pr, &why).await?;
4917 return Ok(pr);
4918 }
4919 Fixed::Declined => state.event(
4924 "land",
4925 format!("round {round}: fixer declined the comments, nothing committed"),
4926 ),
4927 Fixed::Deferred => {
4928 state.status = RunStatus::Blocked;
4932 state.save()?;
4933 return Ok(pr);
4934 }
4935 Fixed::Failed(why) => {
4936 stop(state, &repo, &pr, &format!("the fix round failed: {why}")).await?;
4937 return Ok(pr);
4938 }
4939 }
4940 state.save()?;
4941 }
4942 }
4943 }
4944}
4945
4946pub const CI_HOLD_NODE: &str = "land-ci-unrelated";
4948
4949#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4951pub struct CiHold {
4952 pub head: String,
4954 pub question: String,
4956 pub evidence: CiEvidence,
4958}
4959
4960#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
4962struct CiFailure {
4963 path: String,
4964 start_line: u64,
4965 end_line: u64,
4966 title: String,
4967 message: String,
4968}
4969
4970#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4971struct CiCheckEvidence {
4972 label: String,
4973 head_check: u64,
4974 base_check: u64,
4975 app: u64,
4976 run: String,
4977 base_run: String,
4978 head_failures: Vec<CiFailure>,
4979 base_failures: Vec<CiFailure>,
4980 rerun_exhausted: bool,
4981}
4982
4983#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4985pub struct CiEvidence {
4986 head: String,
4987 base: String,
4988 changed: Vec<String>,
4989 checks: Vec<CiCheckEvidence>,
4990}
4991
4992impl CiEvidence {
4993 fn unrelated(&self, head: &str, failing: &[String]) -> bool {
4996 if self.head != head
4997 || self.base.is_empty()
4998 || failing.is_empty()
4999 || self.changed.iter().any(|p| {
5000 p.starts_with(".github/")
5001 || p.starts_with(".config/")
5002 || p.starts_with(".cargo/")
5003 || matches!(
5004 p.rsplit('/').next().unwrap_or(p),
5005 "Cargo.toml"
5006 | "Cargo.lock"
5007 | "Makefile.toml"
5008 | "build.rs"
5009 | "rust-toolchain.toml"
5010 )
5011 })
5012 {
5013 return false;
5014 }
5015 failing.iter().all(|label| {
5016 let matches: Vec<_> = self.checks.iter().filter(|c| &c.label == label).collect();
5017 matches.len() == 1
5018 && matches[0].rerun_exhausted
5019 && !matches[0].head_failures.is_empty()
5020 && matches[0].head_failures.iter().all(|f| {
5021 !f.path.is_empty()
5024 && !f.path.starts_with('.')
5025 && !f.path.contains("..")
5026 && !f.path.starts_with('/')
5027 && !self.changed.contains(&f.path)
5028 && matches[0].base_failures.contains(f)
5029 })
5030 })
5031 }
5032}
5033
5034async fn ci_json(repo: &Path, endpoint: String) -> Option<serde_json::Value> {
5035 let (ok, body) = gh(repo, &["api".into(), endpoint]).await.ok()?;
5036 if !ok {
5037 return None;
5038 }
5039 serde_json::from_str(&body).ok()
5040}
5041
5042async fn ci_annotations(repo: &Path, check: &serde_json::Value) -> Option<Vec<CiFailure>> {
5043 let count = check.pointer("/output/annotations_count")?.as_u64()?;
5044 if count == 0 || count >= 100 {
5045 return None;
5046 }
5047 let id = check.get("id")?.as_u64()?;
5048 let value = ci_json(
5049 repo,
5050 format!("repos/{{owner}}/{{repo}}/check-runs/{id}/annotations?per_page=100"),
5051 )
5052 .await?;
5053 let annotations = value.as_array()?;
5054 if annotations.len() != count as usize {
5055 return None;
5056 }
5057 annotations
5058 .iter()
5059 .filter(|a| a["annotation_level"] == "failure")
5060 .map(|a| {
5061 Some(CiFailure {
5062 path: a["path"].as_str()?.into(),
5063 start_line: a["start_line"].as_u64()?,
5064 end_line: a["end_line"].as_u64()?,
5065 title: a["title"].as_str()?.into(),
5066 message: a["message"].as_str()?.into(),
5067 })
5068 })
5069 .collect()
5070}
5071
5072async fn ci_runs(repo: &Path, sha: &str) -> Option<Vec<serde_json::Value>> {
5073 let value = ci_json(
5074 repo,
5075 format!("repos/{{owner}}/{{repo}}/commits/{sha}/check-runs?per_page=100&filter=latest"),
5076 )
5077 .await?;
5078 let runs = value["check_runs"].as_array()?;
5079 if value["total_count"].as_u64()? != runs.len() as u64 || runs.len() >= 100 {
5080 return None;
5081 }
5082 Some(runs.clone())
5083}
5084
5085async fn collect_ci_evidence(state: &RunState, seen: &Seen) -> Option<CiEvidence> {
5086 let repo = &state.repo;
5087 let base_ref = format!("refs/remotes/{}/{}", state.config.merge.remote, seen.base);
5088 let base = git::git_raw(repo, &["rev-parse", "--verify", &base_ref])
5089 .await
5090 .ok()?;
5091 if !base.ok() {
5092 return None;
5093 }
5094 let range = format!("{}...{}", base.stdout, seen.head);
5095 let diff = git::git_raw(
5097 repo,
5098 &["diff", "--no-renames", "--name-only", "-z", &range, "--"],
5099 )
5100 .await
5101 .ok()?;
5102 if !diff.ok() {
5103 return None;
5104 }
5105 let head_runs = ci_runs(repo, &seen.head).await?;
5106 let base_runs = ci_runs(repo, &base.stdout).await?;
5107 let mut checks = Vec::new();
5108 for label in &seen.pr.failing {
5109 let matching = |runs: &[serde_json::Value]| {
5110 runs.iter()
5111 .filter(|r| r["name"].as_str() == Some(label))
5112 .cloned()
5113 .collect::<Vec<_>>()
5114 };
5115 let heads = matching(&head_runs);
5116 let bases = matching(&base_runs);
5117 if heads.len() != 1 || bases.len() != 1 {
5118 return None;
5119 }
5120 let h = &heads[0];
5121 let b = &bases[0];
5122 if h["conclusion"] != "failure"
5123 || b["conclusion"] != "failure"
5124 || h["status"] != "completed"
5125 || b["status"] != "completed"
5126 || h["head_sha"].as_str()? != seen.head
5127 || b["head_sha"].as_str()? != base.stdout
5128 || h.pointer("/app/id")?.as_u64()? != b.pointer("/app/id")?.as_u64()?
5129 {
5130 return None;
5131 }
5132 let run = run_of(h["details_url"].as_str()?)?;
5133 let contexts: Vec<_> = seen.contexts.iter().filter(|c| &c.label == label).collect();
5134 if contexts.len() != 1
5135 || contexts[0].run.as_ref() != Some(&run)
5136 || contexts[0].verdict != Verdict::Fail
5137 {
5138 return None;
5139 }
5140 let workflow =
5143 ci_json(repo, format!("repos/{{owner}}/{{repo}}/actions/runs/{run}")).await?;
5144 let base_run = run_of(b["details_url"].as_str()?)?;
5145 let base_workflow = ci_json(
5146 repo,
5147 format!("repos/{{owner}}/{{repo}}/actions/runs/{base_run}"),
5148 )
5149 .await?;
5150 if base_workflow["head_sha"].as_str()? != base.stdout
5151 || base_workflow["head_branch"].as_str()? != seen.base
5152 || base_workflow["status"] != "completed"
5153 || base_workflow["conclusion"] != "failure"
5154 || base_workflow["workflow_id"].as_u64()? != workflow["workflow_id"].as_u64()?
5155 {
5156 return None;
5157 }
5158 let exhausted = state
5159 .land_reruns
5160 .as_ref()
5161 .is_some_and(|r| r.head == seen.head && r.runs.contains_key(&run))
5162 && workflow["head_sha"].as_str()? == seen.head
5163 && workflow["run_attempt"].as_u64()? > 1
5164 && workflow["status"] == "completed";
5165 checks.push(CiCheckEvidence {
5166 label: label.clone(),
5167 head_check: h["id"].as_u64()?,
5168 base_check: b["id"].as_u64()?,
5169 app: h.pointer("/app/id")?.as_u64()?,
5170 run,
5171 base_run,
5172 head_failures: ci_annotations(repo, h).await?,
5173 base_failures: ci_annotations(repo, b).await?,
5174 rerun_exhausted: exhausted,
5175 });
5176 }
5177 Some(CiEvidence {
5178 head: seen.head.clone(),
5179 base: base.stdout,
5180 changed: diff
5181 .stdout
5182 .split('\0')
5183 .filter(|p| !p.is_empty())
5184 .map(str::to_owned)
5185 .collect(),
5186 checks,
5187 })
5188}
5189
5190async fn hold_unrelated(state: &mut RunState, pr: &PrState, evidence: CiEvidence) -> Result<()> {
5191 let detail = serde_json::to_string(&evidence)?;
5192 let resume = "daemon: CI を確認して同じ run を再開する".to_owned();
5193 let hold = "operator: 保留して後で判断する".to_owned();
5194 let mut q = ask::Question::new(
5195 state.id.clone(),
5196 CI_HOLD_NODE.into(),
5197 "land".into(),
5198 "base でも再現する CI の失敗を検出したため、試行を消費せず保留しました".into(),
5199 format!(
5200 "必須チェックや承認は省略しません。再開時にも同じ workflow run は自動再実行しません。\n構造化された判定根拠:\n{detail}"
5201 ),
5202 vec![resume.clone(), hold.clone()],
5203 );
5204 q.actions.insert(
5205 resume,
5206 ask::ChoiceAction::Resume {
5207 run: state.id.clone(),
5208 },
5209 );
5210 q.actions.insert(hold, ask::ChoiceAction::Hold);
5211 ask::Questions::open().put_executable(&mut q)?;
5212 state.land_unrelated = Some(CiHold {
5213 head: evidence.head.clone(),
5214 question: q.id.clone(),
5215 evidence,
5216 });
5217 state.event("land", format!("[ci-unrelated] base reproduces every located failure after rerun; owner question {}: {detail}", q.id));
5218 state.end_pass_parked(crate::run::ParkCause::Question);
5219 state.parked = true;
5220 state.save()?;
5221 if let Err(e) = ask::notify(&state.config.notify, &q).await {
5222 tracing::warn!("could not notify about CI hold: {e:#}");
5223 }
5224 let body = stop_comment(
5226 &state.id,
5227 "CI failures independently reproduced on the base; awaiting an owner decision without charging the task attempt",
5228 );
5229 let (_, body) = crate::github_text::prepare(state, "", &body);
5230 gh(
5231 &state.repo,
5232 &[
5233 "pr".into(),
5234 "comment".into(),
5235 pr.number.to_string(),
5236 "--body".into(),
5237 body,
5238 ],
5239 )
5240 .await
5241 .ok();
5242 Ok(())
5243}
5244
5245#[derive(Clone)]
5249struct Seen {
5250 pr: PrState,
5251 title: String,
5252 failing_urls: Vec<(String, String)>,
5253 head: String,
5255 rollup_head: String,
5258 merge_state: String,
5261 contexts: Vec<CheckInfo>,
5263 base: String,
5265}
5266
5267#[derive(Clone)]
5269struct CheckInfo {
5270 label: String,
5271 verdict: Verdict,
5272 required: Option<bool>,
5273 run: Option<String>,
5275}
5276
5277#[derive(Debug, Clone, PartialEq, Eq)]
5279enum RerunStep {
5280 Rerun(Vec<String>),
5282 Grace,
5284 Fix,
5286}
5287
5288#[cfg(test)]
5292fn rerunnable(contexts: &[CheckInfo]) -> Vec<(String, Option<String>)> {
5293 rerunnable_with(contexts, false)
5294}
5295
5296fn rerunnable_with(
5297 contexts: &[CheckInfo],
5298 include_optional: bool,
5299) -> Vec<(String, Option<String>)> {
5300 contexts
5301 .iter()
5302 .filter(|c| c.verdict == Verdict::Fail && (include_optional || c.required != Some(false)))
5303 .filter(|c| {
5305 c.run.as_ref().is_none_or(|r| {
5306 !contexts.iter().any(|o| {
5307 matches!(o.verdict, Verdict::Pending | Verdict::Unknown)
5308 && o.run.as_ref() == Some(r)
5309 })
5310 })
5311 })
5312 .map(|c| (c.label.clone(), c.run.clone()))
5313 .collect()
5314}
5315
5316fn rerun_step(
5318 failing: &[(String, Option<String>)],
5319 record: Option<&LandReruns>,
5320 head: &str,
5321 now: i64,
5322) -> RerunStep {
5323 if failing.is_empty() || failing.iter().any(|(_, run)| run.is_none()) {
5326 return RerunStep::Fix;
5327 }
5328 let record = record.filter(|r| r.head.eq_ignore_ascii_case(head));
5330 let mut fresh: Vec<String> = Vec::new();
5331 let mut recent = false;
5332 for run in failing.iter().filter_map(|(_, run)| run.as_deref()) {
5333 match record.and_then(|r| r.runs.get(run)) {
5334 None => {
5335 if !fresh.iter().any(|f| f == run) {
5336 fresh.push(run.to_owned());
5337 }
5338 }
5339 Some(&at) if now - at < crate::release_watch::RERUN_GRACE => recent = true,
5340 Some(_) => {}
5341 }
5342 }
5343 if !fresh.is_empty() {
5344 RerunStep::Rerun(fresh)
5345 } else if recent {
5346 RerunStep::Grace
5347 } else {
5348 RerunStep::Fix
5349 }
5350}
5351
5352async fn observe(repo: &Path, pr_url: &str) -> Result<Seen> {
5356 let view = gh(
5357 repo,
5358 &[
5359 "pr".to_owned(),
5360 "view".to_owned(),
5361 pr_url.to_owned(),
5362 "--json".to_owned(),
5363 "url,number,state,title,reviews,comments,mergeStateStatus,headRefOid,baseRefName"
5364 .to_owned(),
5365 ],
5366 )
5367 .await?;
5368 if !view.0 {
5369 bail!("gh pr view {pr_url}: {}", view.1);
5370 }
5371 let number = parse_pr(&view.1)?.number;
5372 let node = last_commit_node(repo, number).await;
5373 let mut seen = seen_from(&view.1, node.as_deref())?;
5374
5375 let inline = gh(
5376 repo,
5377 &[
5378 "api".to_owned(),
5379 format!("repos/{{owner}}/{{repo}}/pulls/{}/comments", seen.pr.number),
5380 ],
5381 )
5382 .await?;
5383 if inline.0 {
5384 match parse_inline_comments(&inline.1) {
5385 Ok(mut comments) => seen.pr.review_comments.append(&mut comments),
5386 Err(e) => tracing::warn!("inline review comments unreadable: {e}"),
5389 }
5390 } else {
5391 tracing::warn!("gh api pulls/{}/comments: {}", seen.pr.number, inline.1);
5392 }
5393 Ok(seen)
5394}
5395
5396fn seen_from(view_json: &str, node_json: Option<&str>) -> Result<Seen> {
5407 let mut pr = parse_pr(view_json)?;
5408 let raw: GhPr = serde_json::from_str(view_json).context("re-read pull request json")?;
5409
5410 let mut rollup_head = String::new();
5411 let mut failing_urls = Vec::new();
5412 let mut contexts = Vec::new();
5413 let mut checks = Checks::Unknown;
5414 let mut failing = Vec::new();
5415 if let Some((oid, rollup)) = node_json.and_then(parse_last_commit_node) {
5416 (checks, failing) = rollup_verdict(&rollup);
5417 failing_urls = rollup
5418 .iter()
5419 .filter(|c| c.verdict() == Verdict::Fail)
5420 .filter_map(|c| c.url().map(|u| (c.label(), u.to_owned())))
5421 .collect();
5422 contexts = rollup
5423 .iter()
5424 .map(|c| CheckInfo {
5425 label: c.label(),
5426 verdict: c.verdict(),
5427 required: c.is_required,
5428 run: c.url().and_then(run_of),
5429 })
5430 .collect();
5431 rollup_head = oid;
5432 }
5433 pr.checks = checks;
5434 pr.failing = failing;
5435
5436 Ok(Seen {
5437 pr,
5438 title: raw.title,
5439 failing_urls,
5440 head: raw.head_ref_oid,
5441 rollup_head,
5442 merge_state: raw.merge_state_status,
5443 contexts,
5444 base: raw.base_ref_name,
5445 })
5446}
5447
5448fn parse_last_commit_node(json: &str) -> Option<(String, Vec<GhCheck>)> {
5451 let v: serde_json::Value = serde_json::from_str(json).ok()?;
5452 if v.get("errors").is_some_and(|e| !e.is_null()) {
5453 return None;
5454 }
5455 let commit = v.pointer("/data/repository/pullRequest/commits/nodes/0/commit")?;
5456 let oid = commit.get("oid")?.as_str().filter(|o| !o.is_empty())?;
5457 let contexts = commit.pointer("/statusCheckRollup/contexts");
5458 let Some(contexts) = contexts.filter(|c| !c.is_null()) else {
5459 return Some((oid.to_owned(), Vec::new()));
5461 };
5462 if contexts.pointer("/pageInfo/hasNextPage")?.as_bool()? {
5463 return None;
5464 }
5465 let nodes = contexts.get("nodes")?.as_array()?;
5466 let rollup = nodes
5467 .iter()
5468 .map(|n| serde_json::from_value::<GhCheck>(n.clone()))
5469 .collect::<Result<Vec<_>, _>>()
5470 .ok()?;
5471 Some((oid.to_owned(), rollup))
5472}
5473
5474async fn last_commit_node(repo: &Path, number: u64) -> Option<String> {
5477 let out = gh(
5478 repo,
5479 &[
5480 "api".to_owned(),
5481 "graphql".to_owned(),
5482 "-F".to_owned(),
5483 "owner={owner}".to_owned(),
5484 "-F".to_owned(),
5485 "repo={repo}".to_owned(),
5486 "-F".to_owned(),
5487 format!("number={number}"),
5488 "-f".to_owned(),
5489 "query=query($owner:String!,$repo:String!,$number:Int!){repository(owner:$owner,\
5490 name:$repo){pullRequest(number:$number){commits(last:1){nodes{commit{oid \
5491 statusCheckRollup{contexts(first:100){pageInfo{hasNextPage} nodes{\
5492 ... on CheckRun{name status conclusion detailsUrl \
5493 isRequired(pullRequestNumber:$number)} \
5494 ... on StatusContext{context state targetUrl \
5495 isRequired(pullRequestNumber:$number)}}}}}}}}}}"
5496 .to_owned(),
5497 ],
5498 )
5499 .await
5500 .ok()?;
5501 out.0.then_some(out.1)
5502}
5503
5504#[doc(hidden)]
5506#[derive(Debug, PartialEq)]
5507pub enum Fixed {
5508 Committed {
5510 head: String,
5512 },
5513 Declined,
5515 Deferred,
5517 Failed(String),
5519}
5520
5521#[doc(hidden)]
5527pub async fn fix_round(
5528 state: &mut RunState,
5529 pr: &PrState,
5530 round: usize,
5531 budget: usize,
5532 reason: &str,
5533 logs: &str,
5534) -> Result<Fixed> {
5535 let winner = state
5536 .winner()
5537 .cloned()
5538 .context("landing needs a winning candidate; none is recorded on this run")?;
5539 let roles = state
5540 .config
5541 .resolve_roles()
5542 .context("resolve the roster for the fix round")?;
5543 let attempts = crate::fixer::attempts(state, &roles, &winner);
5547 let ids: Vec<String> = attempts.iter().map(|(s, _)| s.id.clone()).collect();
5548
5549 let prompt = fix_prompt(state, pr, round, budget, reason, logs);
5550 let mut artifacts = agent::artifacts_dir(&state.dir());
5551 if let Some(request) = state
5552 .merge_repairs
5553 .last()
5554 .filter(|r| r.phase == crate::run::MergeRepairPhase::Fixing)
5555 {
5556 artifacts = artifacts.join(format!("merge-repair-{}", request.question));
5557 }
5558 let prompt = if state.config.cache_dir().is_some() {
5559 format!("{prompt}\n\n{}", prompt::build_cache_note("fix", true))
5560 } else {
5561 prompt
5562 };
5563 let before = git::rev_parse(&winner.worktree, "HEAD").await?;
5567 let mut last = None;
5571 for (i, (spec, seat_key)) in attempts.into_iter().enumerate() {
5572 if owner_requested_stop(state)? {
5573 return Ok(Fixed::Declined);
5574 }
5575 let mut seat = seat_of(state, &seat_key, &spec.id);
5576 let stem = if i == 0 {
5577 format!("land-{round}")
5578 } else {
5579 format!("land-{round}-{}", spec.id)
5580 };
5581 let out = agent::invoke(
5582 &spec,
5583 &mut seat,
5584 &Invocation {
5585 coordination: state.config.coordination.as_ref(),
5586 fetched_base: state.fetched_base.as_ref(),
5587 cwd: &winner.worktree,
5588 prompt: &prompt,
5589 timeout: Duration::from_secs(state.config.graph.timeout_fix),
5590 allow_write: true,
5591 sessions: state.config.graph.sessions,
5592 artifacts: &artifacts,
5593 stem: &stem,
5594 run: &state.id,
5595 node: "land",
5596 cache_dir: state.config.cache_dir().as_deref(),
5597 attachments: &[],
5598 writable: &[],
5599 },
5600 )
5601 .await;
5602 state.seats.insert(seat.key.clone(), seat);
5603 if let Some(next) = ids.get(i + 1)
5604 && agent::chain_advances(&out)
5605 {
5606 let (class, why) = crate::fixer::failure_of(&out);
5607 crate::graph::record_handover(state, "land", &seat_key, &spec.id, next, &class, &why);
5608 continue;
5609 }
5610 last = Some((seat_key, out));
5611 break;
5612 }
5613 let (seat_key, out) = last.expect("the fixer chain always has an entry");
5614
5615 match out {
5616 Ok(o) if o.quota_exhausted() => {
5617 let loss = crate::run::QuotaLoss::from_report(seat_key, "land", o.quota.as_ref());
5618 crate::graph::block_machine_outage(state, "land", std::slice::from_ref(&loss));
5619 state.quota.push(loss);
5620 state.status = RunStatus::Blocked;
5621 state.save()?;
5622 let inherited = crate::repo_lock::WaitPolicy::current();
5626 let wait = crate::repo_lock::WaitPolicy::new(
5627 Duration::from_secs(state.config.graph.timeout_resource_wait),
5628 move || inherited.cancelled(),
5629 );
5630 let _coordination = crate::repo_lock::SeatLease::operation_with(
5631 &winner.worktree,
5632 state.config.coordination.as_ref(),
5633 &wait,
5634 )
5635 .await?;
5636 let rescue = git::rescue_commit(
5637 &winner.worktree,
5638 &format!("magi: deferred land round {round} (uncommitted work)"),
5639 )
5640 .await?;
5641 state.note_withheld("land", &rescue.withheld);
5642 state.save()?;
5643 return Ok(Fixed::Deferred);
5644 }
5645 Ok(o) if !o.usable() => {
5646 return Ok(Fixed::Failed(format!(
5647 "the fixer produced nothing usable ({})",
5648 crate::notices::turn_status(o.exit_code, o.timed_out, o.quota_exhausted())
5649 )));
5650 }
5651 Ok(_) => {}
5652 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
5653 Err(e) => return Ok(Fixed::Failed(format!("{e:#}"))),
5654 }
5655
5656 if owner_requested_stop(state)? {
5657 return Ok(Fixed::Declined);
5658 }
5659
5660 let wait = crate::repo_lock::WaitPolicy::new(
5663 Duration::from_secs(state.config.graph.timeout_resource_wait),
5664 || false,
5665 );
5666 let coordination = crate::repo_lock::SeatLease::operation_with(
5667 &winner.worktree,
5668 state.config.coordination.as_ref(),
5669 &wait,
5670 )
5671 .await?;
5672 match git::rescue_commit(
5673 &winner.worktree,
5674 &format!("magi: land round {round} fixes (uncommitted work)"),
5675 )
5676 .await
5677 {
5678 Ok(r) => state.note_withheld("land", &r.withheld),
5679 Err(e)
5680 if state
5681 .merge_repairs
5682 .last()
5683 .is_some_and(|r| r.phase == crate::run::MergeRepairPhase::Fixing) =>
5684 {
5685 return Ok(Fixed::Failed(format!("saving repair commit failed: {e:#}")));
5686 }
5687 Err(_) => {}
5688 }
5689 let after = git::rev_parse(&winner.worktree, "HEAD").await?;
5690 drop(coordination);
5691 if after == before {
5692 return Ok(Fixed::Declined);
5693 }
5694
5695 if owner_requested_stop(state)? {
5696 return Ok(Fixed::Declined);
5697 }
5698 crate::pr_head::ensure_owner(state)?;
5699 let remote = state.config.merge.remote.clone();
5700 anyhow::ensure!(
5701 crate::foreign_checkout::write_back(state, &after).await?,
5702 "foreign checkout delivery is blocked; see the run events"
5703 );
5704 let public_head = state.pr_branch().unwrap_or(&winner.branch).to_owned();
5705 let push = if state.pr_head.is_some() {
5706 let expected = state
5707 .pr_pushed_head
5708 .as_deref()
5709 .context("missing public head lease")?;
5710 git::push_as(
5711 &winner.worktree,
5712 &remote,
5713 &winner.branch,
5714 &public_head,
5715 expected,
5716 )
5717 .await?
5718 } else {
5719 git::push(&winner.worktree, &remote, &winner.branch).await?
5720 };
5721 if !push.ok() {
5722 return Ok(Fixed::Failed(format!(
5723 "pushing {} to {remote} failed: {}",
5724 public_head, push.stderr
5725 )));
5726 }
5727 state.event(
5728 "land",
5729 format!("round {round}: pushed a fix to {public_head}"),
5730 );
5731 state.pr_pushed_head = Some(after.clone());
5732 state.save()?;
5733 Ok(Fixed::Committed { head: after })
5734}
5735
5736pub(crate) fn seat_of(state: &mut RunState, key: &str, agent: &str) -> SeatState {
5738 crate::fixer::seat_for(state, key, agent)
5739}
5740
5741pub(crate) async fn repair_preflight(state: &RunState, url: &str, head: &str) -> Result<PrState> {
5744 let seen = observe(&state.repo, url).await?;
5745 let winner = state.winner().context("no winning branch to repair")?;
5746 if seen.pr.state != PrLifecycle::Open || seen.head != head {
5747 anyhow::bail!(
5748 "PR is closed or its head changed; review the current head before requesting repair again"
5749 );
5750 }
5751 if git::rev_parse(&winner.worktree, "HEAD").await? != head
5752 || !git::is_clean(&winner.worktree).await?
5753 {
5754 anyhow::bail!(
5755 "repair worktree is missing, dirty or at a different head; restore the reviewed branch and resume this run"
5756 );
5757 }
5758 let view = gh(
5761 &state.repo,
5762 &[
5763 "pr".into(),
5764 "view".into(),
5765 url.into(),
5766 "--json".into(),
5767 "autoMergeRequest,headRefOid,state,headRefName,baseRefName,isCrossRepository".into(),
5768 ],
5769 )
5770 .await?;
5771 if !view.0 {
5772 bail!("cannot check auto-merge: {}", view.1);
5773 }
5774 let live: serde_json::Value = serde_json::from_str(&view.1)?;
5775 let public = state.pr_branch().unwrap_or(&winner.branch);
5776 if live["state"] != "OPEN"
5777 || live["headRefOid"] != head
5778 || live["headRefName"] != public
5779 || live["baseRefName"] != state.base_branch
5780 || live["isCrossRepository"] != false
5781 {
5782 bail!("PR changed during repair preflight; review its current head explicitly");
5783 }
5784 let auto_merge = live
5785 .get("autoMergeRequest")
5786 .context("cannot read the PR auto-merge reservation; repair held")?;
5787 if !auto_merge.is_null() {
5788 let out = gh(&state.repo, &disable_automerge_argv(seen.pr.number)).await?;
5789 if !out.0 {
5790 bail!("cannot disable auto-merge; repair held: {}", out.1);
5791 }
5792 }
5793 Ok(seen.pr)
5794}
5795
5796fn fix_prompt(
5798 state: &RunState,
5799 pr: &PrState,
5800 round: usize,
5801 budget: usize,
5802 reason: &str,
5803 logs: &str,
5804) -> String {
5805 let mut s = format!(
5806 "Your patch is open as a pull request and it is not landing. Land round \
5807 {round} of {budget}.\n\n\
5808 Pull request: {}\n\n\
5809 What is holding it: {reason}\n\n\
5810 # The task\n\n{}\n",
5811 pr.url, state.instruction
5812 );
5813
5814 if pr.failing.is_empty() {
5815 s.push_str("\n# Failing checks\n\n(none)\n");
5816 } else {
5817 let _ = write!(s, "\n# Failing checks\n\n- {}\n", pr.failing.join("\n- "));
5818 if logs.trim().is_empty() {
5819 s.push_str(
5820 "\nNo log could be read; investigate the failure with necessary focused checks.\n",
5821 );
5822 } else {
5823 let _ = write!(s, "\n## Failing log tails\n\n{logs}\n");
5824 }
5825 }
5826
5827 if pr.review_comments.is_empty() {
5828 s.push_str("\n# Review comments\n\n(none)\n");
5829 } else {
5830 s.push_str("\n# Review comments\n");
5831 for c in &pr.review_comments {
5832 let where_ = match (&c.path, c.line) {
5833 (Some(p), Some(l)) => format!(" ({p}:{l})"),
5834 (Some(p), None) => format!(" ({p})"),
5835 _ => String::new(),
5836 };
5837 let _ = write!(s, "\n## {}{where_}\n\n{}\n", c.author, c.body.trim());
5838 }
5839 }
5840
5841 s.push_str(
5842 "\n# Rules\n\n\
5843 1. Fix the cause, never the symptom. Do not delete, skip, or weaken a \
5844 failing test; do not silence a lint with an allow attribute; do not \
5845 stretch a timeout to hide a race. If the check is right, the code is \
5846 wrong.\n\
5847 2. Change nothing the checks and the comments did not raise. A \
5848 drive-by refactor turns a one-line fix into a pull request that \
5849 needs reviewing again.\n\
5850 3. If a comment is wrong, say so with a checkable argument and change \
5851 nothing for it. A declined comment with a reason is a correct \
5852 outcome; a change made to appease a reviewer is not.\n\
5853 4. Commit in this worktree. magi pushes to the pull request's branch \
5854 for you; do not push, merge, or close anything yourself.\n\
5855 5. Never name yourself, your vendor, or your model, anywhere.\n\n\
5856 # Output\n\n\
5857 Say what you changed and why, and what you declined and why.",
5858 );
5859
5860 let language = &state.config.graph.language;
5861 if !(language.trim().is_empty() || language.eq_ignore_ascii_case("en")) {
5862 let _ = write!(s, "\n\nWrite all prose in {language}.");
5863 }
5864 s.push_str(&crate::prompt::github_rule(
5866 language,
5867 &state.config.graph.github_language,
5868 ));
5869 if let Some(overlay) = state.config.prompts.overlay("fix") {
5870 let _ = write!(s, "\n\n{overlay}");
5871 }
5872 s.push('\n');
5873 s.push_str(crate::prompt::child_run_ownership());
5874 s
5875}
5876
5877async fn failing_logs(repo: &Path, failing: &[(String, String)]) -> String {
5880 let mut out = String::new();
5881 for (name, url) in failing.iter().take(MAX_LOGS) {
5882 let args = match (job_of(url), run_of(url)) {
5883 (Some(job), _) => vec![
5884 "run".to_owned(),
5885 "view".to_owned(),
5886 "--log-failed".to_owned(),
5887 "--job".to_owned(),
5888 job,
5889 ],
5890 (None, Some(run)) => vec![
5891 "run".to_owned(),
5892 "view".to_owned(),
5893 run,
5894 "--log-failed".to_owned(),
5895 ],
5896 (None, None) => continue,
5898 };
5899 let (ok, body) = match gh(repo, &args).await {
5900 Ok(v) => v,
5901 Err(e) => (false, format!("{e:#}")),
5902 };
5903 if !ok && body.trim().is_empty() {
5904 continue;
5905 }
5906 let _ = write!(out, "### {name}\n\n```\n{}\n```\n\n", tail(&body, LOG_TAIL));
5907 }
5908 out
5909}
5910
5911fn job_of(details_url: &str) -> Option<String> {
5914 let after = details_url.split("/job/").nth(1)?;
5915 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
5916 (!id.is_empty()).then_some(id)
5917}
5918
5919pub(crate) fn run_of(details_url: &str) -> Option<String> {
5921 let after = details_url.split("/actions/runs/").nth(1)?;
5922 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
5923 (!id.is_empty()).then_some(id)
5924}
5925
5926fn stop_comment(run_id: &str, why: &str) -> String {
5930 format!(
5931 "{MARKER}\nmagi stopped landing this pull request: {why}\n\n\
5932 The branch is untouched and the run is `{run_id}`. Nothing was merged."
5933 )
5934}
5935
5936async fn stop(state: &mut RunState, repo: &Path, pr: &PrState, why: &str) -> Result<()> {
5941 let body = stop_comment(&state.id, why);
5942 let (_, mut body) = crate::github_text::prepare(state, "", &body);
5943 if !body.contains(MARKER) {
5944 body = format!("{MARKER}\n{body}");
5945 }
5946 let posted = gh(
5947 repo,
5948 &[
5949 "pr".to_owned(),
5950 "comment".to_owned(),
5951 pr.number.to_string(),
5952 "--body".to_owned(),
5953 body,
5954 ],
5955 )
5956 .await;
5957 match posted {
5958 Ok((true, _)) => {}
5959 Ok((false, out)) => tracing::warn!("could not comment on {}: {out}", pr.url),
5960 Err(e) => tracing::warn!("could not comment on {}: {e:#}", pr.url),
5961 }
5962 state.status = RunStatus::Blocked;
5963 state.merge = Some(MergeOutcome {
5964 mode: MergeMode::Pr,
5965 ok: false,
5966 detail: why.to_owned(),
5967 empty: false,
5968 });
5969 state.event("land", format!("stopped: {why}"));
5970 state.save()?;
5971 Ok(())
5972}
5973
5974pub(crate) async fn gh(cwd: &Path, args: &[String]) -> Result<(bool, String)> {
5990 let out = tokio::process::Command::new("gh")
5991 .args(args)
5992 .current_dir(cwd)
5993 .env_remove("GH_REPO")
5994 .quiet()
5995 .stdin(std::process::Stdio::null())
5996 .output()
5997 .await
5998 .with_context(|| format!("spawn gh {}", args.join(" ")))?;
5999 let mut body = String::from_utf8_lossy(&out.stdout).into_owned();
6000 let err = String::from_utf8_lossy(&out.stderr);
6001 if body.trim().is_empty() {
6002 body = err.into_owned();
6003 } else if !err.trim().is_empty() {
6004 body.push_str(&err);
6005 }
6006 Ok((out.status.success(), body.trim().to_owned()))
6007}
6008
6009#[derive(Debug, Clone, Copy, PartialEq, Eq)]
6011pub(crate) enum Verdict {
6012 Pass,
6013 Fail,
6014 Pending,
6015 Unknown,
6016}
6017
6018impl Verdict {
6019 pub(crate) fn label(self) -> &'static str {
6021 match self {
6022 Self::Pass => "passed",
6023 Self::Fail => "failed",
6024 Self::Pending => "pending",
6025 Self::Unknown => "unknown",
6026 }
6027 }
6028}
6029
6030#[derive(Debug, Deserialize)]
6031#[serde(rename_all = "camelCase")]
6032struct GhPr {
6033 #[serde(default)]
6034 url: String,
6035 #[serde(default)]
6036 number: u64,
6037 #[serde(default)]
6038 state: String,
6039 #[serde(default)]
6040 title: String,
6041 #[serde(default)]
6042 status_check_rollup: Vec<GhCheck>,
6043 #[serde(default)]
6050 merge_state_status: String,
6051 #[serde(default)]
6055 head_ref_oid: String,
6056 #[serde(default)]
6057 base_ref_name: String,
6058 #[serde(default)]
6059 reviews: Vec<GhReview>,
6060 #[serde(default)]
6061 comments: Vec<GhComment>,
6062}
6063
6064#[derive(Debug, Deserialize)]
6069#[serde(rename_all = "camelCase")]
6070struct GhCheck {
6071 #[serde(default)]
6072 name: Option<String>,
6073 #[serde(default)]
6074 context: Option<String>,
6075 #[serde(default)]
6076 status: Option<String>,
6077 #[serde(default)]
6078 conclusion: Option<String>,
6079 #[serde(default)]
6080 state: Option<String>,
6081 #[serde(default)]
6082 details_url: Option<String>,
6083 #[serde(default)]
6084 target_url: Option<String>,
6085 #[serde(default)]
6088 is_required: Option<bool>,
6089}
6090
6091impl GhCheck {
6092 fn label(&self) -> String {
6094 self.name
6095 .clone()
6096 .or_else(|| self.context.clone())
6097 .unwrap_or_else(|| "(unnamed check)".to_owned())
6098 }
6099
6100 fn url(&self) -> Option<&str> {
6102 self.details_url
6103 .as_deref()
6104 .or(self.target_url.as_deref())
6105 .filter(|u| !u.is_empty())
6106 }
6107
6108 fn verdict(&self) -> Verdict {
6116 if let Some(status) = self.status.as_deref() {
6117 if !status.eq_ignore_ascii_case("COMPLETED") {
6118 return Verdict::Pending;
6119 }
6120 }
6121 let outcome = self
6122 .conclusion
6123 .as_deref()
6124 .or(self.state.as_deref())
6125 .unwrap_or("");
6126 match outcome.to_ascii_uppercase().as_str() {
6127 "SUCCESS" | "SKIPPED" | "NEUTRAL" => Verdict::Pass,
6128 "FAILURE" | "ERROR" | "TIMED_OUT" | "CANCELLED" | "STARTUP_FAILURE"
6129 | "ACTION_REQUIRED" => Verdict::Fail,
6130 "PENDING" | "EXPECTED" | "QUEUED" | "IN_PROGRESS" | "WAITING" | "REQUESTED" => {
6131 Verdict::Pending
6132 }
6133 _ => Verdict::Unknown,
6134 }
6135 }
6136}
6137
6138#[derive(Debug, Deserialize)]
6139struct GhAuthor {
6140 #[serde(default)]
6141 login: String,
6142}
6143
6144#[derive(Debug, Deserialize)]
6145struct GhReview {
6146 #[serde(default)]
6147 author: GhAuthor,
6148 #[serde(default)]
6149 body: String,
6150}
6151
6152#[derive(Debug, Deserialize)]
6153struct GhComment {
6154 #[serde(default)]
6155 author: GhAuthor,
6156 #[serde(default)]
6157 body: String,
6158}
6159
6160#[derive(Debug, Deserialize)]
6161struct GhUser {
6162 #[serde(default)]
6163 login: String,
6164}
6165
6166#[derive(Debug, Deserialize)]
6167struct GhInline {
6168 #[serde(default)]
6169 user: GhUser,
6170 #[serde(default)]
6171 path: Option<String>,
6172 #[serde(default)]
6173 line: Option<u64>,
6174 #[serde(default)]
6175 body: String,
6176}
6177
6178impl Default for GhAuthor {
6179 fn default() -> Self {
6180 Self {
6181 login: "(unknown)".to_owned(),
6182 }
6183 }
6184}
6185
6186impl Default for GhUser {
6187 fn default() -> Self {
6188 Self {
6189 login: "(unknown)".to_owned(),
6190 }
6191 }
6192}
6193
6194#[cfg(test)]
6195pub(crate) mod tests {
6196 use super::*;
6197 use crate::run::{Candidate, ReviewRecord, ReviewRound, Tally};
6198
6199 fn head_json(head: &str, base: &str, state: &str, cross: bool) -> String {
6200 format!(
6201 r#"{{"headRefName":"{head}","headRefOid":"aaa","baseRefName":"{base}","state":"{state}","isCrossRepository":{cross}}}"#
6202 )
6203 }
6204
6205 #[test]
6206 fn a_pull_request_is_closed_only_when_its_head_is_exactly_the_runs_branch() {
6207 let ok = head_json("magi/27b2/A", "main", "OPEN", false);
6208 assert_eq!(
6209 closable(&ok, "magi/27b2/A", "main", &["aaa".to_owned()]),
6210 Ok(())
6211 );
6212 for (json, why) in [
6213 (head_json("magi/27b2/B", "main", "OPEN", false), "head"),
6214 (head_json("magi/27b2/A-2", "main", "OPEN", false), "head"),
6215 (head_json("magi/27b2/A", "main", "OPEN", true), "fork"),
6216 (head_json("magi/27b2/A", "dev", "OPEN", false), "targets"),
6217 (head_json("magi/27b2/A", "main", "MERGED", false), "already"),
6218 (head_json("magi/27b2/A", "main", "CLOSED", false), "already"),
6219 ] {
6220 let err = closable(&json, "magi/27b2/A", "main", &["aaa".to_owned()])
6221 .unwrap_err()
6222 .why;
6223 assert!(err.contains(why), "{json}: {err}");
6224 }
6225 let moved = head_json("magi/27b2/A", "main", "OPEN", false);
6227 let err = closable(&moved, "magi/27b2/A", "main", &["bbb".to_owned()]).unwrap_err();
6228 assert!(err.retry && err.why.contains("not a commit"), "{err:?}");
6229 assert!(
6230 !closable(
6231 &head_json("x", "main", "OPEN", false),
6232 "magi/27b2/A",
6233 "main",
6234 &[]
6235 )
6236 .unwrap_err()
6237 .retry
6238 );
6239 assert!(is_forge_url("https://github.com/o/r.git"));
6240 assert!(is_forge_url("git@github.com:o/r.git"));
6241 assert!(!is_forge_url("/tmp/origin.git"));
6242 assert!(!is_forge_url("C:\\work\\origin.git"));
6243 assert!(!is_forge_url("file:///tmp/origin.git"));
6244 assert!(forge_unavailable(
6245 "gh pr list failed: none of the git remotes configured for this repository point to a known GitHub host."
6246 ));
6247 assert!(!forge_unavailable(
6248 "gh pr list failed: error connecting to api.github.com"
6249 ));
6250 assert!(closable("not json", "magi/27b2/A", "main", &[]).is_err());
6251 assert!(
6253 closable(
6254 r#"{"headRefName":"b","headRefOid":"aaa","baseRefName":"main","state":"OPEN"}"#,
6255 "b",
6256 "main",
6257 &["aaa".to_owned()]
6258 )
6259 .is_err()
6260 );
6261 }
6262
6263 #[test]
6264 fn the_close_comment_names_the_commit_on_the_base() {
6265 let e = crate::already::Evidence {
6266 proof: crate::already::Proof::PatchId,
6267 tip: "1234567890".to_owned(),
6268 commits: vec!["0e368de0000".to_owned()],
6269 };
6270 let c = superseded_comment("main", &e);
6271 assert!(c.contains("0e368de") && c.contains("`main`"), "{c}");
6272 }
6273
6274 const GREEN_OPEN: &str = r####"{
6276 "url": "https://github.com/yukimemi/magi/pull/10",
6277 "number": 10,
6278 "state": "OPEN",
6279 "mergeStateStatus": "CLEAN",
6280 "statusCheckRollup": [
6281 {
6282 "__typename": "CheckRun",
6283 "conclusion": "SKIPPED",
6284 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278334/job/99378963755",
6285 "name": "review",
6286 "status": "COMPLETED",
6287 "workflowName": "claude-review"
6288 },
6289 {
6290 "__typename": "CheckRun",
6291 "conclusion": "SUCCESS",
6292 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963144",
6293 "name": "check (ubuntu-latest)",
6294 "status": "COMPLETED",
6295 "workflowName": "CI"
6296 },
6297 {
6298 "__typename": "CheckRun",
6299 "conclusion": "SUCCESS",
6300 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963095",
6301 "name": "rustfmt",
6302 "status": "COMPLETED",
6303 "workflowName": "CI"
6304 },
6305 {
6306 "__typename": "StatusContext",
6307 "context": "CodeRabbit",
6308 "state": "SUCCESS",
6309 "targetUrl": ""
6310 }
6311 ],
6312 "reviews": [],
6313 "comments": [
6314 {
6315 "author": {
6316 "login": "coderabbitai"
6317 },
6318 "authorAssociation": "NONE",
6319 "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"
6320 }
6321 ]
6322}"####;
6323
6324 const RED_OPEN: &str = r####"{
6326 "url": "https://github.com/yukimemi/magi/pull/9",
6327 "number": 9,
6328 "state": "OPEN",
6329 "mergeStateStatus": "UNSTABLE",
6330 "statusCheckRollup": [
6331 {
6332 "__typename": "CheckRun",
6333 "conclusion": "SUCCESS",
6334 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
6335 "name": "check (ubuntu-latest)",
6336 "status": "COMPLETED",
6337 "workflowName": "CI"
6338 },
6339 {
6340 "__typename": "CheckRun",
6341 "conclusion": "SUCCESS",
6342 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
6343 "name": "rustfmt",
6344 "status": "COMPLETED",
6345 "workflowName": "CI"
6346 },
6347 {
6348 "__typename": "CheckRun",
6349 "conclusion": "FAILURE",
6350 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
6351 "name": "editorconfig",
6352 "status": "COMPLETED",
6353 "workflowName": "CI"
6354 },
6355 {
6356 "__typename": "StatusContext",
6357 "context": "CodeRabbit",
6358 "state": "SUCCESS",
6359 "targetUrl": ""
6360 }
6361 ],
6362 "reviews": [],
6363 "comments": [
6364 {
6365 "author": {
6366 "login": "coderabbitai"
6367 },
6368 "authorAssociation": "NONE",
6369 "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"
6370 }
6371 ]
6372}"####;
6373
6374 const PENDING_OPEN: &str = r####"{
6376 "url": "https://github.com/yukimemi/magi/pull/9",
6377 "number": 9,
6378 "state": "OPEN",
6379 "statusCheckRollup": [
6380 {
6381 "__typename": "CheckRun",
6382 "conclusion": "SUCCESS",
6383 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
6384 "name": "check (ubuntu-latest)",
6385 "status": "COMPLETED",
6386 "workflowName": "CI"
6387 },
6388 {
6389 "__typename": "CheckRun",
6390 "conclusion": "SUCCESS",
6391 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
6392 "name": "rustfmt",
6393 "status": "COMPLETED",
6394 "workflowName": "CI"
6395 },
6396 {
6397 "__typename": "CheckRun",
6398 "conclusion": null,
6399 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
6400 "name": "editorconfig",
6401 "status": "IN_PROGRESS",
6402 "workflowName": "CI"
6403 },
6404 {
6405 "__typename": "StatusContext",
6406 "context": "CodeRabbit",
6407 "state": "SUCCESS",
6408 "targetUrl": ""
6409 }
6410 ],
6411 "reviews": [],
6412 "comments": []
6413}"####;
6414
6415 const MERGED: &str = r####"{
6417 "url": "https://github.com/yukimemi/magi/pull/16",
6418 "number": 16,
6419 "state": "MERGED",
6420 "statusCheckRollup": [
6421 {
6422 "__typename": "CheckRun",
6423 "conclusion": "SUCCESS",
6424 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587933/job/100268878095",
6425 "name": "check (ubuntu-latest)",
6426 "status": "COMPLETED",
6427 "workflowName": "CI"
6428 },
6429 {
6430 "__typename": "CheckRun",
6431 "conclusion": "SUCCESS",
6432 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587918/job/100268876427",
6433 "name": "review",
6434 "status": "COMPLETED",
6435 "workflowName": "claude-review"
6436 }
6437 ],
6438 "reviews": [],
6439 "comments": []
6440}"####;
6441
6442 const REVIEWED_OPEN: &str = r####"{
6444 "url": "https://github.com/yukimemi/magi/pull/12",
6445 "number": 12,
6446 "state": "OPEN",
6447 "statusCheckRollup": [
6448 {
6449 "__typename": "CheckRun",
6450 "conclusion": "SUCCESS",
6451 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212506/job/100065355258",
6452 "name": "check (ubuntu-latest)",
6453 "status": "COMPLETED",
6454 "workflowName": "CI"
6455 },
6456 {
6457 "__typename": "CheckRun",
6458 "conclusion": "SUCCESS",
6459 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212566/job/100065355810",
6460 "name": "review",
6461 "status": "COMPLETED",
6462 "workflowName": "claude-review"
6463 }
6464 ],
6465 "reviews": [
6466 {
6467 "author": {
6468 "login": "claude"
6469 },
6470 "state": "COMMENTED",
6471 "body": ""
6472 }
6473 ],
6474 "comments": [
6475 {
6476 "author": {
6477 "login": "coderabbitai"
6478 },
6479 "authorAssociation": "NONE",
6480 "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"
6481 },
6482 {
6483 "author": {
6484 "login": "claude"
6485 },
6486 "authorAssociation": "NONE",
6487 "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"
6488 }
6489 ]
6490}"####;
6491
6492 const INLINE: &str = r####"[
6494 {
6495 "user": {
6496 "login": "claude[bot]"
6497 },
6498 "path": "src/graph.rs",
6499 "line": 231,
6500 "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"
6501 }
6502]"####;
6503
6504 const CODERABBIT_TRIGGER: &str = r####"<!-- This is an auto-generated comment: summarize by coderabbit.ai -->
6506<!-- This is an auto-generated comment: skip review by coderabbit.ai -->
6507
6508> [!IMPORTANT]
6509> - [ ] <!-- {"checkboxId":"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe"} --> 🔍 Trigger review
6510>
6511> This repository does not receive automatic reviews because it has fewer than 10 stars.
6512>
6513> <details>
6514> <summary>⚙️ Run configuration</summary>
6515>
6516> **Configuration used**: defaults
6517>
6518> **Review profile**: CHILL
6519>
6520> **Plan**: Team
6521>
6522> **Run ID**: `c1e2a68f-87fc-4b35-9ec4-e75c7854966a`
6523>
6524> </details>
6525
6526<!-- end of auto-generated comment: skip review by coderabbit.ai -->
6527
6528<!-- tips_start -->
6529
6530---
6531
6532Thanks 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.
6533
6534<details>
6535<summary>❤️ Share</summary>
6536
6537- [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"####;
6538
6539 const CLAUDE_CHECKLIST: &str = r####"**Claude finished @yukimemi's task in 4m 14s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33636587918)
6541
6542---
6543### Reviewing PR #16
6544
6545- [x] Read AGENTS.md conventions
6546- [x] Review `src/daemon.rs` changes
6547- [x] Review `src/main.rs` changes (new `doctor` reporting)
6548- [x] Review `src/web.rs` changes (reuse of unreadable-run count)
6549- [x] Check test coverage for new behavior
6550- [x] Run verification commands (blocked — see note)
6551- [x] Post findings"####;
6552
6553 const CLAUDE_FINDING: &str = r####"**Claude finished @yukimemi's task in 3m 52s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33571212566)
6555
6556---
6557### Review: `magi review <branch>` — cheap-half-only graph
6558
6559Read 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.
6560
6561**Correctness**
6562
6563- 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"####;
6564
6565 fn pr(checks: Checks, failing: &[&str], comments: usize) -> PrState {
6566 PrState {
6567 url: "https://github.com/yukimemi/magi/pull/16".to_owned(),
6568 number: 16,
6569 state: PrLifecycle::Open,
6570 checks,
6571 blocking: if matches!(checks, Checks::Red) {
6575 Blocking::Yes
6576 } else {
6577 Blocking::No
6578 },
6579 failing: failing.iter().map(|s| (*s).to_owned()).collect(),
6580 review_comments: (0..comments)
6581 .map(|i| ReviewComment {
6582 author: "coderabbitai".to_owned(),
6583 path: Some("src/graph.rs".to_owned()),
6584 line: Some(231),
6585 body: format!("finding {i}"),
6586 })
6587 .collect(),
6588 }
6589 }
6590
6591 #[test]
6592 fn expected_ci_is_exactly_decide_and_absent_ci_never_waits_for_checks() {
6593 use CiExpectation::{Absent, Expected};
6594 for checks in [Checks::Pending, Checks::Unknown, Checks::Green, Checks::Red] {
6595 let p = pr(checks, &["x"], 0);
6596 for waited in [Duration::ZERO, CHECKS_GRACE] {
6597 assert_eq!(
6598 decide_with(&p, 0, 4, waited, Expected),
6599 decide(&p, 0, 4, waited)
6600 );
6601 }
6602 }
6603 for checks in [Checks::Pending, Checks::Unknown, Checks::Red] {
6605 let p = pr(checks, &["x"], 0);
6606 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Merge);
6607 assert_eq!(decide_with(&p, 4, 4, CHECKS_GRACE, Absent), Step::Merge);
6608 }
6609 for comments in [0, 1] {
6611 for round in [0, 4] {
6612 let absent = decide_with(
6613 &pr(Checks::Unknown, &[], comments),
6614 round,
6615 4,
6616 CHECKS_GRACE,
6617 Absent,
6618 );
6619 for checks in [Checks::Green, Checks::Red, Checks::Pending] {
6620 assert_eq!(
6621 decide_with(
6622 &pr(checks, &["third-party"], comments),
6623 round,
6624 4,
6625 Duration::ZERO,
6626 Absent
6627 ),
6628 absent
6629 );
6630 }
6631 if comments != 0 {
6632 assert!(matches!(absent, Step::Fix { .. } | Step::GiveUp { .. }));
6633 assert_eq!(matches!(absent, Step::GiveUp { .. }), round == 4);
6634 }
6635 }
6636 }
6637 let empty = pr(Checks::Unknown, &[], 0);
6638 for waited in [Duration::ZERO, CHECKS_GRACE + POLL] {
6639 assert_eq!(decide_with(&empty, 0, 4, waited, Absent), Step::Merge);
6640 }
6641 assert_eq!(
6642 decide_with(&empty, 0, 4, Duration::ZERO, Expected),
6643 Step::Wait
6644 );
6645 assert_eq!(
6646 decide_with(&empty, 0, 4, CHECKS_GRACE, Expected),
6647 Step::GiveUp { reason: "no check status is readable on the pull request after 3 minute(s); refusing to merge on a guess".to_owned() }
6648 );
6649 let mut p = pr(Checks::Unknown, &[], 0);
6651 p.blocking = Blocking::Conflict;
6652 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Rebase);
6653 p.state = PrLifecycle::Merged;
6655 assert_eq!(
6656 decide_with(&p, 0, 4, Duration::ZERO, Absent),
6657 Step::Done { merged: true }
6658 );
6659 }
6660
6661 #[test]
6662 fn a_green_pull_request_with_nothing_outstanding_parses_as_ready_to_merge() {
6663 let state = parse_pr(GREEN_OPEN).expect("green fixture parses");
6664 assert_eq!(state.number, 10);
6665 assert_eq!(state.state, PrLifecycle::Open);
6666 assert_eq!(state.checks, Checks::Green);
6667 assert!(state.failing.is_empty());
6668 assert!(
6669 state.review_comments.is_empty(),
6670 "the only comment is CodeRabbit's trigger notice: {:?}",
6671 state.review_comments
6672 );
6673 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Merge);
6674 }
6675
6676 #[test]
6677 fn a_failing_check_parses_as_red_and_is_named() {
6678 let state = parse_pr(RED_OPEN).expect("red fixture parses");
6679 assert_eq!(state.checks, Checks::Red);
6680 assert_eq!(state.failing, vec!["editorconfig".to_owned()]);
6681 let mut blocking = state.clone();
6688 blocking.blocking = Blocking::Yes;
6689 match decide(&blocking, 0, 4, Duration::ZERO) {
6690 Step::Fix { reason } => {
6691 assert!(reason.contains("editorconfig"), "reason: {reason}");
6692 assert!(reason.contains("failing"), "reason: {reason}");
6693 }
6694 other => panic!("expected a fix round, got {other:?}"),
6695 }
6696 }
6697
6698 #[test]
6699 fn a_check_still_running_parses_as_pending_and_is_waited_for() {
6700 let state = parse_pr(PENDING_OPEN).expect("pending fixture parses");
6701 assert_eq!(state.checks, Checks::Pending);
6702 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Wait);
6703 }
6704
6705 #[test]
6706 fn a_pull_request_merged_underneath_us_is_done_rather_than_a_failure() {
6707 let state = parse_pr(MERGED).expect("merged fixture parses");
6708 assert_eq!(state.state, PrLifecycle::Merged);
6709 assert_eq!(
6710 decide(&state, 0, 4, Duration::ZERO),
6711 Step::Done { merged: true }
6712 );
6713 }
6714
6715 #[test]
6716 fn a_review_that_found_something_is_outstanding_and_holds_the_merge() {
6717 let state = parse_pr(REVIEWED_OPEN).expect("reviewed fixture parses");
6718 assert_eq!(state.checks, Checks::Green);
6719 let authors: Vec<&str> = state
6720 .review_comments
6721 .iter()
6722 .map(|c| c.author.as_str())
6723 .collect();
6724 assert_eq!(
6725 authors,
6726 vec!["claude"],
6727 "CodeRabbit's walkthrough is machinery; Claude's review is a finding"
6728 );
6729 match decide(&state, 0, 4, Duration::ZERO) {
6730 Step::Fix { reason } => assert!(reason.contains("unresolved"), "reason: {reason}"),
6731 other => panic!("expected a fix round, got {other:?}"),
6732 }
6733 }
6734
6735 #[test]
6736 fn inline_review_comments_keep_their_file_and_line() {
6737 let comments = parse_inline_comments(INLINE).expect("inline fixture parses");
6738 assert_eq!(comments.len(), 1);
6739 assert_eq!(comments[0].author, "claude[bot]");
6740 assert_eq!(comments[0].path.as_deref(), Some("src/graph.rs"));
6741 assert_eq!(comments[0].line, Some(231));
6742 assert!(comments[0].body.contains("empty"), "{}", comments[0].body);
6743 }
6744
6745 #[test]
6746 fn a_status_only_bot_comment_does_not_trigger_a_fix_round() {
6747 assert!(
6748 is_noise(CODERABBIT_TRIGGER),
6749 "CodeRabbit's trigger notice declares itself not a review"
6750 );
6751 assert!(
6752 is_noise(CLAUDE_CHECKLIST),
6753 "a progress checklist asks for nothing"
6754 );
6755 assert!(
6756 !is_noise(CLAUDE_FINDING),
6757 "a review that names a bug is input, not noise"
6758 );
6759
6760 let mut clean = pr(Checks::Green, &[], 0);
6761 clean.review_comments.push(ReviewComment {
6762 author: "coderabbitai".to_owned(),
6763 path: None,
6764 line: None,
6765 body: CODERABBIT_TRIGGER.to_owned(),
6766 });
6767 clean.review_comments.retain(|c| !is_noise(&c.body));
6768 assert_eq!(decide(&clean, 0, 4, Duration::ZERO), Step::Merge);
6769
6770 let mut found = pr(Checks::Green, &[], 0);
6771 found.review_comments.push(ReviewComment {
6772 author: "claude".to_owned(),
6773 path: None,
6774 line: None,
6775 body: CLAUDE_FINDING.to_owned(),
6776 });
6777 found.review_comments.retain(|c| !is_noise(&c.body));
6778 assert!(matches!(
6779 decide(&found, 0, 4, Duration::ZERO),
6780 Step::Fix { .. }
6781 ));
6782 }
6783
6784 #[test]
6785 fn the_policy_table_holds_for_every_combination_that_matters() {
6786 let cases: Vec<(&str, PrState, usize, usize, Duration, Step)> = vec![
6787 (
6788 "pending checks are waited for, even on the last round",
6789 pr(Checks::Pending, &[], 0),
6790 4,
6791 4,
6792 Duration::ZERO,
6793 Step::Wait,
6794 ),
6795 (
6796 "red checks are fixed",
6797 pr(Checks::Red, &["editorconfig"], 0),
6798 0,
6799 4,
6800 Duration::ZERO,
6801 Step::Fix {
6802 reason: "1 check(s) failing: editorconfig".to_owned(),
6803 },
6804 ),
6805 (
6806 "green with comments is fixed, not merged",
6807 pr(Checks::Green, &[], 2),
6808 1,
6809 4,
6810 Duration::ZERO,
6811 Step::Fix {
6812 reason: "checks are green but 2 review comment(s) are unresolved: coderabbitai"
6813 .to_owned(),
6814 },
6815 ),
6816 (
6817 "green and clean merges",
6818 pr(Checks::Green, &[], 0),
6819 3,
6820 4,
6821 Duration::ZERO,
6822 Step::Merge,
6823 ),
6824 (
6825 "an unreadable rollup is waited on while the grace lasts",
6826 pr(Checks::Unknown, &[], 0),
6827 0,
6828 4,
6829 Duration::ZERO,
6830 Step::Wait,
6831 ),
6832 (
6833 "an unreadable rollup is never merged once the grace is spent",
6834 pr(Checks::Unknown, &[], 0),
6835 0,
6836 4,
6837 CHECKS_GRACE,
6838 Step::GiveUp {
6839 reason: "no check status is readable on the pull request after 3 minute(s); \
6840 refusing to merge on a guess"
6841 .to_owned(),
6842 },
6843 ),
6844 ];
6845 for (what, state, round, budget, waited, want) in cases {
6846 assert_eq!(decide(&state, round, budget, waited), want, "{what}");
6847 }
6848 }
6849
6850 #[test]
6851 fn the_forge_verdict_survives_the_round_trip_from_gh() {
6852 let green = parse_pr(GREEN_OPEN).expect("parse");
6856 assert_eq!(green.blocking, Blocking::No);
6857 let red = parse_pr(RED_OPEN).expect("parse");
6858 assert_eq!(
6859 red.blocking,
6860 Blocking::No,
6861 "`UNSTABLE` is mergeable: the red check is one nobody requires"
6862 );
6863 assert_eq!(red.checks, Checks::Red, "and it is still reported as red");
6864 let quiet =
6866 parse_pr(&GREEN_OPEN.replace("\"mergeStateStatus\": \"CLEAN\",", "")).expect("parse");
6867 assert_eq!(quiet.blocking, Blocking::Unsaid);
6868 }
6869
6870 #[test]
6871 fn a_red_check_nobody_requires_does_not_buy_a_fix_round() {
6872 let mut nonblocking = pr(Checks::Red, &["editorconfig", "coverage"], 0);
6878 nonblocking.blocking = Blocking::No;
6879 assert_eq!(
6880 decide(&nonblocking, 0, 4, Duration::ZERO),
6881 Step::Merge,
6882 "the forge says nothing is in the way, so nothing is"
6883 );
6884
6885 let mut blocking = pr(Checks::Red, &["test (ubuntu-latest)"], 0);
6887 blocking.blocking = Blocking::Yes;
6888 assert!(matches!(
6889 decide(&blocking, 0, 4, Duration::ZERO),
6890 Step::Fix { .. }
6891 ));
6892
6893 let mut commented = pr(Checks::Red, &["coverage"], 1);
6896 commented.blocking = Blocking::No;
6897 assert!(matches!(
6898 decide(&commented, 0, 4, Duration::ZERO),
6899 Step::Fix { .. }
6900 ));
6901
6902 let mut unsaid = pr(Checks::Red, &["coverage"], 0);
6904 unsaid.blocking = Blocking::Unsaid;
6905 assert_eq!(decide(&unsaid, 0, 4, Duration::ZERO), Step::Wait);
6906 assert!(matches!(
6907 decide(&unsaid, 0, 4, CHECKS_GRACE),
6908 Step::Fix { .. }
6909 ));
6910 }
6911
6912 #[test]
6913 fn a_red_merge_is_announced_with_every_failing_check_and_a_green_one_is_not() {
6914 let mut red = pr(Checks::Red, &["test (windows-latest)", "coverage"], 0);
6915 red.blocking = Blocking::No;
6916 assert_eq!(
6917 decide(&red, 0, 4, Duration::ZERO),
6918 Step::Merge,
6919 "announcing must not change the decision"
6920 );
6921 let said = red_merge_summary("yukimemi/magi", &red).expect("red merge is announced");
6922 assert!(said.contains("yukimemi/magi"), "{said}");
6923 assert!(said.contains("#16"), "{said}");
6924 assert!(
6925 said.contains("https://github.com/yukimemi/magi/pull/16"),
6926 "{said}"
6927 );
6928 assert!(
6929 said.contains("test (windows-latest)") && said.contains("coverage"),
6930 "{said}"
6931 );
6932
6933 let green = pr(Checks::Green, &["stale"], 0);
6935 assert_eq!(red_merge_summary("yukimemi/magi", &green), None);
6936 }
6937
6938 #[test]
6939 fn red_merge_notices_omit_empty_check_details() {
6940 for checks in [vec![], vec!["", " "]] {
6941 let red = pr(Checks::Red, &checks, 0);
6942 let summary = red_merge_summary("owner/repo", &red).unwrap();
6943 let notice = crate::notices::merged_red("run-1", &summary);
6944 assert_eq!(
6945 notice.message,
6946 format!("Merged owner/repo PR #16 with red checks ({})", red.url)
6947 );
6948 assert_eq!(notice.severity, crate::notices::Severity::Warn);
6949 }
6950 let red = pr(Checks::Red, &["", " test ", " "], 0);
6951 let summary = red_merge_summary("owner/repo", &red).unwrap();
6952 assert!(summary.contains("with red checks: test ("), "{summary}");
6953 }
6954
6955 #[test]
6956 fn the_repo_label_comes_from_the_pull_request_url() {
6957 let p = Path::new("/tmp/checkout");
6958 assert_eq!(
6959 repo_label(p, "https://github.com/yukimemi/magi/pull/16"),
6960 "yukimemi/magi"
6961 );
6962 assert_eq!(repo_label(p, "not a url"), "checkout");
6963 }
6964
6965 #[test]
6966 fn a_branch_the_base_moved_under_is_rebased_not_fixed() {
6967 let mut conflicted = pr(Checks::Green, &[], 0);
6972 conflicted.blocking = Blocking::Conflict;
6973 assert_eq!(decide(&conflicted, 0, 4, Duration::ZERO), Step::Rebase);
6974
6975 let mut red = pr(Checks::Red, &["test (ubuntu-latest)"], 2);
6979 red.blocking = Blocking::Conflict;
6980 assert_eq!(decide(&red, 4, 4, Duration::ZERO), Step::Rebase);
6981
6982 let mut merged = pr(Checks::Red, &[], 0);
6984 merged.blocking = Blocking::Conflict;
6985 merged.state = PrLifecycle::Merged;
6986 assert_eq!(
6987 decide(&merged, 0, 4, Duration::ZERO),
6988 Step::Done { merged: true }
6989 );
6990 }
6991
6992 #[test]
6993 fn the_forge_verdict_is_read_off_merge_state_status() {
6994 for ok in ["CLEAN", "UNSTABLE", "unstable", "HAS_HOOKS"] {
6997 assert_eq!(Blocking::of(ok), Blocking::No, "{ok}");
6998 assert!(!Blocking::of(ok).stops_a_merge(), "{ok}");
6999 }
7000 assert_eq!(Blocking::of("DIRTY"), Blocking::Conflict);
7001 assert_eq!(Blocking::of("BLOCKED"), Blocking::Yes);
7002 assert_eq!(Blocking::of("BEHIND"), Blocking::Yes);
7003 for quiet in ["", "UNKNOWN"] {
7006 assert_eq!(Blocking::of(quiet), Blocking::Unsaid);
7007 assert!(Blocking::of(quiet).stops_a_merge());
7008 }
7009 }
7010
7011 #[test]
7012 fn a_merge_command_that_failed_after_merging_is_still_a_merge() {
7013 let argv = merge_argv(28, "fix: retry uploads on transient network errors");
7014 let jj = "could not determine current branch: failed to run git: not on any branch";
7016
7017 let landed = merged_after_all(&argv, jj, Some(PrLifecycle::Merged))
7018 .expect("the forge says merged, so it merged");
7019 assert!(landed.ok);
7020 assert!(
7021 landed.detail.contains("but the pull request is merged"),
7022 "the record must not read as a clean success: {}",
7023 landed.detail
7024 );
7025 assert!(
7026 landed.detail.contains("not on any branch"),
7027 "and it must keep what the command actually said: {}",
7028 landed.detail
7029 );
7030
7031 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Open)).is_none());
7033 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Closed)).is_none());
7034 assert!(merged_after_all(&argv, jj, None).is_none());
7036 }
7037
7038 #[test]
7039 fn a_pull_request_closed_underneath_us_is_done_and_not_merged() {
7040 let mut state = pr(Checks::Red, &["editorconfig"], 3);
7041 state.state = PrLifecycle::Closed;
7042 assert_eq!(
7043 decide(&state, 0, 4, Duration::ZERO),
7044 Step::Done { merged: false },
7045 "a human closing the pull request ends the loop, whatever CI says"
7046 );
7047 }
7048
7049 #[test]
7050 fn the_last_round_gives_up_with_a_reason_naming_what_is_still_failing() {
7051 let red = decide(
7052 &pr(Checks::Red, &["editorconfig", "test (macos)"], 0),
7053 4,
7054 4,
7055 Duration::ZERO,
7056 );
7057 match red {
7058 Step::GiveUp { reason } => {
7059 assert!(reason.contains("editorconfig"), "reason: {reason}");
7060 assert!(reason.contains("test (macos)"), "reason: {reason}");
7061 assert!(reason.contains("4 fix round(s)"), "reason: {reason}");
7062 }
7063 other => panic!("expected a give-up, got {other:?}"),
7064 }
7065
7066 let commented = decide(&pr(Checks::Green, &[], 1), 2, 2, Duration::ZERO);
7067 match commented {
7068 Step::GiveUp { reason } => {
7069 assert!(reason.contains("unresolved"), "reason: {reason}");
7070 assert!(reason.contains("2 fix round(s)"), "reason: {reason}");
7071 }
7072 other => panic!("expected a give-up, got {other:?}"),
7073 }
7074 }
7075
7076 #[test]
7077 fn the_merge_command_squashes_deletes_the_branch_and_sets_its_own_subject() {
7078 let candidate_commit = "magi: candidate A (uncommitted work)";
7079 let subject = merge_subject(candidate_commit, "add retries to the uploader");
7080 let argv = merge_argv(16, &subject);
7081
7082 assert!(argv.contains(&"--squash".to_owned()));
7083 assert!(argv.contains(&"--delete-branch".to_owned()));
7084 assert!(argv.contains(&"--subject".to_owned()));
7085 assert_eq!(
7086 argv.last().map(String::as_str),
7087 Some("add retries to the uploader"),
7088 "the subject must not be the candidate commit message"
7089 );
7090 assert_ne!(subject, candidate_commit);
7091 }
7092
7093 #[test]
7094 fn a_real_pull_request_title_is_used_as_the_squash_subject_verbatim() {
7095 assert_eq!(
7096 merge_subject("feat: a queue, an unattended loop, and a phone UI", "task"),
7097 "feat: a queue, an unattended loop, and a phone UI"
7098 );
7099 assert_eq!(
7100 merge_subject("", "# port the retry logic\n\ndetails"),
7101 "port the retry logic",
7102 "an empty title falls back to the task's first line, heading marks stripped"
7103 );
7104 }
7105
7106 #[test]
7107 fn a_failing_checks_details_url_yields_the_job_to_read_logs_from() {
7108 let url = "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572";
7109 assert_eq!(job_of(url).as_deref(), Some("100114323572"));
7110 assert_eq!(run_of(url).as_deref(), Some("33587406996"));
7111 assert_eq!(job_of("https://coderabbit.ai/status"), None);
7112 assert_eq!(run_of(""), None);
7113 }
7114
7115 #[test]
7116 fn magis_own_stop_comment_is_never_read_back_as_a_finding() {
7117 let mut out = Vec::new();
7118 push_if_outstanding(
7119 &mut out,
7120 ReviewComment {
7121 author: "yukimemi".to_owned(),
7122 path: None,
7123 line: None,
7124 body: format!("{MARKER}\nmagi stopped landing this pull request: 1 check failing"),
7125 },
7126 );
7127 assert!(out.is_empty());
7128 }
7129
7130 fn run_state() -> RunState {
7134 let mut state = RunState::new(
7135 std::path::PathBuf::from("/repo/magi"),
7136 "main".to_owned(),
7137 "abcdef1234".to_owned(),
7138 "add retries to the uploader".to_owned(),
7139 crate::config::Config::default(),
7140 );
7141 static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
7146 let nanos = std::time::SystemTime::now()
7147 .duration_since(std::time::UNIX_EPOCH)
7148 .map_or(0, |d| d.subsec_nanos() % 1_000_000);
7149 state.id = format!(
7150 "20261004-{nanos:06}-{:04x}",
7151 NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
7152 );
7153 state
7154 }
7155
7156 fn green_pr() -> PrState {
7157 PrState {
7158 url: "https://github.com/yukimemi/magi/pull/42".to_owned(),
7159 number: 42,
7160 state: PrLifecycle::Open,
7161 checks: Checks::Green,
7162 blocking: Blocking::No,
7164 failing: Vec::new(),
7165 review_comments: vec![ReviewComment {
7166 author: "coderabbitai".to_owned(),
7167 path: Some("src/land.rs".to_owned()),
7168 line: Some(212),
7169 body: "this branch never checks the exit code".to_owned(),
7170 }],
7171 }
7172 }
7173
7174 #[test]
7175 fn land_fixer_defers_review_and_verification_without_a_cache() {
7176 let state = run_state();
7177 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7178 assert!(p.contains(crate::prompt::child_run_ownership()), "{p}");
7179 assert!(p.contains("Commit in this worktree"), "{p}");
7180 }
7181
7182 #[test]
7183 fn github_facing_land_text_is_english_whatever_the_language() {
7184 let mut state = run_state();
7185 state.config.graph.language = "ja".to_owned();
7186 let comment = stop_comment(&state.id, "checks are still red");
7187 assert!(crate::github_text::check("", &comment).is_empty());
7188 assert!(comment.is_ascii(), "{comment}");
7189 assert!(comment.starts_with(MARKER));
7190
7191 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7192 let ja_at = p.find("Write all prose in ja").unwrap();
7193 let rule_at = p.find(crate::prompt::GITHUB_ENGLISH_HEADING).unwrap();
7194 assert!(ja_at < rule_at, "{p}");
7195 assert!(p.contains("stays in Japanese"), "{p}");
7196
7197 state.config.graph.language = "en".to_owned();
7198 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7199 assert!(p.contains(crate::prompt::GITHUB_ENGLISH_HEADING), "{p}");
7200 assert!(!p.contains("does not apply"), "{p}");
7201 }
7202
7203 const NUMSTAT: &str = "12\t3\tsrc/land.rs\n40\t1\tsrc/web.rs\n-\t-\tassets/logo.png";
7204
7205 fn panel() -> String {
7206 approval_panel(
7207 &run_state(),
7208 &green_pr(),
7209 NUMSTAT,
7210 "diff --git a/src/land.rs b/src/land.rs\n@@ -1,2 +1,2 @@\n-old line\n+new line\n context",
7211 &[
7212 "land: ask before merging".to_owned(),
7213 "land: colour the diff".to_owned(),
7214 ],
7215 "feat: merge approval from the phone",
7216 )
7217 }
7218
7219 #[test]
7220 fn the_approval_panel_carries_the_whole_case_for_the_merge() {
7221 let html = panel();
7222 for needle in [
7223 "42",
7224 "main",
7225 "src/land.rs",
7226 "src/web.rs",
7227 "assets/logo.png",
7228 "feat: merge approval from the phone",
7229 "land: ask before merging",
7230 "land: colour the diff",
7231 "coderabbitai",
7232 "this branch never checks the exit code",
7233 "green",
7234 ] {
7235 assert!(html.contains(needle), "the panel must state `{needle}`");
7236 }
7237 }
7238
7239 async fn landing_git_fixture() -> (tempfile::TempDir, RunState, String) {
7240 crate::run::pin_test_home();
7241 let tmp = tempfile::tempdir().unwrap();
7242 let repo = tmp.path().join("repo");
7243 let remote = tmp.path().join("remote.git");
7244 std::fs::create_dir(&repo).unwrap();
7245 git::git(tmp.path(), &["init", "--bare", remote.to_str().unwrap()])
7246 .await
7247 .unwrap();
7248 git::git(&repo, &["init", "-b", "main"]).await.unwrap();
7249 git::git(&repo, &["config", "user.name", "Test"])
7250 .await
7251 .unwrap();
7252 git::git(&repo, &["config", "user.email", "test@example.test"])
7253 .await
7254 .unwrap();
7255 std::fs::write(repo.join("base"), "base").unwrap();
7256 git::git(&repo, &["add", "."]).await.unwrap();
7257 git::git(&repo, &["commit", "-m", "base"]).await.unwrap();
7258 git::git(
7259 &repo,
7260 &["remote", "add", "origin", remote.to_str().unwrap()],
7261 )
7262 .await
7263 .unwrap();
7264 git::git(&repo, &["push", "origin", "main"]).await.unwrap();
7265 git::git(&repo, &["checkout", "-b", "winner"])
7266 .await
7267 .unwrap();
7268 std::fs::write(repo.join("change"), "change").unwrap();
7269 git::git(&repo, &["add", "."]).await.unwrap();
7270 git::git(&repo, &["commit", "-m", "change"]).await.unwrap();
7271 let head = git::rev_parse(&repo, "HEAD").await.unwrap();
7272 git::git(&repo, &["push", "origin", "HEAD:refs/heads/task-head"])
7273 .await
7274 .unwrap();
7275 let mut state = run_state();
7276 state.repo = repo.clone();
7277 state.base_commit = git::rev_parse(&repo, "origin/main").await.unwrap();
7278 state.config.graph.land = true;
7279 state.config.graph.land_approval = true;
7280 state.pr_head = Some("task-head".into());
7281 state.pr_pushed_head = Some(head.clone());
7282 state.candidates = vec![winning_candidate("change")];
7283 state.candidates[0].worktree = repo;
7284 state.candidates[0].branch = "winner".into();
7285 state.tally = Some(uncontested_tally());
7286 state.gate_ran = true;
7287 state.gate_head = Some(head.clone());
7288 state.land_sync_pending = true;
7289 state.save().unwrap();
7290 (tmp, state, head)
7291 }
7292
7293 async fn resume_observed_head(state: &mut RunState, head: &str) -> Result<String> {
7294 let forge = Scripted::new(vec![seen(head, Checks::Green, "CLEAN", false)], vec![]);
7295 resume_landing_head(state, head, &green_pr().url, &forge).await
7296 }
7297
7298 async fn advance_landing_base(state: &RunState) {
7299 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7300 std::fs::write(state.repo.join("advance"), "advance").unwrap();
7301 git::git(&state.repo, &["add", "."]).await.unwrap();
7302 git::git(&state.repo, &["commit", "-m", "advance base"])
7303 .await
7304 .unwrap();
7305 git::git(&state.repo, &["push", "origin", "main"])
7306 .await
7307 .unwrap();
7308 git::git(&state.repo, &["checkout", "winner"])
7309 .await
7310 .unwrap();
7311 }
7312
7313 async fn foreign_landing_fixture() -> (tempfile::TempDir, RunState, String, std::path::PathBuf)
7314 {
7315 let (tmp, mut state, old) = landing_git_fixture().await;
7316 let path = tmp.path().join("foreign");
7317 git::worktree_add_branch(&state.repo, &path, "task-head", &old)
7318 .await
7319 .unwrap();
7320 state.foreign_checkout = Some(
7321 crate::foreign_checkout::inspect(&state.repo, "task-head", &path)
7322 .await
7323 .unwrap(),
7324 );
7325 state.config.merge.mode = crate::config::MergeMode::Pr;
7326 state.save().unwrap();
7327 (tmp, state, old, path)
7328 }
7329
7330 #[tokio::test]
7331 async fn foreign_landing_sync_and_interrupted_resumes_preserve_delivery_ancestry() {
7332 for phase in 0..4 {
7333 let (_tmp, mut state, old, path) = foreign_landing_fixture().await;
7334 advance_landing_base(&state).await;
7335 state.config.verify.gate = vec!["test -f advance && test -f change".into()];
7336 if phase == 0 {
7337 assert_eq!(
7340 rebase_landing_worktree(&mut state, "origin/main")
7341 .await
7342 .unwrap(),
7343 crate::rebase::Rebased::Applied
7344 );
7345 } else {
7346 interrupt_landing_rebase(&mut state).await;
7347 let repaired_tree = git::tree_of(&state.repo, "HEAD").await.unwrap();
7348 if phase == 2 {
7349 git::sync_to_head(&state.repo).await.unwrap();
7350 } else if phase == 3 {
7351 restore_landing_worktree(&mut state).await.unwrap();
7354 let joined = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7355 state.land_rebase_from = Some(old.clone());
7356 state.save().unwrap();
7357 restore_landing_worktree(&mut state).await.unwrap();
7358 assert_eq!(git::rev_parse(&state.repo, "HEAD").await.unwrap(), joined);
7359 }
7360 state.save().unwrap();
7361 state = RunState::load(&state.id).unwrap();
7362 restore_landing_worktree(&mut state).await.unwrap();
7363 assert_eq!(
7364 git::tree_of(&state.repo, "HEAD").await.unwrap(),
7365 repaired_tree
7366 );
7367 }
7368 let head = if phase == 0 {
7369 let forge = Scripted::new(vec![seen(&old, Checks::Green, "CLEAN", false)], vec![]);
7370 publish_landing_head(&mut state, &old, &green_pr().url, &forge)
7371 .await
7372 .unwrap()
7373 } else {
7374 resume_observed_head(&mut state, &old).await.unwrap()
7375 };
7376 assert!(git::is_ancestor(&state.repo, &old, &head).await);
7377 assert!(git::is_ancestor(&state.repo, "origin/main", &head).await);
7378 assert_eq!(git::rev_parse(&path, "HEAD").await.unwrap(), head);
7379 assert_eq!(
7380 git::remote_head(&state.repo, "origin", "task-head")
7381 .await
7382 .unwrap(),
7383 Some(head.clone())
7384 );
7385 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7386 assert_eq!(state.foreign_checkout.as_ref().unwrap().synced_head, head);
7387 assert!(state.gate_allows_progress());
7388 assert!(state.land_rebase_from.is_none());
7389 assert!(!state.land_sync_pending);
7390 assert!(git::is_clean(&path).await.unwrap());
7391 }
7392 }
7393
7394 #[tokio::test]
7395 async fn foreign_landing_conflict_repair_can_resume_and_publish_without_losing_ancestry() {
7396 let (_tmp, mut state, old, path) = foreign_landing_fixture().await;
7397 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7398 std::fs::write(state.repo.join("change"), "conflicting base change").unwrap();
7399 git::commit_all(&state.repo, "conflicting base")
7400 .await
7401 .unwrap();
7402 git::git(&state.repo, &["push", "origin", "main"])
7403 .await
7404 .unwrap();
7405 git::git(&state.repo, &["checkout", "winner"])
7406 .await
7407 .unwrap();
7408 landing_gate_fixer(
7409 &mut state,
7410 "cat >/dev/null; printf resolved > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"resolved\"}'",
7411 );
7412 state.config.graph.gate_fix_rounds = 0;
7413 state.config.verify.gate = vec!["exit 1".into()];
7414 assert!(resume_observed_head(&mut state, &old).await.is_err());
7415 assert!(state.rebase_fixes.iter().any(|fix| fix.finished));
7416 let repaired = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7417 assert!(git::is_ancestor(&state.repo, &old, &repaired).await);
7418 assert_eq!(
7419 std::fs::read_to_string(state.repo.join("change")).unwrap(),
7420 "resolved"
7421 );
7422 assert_eq!(git::rev_parse(&path, "HEAD").await.unwrap(), old);
7424 assert_eq!(
7425 git::remote_head(&state.repo, "origin", "task-head")
7426 .await
7427 .unwrap(),
7428 Some(old.clone())
7429 );
7430 state = RunState::load(&state.id).unwrap();
7431 state.config.verify.gate = vec!["grep -q resolved change".into()];
7432 let head = resume_observed_head(&mut state, &old).await.unwrap();
7433 assert_eq!(head, repaired);
7434 assert_eq!(git::rev_parse(&path, "HEAD").await.unwrap(), head);
7435 assert_eq!(
7436 std::fs::read_to_string(path.join("change")).unwrap(),
7437 "resolved"
7438 );
7439 assert_eq!(
7440 git::remote_head(&state.repo, "origin", "task-head")
7441 .await
7442 .unwrap(),
7443 Some(head.clone())
7444 );
7445 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7446 assert!(git::is_ancestor(&state.repo, "origin/main", &head).await);
7447 assert!(git::is_clean(&path).await.unwrap());
7448 }
7449
7450 #[tokio::test]
7451 async fn landing_resume_gates_rebased_sha_and_publishes_it_to_the_existing_head() {
7452 let (_tmp, mut state, old) = landing_git_fixture().await;
7453 advance_landing_base(&state).await;
7454 state.config.verify.gate = vec!["test -f advance".into()];
7455 let head = resume_observed_head(&mut state, &old).await.unwrap();
7456 assert_ne!(head, old);
7457 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7458 assert!(state.gate_allows_progress());
7459 assert_eq!(
7460 git::remote_head(&state.repo, "origin", "task-head")
7461 .await
7462 .unwrap(),
7463 Some(head.clone())
7464 );
7465 assert_eq!(state.pr_pushed_head, Some(head));
7466 assert!(!state.land_sync_pending);
7467 assert!(state.config.graph.land_approval);
7468 }
7469
7470 fn landing_gate_fixer(state: &mut RunState, script: &str) {
7471 state.config.disk.min_free_bytes = 0;
7472 state.config.graph.gate_fix_rounds = 1;
7473 state.config.agents = vec![crate::config::AgentSpec {
7474 id: "mock".into(),
7475 kind: crate::config::AgentKind::Command,
7476 model: None,
7477 command: vec!["sh".into(), "-c".into(), script.into()],
7478 extra_args: Vec::new(),
7479 env: Default::default(),
7480 prompt_delivery: None,
7481 max_turn_secs: None,
7482 }];
7483 state.candidates[0].agent = "mock".into();
7484 }
7485
7486 #[tokio::test]
7487 async fn landing_resume_revalidates_an_operator_published_winner_extension() {
7488 let (_tmp, mut state, old) = landing_git_fixture().await;
7489 std::fs::write(state.repo.join("change"), "operator update").unwrap();
7490 git::commit_all(&state.repo, "extend winner").await.unwrap();
7491 let updated = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7492 git::git(
7493 &state.repo,
7494 &["push", "origin", "HEAD:refs/heads/task-head"],
7495 )
7496 .await
7497 .unwrap();
7498 state.config.verify.gate = vec!["exit 1".into()];
7499 state.config.graph.gate_fix_rounds = 0;
7500 assert!(resume_observed_head(&mut state, &updated).await.is_err());
7501 assert_ne!(old, updated);
7502 assert_eq!(state.gate_head.as_ref(), Some(&updated));
7503 assert!(!state.gate_allows_progress());
7504 assert!(state.land_sync_pending);
7505 state.config.verify.gate = vec!["grep -q 'operator update' change".into()];
7506 let head = resume_observed_head(&mut state, &updated).await.unwrap();
7507 assert_eq!(head, updated);
7508 assert!(state.gate_allows_progress());
7509 assert!(!state.land_sync_pending);
7510 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7511 land_with(&mut state, &green_pr().url, &forge)
7512 .await
7513 .unwrap();
7514 assert!(state.parked);
7515 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7516 assert!(forge.argvs().is_empty());
7517 }
7518
7519 #[tokio::test]
7520 async fn landing_resume_refuses_remote_only_and_divergent_operator_updates() {
7521 for divergent in [false, true] {
7522 let (_tmp, mut state, old) = landing_git_fixture().await;
7523 if divergent {
7524 git::git(&state.repo, &["reset", "--hard", "origin/main"])
7525 .await
7526 .unwrap();
7527 }
7528 std::fs::write(state.repo.join("external"), "external").unwrap();
7529 git::commit_all(&state.repo, "external update")
7530 .await
7531 .unwrap();
7532 let external = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7533 git::git(
7534 &state.repo,
7535 &["push", "--force", "origin", "HEAD:refs/heads/task-head"],
7536 )
7537 .await
7538 .unwrap();
7539 if !divergent {
7540 git::git(&state.repo, &["reset", "--hard", &old])
7541 .await
7542 .unwrap();
7543 }
7544 let error = resume_observed_head(&mut state, &external)
7545 .await
7546 .unwrap_err();
7547 assert!(
7548 error
7549 .to_string()
7550 .contains("public head moved outside this run")
7551 );
7552 assert_eq!(state.pr_pushed_head.as_ref(), Some(&old));
7553 assert_eq!(
7554 git::remote_head(&state.repo, "origin", "task-head")
7555 .await
7556 .unwrap(),
7557 Some(external)
7558 );
7559 }
7560 }
7561
7562 #[tokio::test]
7563 async fn landing_resume_repairs_a_failed_rebased_gate_before_publication() {
7564 let (_tmp, mut state, old) = landing_git_fixture().await;
7565 advance_landing_base(&state).await;
7566 landing_gate_fixer(
7567 &mut state,
7568 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7569 );
7570 state.config.verify.gate =
7571 vec!["grep -q fixed change || { echo 'change needs repair'; exit 1; }".into()];
7572 state.config.verify.e2e = vec!["test -f advance".into()];
7573 state.config.graph.gate_fix_rounds = 0;
7576 assert!(resume_observed_head(&mut state, &old).await.is_err());
7577 assert_eq!(
7578 git::remote_head(&state.repo, "origin", "task-head")
7579 .await
7580 .unwrap(),
7581 Some(old.clone())
7582 );
7583 state.config.graph.gate_fix_rounds = 1;
7584 let head = resume_observed_head(&mut state, &old).await.unwrap();
7585 assert_eq!(state.gate_fixes.len(), 1);
7586 assert!(state.gate_fixes[0].committed);
7587 assert!(state.gate_allows_progress());
7588 assert_eq!(state.gate_head.as_ref(), Some(&head));
7589 assert_eq!(
7590 git::remote_head(&state.repo, "origin", "task-head")
7591 .await
7592 .unwrap(),
7593 Some(head.clone())
7594 );
7595 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7596 land_with(&mut state, &green_pr().url, &forge)
7597 .await
7598 .unwrap();
7599 assert!(state.parked);
7600 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7601 assert!(forge.argvs().is_empty());
7602 }
7603
7604 #[tokio::test]
7605 async fn landing_gate_repairs_stop_at_the_saved_budget_without_publishing() {
7606 let (_tmp, mut state, old) = landing_git_fixture().await;
7607 advance_landing_base(&state).await;
7608 landing_gate_fixer(
7609 &mut state,
7610 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7611 );
7612 state.config.verify.gate = vec!["echo still red; exit 1".into()];
7613 for _ in 0..2 {
7614 assert!(resume_observed_head(&mut state, &old).await.is_err());
7615 assert_eq!(state.gate_fixes.len(), 1);
7616 assert_eq!(
7617 git::remote_head(&state.repo, "origin", "task-head")
7618 .await
7619 .unwrap(),
7620 Some(old.clone())
7621 );
7622 }
7623 }
7624
7625 #[tokio::test]
7626 async fn landing_gate_repair_cannot_publish_failed_e2e_on_repeated_resumes() {
7627 let (_tmp, mut state, old) = landing_git_fixture().await;
7628 advance_landing_base(&state).await;
7629 landing_gate_fixer(
7630 &mut state,
7631 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7632 );
7633 state.config.verify.gate =
7634 vec!["grep -q fixed change || { echo 'change needs repair'; exit 1; }".into()];
7635 state.config.verify.e2e = vec!["grep -q '^change$' change".into()];
7637 for resume in 0..3 {
7638 assert!(resume_observed_head(&mut state, &old).await.is_err());
7639 state = RunState::load(&state.id).unwrap();
7640 let evidence = state.gate_repair_e2e.as_ref().unwrap();
7641 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7642 assert_eq!(evidence.head, head);
7643 assert!(!evidence.passed);
7644 assert!(evidence.outcomes.iter().any(|o| !o.ok()));
7645 assert_eq!(state.gate_fixes.len(), 1);
7646 assert_eq!(
7647 git::remote_head(&state.repo, "origin", "task-head")
7648 .await
7649 .unwrap(),
7650 Some(old.clone())
7651 );
7652 if resume > 0 {
7653 assert!(
7654 state.gate_allows_progress(),
7655 "a green gate must not bypass red e2e"
7656 );
7657 }
7658 }
7659 state.config.verify.e2e = vec!["grep -q fixed change".into()];
7662 let head = resume_observed_head(&mut state, &old).await.unwrap();
7663 assert!(state.gate_repair_e2e.as_ref().unwrap().passed);
7664 assert_eq!(state.gate_repair_e2e.as_ref().unwrap().head, head);
7665 assert_eq!(state.gate_fixes.len(), 1);
7666 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7667 land_with(&mut state, &green_pr().url, &forge)
7668 .await
7669 .unwrap();
7670 assert!(state.parked);
7671 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7672 assert!(forge.argvs().is_empty());
7673 }
7674
7675 #[tokio::test]
7676 async fn landing_resumes_recheck_pending_deferred_and_stale_repair_e2e() {
7677 for phase in 0..3 {
7678 let (_tmp, mut state, old) = landing_git_fixture().await;
7679 advance_landing_base(&state).await;
7680 let head = resume_observed_head(&mut state, &old).await.unwrap();
7681 state.land_sync_pending = true;
7684 state.config.verify.e2e = vec!["echo e2e is red; exit 1".into()];
7685 state.gate_repair_e2e = Some(crate::run::GateRepairE2e {
7686 head: if phase == 2 {
7687 old.clone()
7688 } else {
7689 head.clone()
7690 },
7691 passed: phase == 2,
7692 outcomes: if phase == 1 {
7693 vec![crate::run::CommandOutcome {
7694 command: state.config.verify.e2e[0].clone(),
7695 code: None,
7696 output_tail: "verification resource unavailable".into(),
7697 duration_ms: 0,
7698 resource_blocked: true,
7699 }]
7700 } else {
7701 Vec::new()
7702 },
7703 });
7704 state.save().unwrap();
7705 for _ in 0..2 {
7706 state = RunState::load(&state.id).unwrap();
7707 assert!(resume_observed_head(&mut state, &head).await.is_err());
7708 let evidence = state.gate_repair_e2e.as_ref().unwrap();
7709 assert_eq!(evidence.head, head);
7710 assert!(!evidence.passed);
7711 assert!(!evidence.outcomes.is_empty());
7712 assert_eq!(
7713 git::remote_head(&state.repo, "origin", "task-head")
7714 .await
7715 .unwrap(),
7716 Some(head.clone())
7717 );
7718 assert!(state.land_sync_pending);
7719 }
7720 }
7721 }
7722
7723 async fn interrupt_landing_rebase(state: &mut RunState) {
7724 state.land_rebase_from = Some(git::rev_parse(&state.repo, "HEAD").await.unwrap());
7725 state.save().unwrap();
7726 let scratch = state.dir().join("rebase");
7727 assert_eq!(
7728 crate::rebase::rebase_with_fixer(state, &scratch, "winner", "origin/main")
7729 .await
7730 .unwrap(),
7731 crate::rebase::Rebased::Applied
7732 );
7733 assert!(!git::is_clean(&state.repo).await.unwrap());
7734 }
7735
7736 async fn landing_setup(state: &mut RunState) {
7737 git::git(
7738 &state.repo,
7739 &["config", "extensions.worktreeConfig", "true"],
7740 )
7741 .await
7742 .unwrap();
7743 state.config.worktree.setup =
7744 vec![toml::from_str("run = \"printf secret > .env\"").unwrap()];
7745 crate::worktree_setup::prepare(&state.config, &state.repo, &state.repo)
7746 .await
7747 .unwrap();
7748 state.config.verify.gate = vec!["test -f advance && test -f .env".into()];
7749 }
7750
7751 #[tokio::test]
7752 async fn landing_resume_restores_setup_after_both_fresh_and_interrupted_rebases() {
7753 for phase in 0..3 {
7754 let (_tmp, mut state, old) = landing_git_fixture().await;
7755 advance_landing_base(&state).await;
7756 landing_setup(&mut state).await;
7757 if phase > 0 {
7758 interrupt_landing_rebase(&mut state).await;
7759 if phase == 2 {
7760 git::sync_to_head(&state.repo).await.unwrap();
7762 assert!(!state.repo.join(".env").exists());
7763 }
7764 state = RunState::load(&state.id).unwrap();
7765 }
7766 let head = resume_observed_head(&mut state, &old).await.unwrap();
7767 assert_ne!(head, old);
7768 assert!(state.gate_allows_progress());
7769 assert!(state.land_rebase_from.is_none());
7770 assert_eq!(
7771 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7772 "secret"
7773 );
7774 assert!(git::is_clean(&state.repo).await.unwrap());
7775 assert!(
7776 !git::git(&state.repo, &["ls-tree", "--name-only", "HEAD"])
7777 .await
7778 .unwrap()
7779 .contains(".env")
7780 );
7781 }
7782 }
7783
7784 #[tokio::test]
7785 async fn landing_restoration_protects_ignored_files_outside_setup_products() {
7786 let (_tmp, mut state, _) = landing_git_fixture().await;
7787 advance_landing_base(&state).await;
7788 landing_setup(&mut state).await;
7789 interrupt_landing_rebase(&mut state).await;
7790 let locals = [
7793 "local notes",
7794 #[cfg(unix)]
7795 "local\nnotes",
7796 ];
7797 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7798 .await
7799 .unwrap();
7800 std::fs::write(state.repo.join(excludes), "local*\n").unwrap();
7801 for local in locals {
7802 std::fs::write(state.repo.join(local), "keep these notes").unwrap();
7803 assert!(
7804 git::git_raw(&state.repo, &["check-ignore", "--quiet", local])
7805 .await
7806 .unwrap()
7807 .ok()
7808 );
7809 }
7810 restore_landing_worktree(&mut state).await.unwrap();
7811 for local in locals {
7812 assert_eq!(
7813 std::fs::read_to_string(state.repo.join(local)).unwrap(),
7814 "keep these notes"
7815 );
7816 }
7817 assert_eq!(
7818 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7819 "secret"
7820 );
7821 assert!(git::is_clean(&state.repo).await.unwrap());
7822 assert!(state.land_rebase_from.is_none());
7823 }
7824
7825 #[tokio::test]
7826 async fn landing_restoration_rejects_ignored_paths_conflicting_with_the_new_tree() {
7827 for local in ["advance", "advance/notes", "new-directory"] {
7828 let (_tmp, mut state, _) = landing_git_fixture().await;
7829 advance_landing_base(&state).await;
7830 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7832 std::fs::create_dir(state.repo.join("new-directory")).unwrap();
7833 std::fs::write(state.repo.join("new-directory/tracked"), "new").unwrap();
7834 git::git(&state.repo, &["add", "."]).await.unwrap();
7835 git::git(&state.repo, &["commit", "-m", "add directory"])
7836 .await
7837 .unwrap();
7838 git::git(&state.repo, &["push", "origin", "main"])
7839 .await
7840 .unwrap();
7841 git::git(&state.repo, &["checkout", "winner"])
7842 .await
7843 .unwrap();
7844 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7845 .await
7846 .unwrap();
7847 std::fs::write(state.repo.join(excludes), "advance\nnew-directory\n").unwrap();
7848 let path = state.repo.join(local);
7849 std::fs::create_dir_all(path.parent().unwrap()).unwrap();
7850 std::fs::write(&path, "local notes").unwrap();
7851 interrupt_landing_rebase(&mut state).await;
7852 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7853 let checkpoint = state.land_rebase_from.clone();
7854 let error = restore_landing_worktree(&mut state).await.unwrap_err();
7855 assert!(
7856 error.to_string().contains("conflicting with HEAD"),
7857 "{error:#}"
7858 );
7859 assert_eq!(std::fs::read_to_string(&path).unwrap(), "local notes");
7860 assert_eq!(
7861 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7862 before
7863 );
7864 assert_eq!(state.land_rebase_from, checkpoint);
7865 }
7866 }
7867
7868 #[tokio::test]
7869 async fn landing_resume_preserves_ignored_gate_artifacts_without_setup() {
7870 for interrupted in [false, true] {
7871 let (_tmp, mut state, old) = landing_git_fixture().await;
7872 assert!(state.config.worktree.setup.is_empty());
7873 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7875 .await
7876 .unwrap();
7877 std::fs::write(state.repo.join(excludes), "target/\n").unwrap();
7878 state.config.verify.gate =
7879 vec!["mkdir -p target && printf artifact > target/probe".into()];
7880 state.gate_ran = false;
7881 resume_observed_head(&mut state, &old).await.unwrap();
7882 assert_eq!(
7883 std::fs::read_to_string(state.repo.join("target/probe")).unwrap(),
7884 "artifact"
7885 );
7886 advance_landing_base(&state).await;
7887 if interrupted {
7888 interrupt_landing_rebase(&mut state).await;
7889 state = RunState::load(&state.id).unwrap();
7890 }
7891 state.config.verify.gate =
7892 vec!["test -f advance && test \"$(cat target/probe)\" = artifact".into()];
7893 let head = resume_observed_head(&mut state, &old).await.unwrap();
7894 assert_ne!(head, old);
7895 assert!(state.gate_allows_progress());
7896 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7897 assert_eq!(
7898 std::fs::read_to_string(state.repo.join("target/probe")).unwrap(),
7899 "artifact"
7900 );
7901 assert!(state.land_rebase_from.is_none());
7902 assert_eq!(
7903 git::remote_head(&state.repo, "origin", "task-head")
7904 .await
7905 .unwrap(),
7906 Some(head.clone())
7907 );
7908 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7909 land_with(&mut state, &green_pr().url, &forge)
7910 .await
7911 .unwrap();
7912 assert!(state.parked);
7913 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7914 assert!(forge.argvs().is_empty());
7915 }
7916 }
7917
7918 #[tokio::test]
7919 #[cfg(unix)]
7920 async fn landing_restoration_waits_for_external_coordination_before_changing_files() {
7921 use std::os::fd::AsRawFd as _;
7922
7923 for interrupted in [false, true] {
7924 let (_tmp, mut state, _) = landing_git_fixture().await;
7925 advance_landing_base(&state).await;
7926 landing_setup(&mut state).await;
7927 if interrupted {
7928 interrupt_landing_rebase(&mut state).await;
7929 }
7930 state.config.worktree.setup =
7931 vec![toml::from_str("run = \"printf restored > .env\"").unwrap()];
7932 let common = crate::repo_lock::common_dir(&state.repo)
7933 .await
7934 .unwrap()
7935 .unwrap();
7936 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
7937 state.config.coordination = crate::config::test_coordination();
7938 state.config.graph.timeout_resource_wait = 0;
7939 let external = std::fs::OpenOptions::new()
7940 .read(true)
7941 .write(true)
7942 .create(true)
7943 .truncate(false)
7944 .open(common.join("updater.lock"))
7945 .unwrap();
7946 let locked =
7948 unsafe { libc::flock(external.as_raw_fd(), libc::LOCK_EX | libc::LOCK_NB) };
7949 assert_eq!(locked, 0);
7950 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7951 let checkpoint = state.land_rebase_from.clone();
7952 let error = restore_landing_worktree(&mut state).await.unwrap_err();
7953 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
7954 assert_eq!(
7955 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7956 before
7957 );
7958 assert_eq!(state.land_rebase_from, checkpoint);
7959 assert_eq!(
7960 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7961 "secret"
7962 );
7963
7964 drop(external);
7965 state.config.graph.timeout_resource_wait = 2;
7966 restore_landing_worktree(&mut state).await.unwrap();
7967 assert!(git::is_clean(&state.repo).await.unwrap());
7968 assert!(state.land_rebase_from.is_none());
7969 assert_eq!(
7970 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7971 "restored"
7972 );
7973 }
7974 }
7975
7976 #[tokio::test]
7977 #[cfg(unix)]
7978 async fn landing_restoration_inherits_cancellation_while_waiting_for_a_local_seat() {
7979 use std::sync::atomic::{AtomicBool, Ordering};
7980
7981 let (_tmp, mut state, _) = landing_git_fixture().await;
7982 advance_landing_base(&state).await;
7983 landing_setup(&mut state).await;
7984 interrupt_landing_rebase(&mut state).await;
7985 let common = crate::repo_lock::common_dir(&state.repo)
7986 .await
7987 .unwrap()
7988 .unwrap();
7989 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
7990 state.config.coordination = crate::config::test_coordination();
7991 let holder = crate::repo_lock::SeatLease::for_checkout(
7992 &state.repo,
7993 true,
7994 state.config.coordination.as_ref(),
7995 )
7996 .await
7997 .unwrap();
7998 assert!(holder.is_some());
7999 let cancelled = Arc::new(AtomicBool::new(false));
8000 let signal = cancelled.clone();
8001 let wait = crate::repo_lock::WaitPolicy::new(Duration::from_secs(30), move || {
8002 signal.load(Ordering::SeqCst)
8003 });
8004 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
8005 let checkpoint = state.land_rebase_from.clone();
8006 let (result, ()) = tokio::join!(
8007 tokio::time::timeout(
8008 Duration::from_secs(2),
8009 wait.scope(restore_landing_worktree(&mut state)),
8010 ),
8011 async {
8012 tokio::time::sleep(Duration::from_millis(100)).await;
8013 cancelled.store(true, Ordering::SeqCst);
8014 }
8015 );
8016 let error = result
8017 .expect("cancellation must release the waiting driver")
8018 .unwrap_err();
8019 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
8020 assert_eq!(
8021 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
8022 before
8023 );
8024 assert_eq!(state.land_rebase_from, checkpoint);
8025 assert_eq!(
8026 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
8027 "secret"
8028 );
8029 drop(holder);
8030 restore_landing_worktree(&mut state).await.unwrap();
8031 assert!(state.land_rebase_from.is_none());
8032 assert!(git::is_clean(&state.repo).await.unwrap());
8033 }
8034
8035 #[tokio::test]
8036 #[cfg(unix)]
8037 async fn landing_verification_inherits_cancellation_while_waiting_for_a_local_seat() {
8038 use std::sync::atomic::{AtomicBool, Ordering};
8039
8040 for e2e in [false, true] {
8041 let (_tmp, mut state, head) = landing_git_fixture().await;
8042 let common = crate::repo_lock::common_dir(&state.repo)
8043 .await
8044 .unwrap()
8045 .unwrap();
8046 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
8047 state.config.coordination = crate::config::test_coordination();
8048 if e2e {
8049 state.config.verify.e2e = vec!["true".into()];
8050 state.gate_repair_e2e = Some(crate::run::GateRepairE2e {
8051 head: head.clone(),
8052 passed: false,
8053 outcomes: Vec::new(),
8054 });
8055 } else {
8056 state.config.verify.gate = vec!["true".into()];
8057 state.gate_ran = false;
8058 }
8059 let holder = crate::repo_lock::SeatLease::for_checkout(
8060 &state.repo,
8061 true,
8062 state.config.coordination.as_ref(),
8063 )
8064 .await
8065 .unwrap();
8066 assert!(holder.is_some());
8067 let cancelled = Arc::new(AtomicBool::new(false));
8068 let signal = cancelled.clone();
8069 let waiting = Arc::new(tokio::sync::Notify::new());
8070 let observed = waiting.clone();
8071 let wait = crate::repo_lock::WaitPolicy::new(Duration::from_secs(30), move || {
8072 observed.notify_one();
8073 signal.load(Ordering::SeqCst)
8074 });
8075 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
8076 let url = green_pr().url;
8077 let result = {
8078 let mut publishing =
8079 Box::pin(wait.scope(publish_landing_head(&mut state, &head, &url, &forge)));
8080 tokio::time::timeout(Duration::from_secs(30), async {
8084 tokio::select! {
8085 result = &mut publishing => panic!(
8086 "verification must wait behind the held seat: {result:?}"
8087 ),
8088 () = waiting.notified() => {}
8089 }
8090 })
8091 .await
8092 .expect("verification must reach the inherited coordination wait");
8093 cancelled.store(true, Ordering::SeqCst);
8094 tokio::time::timeout(Duration::from_secs(2), publishing).await
8095 };
8096 let error = result
8097 .expect("cancellation must release the verification waiter")
8098 .unwrap_err();
8099 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
8100 assert!(error.to_string().contains("cancelled"), "{error:#}");
8101 assert!(forge.argvs().is_empty());
8102 assert_eq!(
8103 git::remote_head(&state.repo, "origin", "task-head")
8104 .await
8105 .unwrap(),
8106 Some(head.clone())
8107 );
8108 drop(holder);
8109 assert_eq!(
8111 publish_landing_head(&mut state, &head, &url, &forge)
8112 .await
8113 .unwrap(),
8114 head
8115 );
8116 }
8117 }
8118
8119 #[tokio::test]
8120 async fn landing_resume_preserves_user_edits_after_an_interrupted_rebase() {
8121 for staged in [false, true] {
8122 let (_tmp, mut state, old) = landing_git_fixture().await;
8123 advance_landing_base(&state).await;
8124 interrupt_landing_rebase(&mut state).await;
8125 std::fs::write(state.repo.join("change"), "user edit").unwrap();
8126 if staged {
8127 git::git(&state.repo, &["add", "change"]).await.unwrap();
8128 }
8129 assert!(resume_observed_head(&mut state, &old).await.is_err());
8130 assert_eq!(
8131 std::fs::read_to_string(state.repo.join("change")).unwrap(),
8132 "user edit"
8133 );
8134 assert_eq!(
8135 git::remote_head(&state.repo, "origin", "task-head")
8136 .await
8137 .unwrap(),
8138 Some(old)
8139 );
8140 }
8141 }
8142
8143 #[tokio::test]
8144 async fn landing_resume_returns_to_approval_wait_and_closed_pr_skips_sync() {
8145 let (_tmp, mut state, head) = landing_git_fixture().await;
8146 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
8147 let id = state.id.clone();
8148 let pr = land_with(&mut state, &green_pr().url, &forge)
8149 .await
8150 .unwrap();
8151 assert_eq!(pr.state, PrLifecycle::Open);
8152 assert_eq!(state.id, id);
8153 assert!(state.parked);
8154 assert_eq!(state.status, RunStatus::Landing);
8155 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
8156 assert!(forge.argvs().is_empty());
8157
8158 state.land_sync_pending = true;
8159 std::fs::write(state.repo.join("dirty"), "do not touch").unwrap();
8160 let mut closed = seen("foreign", Checks::Green, "CLEAN", false);
8161 closed.pr.state = PrLifecycle::Closed;
8162 let forge = Scripted::new(vec![closed], vec![]);
8163 assert_eq!(
8164 land_with(&mut state, &green_pr().url, &forge)
8165 .await
8166 .unwrap()
8167 .state,
8168 PrLifecycle::Closed
8169 );
8170 assert_eq!(
8171 std::fs::read_to_string(state.repo.join("dirty")).unwrap(),
8172 "do not touch"
8173 );
8174 assert!(forge.argvs().is_empty());
8175 }
8176
8177 #[tokio::test]
8178 async fn landing_resume_does_not_publish_a_failed_rebased_gate() {
8179 let (_tmp, mut state, old) = landing_git_fixture().await;
8180 advance_landing_base(&state).await;
8181 state.config.verify.gate = vec!["exit 1".into()];
8182 assert!(resume_observed_head(&mut state, &old).await.is_err());
8183 assert_ne!(state.gate_head.as_deref(), Some(old.as_str()));
8184 assert!(!state.gate_allows_progress());
8185 assert_eq!(
8186 git::remote_head(&state.repo, "origin", "task-head")
8187 .await
8188 .unwrap(),
8189 Some(old)
8190 );
8191 assert!(state.land_sync_pending);
8192 }
8193
8194 #[tokio::test]
8195 async fn landing_publication_recovers_a_push_before_save_and_refuses_a_lease_conflict() {
8196 let (_tmp, mut state, old) = landing_git_fixture().await;
8197 advance_landing_base(&state).await;
8198 let pushed = resume_observed_head(&mut state, &old).await.unwrap();
8199 state.pr_pushed_head = Some(old.clone());
8201 state.land_sync_pending = true;
8202 assert_eq!(
8203 resume_observed_head(&mut state, &pushed).await.unwrap(),
8204 pushed
8205 );
8206 git::git(
8209 &state.repo,
8210 &["push", "--force", "origin", "main:refs/heads/task-head"],
8211 )
8212 .await
8213 .unwrap();
8214 assert!(
8215 publish_landing_head(
8216 &mut state,
8217 &pushed,
8218 &green_pr().url,
8219 &Scripted::new(vec![seen(&pushed, Checks::Green, "CLEAN", false)], vec![])
8220 )
8221 .await
8222 .unwrap_err()
8223 .to_string()
8224 .contains("publishing gated")
8225 );
8226 assert!(
8227 resume_observed_head(&mut state, "foreign-head")
8228 .await
8229 .is_err()
8230 );
8231 }
8232 #[tokio::test]
8233 async fn landing_publication_refuses_a_pr_closed_during_gate() {
8234 let (_tmp, mut state, head) = landing_git_fixture().await;
8235 let mut closed = seen(&head, Checks::Green, "CLEAN", false);
8236 closed.pr.state = PrLifecycle::Closed;
8237 let forge = Scripted::new(vec![closed], vec![]);
8238 assert!(
8239 publish_landing_head(&mut state, &head, &green_pr().url, &forge)
8240 .await
8241 .unwrap_err()
8242 .to_string()
8243 .contains("PR closed or merged")
8244 );
8245 }
8246
8247 fn winning_candidate(summary: &str) -> Candidate {
8249 Candidate {
8250 index: 0,
8251 label: 'A',
8252 agent: "opus".to_owned(),
8253 branch: "magi/x/A".to_owned(),
8254 worktree: PathBuf::from("/wt/A"),
8255 summary: summary.to_owned(),
8256 stat: String::new(),
8257 files: 1,
8258 commits: 1,
8259 empty: false,
8260 failed: None,
8261 verified_noop: None,
8262 duration_ms: 0,
8263 folded: false,
8264 }
8265 }
8266
8267 fn uncontested_tally() -> Tally {
8268 Tally {
8269 first_choice: BTreeMap::from([('A', 1)]),
8270 borda: BTreeMap::new(),
8271 winner: 'A',
8272 rankings: 1,
8273 unanimous_initial: true,
8274 deliberated: false,
8275 changed_votes: 0,
8276 unanimous_final: true,
8277 tie_break: None,
8278 judges: 1,
8279 present: 1,
8280 quorum: 1,
8281 met_quorum: true,
8282 uncontested: None,
8283 }
8284 }
8285
8286 fn review_record(reviewer: usize, agent: &str, summary: &str) -> ReviewRecord {
8287 ReviewRecord {
8288 attempts: 0,
8289 reviewer,
8290 agent: agent.to_owned(),
8291 summary: summary.to_owned(),
8292 findings: Vec::new(),
8293 vote: None,
8294 failed: None,
8295 duration_ms: 0,
8296 }
8297 }
8298
8299 fn review_round(round: usize, reviews: Vec<ReviewRecord>) -> ReviewRound {
8300 let answered = reviews.len();
8301 ReviewRound {
8302 round,
8303 head: "abc1234".to_owned(),
8304 verified_head: None,
8305 verified_at: None,
8306 reviews,
8307 e2e: Vec::new(),
8308 verify_retried: false,
8309 e2e_deferred: false,
8310 e2e_defer_reason: None,
8311 fix: None,
8312 blocking: 0,
8313 answered,
8314 expected: answered,
8315 clean: true,
8316 progressed: false,
8317 vote_split: false,
8318 reconsideration: Vec::new(),
8319 verdict: None,
8320 }
8321 }
8322
8323 #[test]
8324 fn the_approval_panel_states_the_task_verbatim_in_either_language() {
8325 let en = panel();
8326 assert!(en.contains("Task"), "{en}");
8327 assert!(en.contains("add retries to the uploader"), "{en}");
8328
8329 let mut state = run_state();
8330 state.config.graph.language = "ja".to_owned();
8331 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8332 assert!(ja.contains("タスク"), "{ja}");
8333 assert!(
8334 ja.contains("add retries to the uploader"),
8335 "the task itself is not translated: {ja}"
8336 );
8337 }
8338
8339 #[test]
8340 fn the_approval_panel_omits_what_changed_and_review_verdict_with_no_data() {
8341 let html = panel();
8345 assert!(!html.contains("What changed"), "{html}");
8346 assert!(!html.contains("Review verdict"), "{html}");
8347 }
8348
8349 #[test]
8350 fn the_approval_panel_omits_what_changed_when_the_winners_summary_is_empty() {
8351 let mut state = run_state();
8352 state.candidates = vec![winning_candidate("")];
8353 state.tally = Some(uncontested_tally());
8354 let html = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8355 assert!(
8356 !html.contains("What changed"),
8357 "an empty summary must not render an empty box: {html}"
8358 );
8359 }
8360
8361 #[test]
8362 fn the_approval_panel_shows_the_winners_own_account_in_either_language() {
8363 let mut state = run_state();
8364 state.candidates = vec![winning_candidate(
8365 "Added a retry loop around the uploader PUT call.",
8366 )];
8367 state.tally = Some(uncontested_tally());
8368 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8369 assert!(en.contains("What changed"), "{en}");
8370 assert!(
8371 en.contains("Added a retry loop around the uploader PUT call."),
8372 "{en}"
8373 );
8374
8375 state.config.graph.language = "ja".to_owned();
8376 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8377 assert!(ja.contains("変更内容"), "{ja}");
8378 assert!(
8379 ja.contains("Added a retry loop around the uploader PUT call."),
8380 "{ja}"
8381 );
8382 }
8383
8384 #[test]
8385 fn the_approval_panel_shows_only_the_last_review_rounds_verdict() {
8386 let mut state = run_state();
8387 state.reviews = vec![
8388 review_round(
8389 1,
8390 vec![review_record(1, "alpha", "found a race, sent back")],
8391 ),
8392 review_round(2, vec![review_record(1, "alpha", "race is fixed, clean")]),
8393 ];
8394 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8395 assert!(en.contains("Review verdict"), "{en}");
8396 assert!(en.contains("race is fixed, clean"), "{en}");
8397 assert!(
8398 !en.contains("found a race, sent back"),
8399 "only the round that actually cleared the merge should show: {en}"
8400 );
8401
8402 state.config.graph.language = "ja".to_owned();
8403 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8404 assert!(ja.contains("レビューの結論"), "{ja}");
8405 assert!(ja.contains("レビュアー"), "{ja}");
8406 assert!(ja.contains("race is fixed, clean"), "{ja}");
8407 }
8408
8409 fn unanswered_review_record(reviewer: usize, agent: &str, reason: &str) -> ReviewRecord {
8415 ReviewRecord {
8416 attempts: 0,
8417 reviewer,
8418 agent: agent.to_owned(),
8419 summary: String::new(),
8420 findings: Vec::new(),
8421 vote: None,
8422 failed: Some(reason.to_owned()),
8423 duration_ms: 0,
8424 }
8425 }
8426
8427 #[test]
8428 fn the_approval_panel_never_shows_an_unanswered_seat_as_a_blank_verdict() {
8429 let mut state = run_state();
8430 state.reviews = vec![review_round(
8431 1,
8432 vec![
8433 review_record(1, "alpha", "clean, nothing to add"),
8434 unanswered_review_record(2, "beta", "timed out"),
8435 ],
8436 )];
8437 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8438 assert!(en.contains("clean, nothing to add"), "{en}");
8439 assert!(
8440 en.contains("produced no answer: timed out"),
8441 "a seat that never answered must say so, not render a blank box: {en}"
8442 );
8443 assert!(
8444 !en.contains("<div style=\"white-space:pre-wrap;font-size:13px\"></div>"),
8445 "no reviewer box may be left empty: {en}"
8446 );
8447
8448 state.config.graph.language = "ja".to_owned();
8449 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8450 assert!(ja.contains("回答なし: timed out"), "{ja}");
8451 }
8452
8453 #[test]
8454 fn the_approval_panel_contains_nothing_the_frames_policy_would_block() {
8455 let html = panel();
8456 assert!(!html.contains("<script"), "no script survives the csp");
8457 assert!(!html.contains("<form"), "form-action is 'none'");
8458 let pr = green_pr();
8459 assert_eq!(
8460 html.matches("http").count(),
8461 html.matches(pr.url.as_str()).count(),
8462 "the only http url in the panel is the pull request's own link"
8463 );
8464 assert!(
8465 html.contains("target=\"_blank\""),
8466 "the PR link must open in a new tab so it escapes the iframe"
8467 );
8468 assert!(
8469 html.contains("rel=\"noopener noreferrer\""),
8470 "external links opening in new tabs must carry noopener noreferrer"
8471 );
8472 }
8473
8474 #[test]
8475 fn added_and_removed_diff_lines_are_distinguishable_without_colour() {
8476 let html = panel();
8477 assert!(
8478 html.contains(">+</span>"),
8479 "an added line carries a `+` in the gutter, not only a background"
8480 );
8481 assert!(
8482 html.contains(">-</span>"),
8483 "a removed line carries a `-` in the gutter, not only a background"
8484 );
8485 assert!(
8486 html.contains(">new line</span>"),
8487 "the marker is moved to the gutter, so the body is printed once without it"
8488 );
8489 }
8490
8491 #[test]
8492 fn a_diff_past_the_threshold_is_cut_with_an_honest_count() {
8493 let total = DIFF_MAX_LINES + 100;
8494 let diff: String = (0..total).map(|i| format!("+line {i}\n")).collect();
8495 let html = approval_panel(
8496 &run_state(),
8497 &green_pr(),
8498 NUMSTAT,
8499 &diff,
8500 &[],
8501 "feat: something long",
8502 );
8503 assert!(
8504 html.contains(&format!("100 of {total} diff lines omitted")),
8505 "the note must say exactly how much was cut"
8506 );
8507 assert!(html.contains(&format!("line {}", DIFF_MAX_LINES - 1)));
8508 assert!(
8509 !html.contains(&format!("line {DIFF_MAX_LINES}")),
8510 "nothing past the threshold is rendered"
8511 );
8512 assert!(
8513 html.contains("/repo/magi"),
8514 "the note says where the rest is"
8515 );
8516 }
8517
8518 #[test]
8519 fn a_path_with_html_metacharacters_is_escaped_rather_than_rendered() {
8520 let html = approval_panel(
8521 &run_state(),
8522 &green_pr(),
8523 "1\t2\tsrc/<b>&\"x\"'.rs",
8524 "",
8525 &[],
8526 "subject",
8527 );
8528 assert!(html.contains("src/<b>&"x"'.rs"));
8529 assert!(
8530 !html.contains("<b>"),
8531 "an agent-influenced path must never become markup"
8532 );
8533 }
8534
8535 #[tokio::test]
8536 async fn the_merge_lock_serialises_one_repository_but_never_a_different_one() {
8537 let a = std::path::PathBuf::from("/repo/a");
8538 let b = std::path::PathBuf::from("/repo/b");
8539
8540 let held = repo_merge_lock(&a).lock_owned().await;
8541
8542 assert!(
8545 repo_merge_lock(&a).try_lock().is_err(),
8546 "a second merge into the same repository must not proceed concurrently"
8547 );
8548
8549 assert!(
8553 repo_merge_lock(&b).try_lock().is_ok(),
8554 "a different repository's merge lock must be independent"
8555 );
8556
8557 drop(held);
8558 assert!(
8559 repo_merge_lock(&a).try_lock().is_ok(),
8560 "the lock is released once the holder is done"
8561 );
8562 }
8563
8564 pub(crate) fn repair_state(major: bool, reject: bool) -> RunState {
8565 let mut state = landing_state();
8566 let mut rec = review_record(1, "alpha", "precise rejection reason");
8567 rec.vote = Some(if reject {
8568 crate::verdict::ReviewVote::Reject
8569 } else {
8570 crate::verdict::ReviewVote::Approve
8571 });
8572 if major {
8573 rec.findings = contested().findings;
8574 }
8575 let mut round = review_round(1, vec![rec]);
8576 round.clean = false;
8577 round.blocking = usize::from(major);
8578 state.reviews.push(round);
8579 state.config.graph.review_rounds = 1;
8580 state
8581 }
8582
8583 #[test]
8584 fn approval_policy_controls_are_independent_and_keep_all_reasons() {
8585 for every in [false, true] {
8586 for contested in [false, true] {
8587 for major in [false, true] {
8588 for reject in [false, true] {
8589 let mut state = repair_state(major, reject);
8590 state.config.graph.land_approval = every;
8591 state.config.graph.hold_contested_merge = contested;
8592 let reasons = approval_reasons(&state);
8593 assert_eq!(reasons.contains(&ApprovalReason::EveryMerge), every);
8594 assert_eq!(
8595 reasons.contains(&ApprovalReason::OpenBlockingFindings),
8596 contested && major
8597 );
8598 assert_eq!(
8599 reasons.contains(&ApprovalReason::FinalReject),
8600 contested && reject
8601 );
8602 assert_eq!(
8603 reasons.len(),
8604 usize::from(every)
8605 + usize::from(contested && major)
8606 + usize::from(contested && reject)
8607 );
8608 }
8609 }
8610 }
8611 }
8612 }
8613
8614 #[test]
8615 fn approval_policy_and_rendering_follow_reconsideration_in_both_directions() {
8616 use crate::verdict::ReviewVote::{Approve, Reject};
8617 for (initial_reject, final_vote) in [(true, Approve), (false, Reject)] {
8618 let mut state = repair_state(false, initial_reject);
8619 state.reviews[0]
8620 .reconsideration
8621 .push(crate::run::ReviewRevoteRecord {
8622 reviewer: 1,
8623 agent: "alpha".into(),
8624 vote: Some(final_vote),
8625 reason: "changed after reading the panel <evidence>".into(),
8626 failed: None,
8627 });
8628 assert_eq!(
8629 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8630 final_vote == Reject
8631 );
8632 for language in ["en", "ja"] {
8633 state.config.graph.language = language.into();
8634 let evidence = approval_evidence(&state);
8635 assert!(evidence.contains(&format!("→ {}", final_vote.label())));
8636 assert!(evidence.contains("changed after reading the panel <evidence>"));
8637 let html = approval_panel(&state, &green_pr(), "", "", &[], "subject");
8638 assert!(html.contains("changed after reading the panel <evidence>"));
8639 assert!(!html.contains("<evidence>"));
8640 }
8641 state.reviews[0].reconsideration[0].vote = None;
8642 state.reviews[0].reconsideration[0].failed = Some("timed out".into());
8643 assert_eq!(
8644 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8645 initial_reject
8646 );
8647 assert!(approval_evidence(&state).contains("timed out"));
8648 }
8649 }
8650
8651 #[tokio::test]
8652 async fn approval_merge_paths_apply_controls_to_major_and_reject_independently() {
8653 for every in [false, true] {
8654 for contested in [false, true] {
8655 for (major, reject) in [(false, false), (false, true), (true, false), (true, true)]
8656 {
8657 let mut state = repair_state(major, reject);
8658 state.config.graph.land_approval = every;
8659 state.config.graph.hold_contested_merge = contested;
8660 let forge = Scripted::new(
8661 vec![seen("abc", Checks::Green, "CLEAN", false)],
8662 vec![(true, "")],
8663 );
8664 land_with(&mut state, URL, &forge).await.unwrap();
8665 let expected = every || (contested && (major || reject));
8666 assert_eq!(state.land_approval.is_some(), expected);
8667 assert_eq!(forge.calls().contains(&"merge"), !expected);
8668 if expected {
8669 assert!(state.parked);
8670 }
8671 }
8672 }
8673 }
8674 }
8675
8676 #[tokio::test]
8677 async fn reviewed_branch_hold_is_read_before_landing_decision() {
8678 for (base, control) in [
8679 (false, "land_approval"),
8680 (true, "land_approval"),
8681 (false, "hold_contested_merge"),
8682 ] {
8683 let (_tmp, mut state, _) = landing_git_fixture().await;
8684 state.config.graph.land_approval = base;
8685 state.config.graph.hold_contested_merge = false;
8686 state.reviewed_commits = Some(Vec::new());
8687 if control == "hold_contested_merge" {
8688 state.reviews = repair_state(false, true).reviews;
8689 }
8690 std::fs::write(
8691 state.repo.join("magi.toml"),
8692 format!("[graph]\n{control} = {}\n", !base),
8693 )
8694 .unwrap();
8695 git::git(&state.repo, &["add", "magi.toml"]).await.unwrap();
8696 git::git(&state.repo, &["commit", "-m", "approval policy"])
8697 .await
8698 .unwrap();
8699 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8700 state.land_sync_pending = false;
8701 state.pr_pushed_head = Some(head.clone());
8702 state.gate_head = Some(head.clone());
8703 let forge = Scripted::new(
8704 vec![seen(&head, Checks::Green, "CLEAN", false)],
8705 vec![(true, "")],
8706 );
8707 land_with(&mut state, URL, &forge).await.unwrap();
8708 assert!(
8709 state.land_approval.is_some(),
8710 "base={base}, control={control}"
8711 );
8712 assert!(!forge.calls().contains(&"merge"));
8713 if !base {
8714 let question = ask::Questions::open()
8715 .get(&state.land_approval.as_ref().unwrap().question)
8716 .unwrap();
8717 assert!(question.detail.contains(&format!(
8718 "{control}=true from the reviewed branch's magi.toml"
8719 )));
8720 }
8721 }
8722 }
8723
8724 #[tokio::test]
8725 async fn reviewed_branch_hold_asks_and_survives_removal_and_resume() {
8726 for file in ["magi.toml", ".magi/config.toml"] {
8727 for control in crate::config::OwnerHold::ALL {
8728 let (_tmp, mut state, _) = landing_git_fixture().await;
8729 state.config.graph.land_approval = false;
8730 state.config.graph.hold_contested_merge = false;
8731 state.reviewed_commits = Some(Vec::new());
8732 if control == crate::config::OwnerHold::HoldContestedMerge {
8733 state.reviews = repair_state(false, true).reviews;
8734 }
8735 let config = state.repo.join(file);
8736 std::fs::create_dir_all(config.parent().unwrap()).unwrap();
8737 std::fs::write(
8738 &config,
8739 format!(
8740 "[graph]\n{} = true\n[verify]\ngate = ['untrusted']\n",
8741 control.key()
8742 ),
8743 )
8744 .unwrap();
8745 git::git(&state.repo, &["add", file]).await.unwrap();
8746 git::git(&state.repo, &["commit", "-m", "require approval"])
8747 .await
8748 .unwrap();
8749 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8750 let gate = state.config.verify.gate.clone();
8751 state.observe_branch_owner_holds(&head).await;
8752 assert_eq!(state.config.verify.gate, gate);
8753 assert!(state.owner_hold(control));
8754 let holds = state.branch_owner_holds.clone();
8755 git::git(&state.repo, &["rm", file]).await.unwrap();
8756 git::git(&state.repo, &["commit", "-m", "remove config"])
8757 .await
8758 .unwrap();
8759 let later = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8760 state.save().unwrap();
8761 state = RunState::load(&state.id).unwrap();
8762 state.observe_branch_owner_holds(&later).await;
8763 assert_eq!(state.branch_owner_holds, holds);
8764 assert_eq!(state.branch_owner_holds[0].head, head);
8765 state.land_sync_pending = false;
8766 state.pr_pushed_head = Some(later.clone());
8767 state.gate_head = Some(later.clone());
8768 let forge = Scripted::new(
8769 vec![seen(&later, Checks::Green, "CLEAN", false)],
8770 vec![(true, "")],
8771 );
8772 land_with(&mut state, URL, &forge).await.unwrap();
8773 assert!(!forge.calls().contains(&"merge"));
8774 assert!(state.parked);
8775 let question = ask::Questions::open()
8776 .get(&state.land_approval.as_ref().unwrap().question)
8777 .unwrap();
8778 assert!(question.detail.contains("Approval required because:"));
8779 assert!(question.detail.contains(&format!(
8780 "{}=true from the reviewed branch's {file}",
8781 control.key()
8782 )));
8783 assert_eq!(state.branch_owner_holds, holds);
8784 state.save().unwrap();
8785 let resumed = RunState::load(&state.id).unwrap();
8786 assert!(resumed.owner_hold(control));
8787 assert_eq!(resumed.branch_owner_holds, holds);
8788 assert_eq!(
8789 resumed.land_approval.unwrap().question,
8790 state.land_approval.unwrap().question
8791 );
8792 }
8793 }
8794 }
8795
8796 #[tokio::test]
8797 async fn approval_snapshot_exposes_minor_findings_and_survives_disabled_controls() {
8798 let mut state = repair_state(false, true);
8799 state.reviews[0].clean = true;
8800 let mut finding = contested().findings.remove(0);
8801 finding.severity = crate::verdict::Severity::Minor;
8802 state.reviews[0].reviews[0].findings.push(finding);
8803 assert!(state.open_findings().is_empty());
8804 let mut pr = green_pr();
8805 pr.review_comments.clear();
8806 for language in ["en", "ja"] {
8807 state.config.graph.language = language.into();
8808 let html = approval_panel(&state, &pr, "", "", &[], "subject");
8809 assert!(html.contains("[R3-1-1] minor"));
8810 assert!(html.contains(if language == "ja" {
8811 "内部指摘の解決を意味するものではありません"
8812 } else {
8813 "This does not mean internal findings are resolved"
8814 }));
8815 assert!(
8816 html.find(if language == "ja" {
8817 "承認が必要な理由:"
8818 } else {
8819 "Approval required because:"
8820 })
8821 .unwrap()
8822 < html.find("[R3-1-1]").unwrap()
8823 );
8824 }
8825 state.config.graph.language = "en".into();
8826 let observed = seen("abc", Checks::Green, "CLEAN", false);
8827 assert_eq!(
8828 approval_gate(&mut state, &observed.pr, "subject", None, "abc")
8829 .await
8830 .unwrap(),
8831 ApprovalGate::Pending
8832 );
8833 let id = state.land_approval.as_ref().unwrap().question.clone();
8834 let q = ask::Questions::open().get(&id).unwrap();
8835 assert!(q.detail.starts_with("Approval required because:"));
8836 assert!(q.detail.contains("final reviewer reject"));
8837 assert!(q.detail.contains("[R3-1-1] minor"));
8838 assert!(
8839 q.detail
8840 .contains("No adoption or resolution evidence recorded")
8841 );
8842 state.config.graph.land_approval = false;
8843 state.config.graph.hold_contested_merge = false;
8844 state.reviews.clear();
8845 assert_eq!(approval_reasons(&state), [ApprovalReason::ExistingDecision]);
8846 assert!(deputy_brief(&q, Some(&state)).contains("final reviewer reject"));
8847 assert!(deputy_brief(&q, None).contains("[R3-1-1] minor"));
8848 let forge = Scripted::new(vec![observed], vec![]);
8849 land_with(&mut state, URL, &forge).await.unwrap();
8850 assert!(!forge.calls().contains(&"merge"));
8851 assert_eq!(state.land_approval.as_ref().unwrap().question, id);
8852 assert_eq!(ask::Questions::open().get(&id).unwrap().detail, q.detail);
8853 }
8854
8855 #[tokio::test]
8856 async fn approval_evidence_keeps_all_findings_and_bounds_unicode_prose() {
8857 let mut state = repair_state(false, true);
8858 state.config.graph.land_approval = false;
8859 let long_reason = format!("{}REASON_TAIL", "拒否🦀".repeat(200));
8860 let long_detail = format!("{}DETAIL_TAIL", "詳細🦀".repeat(200));
8861 let long_title = format!("{}TITLE_TAIL", "題🦀".repeat(100));
8862 state.reviews[0].reviews[0].summary = long_reason.clone();
8863 for i in 1..=10 {
8864 let mut finding = contested().findings.remove(0);
8865 finding.id = format!("R1-1-{i}");
8866 finding.severity = if i == 9 {
8867 crate::verdict::Severity::Major
8868 } else {
8869 crate::verdict::Severity::Minor
8870 };
8871 finding.title = long_title.clone();
8872 finding.detail = long_detail.clone();
8873 state.reviews[0].reviews[0].findings.push(finding);
8874 }
8875 state.reviews[0].fix = Some(crate::run::FixRecord {
8876 agent: "fixer".into(),
8877 addressed: vec!["R1-1-9".into()],
8878 rejected: vec![crate::verdict::Rejection {
8879 id: "R1-1-10".into(),
8880 why: long_reason.clone(),
8881 }],
8882 notes: long_detail.clone(),
8883 committed: false,
8884 failed: None,
8885 duration_ms: 0,
8886 continuation: None,
8887 });
8888 assert_eq!(
8889 approval_reasons(&state),
8890 [
8891 ApprovalReason::OpenBlockingFindings,
8892 ApprovalReason::FinalReject
8893 ]
8894 );
8895 let excerpt = approval_excerpt(&long_reason, 300);
8896 assert_eq!(excerpt.chars().count(), 300);
8897 assert!(excerpt.ends_with('…'));
8898 let boundary = "拒".repeat(300);
8899 assert_eq!(approval_excerpt(&boundary, 300), boundary);
8900 for language in ["en", "ja"] {
8901 state.config.graph.language = language.into();
8902 for revote in [
8903 None,
8904 Some(crate::verdict::ReviewVote::Reject),
8905 Some(crate::verdict::ReviewVote::Approve),
8906 ] {
8907 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Reject);
8908 state.reviews[0].reconsideration.clear();
8909 if let Some(vote) = revote {
8910 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Approve);
8911 state.reviews[0]
8912 .reconsideration
8913 .push(crate::run::ReviewRevoteRecord {
8914 reviewer: 1,
8915 agent: "alpha".into(),
8916 vote: Some(vote),
8917 reason: long_reason.clone(),
8918 failed: None,
8919 });
8920 }
8921 let evidence = approval_evidence(&state);
8922 let final_vote = revote.unwrap_or(crate::verdict::ReviewVote::Reject);
8923 assert!(evidence.contains(&format!("#1 (alpha): {}", final_vote.label())));
8924 assert!(approval_reasons(&state).contains(&ApprovalReason::OpenBlockingFindings));
8925 assert_eq!(
8926 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8927 final_vote == crate::verdict::ReviewVote::Reject
8928 );
8929 assert!(evidence.contains(&excerpt));
8930 assert!(evidence.contains("[R1-1-8] minor"));
8931 assert!(evidence.contains("[R1-1-9] major"));
8932 assert!(evidence.contains("[R1-1-10] minor"));
8933 for tail in ["REASON_TAIL", "DETAIL_TAIL", "TITLE_TAIL"] {
8934 assert!(!evidence.contains(tail));
8935 }
8936 assert!(evidence.contains(if language == "ja" {
8937 "採用申告(解決未確認)"
8938 } else {
8939 "claimed addressed (resolution unconfirmed)"
8940 }));
8941 assert!(evidence.contains(if language == "ja" {
8942 "不採用理由"
8943 } else {
8944 "declined"
8945 }));
8946 let major_evidence = evidence
8947 .split("[R1-1-9] major")
8948 .nth(1)
8949 .unwrap()
8950 .split("[R1-1-10]")
8951 .next()
8952 .unwrap();
8953 assert!(major_evidence.contains(if language == "ja" {
8954 "採用申告(解決未確認)"
8955 } else {
8956 "claimed addressed (resolution unconfirmed)"
8957 }));
8958 let last_evidence = evidence.split("[R1-1-10] minor").nth(1).unwrap();
8959 assert!(last_evidence.contains(if language == "ja" {
8960 "不採用理由"
8961 } else {
8962 "declined"
8963 }));
8964 let html = approval_panel(&state, &green_pr(), "", "", &[], "subject");
8965 assert!(html.contains(&esc(&evidence)));
8966 assert_eq!(
8967 approval_gate(&mut state, &green_pr(), "subject", None, "abc")
8968 .await
8969 .unwrap(),
8970 ApprovalGate::Pending
8971 );
8972 let id = &state.land_approval.take().unwrap().question;
8973 let q = ask::Questions::open().get(id).unwrap();
8974 assert!(q.detail.starts_with(&evidence));
8975 }
8976 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Reject);
8977 }
8978 }
8979
8980 #[test]
8981 fn merge_repair_choice_covers_major_only_and_reject_only_without_contested_and() {
8982 for (major, reject) in [(true, false), (false, true), (true, true)] {
8983 let state = repair_state(major, reject);
8984 assert!(repair_available(&state));
8985 assert_eq!(&approval_choices(&state)[..3], [APPROVE, HOLD, REPAIR]);
8986 }
8987 assert!(!repair_available(&repair_state(false, false)));
8988 let mut clean = repair_state(true, false);
8989 clean.reviews[0].clean = true;
8990 assert_eq!(&approval_choices(&clean)[..3], [APPROVE, HOLD, REPAIR]);
8991 assert_eq!(approval(Some(REPAIR)), Approval::Repair);
8992 }
8993
8994 #[tokio::test]
8995 async fn merge_repair_upgrades_legacy_questions_and_snapshots_exact_evidence_once() {
8996 let mut state = repair_state(true, false);
8997 let pr = green_pr();
8998 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8999 .await
9000 .unwrap();
9001 let store = ask::Questions::open();
9002 let id = state.land_approval.as_ref().unwrap().question.clone();
9003 store
9005 .update(&id, |q| {
9006 q.choices = vec![APPROVE.into(), HOLD.into()];
9007 Ok(())
9008 })
9009 .unwrap();
9010 let upgraded = store.get(&id).unwrap();
9011 assert_eq!(upgraded.choices, approval_choices(&state));
9012 assert!(!upgraded.actions.contains_key(HOLD));
9013 assert_eq!(store.get(&id).unwrap().choices, upgraded.choices);
9014 assert!(
9015 store
9016 .list()
9017 .iter()
9018 .any(|q| q.id == id && q.choices == upgraded.choices)
9019 );
9020 assert!(
9021 crate::prompt::chat_consult(&upgraded).contains("--reply 'fix findings and re-review'")
9022 );
9023 assert!(deputy_brief(&upgraded, Some(&state)).contains("never approves a merge"));
9024 store
9025 .update(&id, |q| q.answer(ask::Answer::Choice(REPAIR.into())))
9026 .unwrap();
9027 store
9030 .update(&id, |q| {
9031 q.actions.clear();
9032 Ok(())
9033 })
9034 .unwrap();
9035 assert_eq!(
9036 store.get(&id).unwrap().chosen_action(),
9037 Some(&ask::ChoiceAction::Resume {
9038 run: state.id.clone()
9039 })
9040 );
9041 let binding = state.land_approval.clone();
9042 assert_eq!(
9043 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9044 .await
9045 .unwrap(),
9046 ApprovalGate::Repair
9047 );
9048 assert!(state.land_approval.is_none());
9049 assert_eq!(state.merge_repairs.len(), 1);
9050 let request = &state.merge_repairs[0];
9051 assert_eq!(request.question, id);
9052 assert_eq!(request.head, "abc");
9053 assert_eq!(request.pr, pr.url);
9054 assert_eq!(
9055 request.reviews[0].reviews[0].summary,
9056 "precise rejection reason"
9057 );
9058 assert_eq!(request.reviews[0].reviews[0].findings[0].id, "R3-1-1");
9059 assert_eq!(
9060 request.reviews[0].reviews[0].findings[0].detail,
9061 state.reviews[0].reviews[0].findings[0].detail
9062 );
9063 state.land_approval = binding;
9065 assert_eq!(
9066 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9067 .await
9068 .unwrap(),
9069 ApprovalGate::Repair
9070 );
9071 assert_eq!(state.merge_repairs.len(), 1);
9072 state.land_approval = None;
9073 state.config.graph.land_approval = false;
9074 state.config.graph.hold_contested_merge = false;
9075 state.reviews.clear();
9076 assert_eq!(approval_reasons(&state), [ApprovalReason::AfterRepair]);
9077 assert_eq!(
9078 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9079 .await
9080 .unwrap(),
9081 ApprovalGate::Pending
9082 );
9083 let fresh_id = &state.land_approval.as_ref().unwrap().question;
9084 assert_ne!(fresh_id, &id);
9085 let fresh = store.get(fresh_id).unwrap();
9086 assert!(
9087 fresh
9088 .detail
9089 .contains("fresh owner approval after merge repair")
9090 );
9091 assert!(fresh.detail.contains("No review recorded"));
9092 assert!(!fresh.detail.contains("precise rejection reason"));
9093 }
9094
9095 #[tokio::test]
9096 async fn merge_repair_answer_never_merges_and_hold_never_requests_repair() {
9097 for choice in [REPAIR, HOLD] {
9098 let mut state = repair_state(false, true);
9099 let observed = seen("abc", Checks::Green, "CLEAN", false);
9100 approval_gate(&mut state, &observed.pr, "feat: x", None, "abc")
9101 .await
9102 .unwrap();
9103 let id = state.land_approval.as_ref().unwrap().question.clone();
9104 ask::Questions::open()
9105 .update(&id, |q| q.answer(ask::Answer::Choice(choice.into())))
9106 .unwrap();
9107 let forge = Scripted::new(vec![observed], vec![(true, "")]);
9108 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9109 .await
9110 .unwrap();
9111 assert!(
9112 forge
9113 .argvs()
9114 .iter()
9115 .all(|a| a.iter().any(|s| s == "--disable-auto"))
9116 );
9117 assert!(!forge.calls().contains(&"fix"));
9118 assert_eq!(state.merge_repairs.len(), usize::from(choice == REPAIR));
9119 assert_ne!(state.status, RunStatus::Merged);
9120 }
9121 }
9122
9123 #[test]
9124 fn only_the_merge_choice_merges_and_silence_holds() {
9125 let table = [
9126 (None, Approval::Hold),
9127 (Some("merge"), Approval::Merge),
9128 (Some(" merge\n"), Approval::Merge),
9129 (Some("hold"), Approval::Hold),
9130 (Some(""), Approval::Hold),
9131 (Some("yes"), Approval::Hold),
9132 ];
9133 for (answer, want) in table {
9134 assert_eq!(
9135 approval(answer),
9136 want,
9137 "answer {answer:?} must resolve to {want:?}"
9138 );
9139 }
9140 }
9141
9142 #[tokio::test]
9143 async fn a_first_visit_to_the_merge_gate_files_a_question_and_returns_pending_at_once() {
9144 let mut state = landing_state();
9145 state.config.graph.land_approval = true;
9146 let pr = green_pr();
9147
9148 let gate = approval_gate(&mut state, &pr, "feat: x", None, "abc")
9149 .await
9150 .unwrap();
9151 assert_eq!(gate, ApprovalGate::Pending, "nobody has answered yet");
9152 assert!(
9153 !state.parked,
9154 "approval_gate itself never sets `parked`; only its caller does"
9155 );
9156
9157 let store = ask::Questions::open();
9158 let filed: Vec<_> = store
9159 .list()
9160 .into_iter()
9161 .filter(|q| q.run == state.id)
9162 .collect();
9163 assert_eq!(filed.len(), 1, "exactly one question is filed");
9164 assert_eq!(filed[0].node, APPROVAL_NODE);
9165 assert_eq!(filed[0].choices, approval_choices(&state));
9166 assert!(filed[0].status.open());
9167
9168 let again = approval_gate(&mut state, &pr, "feat: x", None, "abc")
9172 .await
9173 .unwrap();
9174 assert_eq!(again, ApprovalGate::Pending);
9175 let still_one = store
9176 .list()
9177 .into_iter()
9178 .filter(|q| q.run == state.id)
9179 .count();
9180 assert_eq!(
9181 still_one, 1,
9182 "asking twice must not double-file the question"
9183 );
9184 }
9185
9186 #[tokio::test]
9187 async fn approving_the_existing_question_is_read_back_as_approved() {
9188 crate::run::pin_test_home();
9189 let mut state = run_state();
9190 state.config.graph.land_approval = true;
9191 let pr = green_pr();
9192 assert_eq!(
9193 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9194 .await
9195 .unwrap(),
9196 ApprovalGate::Pending
9197 );
9198
9199 let store = ask::Questions::open();
9200 let mut q = store
9201 .list()
9202 .into_iter()
9203 .find(|q| q.run == state.id)
9204 .expect("filed above");
9205 let talks = crate::talk::Talks::open();
9206 let cfg = crate::config::Config {
9207 agents: vec![crate::config::AgentSpec {
9208 id: "mock".into(),
9209 kind: crate::config::AgentKind::Command,
9210 model: None,
9211 command: vec!["true".into()],
9212 extra_args: Vec::new(),
9213 env: Default::default(),
9214 prompt_delivery: None,
9215 max_turn_secs: None,
9216 }],
9217 ..crate::config::Config::default()
9218 };
9219 let mut talk = crate::talk::begin(&talks, &cfg, state.repo.clone(), Some("mock")).unwrap();
9220 crate::consult::begin(&store, &talks, &q, &talk).unwrap();
9221 crate::talk::drain(&mut talk, &talks).unwrap();
9222 assert_eq!(
9223 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9224 .await
9225 .unwrap(),
9226 ApprovalGate::Pending,
9227 "consultation cannot approve or hold the merge"
9228 );
9229 q = store.get(&q.id).unwrap();
9230 assert!(q.answer.is_none());
9231 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
9233 store.put(&mut q).unwrap();
9234
9235 assert_eq!(
9236 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9237 .await
9238 .unwrap(),
9239 ApprovalGate::Approved
9240 );
9241 }
9242
9243 #[tokio::test]
9244 async fn legacy_hold_actions_are_removed_on_get_and_list_before_answering() {
9245 crate::run::pin_test_home();
9246 let store = ask::Questions::open();
9247 for via_list in [false, true] {
9248 let mut state = repair_state(false, true);
9249 let pr = green_pr();
9250 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9251 .await
9252 .unwrap();
9253 let id = state.land_approval.as_ref().unwrap().question.clone();
9254 store
9255 .update(&id, |q| {
9256 q.actions.insert(
9257 HOLD.to_owned(),
9258 ask::ChoiceAction::Resume {
9259 run: state.id.clone(),
9260 },
9261 );
9262 Ok(())
9263 })
9264 .unwrap();
9265 let q = if via_list {
9266 store.list().into_iter().find(|q| q.id == id).unwrap()
9267 } else {
9268 store.get(&id).unwrap()
9269 };
9270 assert!(!q.actions.contains_key(HOLD));
9271 store
9272 .update(&id, |q| {
9273 assert!(!q.actions.contains_key(HOLD));
9275 assert!(!upgrade_repair_choice(q, &state));
9276 q.answer(ask::Answer::Choice(HOLD.to_owned()))
9277 })
9278 .unwrap();
9279 assert!(store.get(&id).unwrap().chosen_action().is_none());
9280 assert_eq!(
9281 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9282 .await
9283 .unwrap(),
9284 ApprovalGate::Held
9285 );
9286 }
9287 }
9288
9289 #[tokio::test]
9290 async fn explicit_hold_stays_held_but_expired_approval_is_reasked() {
9291 crate::run::pin_test_home();
9292 let store = ask::Questions::open();
9293
9294 let mut held_state = run_state();
9295 held_state.config.graph.land_approval = true;
9296 let pr = green_pr();
9297 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
9298 .await
9299 .unwrap();
9300 let mut q = store
9301 .list()
9302 .into_iter()
9303 .find(|q| q.run == held_state.id)
9304 .expect("filed above");
9305 q.answer(ask::Answer::Choice(HOLD.to_owned())).unwrap();
9306 store.put(&mut q).unwrap();
9307 assert_eq!(
9308 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
9309 .await
9310 .unwrap(),
9311 ApprovalGate::Held
9312 );
9313
9314 let mut abandoned_state = run_state();
9315 abandoned_state.config.graph.land_approval = true;
9316 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
9317 .await
9318 .unwrap();
9319 let mut q = store
9320 .list()
9321 .into_iter()
9322 .find(|q| q.run == abandoned_state.id)
9323 .expect("filed above");
9324 q.abandon("no answer within the timeout");
9325 store.put(&mut q).unwrap();
9326 assert_eq!(
9327 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
9328 .await
9329 .unwrap(),
9330 ApprovalGate::Pending,
9331 "an expired approval must ask again without merging"
9332 );
9333 assert_eq!(
9334 store.get(&q.id).unwrap().status,
9335 ask::QuestionStatus::Abandoned
9336 );
9337 assert_ne!(
9338 abandoned_state.land_approval.as_ref().unwrap().question,
9339 q.id
9340 );
9341 }
9342
9343 fn contested() -> ContestedHandoff {
9344 let finding = |id: &str, n: u32| crate::verdict::Finding {
9345 id: id.to_owned(),
9346 severity: crate::verdict::Severity::Major,
9347 file: Some("src/a.rs".to_owned()),
9348 line: Some(n),
9349 title: format!("problem {id}"),
9350 detail: String::new(),
9351 };
9352 ContestedHandoff {
9353 findings: (1..=7).map(|n| finding(&format!("R3-1-{n}"), n)).collect(),
9354 rejecters: vec![(1, "alpha".to_owned())],
9355 }
9356 }
9357
9358 #[test]
9359 fn the_contested_record_is_asked_about_unless_the_switch_is_off() {
9360 let mut state = run_state();
9361 assert!(contested_to_ask(&state).is_none(), "nothing recorded");
9362 state.contested_handoff = Some(contested());
9363 assert!(contested_to_ask(&state).is_some());
9364 state.config.graph.hold_contested_merge = false;
9365 assert!(
9366 contested_to_ask(&state).is_none(),
9367 "the switch restores today"
9368 );
9369 }
9370
9371 #[test]
9372 fn the_deputy_brief_carries_the_pr_the_findings_and_names_what_is_missing() {
9373 let q = ask::Question::new(
9374 "run-1".to_owned(),
9375 APPROVAL_NODE.to_owned(),
9376 "land".to_owned(),
9377 "Merge?".to_owned(),
9378 String::new(),
9379 vec![APPROVE.to_owned(), HOLD.to_owned()],
9380 );
9381 let none = deputy_brief(&q, None);
9382 assert!(none.contains("could not be read"), "{none}");
9383 assert!(none.contains("Silence is a hold"), "{none}");
9384
9385 let mut state = run_state();
9386 state.pr = Some(crate::run::PrRecord {
9387 url: "https://example.test/pull/7".to_owned(),
9388 number: 7,
9389 state: "open".to_owned(),
9390 checks: "green".to_owned(),
9391 round: 0,
9392 rounds: 3,
9393 red_at_merge: Vec::new(),
9394 });
9395 state.contested_handoff = Some(contested());
9396 let b = deputy_brief(&q, Some(&state));
9397 assert!(b.contains("https://example.test/pull/7"), "{b}");
9398 assert!(b.contains("not recorded in this legacy question"), "{b}");
9399 assert!(!b.contains("This question was filed although"));
9400 state.contested_handoff = None;
9401 assert!(deputy_brief(&q, Some(&state)).contains("not recorded in this legacy question"));
9402 }
9403
9404 #[test]
9405 fn the_contested_question_names_the_pr_the_findings_and_the_rejecter() {
9406 for lang in ["en", "ja"] {
9407 let mut cfg = crate::config::Config::default();
9408 cfg.graph.language = lang.to_owned();
9409 let w = words(&cfg.graph.language);
9410 let text = w.approval_detail(
9411 "https://github.com/yukimemi/magi/pull/42",
9412 "main",
9413 "feat: x",
9414 Some(&contested()),
9415 );
9416 assert!(text.contains("pull/42"), "{text}");
9417 assert!(
9418 text.contains("R3-1-1 major src/a.rs:1: problem R3-1-1"),
9419 "{text}"
9420 );
9421 assert!(text.contains("R3-1-5"), "{text}");
9422 assert!(!text.contains("R3-1-6"), "the list is capped: {text}");
9423 assert!(text.contains("2"), "the rest are counted: {text}");
9424 assert!(text.contains("#1 (alpha)"), "{text}");
9425 }
9426 let plain = words("en").approval_detail("u", "main", "s", None);
9427 assert!(!plain.contains("reject"), "{plain}");
9428 }
9429
9430 #[tokio::test]
9431 async fn a_contested_question_is_filed_once_and_a_resume_finds_the_same_one() {
9432 crate::run::pin_test_home();
9433 let mut state = run_state();
9434 state.config.graph.land_approval = false;
9435 state.contested_handoff = Some(contested());
9436 let pr = green_pr();
9437 let c = contested_to_ask(&state);
9438 assert_eq!(
9439 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9440 .await
9441 .unwrap(),
9442 ApprovalGate::Pending,
9443 "silence is a hold"
9444 );
9445 let store = ask::Questions::open();
9446 let filed: Vec<_> = store
9447 .list()
9448 .into_iter()
9449 .filter(|q| q.run == state.id)
9450 .collect();
9451 assert_eq!(filed.len(), 1);
9452 assert!(filed[0].detail.contains("R3-1-1"), "{}", filed[0].detail);
9453
9454 assert_eq!(
9455 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9456 .await
9457 .unwrap(),
9458 ApprovalGate::Pending
9459 );
9460 let mut q = store
9461 .list()
9462 .into_iter()
9463 .find(|q| q.run == state.id)
9464 .unwrap();
9465 assert_eq!(q.id, filed[0].id, "the same question after a resume");
9466 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
9467 store.put(&mut q).unwrap();
9468 assert_eq!(
9469 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9470 .await
9471 .unwrap(),
9472 ApprovalGate::Approved
9473 );
9474 }
9475
9476 #[test]
9477 fn the_diffstat_table_is_ordered_by_churn_with_binaries_last() {
9478 let rows = parse_numstat(NUMSTAT);
9479 assert_eq!(
9480 rows.iter().map(|r| r.path.as_str()).collect::<Vec<_>>(),
9481 ["src/web.rs", "src/land.rs", "assets/logo.png"]
9482 );
9483 assert_eq!(rows[2].added, None, "a binary file has no line counts");
9484 }
9485 #[test]
9486 fn the_approval_speaks_the_language_the_repository_is_configured_for() {
9487 let mut state = run_state();
9491 state.config.graph.language = "ja".to_owned();
9492 let pr = green_pr();
9493 let commits = ["c1".to_owned()];
9494
9495 let ja = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
9496 assert!(ja.contains("lang=\"ja\""), "the document must declare it");
9497 assert!(ja.contains("squash されるコミット"), "{ja}");
9498 assert!(ja.contains("レビューコメント"), "{ja}");
9499 assert!(ja.contains("差分"), "{ja}");
9500 assert!(
9501 !ja.contains("Commits being squashed"),
9502 "no English left over"
9503 );
9504
9505 let w = words("ja");
9506 assert!(w.approval_summary(17, "feat: x").contains("マージ"));
9507 assert!(
9508 w.approval_detail("http://x/1", "main", "feat: x", None)
9509 .contains("パネル")
9510 );
9511
9512 assert!(ja.contains("src/a.rs"), "the diffstat is not prose");
9514 assert!(ja.contains("feat: x"), "nor is the merge subject");
9515
9516 state.config.graph.language = "en".to_owned();
9519 let en = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
9520 assert!(en.contains("Commits being squashed"), "{en}");
9521 assert_eq!(words("Klingon").html_lang, "en");
9522 }
9523
9524 #[test]
9528 fn pick_open_pr_classifies_by_count_and_base() {
9529 let one = r#"[{"number":58,"url":"https://x/pull/58","title":"t","baseRefName":"main"}]"#;
9530 assert_eq!(
9531 pick_open_pr(one, "main").unwrap(),
9532 OpenPr::One {
9533 url: "https://x/pull/58".into(),
9534 title: "t".into()
9535 }
9536 );
9537 assert_eq!(pick_open_pr("[]", "main").unwrap(), OpenPr::None);
9538 assert_eq!(pick_open_pr(one, "dev").unwrap(), OpenPr::None);
9539 let two = r#"[{"number":1,"url":"u1","title":"","baseRefName":"main"},
9540 {"number":2,"url":"u2","title":"","baseRefName":"main"}]"#;
9541 assert_eq!(
9542 pick_open_pr(two, "main").unwrap(),
9543 OpenPr::Many(vec!["u1".into(), "u2".into()])
9544 );
9545 let fork = r#"[{"url":"f","baseRefName":"main","isCrossRepository":true}]"#;
9547 assert_eq!(pick_open_pr(fork, "main").unwrap(), OpenPr::None);
9548 assert!(pick_open_pr("not json", "main").is_err());
9549 assert!(pick_open_pr(r#"[{"url":"u","title":"t"}]"#, "main").is_err());
9551 assert!(pick_open_pr(r#"[{"title":"t","baseRefName":"main"}]"#, "main").is_err());
9552 }
9553
9554 #[test]
9555 fn pick_merged_pr_picks_the_unique_match() {
9556 let json = r#"[
9557 {"url": "https://github.com/o/r/pull/42", "number": 42,
9558 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"}
9559 ]"#;
9560 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9561 let found = pick_merged_pr(json, "main", created_at)
9562 .expect("valid json")
9563 .expect("one unambiguous match");
9564 assert_eq!(found.url, "https://github.com/o/r/pull/42");
9565 assert_eq!(found.number, 42);
9566 }
9567
9568 #[test]
9572 fn pick_merged_pr_refuses_when_more_than_one_candidate_survives() {
9573 let json = r#"[
9574 {"url": "https://github.com/o/r/pull/42", "number": 42,
9575 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"},
9576 {"url": "https://github.com/o/r/pull/43", "number": 43,
9577 "mergedAt": "2026-09-21T10:00:00Z", "baseRefName": "main"}
9578 ]"#;
9579 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9580 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9581 }
9582
9583 #[test]
9587 fn pick_merged_pr_ignores_a_different_base_branch() {
9588 let json = r#"[
9589 {"url": "https://github.com/o/r/pull/42", "number": 42,
9590 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "release"}
9591 ]"#;
9592 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9593 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9594 }
9595
9596 #[test]
9599 fn pick_merged_pr_ignores_a_merge_that_predates_the_run() {
9600 let json = r#"[
9601 {"url": "https://github.com/o/r/pull/42", "number": 42,
9602 "mergedAt": "2026-09-18T10:00:00Z", "baseRefName": "main"}
9603 ]"#;
9604 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9605 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9606 }
9607
9608 #[test]
9609 fn slug_of_pr_url_reads_host_owner_and_repo() {
9610 assert_eq!(
9611 slug_of_pr_url("https://github.com/yukimemi/shun/pull/272").as_deref(),
9612 Some("github.com/yukimemi/shun")
9613 );
9614 }
9615
9616 #[test]
9617 fn slug_of_pr_url_refuses_a_url_with_no_pull_segment() {
9618 assert_eq!(slug_of_pr_url("https://github.com/yukimemi/shun"), None);
9619 assert_eq!(slug_of_pr_url("not a url at all"), None);
9620 assert_eq!(slug_of_pr_url("https://github.com"), None);
9621 }
9622
9623 #[test]
9624 fn slug_of_repo_url_reads_host_owner_and_repo() {
9625 assert_eq!(
9626 slug_of_repo_url("https://github.com/yukimemi/magi").as_deref(),
9627 Some("github.com/yukimemi/magi")
9628 );
9629 assert_eq!(slug_of_repo_url("https://github.com"), None);
9630 }
9631
9632 #[test]
9633 fn ensure_same_repo_accepts_a_matching_slug_regardless_of_case() {
9634 ensure_same_repo("github.com/yukimemi/magi", "GitHub.Com/YukiMemi/Magi")
9635 .expect("same repo, different case");
9636 }
9637
9638 #[test]
9643 fn ensure_same_repo_refuses_a_different_repo() {
9644 let err =
9645 ensure_same_repo("github.com/yukimemi/magi", "github.com/yukimemi/shun").unwrap_err();
9646 let msg = format!("{err:#}");
9647 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
9648 assert!(msg.contains("github.com/yukimemi/shun"), "{msg}");
9649 }
9650
9651 #[test]
9656 fn ensure_same_repo_refuses_the_same_slug_on_a_different_host() {
9657 let err = ensure_same_repo(
9658 "github.com/yukimemi/magi",
9659 "github.example.com/yukimemi/magi",
9660 )
9661 .unwrap_err();
9662 let msg = format!("{err:#}");
9663 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
9664 assert!(msg.contains("github.example.com/yukimemi/magi"), "{msg}");
9665 }
9666
9667 #[tokio::test]
9672 async fn find_external_merge_returns_none_without_a_winner() {
9673 let state = RunState::new(
9674 PathBuf::from("/no/such/repo"),
9675 "main".to_owned(),
9676 "0000000000000000000000000000000000000000".to_owned(),
9677 "irrelevant".to_owned(),
9678 crate::config::Config::default(),
9679 );
9680 assert_eq!(find_external_merge(&state).await.unwrap(), None);
9681 }
9682
9683 fn pr_run(home: &Path, id: &str, repo: &str, status: RunStatus, url: &str, state: &str) {
9684 let mut run = RunState::new(
9685 PathBuf::from(repo),
9686 "main".to_owned(),
9687 "abcdef1234".to_owned(),
9688 "x".to_owned(),
9689 crate::config::Config::default(),
9690 );
9691 run.id = id.to_owned();
9692 run.status = status;
9693 run.driver_exited = true;
9694 run.pr = Some(crate::run::PrRecord {
9695 number: url.rsplit('/').next().unwrap().parse().unwrap(),
9696 url: url.to_owned(),
9697 state: state.to_owned(),
9698 checks: "red".to_owned(),
9699 round: 0,
9700 rounds: 2,
9701 red_at_merge: Vec::new(),
9702 });
9703 run.save_under(home).unwrap();
9704 }
9705
9706 fn recorded(home: &Path, id: &str) -> String {
9707 let body = std::fs::read_to_string(home.join("runs").join(id).join("run.json")).unwrap();
9708 serde_json::from_str::<RunState>(&body)
9709 .unwrap()
9710 .pr
9711 .unwrap()
9712 .state
9713 }
9714
9715 const PR: &str = "https://github.com/o/r/pull/7";
9716
9717 #[test]
9718 fn write_through_updates_predecessors_and_siblings_only() {
9719 let tmp = tempfile::tempdir().unwrap();
9720 let h = tmp.path();
9721 pr_run(
9722 h,
9723 "20261004-100000-aaaa",
9724 "/repo/r",
9725 RunStatus::Superseded,
9726 PR,
9727 "open",
9728 );
9729 pr_run(
9730 h,
9731 "20261004-100100-bbbb",
9732 "/repo/r",
9733 RunStatus::Blocked,
9734 PR,
9735 "open",
9736 );
9737 pr_run(
9739 h,
9740 "20261004-100200-cccc",
9741 "/repo/r",
9742 RunStatus::Landing,
9743 PR,
9744 "open",
9745 );
9746 pr_run(
9748 h,
9749 "20261004-100300-dddd",
9750 "/repo/other",
9751 RunStatus::Blocked,
9752 "https://github.com/o/other/pull/7",
9753 "open",
9754 );
9755 pr_run(
9757 h,
9758 "20261004-100400-eeee",
9759 "/repo/r",
9760 RunStatus::Blocked,
9761 "https://github.com/o/r/pull/8",
9762 "open",
9763 );
9764 pr_run(
9765 h,
9766 "20261004-100500-ffff",
9767 "/repo/r",
9768 RunStatus::Merged,
9769 PR,
9770 "open",
9771 );
9772 let source = RunState::load_under("20261004-100500-ffff", h).unwrap();
9773
9774 assert_eq!(
9775 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
9776 2
9777 );
9778 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
9779 assert_eq!(recorded(h, "20261004-100100-bbbb"), "merged");
9780 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
9781 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
9782 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
9783 assert_eq!(recorded(h, "20261004-100500-ffff"), "open");
9785 assert_eq!(
9787 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
9788 0
9789 );
9790 let hit = RunState::load_under("20261004-100000-aaaa", h).unwrap();
9791 assert!(hit.events.iter().any(|e| e.message.contains("merged")));
9792 }
9793
9794 #[test]
9795 fn lifecycle_updates_preserve_live_and_unknown_terminal_drivers() {
9796 let home = tempfile::tempdir().unwrap();
9797 let live_id = "20261004-100000-aaaa";
9798 let unknown_id = "20261004-100100-bbbb";
9799 for id in [live_id, unknown_id] {
9800 pr_run(home.path(), id, "repo", RunStatus::Ready, PR, "open");
9801 let mut s = RunState::load_under(id, home.path()).unwrap();
9802 s.driver_exited = false;
9803 s.driver_claimed = None;
9805 if id == live_id {
9806 s.driver_pid = Some(std::process::id());
9807 s.driver_started_at = crate::proc::process_started_at(std::process::id());
9808 }
9809 s.save_under(home.path()).unwrap();
9810 if id == unknown_id {
9811 assert_eq!(
9812 s.liveness_under(home.path(), false),
9813 crate::run::Liveness::Unknown
9814 );
9815 }
9816 }
9817 let known = BTreeMap::from([(PR.to_owned(), PrLifecycle::Merged)]);
9818 assert_eq!(apply_pr_states(home.path(), &known), 0);
9819 for id in [live_id, unknown_id] {
9820 assert_eq!(recorded(home.path(), id), "open");
9821 }
9822 }
9823
9824 #[test]
9825 fn repair_rewrites_merged_and_closed_and_leaves_open_and_unknown() {
9826 let tmp = tempfile::tempdir().unwrap();
9827 let h = tmp.path();
9828 let url = |n: u32| format!("https://github.com/o/r/pull/{n}");
9829 pr_run(
9830 h,
9831 "20261004-100000-aaaa",
9832 "/repo/r",
9833 RunStatus::Superseded,
9834 &url(1),
9835 "open",
9836 );
9837 pr_run(
9838 h,
9839 "20261004-100100-bbbb",
9840 "/repo/r",
9841 RunStatus::Blocked,
9842 &url(2),
9843 "open",
9844 );
9845 pr_run(
9846 h,
9847 "20261004-100200-cccc",
9848 "/repo/r",
9849 RunStatus::Ready,
9850 &url(3),
9851 "open",
9852 );
9853 pr_run(
9854 h,
9855 "20261004-100300-dddd",
9856 "/repo/r",
9857 RunStatus::Ready,
9858 &url(4),
9859 "open",
9860 );
9861 pr_run(
9862 h,
9863 "20261004-100400-eeee",
9864 "/repo/r",
9865 RunStatus::Implementing,
9866 &url(1),
9867 "open",
9868 );
9869 assert_eq!(stale_open_prs(h).len(), 4);
9870
9871 let mut known = BTreeMap::new();
9872 known.insert(url(1), PrLifecycle::Merged);
9873 known.insert(url(2), PrLifecycle::Closed);
9874 known.insert(url(3), PrLifecycle::Open);
9875 assert_eq!(apply_pr_states(h, &known), 2);
9877 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
9878 assert_eq!(recorded(h, "20261004-100100-bbbb"), "closed");
9879 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
9880 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
9881 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
9882 assert_eq!(apply_pr_states(h, &known), 0);
9883 }
9884
9885 use std::collections::VecDeque;
9888 use std::sync::Mutex;
9889
9890 struct Scripted {
9893 evidence: Mutex<Option<CiEvidence>>,
9894 views: Mutex<VecDeque<Seen>>,
9895 merges: Mutex<VecDeque<(bool, String)>>,
9896 fix: Mutex<Option<Fixed>>,
9897 log: Mutex<Vec<&'static str>>,
9898 argvs: Mutex<Vec<Vec<String>>>,
9899 required: Mutex<Option<BTreeSet<String>>>,
9900 merged: Mutex<bool>,
9903 queued: Mutex<bool>,
9904 unreadable_after_merge: Mutex<bool>,
9906 reruns: Mutex<Vec<String>>,
9908 rerun_fails: Mutex<bool>,
9909 clock: Mutex<i64>,
9911 }
9912
9913 impl Scripted {
9914 fn new(views: Vec<Seen>, merges: Vec<(bool, &str)>) -> Self {
9915 Self {
9916 evidence: Mutex::new(None),
9917 views: Mutex::new(views.into()),
9918 merges: Mutex::new(
9919 merges
9920 .into_iter()
9921 .map(|(ok, m)| (ok, m.to_owned()))
9922 .collect(),
9923 ),
9924 fix: Mutex::new(None),
9925 log: Mutex::new(Vec::new()),
9926 argvs: Mutex::new(Vec::new()),
9927 required: Mutex::new(None),
9928 merged: Mutex::new(false),
9929 queued: Mutex::new(false),
9930 unreadable_after_merge: Mutex::new(false),
9931 reruns: Mutex::new(Vec::new()),
9932 rerun_fails: Mutex::new(false),
9933 clock: Mutex::new(1_000),
9934 }
9935 }
9936 fn argvs(&self) -> Vec<Vec<String>> {
9937 self.argvs.lock().unwrap().clone()
9938 }
9939 fn calls(&self) -> Vec<&'static str> {
9940 self.log.lock().unwrap().clone()
9941 }
9942 }
9943
9944 impl Forge for Scripted {
9945 async fn attribution(&self, _state: &RunState, _seen: &Seen) -> Option<CiEvidence> {
9946 self.evidence.lock().unwrap().clone()
9947 }
9948 async fn view(&self, _repo: &Path, _url: &str) -> Result<Seen> {
9949 self.log.lock().unwrap().push("view");
9950 if *self.unreadable_after_merge.lock().unwrap()
9951 && !self.argvs.lock().unwrap().is_empty()
9952 {
9953 anyhow::bail!("forge unreachable");
9954 }
9955 let mut v = self.views.lock().unwrap();
9956 let mut seen = if v.len() > 1 {
9957 v.pop_front().unwrap()
9958 } else {
9959 v[0].clone()
9960 };
9961 if *self.merged.lock().unwrap() {
9962 seen.pr.state = PrLifecycle::Merged;
9963 }
9964 Ok(seen)
9965 }
9966 async fn merge(&self, _repo: &Path, argv: &[String]) -> Result<(bool, String)> {
9967 self.log.lock().unwrap().push("merge");
9968 self.argvs.lock().unwrap().push(argv.to_vec());
9969 let out = self
9970 .merges
9971 .lock()
9972 .unwrap()
9973 .pop_front()
9974 .expect("unscripted merge");
9975 if out.0 && !*self.queued.lock().unwrap() && !argv.iter().any(|a| a == "--disable-auto")
9976 {
9977 *self.merged.lock().unwrap() = true;
9978 }
9979 Ok(out)
9980 }
9981 async fn poll(&self) {
9982 self.log.lock().unwrap().push("poll");
9983 *self.clock.lock().unwrap() += POLL.as_secs() as i64;
9984 }
9985 async fn rerun(&self, _repo: &Path, run: &str) -> Result<()> {
9986 self.log.lock().unwrap().push("rerun");
9987 self.reruns.lock().unwrap().push(run.to_owned());
9988 if *self.rerun_fails.lock().unwrap() {
9989 anyhow::bail!("gh run rerun: no");
9990 }
9991 Ok(())
9992 }
9993 fn now(&self) -> i64 {
9994 *self.clock.lock().unwrap()
9995 }
9996 async fn required_contexts(&self, _repo: &Path, _base: &str) -> Option<BTreeSet<String>> {
9997 self.required.lock().unwrap().clone()
9998 }
9999 async fn fix(
10000 &self,
10001 _state: &mut RunState,
10002 _pr: &PrState,
10003 _round: usize,
10004 _budget: usize,
10005 _reason: &str,
10006 _logs: &str,
10007 ) -> Result<Fixed> {
10008 self.log.lock().unwrap().push("fix");
10009 Ok(self.fix.lock().unwrap().take().expect("unscripted fix"))
10010 }
10011 }
10012
10013 const REFUSED: &str =
10014 "X Pull request #42 is not mergeable: the base branch policy prohibits the merge.";
10015
10016 fn seen(head: &str, checks: Checks, merge_state: &str, comments: bool) -> Seen {
10017 let mut pr = green_pr();
10018 pr.checks = checks;
10019 pr.blocking = Blocking::of(merge_state);
10020 if !comments {
10021 pr.review_comments.clear();
10022 }
10023 Seen {
10024 pr,
10025 title: "feat: x".to_owned(),
10026 failing_urls: Vec::new(),
10027 head: head.to_owned(),
10028 rollup_head: head.to_owned(),
10029 merge_state: merge_state.to_owned(),
10030 contexts: Vec::new(),
10031 base: "main".to_owned(),
10032 }
10033 }
10034
10035 fn landing_state() -> RunState {
10036 crate::run::pin_test_home();
10037 let mut state = run_state();
10038 state.config.graph.land_approval = false;
10039 state
10040 }
10041
10042 #[test]
10043 fn a_pushed_head_is_awaited_case_insensitively_and_an_unreadable_one_is_not_a_match() {
10044 assert!(!awaiting_new_head(None, "aaa"));
10045 assert!(!awaiting_new_head(Some("abc123"), "ABC123"));
10046 assert!(awaiting_new_head(Some("abc123"), "def456"));
10047 assert!(awaiting_new_head(Some("abc123"), ""));
10048 }
10049
10050 #[test]
10051 fn a_refusal_is_judged_by_the_pull_requests_state_not_by_its_wording() {
10052 let open = |c, m: &str| seen("a", c, m, false);
10053 let table = [
10054 (None, false, Refused::Pending),
10055 (
10056 Some(open(Checks::Pending, "BLOCKED")),
10057 false,
10058 Refused::Pending,
10059 ),
10060 (
10061 Some(open(Checks::Unknown, "BLOCKED")),
10062 false,
10063 Refused::Pending,
10064 ),
10065 (
10066 Some(open(Checks::Green, "UNKNOWN")),
10067 false,
10068 Refused::Pending,
10069 ),
10070 (Some(open(Checks::Green, "")), false, Refused::Pending),
10071 (
10072 Some(open(Checks::Green, "BLOCKED")),
10073 false,
10074 Refused::Recheck,
10075 ),
10076 (Some(open(Checks::Green, "BLOCKED")), true, Refused::Final),
10077 ];
10078 for (after, rechecked, want) in table {
10079 assert_eq!(
10080 classify_refusal(after.as_ref(), rechecked, "a", CiExpectation::Expected),
10081 want
10082 );
10083 }
10084 let mut closed = open(Checks::Green, "CLEAN");
10085 closed.pr.state = PrLifecycle::Closed;
10086 assert_eq!(
10087 classify_refusal(Some(&closed), false, "a", CiExpectation::Expected),
10088 Refused::Final
10089 );
10090 }
10091
10092 #[tokio::test]
10093 async fn a_normal_landing_merges_on_the_first_look() {
10094 let mut state = landing_state();
10095 let forge = Scripted::new(
10096 vec![seen("a", Checks::Green, "CLEAN", false)],
10097 vec![(true, "")],
10098 );
10099 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10100 .await
10101 .unwrap();
10102 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10104 assert_eq!(state.status, RunStatus::Merged);
10105 }
10106
10107 #[tokio::test]
10108 async fn a_successful_merge_command_that_only_queued_is_not_a_merge() {
10109 let mut state = landing_state();
10110 let forge = Scripted::new(
10111 vec![seen("a", Checks::Green, "CLEAN", false)],
10112 std::iter::repeat_n((true, ""), 100).collect(),
10113 );
10114 *forge.queued.lock().unwrap() = true;
10115 let task = async {
10116 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10117 .await
10118 .unwrap();
10119 };
10120 task.await;
10123 assert_ne!(state.status, RunStatus::Merged);
10124 }
10125
10126 #[tokio::test]
10127 async fn an_unreadable_forge_after_a_merge_command_is_not_a_confirmation() {
10128 let mut state = landing_state();
10129 let forge = Scripted::new(
10130 vec![seen("a", Checks::Green, "CLEAN", false)],
10131 std::iter::repeat_n((true, ""), 100).collect(),
10132 );
10133 *forge.unreadable_after_merge.lock().unwrap() = true;
10134 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10135 .await
10136 .ok();
10137 assert_ne!(state.status, RunStatus::Merged);
10138 }
10139
10140 #[tokio::test]
10141 async fn a_task_public_head_is_awaited_on_land_entry() {
10142 let mut state = landing_state();
10143 state.pr_head = Some("magi/task-abcd-1234".into());
10144 state.pr_pushed_head = Some("new".into());
10145 let forge = Scripted::new(
10146 vec![
10147 seen("old", Checks::Green, "CLEAN", false),
10148 seen("new", Checks::Green, "CLEAN", false),
10149 ],
10150 vec![(true, "")],
10151 );
10152 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10153 .await
10154 .unwrap();
10155 assert_eq!(
10156 forge.calls(),
10157 ["view", "poll", "view", "view", "merge", "view"]
10158 );
10159 assert_eq!(state.status, RunStatus::Merged);
10160 }
10161
10162 #[tokio::test]
10163 async fn a_superseded_public_head_owner_cannot_reenter_land() {
10164 let mut state = landing_state();
10165 state.pr_taken_over_by = Some("next".into());
10166 let forge = Scripted::new(vec![seen("a", Checks::Green, "CLEAN", false)], vec![]);
10167 assert!(
10168 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10169 .await
10170 .is_err()
10171 );
10172 assert!(forge.calls().is_empty());
10173 }
10174
10175 #[tokio::test]
10176 async fn after_a_pushed_fix_no_merge_is_tried_until_the_head_matches() {
10177 let mut state = landing_state();
10178 let forge = Scripted::new(
10179 vec![
10180 seen("old", Checks::Green, "CLEAN", true),
10181 seen("old", Checks::Green, "CLEAN", true),
10183 seen("new", Checks::Pending, "BLOCKED", true),
10184 seen("new", Checks::Green, "CLEAN", true),
10185 ],
10186 vec![(true, "")],
10187 );
10188 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10189 head: "NEW".to_owned(),
10190 });
10191 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10192 .await
10193 .unwrap();
10194 assert_eq!(
10195 forge.calls(),
10196 [
10197 "view", "fix", "poll", "view", "poll", "view", "poll", "view", "view", "merge",
10198 "view"
10199 ]
10200 );
10201 assert_eq!(state.status, RunStatus::Merged);
10202 }
10203
10204 #[tokio::test]
10205 async fn a_head_that_never_arrives_stops_naming_both_commits() {
10206 let mut state = landing_state();
10207 let forge = Scripted::new(
10208 vec![
10209 seen("old", Checks::Green, "CLEAN", true),
10210 seen("someone-elses", Checks::Green, "CLEAN", true),
10211 ],
10212 vec![],
10213 );
10214 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10215 head: "mine".to_owned(),
10216 });
10217 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10218 .await
10219 .unwrap();
10220 assert!(!forge.calls().contains(&"merge"));
10221 let why = state.merge.as_ref().unwrap().detail.clone();
10222 assert!(
10223 why.contains("mine") && why.contains("someone-elses"),
10224 "{why}"
10225 );
10226 assert_eq!(state.status, RunStatus::Blocked);
10227 }
10228
10229 #[tokio::test]
10230 async fn a_policy_refusal_while_checks_run_waits_and_then_merges() {
10231 let mut state = landing_state();
10232 let forge = Scripted::new(
10233 vec![
10234 seen("a", Checks::Green, "CLEAN", false),
10235 seen("a", Checks::Green, "CLEAN", false),
10236 seen("a", Checks::Pending, "BLOCKED", false),
10237 seen("a", Checks::Pending, "BLOCKED", false),
10238 seen("a", Checks::Green, "CLEAN", false),
10239 ],
10240 vec![(false, REFUSED), (true, "")],
10241 );
10242 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10243 .await
10244 .unwrap();
10245 assert_eq!(
10246 forge.calls(),
10247 [
10248 "view", "view", "merge", "view", "poll", "view", "poll", "view", "view", "merge",
10249 "view"
10250 ]
10251 );
10252 assert_eq!(state.status, RunStatus::Merged);
10253 }
10254
10255 #[tokio::test]
10256 async fn a_refusal_that_outlives_settled_checks_stops_with_the_merge_state() {
10257 let mut state = landing_state();
10258 let forge = Scripted::new(
10259 vec![
10260 seen("a", Checks::Green, "CLEAN", false),
10261 seen("a", Checks::Green, "BLOCKED", false),
10262 ],
10263 vec![(false, REFUSED), (false, REFUSED)],
10264 );
10265 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10266 .await
10267 .unwrap();
10268 assert_eq!(forge.calls().iter().filter(|c| **c == "merge").count(), 2);
10270 let why = state.merge.as_ref().unwrap().detail.clone();
10271 assert!(
10272 why.contains("policy prohibits") && why.contains("BLOCKED") && why.contains("refused"),
10273 "{why}"
10274 );
10275 assert_eq!(state.status, RunStatus::Blocked);
10276 }
10277
10278 #[test]
10279 fn a_decision_is_bound_to_a_head_only_when_every_signal_agrees() {
10280 assert_eq!(bound_head("abc", "abc", None), Some("abc"));
10281 assert_eq!(bound_head("abc", "ABC", Some("abc")), Some("abc"));
10282 assert_eq!(bound_head("old", "old", Some("new")), None);
10284 assert_eq!(bound_head("new", "old", Some("new")), None);
10286 assert_eq!(bound_head("new", "old", None), None);
10287 assert_eq!(bound_head("", "", None), None);
10289 assert_eq!(bound_head("", "", Some("new")), None);
10290 assert_eq!(bound_head("abc", "", None), None);
10291 }
10292
10293 fn view_json(head: &str) -> String {
10294 format!(
10295 r#"{{"url":"https://github.com/o/r/pull/42","number":42,"state":"OPEN",
10296 "title":"t","headRefOid":"{head}","mergeStateStatus":"CLEAN",
10297 "reviews":[],"comments":[]}}"#
10298 )
10299 }
10300
10301 fn node_json(oid: &str, check: &str, has_next: bool) -> String {
10302 format!(
10303 r#"{{"data":{{"repository":{{"pullRequest":{{"commits":{{"nodes":[{{"commit":
10304 {{"oid":"{oid}","statusCheckRollup":{{"contexts":{{"pageInfo":{{"hasNextPage":{has_next}}},
10305 "nodes":[{{"__typename":"CheckRun","name":"ci","status":"COMPLETED",
10306 "conclusion":"{check}","detailsUrl":"https://example.test/1"}}]}}}}}}}}]}}}}}}}}}}"#
10307 )
10308 }
10309
10310 #[test]
10311 fn rollup_is_bound_to_the_commit_in_the_same_node() {
10312 let s = seen_from(&view_json("new"), Some(&node_json("old", "FAILURE", false))).unwrap();
10315 assert_eq!(s.rollup_head, "old");
10316 assert_eq!(s.pr.checks, Checks::Red);
10317 assert_eq!(bound_head(&s.head, &s.rollup_head, Some("new")), None);
10318 assert_eq!(s.failing_urls.len(), 1);
10319 }
10320
10321 #[test]
10322 fn checks_come_from_the_node_not_the_view() {
10323 let view = view_json("new").replace(
10324 r#""reviews""#,
10325 r#""statusCheckRollup":[{"name":"ci","status":"COMPLETED","conclusion":"FAILURE"}],"reviews""#,
10326 );
10327 let s = seen_from(&view, Some(&node_json("new", "SUCCESS", false))).unwrap();
10328 assert_eq!(s.pr.checks, Checks::Green);
10329 assert!(s.pr.failing.is_empty());
10330 assert_eq!(
10331 bound_head(&s.head, &s.rollup_head, Some("new")),
10332 Some("new")
10333 );
10334 }
10335
10336 #[test]
10337 fn an_unreadable_or_paged_node_leaves_the_head_unbound() {
10338 for node in [
10339 None,
10340 Some("not json".to_owned()),
10341 Some(r#"{"errors":[{"message":"x"}]}"#.to_owned()),
10342 Some(node_json("new", "SUCCESS", true)),
10343 ] {
10344 let s = seen_from(&view_json("new"), node.as_deref()).unwrap();
10345 assert!(s.rollup_head.is_empty());
10346 assert_eq!(s.pr.checks, Checks::Unknown);
10347 assert_eq!(bound_head(&s.head, &s.rollup_head, None), None);
10348 }
10349 }
10350
10351 #[test]
10352 fn the_merge_command_is_pinned_to_the_observed_head() {
10353 let argv = merge_argv_at(7, "feat: x", "deadbeef");
10354 let at = argv
10355 .iter()
10356 .position(|a| a == "--match-head-commit")
10357 .unwrap();
10358 assert_eq!(argv[at + 1], "deadbeef");
10359 }
10360
10361 #[tokio::test]
10362 async fn stale_checks_after_a_fix_push_never_reach_a_merge() {
10363 let mut state = landing_state();
10364 let mut stale = seen("new", Checks::Red, "CLEAN", false);
10367 stale.rollup_head = "old".to_owned();
10368 let forge = Scripted::new(
10369 vec![seen("old", Checks::Green, "CLEAN", true), stale],
10370 vec![],
10371 );
10372 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10373 head: "new".to_owned(),
10374 });
10375 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10376 .await
10377 .unwrap();
10378 assert!(!forge.calls().contains(&"merge"));
10379 assert_eq!(state.status, RunStatus::Blocked);
10380 let why = state.merge.as_ref().unwrap().detail.clone();
10381 assert!(why.contains("new") && why.contains("old"), "{why}");
10382 }
10383
10384 #[test]
10385 fn a_refusal_read_against_another_commits_checks_is_pending() {
10386 let mut after = seen("a", Checks::Green, "BLOCKED", false);
10387 after.rollup_head = "old".to_owned();
10388 assert_eq!(
10389 classify_refusal(Some(&after), true, "a", CiExpectation::Expected),
10390 Refused::Pending
10391 );
10392 }
10393
10394 #[tokio::test]
10395 async fn absent_ci_empty_rollup_reaches_approval_then_merges_on_the_approved_head() {
10396 let mut state = landing_state();
10397 state.config.merge.ci = crate::config::MergeCi::None;
10398 state.config.graph.land_approval = true;
10399 let forge = Scripted::new(
10400 vec![seen("a", Checks::Unknown, "CLEAN", false)],
10401 vec![(true, "")],
10402 );
10403 land_with(&mut state, URL, &forge).await.unwrap();
10404 assert!(state.parked);
10405 assert_eq!(forge.calls(), ["view"]);
10406 let store = ask::Questions::open();
10407 let mut q = store
10408 .get(&state.land_approval.as_ref().unwrap().question)
10409 .unwrap();
10410 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
10411 store.put(&mut q).unwrap();
10412
10413 land_with(&mut state, URL, &forge).await.unwrap();
10414 assert_eq!(forge.calls(), ["view", "view", "view", "merge", "view"]);
10415 assert_eq!(state.status, RunStatus::Merged);
10416 assert_eq!(
10417 value_of(&forge.argvs()[0], "--match-head-commit"),
10418 Some("a")
10419 );
10420 }
10421
10422 #[tokio::test]
10423 async fn absent_ci_ignores_failed_workflow_runs_without_rerunning_them() {
10424 let mut state = landing_state();
10425 state.config.merge.ci = crate::config::MergeCi::None;
10426 let forge = Scripted::new(vec![red("a", Some("7"))], vec![(true, "")]);
10427 land_with(&mut state, URL, &forge).await.unwrap();
10428 assert!(forge.reruns.lock().unwrap().is_empty());
10429 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10430 assert_eq!(state.status, RunStatus::Merged);
10431 }
10432
10433 #[test]
10434 fn absent_ci_still_requires_a_readable_matching_head_and_resolved_comments() {
10435 let shown = BTreeSet::new();
10436 let guard = |s: Option<&Seen>| {
10437 direct_merge_is_safe(s, "a", &shown, 0, 4, Duration::ZERO, CiExpectation::Absent)
10438 };
10439 let mut fresh = seen("a", Checks::Unknown, "CLEAN", false);
10440 assert!(guard(Some(&fresh)));
10441 assert!(!guard(None));
10442 fresh.rollup_head = "old".to_owned();
10443 assert!(!guard(Some(&fresh)));
10444 fresh.rollup_head = "a".to_owned();
10445 fresh.head = "b".to_owned();
10446 assert!(!guard(Some(&fresh)));
10447 assert!(!guard(Some(&seen("a", Checks::Unknown, "CLEAN", true))));
10448 assert!(!guard(Some(&seen("a", Checks::Unknown, "DIRTY", false))));
10449 }
10450
10451 #[test]
10452 fn absent_ci_refusal_does_not_wait_for_third_party_checks() {
10453 for checks in [Checks::Unknown, Checks::Pending, Checks::Red, Checks::Green] {
10454 let after = seen("a", checks, "BLOCKED", false);
10455 assert_eq!(
10456 classify_refusal(Some(&after), false, "a", CiExpectation::Absent),
10457 Refused::Recheck
10458 );
10459 assert_eq!(
10460 classify_refusal(Some(&after), true, "a", CiExpectation::Absent),
10461 Refused::Final
10462 );
10463 }
10464 }
10465
10466 #[tokio::test]
10467 async fn a_matching_head_with_red_non_required_checks_still_merges() {
10468 let mut state = landing_state();
10469 let forge = Scripted::new(
10470 vec![seen("a", Checks::Red, "CLEAN", false)],
10471 vec![(true, "")],
10472 );
10473 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10474 .await
10475 .unwrap();
10476 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10477 assert_eq!(state.status, RunStatus::Merged);
10478 }
10479
10480 #[tokio::test]
10481 async fn a_merge_refused_because_the_head_moved_looks_again_instead_of_failing() {
10482 let mut state = landing_state();
10483 let forge = Scripted::new(
10484 vec![
10485 seen("a", Checks::Green, "CLEAN", false),
10486 seen("a", Checks::Green, "CLEAN", false),
10487 seen("b", Checks::Green, "BLOCKED", false),
10489 seen("b", Checks::Green, "CLEAN", false),
10490 ],
10491 vec![(false, REFUSED), (true, "")],
10492 );
10493 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10494 .await
10495 .unwrap();
10496 assert_eq!(
10497 forge.calls(),
10498 [
10499 "view", "view", "merge", "view", "poll", "view", "view", "merge", "view"
10500 ]
10501 );
10502 assert_eq!(state.status, RunStatus::Merged);
10503 }
10504
10505 fn merged_view(head: &str) -> Seen {
10506 let mut m = seen(head, Checks::Green, "CLEAN", false);
10507 m.pr.state = PrLifecycle::Merged;
10508 m
10509 }
10510
10511 fn has(argv: &[String], flag: &str) -> bool {
10512 argv.iter().any(|a| a == flag)
10513 }
10514
10515 fn value_of<'a>(argv: &'a [String], flag: &str) -> Option<&'a str> {
10516 let at = argv.iter().position(|a| a == flag)?;
10517 argv.get(at + 1).map(String::as_str)
10518 }
10519
10520 const URL: &str = "https://github.com/o/r/pull/42";
10521
10522 #[tokio::test]
10523 async fn the_merge_step_merges_directly_on_the_observed_head_and_never_arms() {
10524 let mut state = landing_state();
10525 let forge = Scripted::new(
10526 vec![
10527 seen("abc", Checks::Green, "CLEAN", false),
10528 seen("abc", Checks::Green, "CLEAN", false),
10529 ],
10530 vec![(true, "")],
10531 );
10532 land_with(&mut state, URL, &forge).await.unwrap();
10533 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10534 let argv = &forge.argvs()[0];
10535 assert!(has(argv, "--squash") && has(argv, "--subject"));
10536 assert!(!has(argv, "--auto") && !has(argv, "--admin"));
10537 assert_eq!(value_of(argv, "--match-head-commit"), Some("abc"));
10538 assert_eq!(state.status, RunStatus::Merged);
10539 assert!(state.land_armed_head.is_none());
10540 }
10541
10542 #[tokio::test]
10543 async fn a_resume_disables_an_arm_left_by_an_older_build_before_merging() {
10544 let mut state = landing_state();
10545 state.land_armed_head = Some("a".to_owned());
10546 let forge = Scripted::new(
10547 vec![seen("a", Checks::Green, "CLEAN", false)],
10548 vec![(true, ""), (true, "")],
10549 );
10550 land_with(&mut state, URL, &forge).await.unwrap();
10551 let argvs = forge.argvs();
10552 assert!(has(&argvs[0], "--disable-auto"));
10553 assert!(!has(&argvs[1], "--auto"));
10554 assert_eq!(value_of(&argvs[1], "--match-head-commit"), Some("a"));
10555 assert_eq!(state.status, RunStatus::Merged);
10556 assert!(state.land_armed_head.is_none());
10557 }
10558
10559 #[tokio::test]
10560 async fn an_approval_never_carries_over_to_a_new_head() {
10561 crate::run::pin_test_home();
10562 let mut state = run_state();
10563 state.config.graph.land_approval = true;
10564 let pr = green_pr();
10565 let store = ask::Questions::open();
10566
10567 approval_gate(&mut state, &pr, "feat: x", None, "aaa")
10568 .await
10569 .unwrap();
10570 let mut q = store
10571 .list()
10572 .into_iter()
10573 .find(|q| q.run == state.id)
10574 .unwrap();
10575 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
10576 store.put(&mut q).unwrap();
10577 assert_eq!(
10578 approval_gate(&mut state, &pr, "feat: x", None, "AAA")
10579 .await
10580 .unwrap(),
10581 ApprovalGate::Approved,
10582 "the same head keeps its approval"
10583 );
10584
10585 assert_eq!(
10587 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
10588 .await
10589 .unwrap(),
10590 ApprovalGate::Pending
10591 );
10592 let all: Vec<_> = store
10593 .list()
10594 .into_iter()
10595 .filter(|q| q.run == state.id)
10596 .collect();
10597 assert_eq!(all.len(), 2);
10598
10599 state.land_approval = None;
10601 assert_eq!(
10602 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
10603 .await
10604 .unwrap(),
10605 ApprovalGate::Pending
10606 );
10607 let open = store
10608 .list()
10609 .into_iter()
10610 .filter(|q| q.run == state.id && q.status.open())
10611 .count();
10612 assert_eq!(open, 1, "the superseded question was retired");
10613 }
10614
10615 #[tokio::test]
10616 async fn the_merge_is_bound_to_the_head_it_was_decided_on() {
10617 let mut state = landing_state();
10618 let forge = Scripted::new(
10619 vec![
10620 seen("a", Checks::Green, "CLEAN", false),
10621 seen("b", Checks::Green, "CLEAN", false),
10623 ],
10624 vec![(true, "")],
10625 );
10626 land_with(&mut state, URL, &forge).await.unwrap();
10627 let argvs = forge.argvs();
10628 assert_eq!(argvs.len(), 1, "no merge was tried on the moved head");
10629 assert!(!has(&argvs[0], "--auto"));
10630 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("b"));
10631 assert_eq!(state.status, RunStatus::Merged);
10632 }
10633
10634 fn passing(label: &str) -> CheckInfo {
10635 CheckInfo {
10636 label: label.to_owned(),
10637 verdict: Verdict::Pass,
10638 required: Some(false),
10639 run: None,
10640 }
10641 }
10642
10643 fn failing(label: &str, run: Option<&str>) -> (String, Option<String>) {
10644 (label.to_owned(), run.map(str::to_owned))
10645 }
10646
10647 fn reran(head: &str, runs: &[(&str, i64)]) -> LandReruns {
10648 LandReruns {
10649 head: head.to_owned(),
10650 runs: runs.iter().map(|(r, at)| ((*r).to_owned(), *at)).collect(),
10651 }
10652 }
10653
10654 #[test]
10655 fn a_failed_run_is_rerun_once_then_waited_on_then_left_to_the_fixer() {
10656 let f = [failing("test (macos)", Some("7"))];
10657 assert_eq!(
10658 rerun_step(&f, None, "h", 100),
10659 RerunStep::Rerun(vec!["7".to_owned()])
10660 );
10661 let rec = reran("h", &[("7", 100)]);
10662 let grace = crate::release_watch::RERUN_GRACE;
10663 assert_eq!(
10664 rerun_step(&f, Some(&rec), "h", 100 + grace - 1),
10665 RerunStep::Grace
10666 );
10667 assert_eq!(rerun_step(&f, Some(&rec), "h", 100 + grace), RerunStep::Fix);
10668 }
10669
10670 #[test]
10671 fn a_failure_without_a_run_id_goes_to_the_fixer() {
10672 let f = [failing("a", Some("7")), failing("ci/external", None)];
10673 assert_eq!(rerun_step(&f, None, "h", 0), RerunStep::Fix);
10674 assert_eq!(rerun_step(&[], None, "h", 0), RerunStep::Fix);
10675 }
10676
10677 #[test]
10678 fn a_moved_head_forgets_the_reruns() {
10679 let f = [failing("a", Some("7"))];
10680 let rec = reran("old", &[("7", 100)]);
10681 assert_eq!(
10682 rerun_step(&f, Some(&rec), "new", 101),
10683 RerunStep::Rerun(vec!["7".to_owned()])
10684 );
10685 }
10686
10687 #[test]
10688 fn only_unrerun_runs_are_rerun_and_duplicates_collapse() {
10689 let f = [
10690 failing("a", Some("7")),
10691 failing("b", Some("7")),
10692 failing("c", Some("8")),
10693 ];
10694 assert_eq!(
10695 rerun_step(&f, None, "h", 0),
10696 RerunStep::Rerun(vec!["7".to_owned(), "8".to_owned()])
10697 );
10698 let rec = reran("h", &[("7", 0)]);
10699 assert_eq!(
10700 rerun_step(&f, Some(&rec), "h", 1),
10701 RerunStep::Rerun(vec!["8".to_owned()])
10702 );
10703 }
10704
10705 #[test]
10706 fn only_blocking_failures_are_candidates_for_a_rerun() {
10707 let check = |label: &str, verdict, required, run: &str| CheckInfo {
10708 label: label.to_owned(),
10709 verdict,
10710 required,
10711 run: Some(run.to_owned()),
10712 };
10713 let got = rerunnable(&[
10714 check("passed", Verdict::Pass, Some(true), "1"),
10715 check("optional", Verdict::Fail, Some(false), "2"),
10716 check("required", Verdict::Fail, Some(true), "3"),
10717 check("unknown", Verdict::Fail, None, "4"),
10718 ]);
10719 let labels: Vec<_> = got.iter().map(|(l, _)| l.as_str()).collect();
10720 assert_eq!(labels, ["required", "unknown"]);
10721 }
10722
10723 fn unrelated_ci_fixture() -> CiEvidence {
10724 let failure = CiFailure {
10725 path: "tests/web_render.rs".into(),
10726 start_line: 42,
10727 end_line: 42,
10728 title: "question_identity_disclosure_copy_and_live_updates".into(),
10729 message: "assertion failed".into(),
10730 };
10731 CiEvidence {
10732 head: "a".into(),
10733 base: "base-sha".into(),
10734 changed: vec![
10735 "AGENTS.md".into(),
10736 "src/talk.rs".into(),
10737 "tests/consult_investigation.rs".into(),
10738 ],
10739 checks: vec![CiCheckEvidence {
10740 label: "coverage".into(),
10741 head_check: 70,
10742 base_check: 60,
10743 app: 1,
10744 run: "7".into(),
10745 base_run: "6".into(),
10746 head_failures: vec![failure.clone()],
10747 base_failures: vec![failure],
10748 rerun_exhausted: true,
10749 }],
10750 }
10751 }
10752
10753 #[test]
10754 fn unrelated_ci_requires_complete_structural_evidence_for_every_failure() {
10755 let good = unrelated_ci_fixture();
10756 let red = vec!["coverage".into()];
10757 assert!(good.unrelated("a", &red));
10758 assert!(!good.unrelated("another-head", &red));
10759 assert!(!good.unrelated("a", &["coverage".into(), "test".into()]));
10760 assert!(!good.unrelated("a", &[]));
10761 for mutation in 0..8 {
10762 let mut bad = good.clone();
10763 match mutation {
10764 0 => bad.checks[0].rerun_exhausted = false,
10765 1 => bad.checks[0].base_failures.clear(),
10766 2 => bad.checks[0].head_failures.clear(),
10767 3 => bad.changed.push("tests/web_render.rs".into()),
10768 4 => bad.changed.push(".github/workflows/ci.yml".into()),
10769 5 => bad.checks[0].base_failures[0].message = "different failure".into(),
10770 6 => bad.checks.push(bad.checks[0].clone()),
10771 _ => bad.base.clear(),
10772 }
10773 assert!(!bad.unrelated("a", &red), "mutation {mutation}");
10774 }
10775 }
10776
10777 #[test]
10778 fn red_unknown_merge_state_waits_before_repair_but_never_implies_merge() {
10779 let pr = seen("a", Checks::Red, "UNKNOWN", false).pr;
10780 assert_eq!(decide(&pr, 0, 2, Duration::ZERO), Step::Wait);
10781 assert!(matches!(decide(&pr, 0, 2, CHECKS_GRACE), Step::Fix { .. }));
10782 assert!(matches!(
10783 decide(&pr, 2, 2, CHECKS_GRACE),
10784 Step::GiveUp { .. }
10785 ));
10786 let optional = CheckInfo {
10787 label: "coverage".into(),
10788 verdict: Verdict::Fail,
10789 required: Some(false),
10790 run: Some("7".into()),
10791 };
10792 assert!(rerunnable_with(std::slice::from_ref(&optional), false).is_empty());
10793 assert_eq!(
10794 rerunnable_with(&[optional], true),
10795 vec![("coverage".into(), Some("7".into()))]
10796 );
10797 }
10798
10799 #[tokio::test]
10800 async fn unrelated_ci_after_a_comment_round_does_not_charge_a_no_commit_stop() {
10801 let mut state = landing_state();
10802 let mut red = coverage_unknown();
10803 red.pr = seen("a", Checks::Red, "BLOCKED", true).pr;
10804 red.pr.failing = vec!["coverage".into()];
10805 let forge = Scripted::new(vec![red], vec![]);
10806 *forge.evidence.lock().unwrap() = Some(unrelated_ci_fixture());
10807 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10808 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10809 assert!(forge.calls().contains(&"fix"));
10810 assert!(state.land_unrelated.is_some());
10811 assert!(state.parked);
10812 assert!(
10813 !state
10814 .events
10815 .iter()
10816 .any(|e| e.message.contains("fixer produced no commit"))
10817 );
10818 }
10819
10820 fn coverage_unknown() -> Seen {
10821 let mut s = red("a", Some("7"));
10822 s.pr.blocking = Blocking::Unsaid;
10823 s.merge_state = "UNKNOWN".into();
10824 s.pr.failing = vec!["coverage".into()];
10825 s.contexts[0].label = "coverage".into();
10826 s.contexts[0].required = Some(false);
10827 s
10828 }
10829
10830 #[tokio::test]
10831 async fn run_196c_unknown_then_unstable_does_not_spend_a_fix_round() {
10832 let mut state = landing_state();
10833 let unknown = coverage_unknown();
10834 let mut unstable = unknown.clone();
10835 unstable.pr.blocking = Blocking::of("UNSTABLE");
10836 unstable.merge_state = "UNSTABLE".into();
10837 let forge = Scripted::new(vec![unknown, unstable], vec![(true, "")]);
10838 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10839 assert!(!forge.calls().contains(&"fix"));
10840 assert!(!forge.calls().contains(&"rerun"));
10841 assert_eq!(state.status, RunStatus::Merged);
10842 assert_eq!(state.pr.unwrap().round, 0);
10843 }
10844
10845 #[tokio::test]
10846 async fn run_196c_persistent_unknown_reruns_optional_once_then_parks_with_evidence() {
10847 let mut state = landing_state();
10848 let forge = Scripted::new(vec![coverage_unknown()], vec![]);
10849 *forge.evidence.lock().unwrap() = Some(unrelated_ci_fixture());
10850 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10851 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10852 assert!(!forge.calls().contains(&"fix"));
10853 assert!(state.parked);
10854 assert_eq!(state.status, RunStatus::Landing);
10855 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10856 let hold = state.land_unrelated.as_ref().unwrap();
10857 let q = ask::Questions::open().get(&hold.question).unwrap();
10858 assert!(
10859 q.actions
10860 .values()
10861 .any(|a| matches!(a, ask::ChoiceAction::Resume { .. }))
10862 );
10863 assert!(
10864 state
10865 .events
10866 .iter()
10867 .any(|e| e.message.contains("[ci-unrelated]") && e.message.contains("base-sha"))
10868 );
10869 let first = state.land_unsaid.clone();
10870 state.parked = false;
10872 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10873 assert_eq!(state.land_unsaid, first);
10874 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10875 }
10876
10877 fn red(head: &str, run: Option<&str>) -> Seen {
10878 let mut s = seen(head, Checks::Red, "BLOCKED", false);
10879 s.pr.failing = vec!["test (macos)".to_owned()];
10880 s.contexts = vec![CheckInfo {
10881 label: "test (macos)".to_owned(),
10882 verdict: Verdict::Fail,
10883 required: Some(true),
10884 run: run.map(str::to_owned),
10885 }];
10886 s
10887 }
10888
10889 const RERUN_PR: &str = "https://github.com/o/r/pull/42";
10890
10891 #[tokio::test]
10892 async fn a_flaky_red_check_is_rerun_without_a_fix_round_and_then_merges() {
10893 let mut state = landing_state();
10894 let forge = Scripted::new(
10895 vec![
10896 red("a", Some("7")),
10897 seen("a", Checks::Pending, "BLOCKED", false),
10898 seen("a", Checks::Green, "CLEAN", false),
10899 ],
10900 vec![(true, "")],
10901 );
10902 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10903 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10904 assert!(!forge.calls().contains(&"fix"));
10905 assert_eq!(state.status, RunStatus::Merged);
10906 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10907 let argvs = forge.argvs();
10908 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("a"));
10909 assert!(
10910 state
10911 .events
10912 .iter()
10913 .any(|e| e.message.contains("test (macos)") && e.message.contains("run 7"))
10914 );
10915 }
10916
10917 #[tokio::test]
10918 async fn still_red_after_the_grace_goes_to_the_fixer_and_a_run_is_not_rerun_twice() {
10919 let mut state = landing_state();
10920 let forge = Scripted::new(
10921 vec![
10922 red("a", Some("7")),
10923 seen("a", Checks::Green, "CLEAN", false),
10924 ],
10925 vec![(true, "")],
10926 );
10927 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10928 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10930 assert_eq!(forge.reruns.lock().unwrap().len(), 1);
10931 let calls = forge.calls();
10932 let rerun_at = calls.iter().position(|c| *c == "rerun").unwrap();
10933 let fix_at = calls.iter().position(|c| *c == "fix");
10934 assert!(fix_at.is_none_or(|f| f > rerun_at));
10935 }
10936
10937 #[tokio::test]
10938 async fn a_failed_run_is_rerun_while_another_run_is_still_pending() {
10939 let mut state = landing_state();
10940 let mut v = red("a", Some("7"));
10941 v.pr.checks = Checks::Pending;
10942 v.contexts.push(CheckInfo {
10943 label: "slow".to_owned(),
10944 verdict: Verdict::Pending,
10945 required: Some(true),
10946 run: Some("8".to_owned()),
10947 });
10948 let forge = Scripted::new(
10949 vec![v, seen("a", Checks::Green, "CLEAN", false)],
10950 vec![(true, "")],
10951 );
10952 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10953 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10954 assert_eq!(state.status, RunStatus::Merged);
10955 }
10956
10957 #[test]
10958 fn a_run_with_a_job_still_going_is_not_rerun_yet() {
10959 let mut v = red("a", Some("7"));
10960 v.contexts.push(CheckInfo {
10961 label: "same run, still going".to_owned(),
10962 verdict: Verdict::Pending,
10963 required: Some(true),
10964 run: Some("7".to_owned()),
10965 });
10966 assert!(rerunnable(&v.contexts).is_empty());
10967 }
10968
10969 #[tokio::test]
10970 async fn the_rerun_is_made_even_when_the_fix_budget_is_spent() {
10971 let mut state = landing_state();
10972 state.config.graph.land_rounds = 0;
10973 let forge = Scripted::new(
10974 vec![
10975 red("a", Some("7")),
10976 seen("a", Checks::Green, "CLEAN", false),
10977 ],
10978 vec![(true, "")],
10979 );
10980 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10981 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10982 assert_eq!(state.status, RunStatus::Merged);
10983 assert!(!forge.calls().contains(&"fix"));
10984 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10985 }
10986
10987 #[tokio::test]
10988 async fn a_deferred_landing_fix_keeps_its_round_for_resume() {
10989 let mut state = landing_state();
10990 state.config.graph.land_rounds = 1;
10991 let forge = Scripted::new(vec![seen("a", Checks::Green, "CLEAN", true)], vec![]);
10992 *forge.fix.lock().unwrap() = Some(Fixed::Deferred);
10993 let pr = land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10994 assert_eq!(pr.state, PrLifecycle::Open);
10995 assert_eq!(state.status, RunStatus::Blocked);
10996 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10997 assert!(
10998 state.merge_decision.is_none(),
10999 "no ordinary failure handoff"
11000 );
11001 assert!(forge.argvs().is_empty(), "no merge on outage");
11002
11003 let recovered = Scripted::new(
11004 vec![
11005 seen("a", Checks::Green, "CLEAN", true),
11006 seen("b", Checks::Green, "CLEAN", false),
11007 ],
11008 vec![(true, "")],
11009 );
11010 *recovered.fix.lock().unwrap() = Some(Fixed::Committed { head: "b".into() });
11011 land_with(&mut state, RERUN_PR, &recovered).await.unwrap();
11012 assert_eq!(state.status, RunStatus::Merged);
11013 assert_eq!(state.pr.as_ref().unwrap().round, 1);
11014 assert_eq!(recovered.calls().iter().filter(|c| **c == "fix").count(), 1);
11015 }
11016
11017 #[tokio::test]
11018 async fn the_last_fix_rounds_new_head_gets_its_rerun() {
11019 let mut state = landing_state();
11020 state.config.graph.land_rounds = 1;
11021 let forge = Scripted::new(
11022 vec![
11023 seen("a", Checks::Green, "CLEAN", true),
11024 red("b", Some("7")),
11025 seen("b", Checks::Green, "CLEAN", false),
11026 ],
11027 vec![(true, "")],
11028 );
11029 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
11030 head: "b".to_owned(),
11031 });
11032 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
11033 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
11034 assert_eq!(forge.calls().iter().filter(|c| **c == "fix").count(), 1);
11035 assert_eq!(state.pr.as_ref().unwrap().round, 1);
11036 assert_eq!(state.status, RunStatus::Merged);
11037 assert_eq!(state.land_reruns.as_ref().unwrap().head, "b");
11038 assert_eq!(
11039 value_of(&forge.argvs()[0], "--match-head-commit"),
11040 Some("b")
11041 );
11042 }
11043
11044 #[tokio::test]
11045 async fn a_failed_rerun_call_falls_through_to_the_fix_in_the_same_lap() {
11046 let mut state = landing_state();
11047 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
11048 *forge.rerun_fails.lock().unwrap() = true;
11049 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
11050 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
11051 assert_eq!(forge.reruns.lock().unwrap().len(), 1, "never retried");
11052 assert_eq!(
11053 forge.calls().iter().filter(|c| **c == "fix").count(),
11054 1,
11055 "{:?}",
11056 forge.calls()
11057 );
11058 }
11059
11060 #[tokio::test]
11061 async fn a_saved_rerun_record_stops_a_restart_from_rerunning() {
11062 let mut state = landing_state();
11063 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
11064 state.land_reruns = Some(reran("a", &[("7", *forge.clock.lock().unwrap())]));
11066 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
11067 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
11068 assert!(forge.reruns.lock().unwrap().is_empty());
11069 }
11070
11071 #[tokio::test]
11072 async fn the_switch_off_and_a_missing_run_id_go_straight_to_the_fixer() {
11073 let mut state = landing_state();
11074 state.config.graph.rerun_flaky_checks = false;
11075 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
11076 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
11077 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
11078 assert!(forge.reruns.lock().unwrap().is_empty());
11079 assert!(forge.calls().contains(&"fix"));
11080
11081 let mut state = landing_state();
11082 let forge = Scripted::new(vec![red("a", None)], vec![]);
11083 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
11084 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
11085 assert!(forge.reruns.lock().unwrap().is_empty());
11086 assert!(forge.calls().contains(&"fix"));
11087 }
11088
11089 fn names(xs: &[&str]) -> BTreeSet<String> {
11090 xs.iter().map(|x| (*x).to_owned()).collect()
11091 }
11092
11093 #[test]
11094 fn a_required_check_the_rollup_never_listed_is_named() {
11095 let req = names(&["build"]);
11096 let why = waiting_on("BLOCKED", &[passing("review")], Some(&req));
11097 assert!(why.contains("never reported: build"), "{why}");
11098 assert!(!why.contains("probably waiting for a review"), "{why}");
11099 }
11100
11101 #[test]
11102 fn an_unreadable_required_list_is_not_read_as_a_review_wait() {
11103 let why = waiting_on("BLOCKED", &[passing("review")], None);
11104 assert!(why.contains("could not be read"), "{why}");
11105 assert!(!why.contains("probably waiting for a review"), "{why}");
11106 }
11107
11108 #[test]
11109 fn all_required_reported_keeps_the_review_guess() {
11110 let req = names(&["build"]);
11111 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
11112 assert!(why.contains("probably waiting for a review"), "{why}");
11113 assert!(!why.contains("never reported"), "{why}");
11114 }
11115
11116 #[test]
11117 fn required_names_match_the_rollup_ignoring_case_only() {
11118 let req = names(&["Build"]);
11119 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
11120 assert!(!why.contains("never reported"), "{why}");
11121 }
11122
11123 #[test]
11124 fn required_contexts_are_read_from_protection_and_rulesets() {
11125 let classic = r#"{"contexts":["build"],"checks":[{"context":"lint","app_id":1}]}"#;
11126 assert_eq!(
11127 parse_classic_required(classic),
11128 Some(names(&["build", "lint"]))
11129 );
11130 let rules = r#"[{"type":"pull_request","parameters":{}},
11131 {"type":"required_status_checks","parameters":{"required_status_checks":[{"context":"test"}]}}]"#;
11132 assert_eq!(parse_ruleset_required(rules), Some(names(&["test"])));
11133 assert_eq!(parse_ruleset_required("nope"), None);
11134 assert_eq!(encode_path_segment("release/1.x"), "release%2F1.x");
11135 }
11136
11137 #[test]
11138 fn the_direct_merge_guard_needs_the_approved_head_bound_to_its_checks() {
11139 let shown = BTreeSet::new();
11140 let ok = seen("a", Checks::Green, "CLEAN", false);
11141 let guard = |s: Option<&Seen>| {
11142 direct_merge_is_safe(
11143 s,
11144 "A",
11145 &shown,
11146 0,
11147 4,
11148 Duration::ZERO,
11149 CiExpectation::Expected,
11150 )
11151 };
11152 assert!(guard(Some(&ok)));
11153 assert!(!guard(None));
11154 assert!(!guard(Some(&seen("b", Checks::Green, "CLEAN", false))));
11155 let mut stale = ok.clone();
11156 stale.rollup_head = "old".to_owned();
11157 assert!(!guard(Some(&stale)));
11158 assert!(!guard(Some(&seen("a", Checks::Pending, "BLOCKED", false))));
11159 assert!(!guard(Some(&merged_view("a"))));
11160 }
11161
11162 #[test]
11163 fn the_rollup_node_carries_whether_each_check_is_required() {
11164 let node = node_json("new", "SUCCESS", false)
11165 .replace(r#""name":"ci","#, r#""name":"ci","isRequired":true,"#);
11166 let s = seen_from(&view_json("new"), Some(&node)).unwrap();
11167 assert_eq!(s.contexts.len(), 1);
11168 assert_eq!(s.contexts[0].required, Some(true));
11169 let s = seen_from(&view_json("new"), Some(&node_json("new", "SUCCESS", false))).unwrap();
11170 assert_eq!(s.contexts[0].required, None);
11171 }
11172
11173 #[tokio::test]
11174 async fn a_resume_that_cannot_disable_a_recorded_arm_stops_and_keeps_the_record() {
11175 let mut state = landing_state();
11176 state.land_armed_head = Some("a".to_owned());
11177 let forge = Scripted::new(
11178 vec![seen("a", Checks::Green, "CLEAN", true)],
11179 vec![(false, "disable exploded")],
11180 );
11181 land_with(&mut state, URL, &forge).await.unwrap();
11182 assert!(!forge.calls().contains(&"fix"));
11183 assert_eq!(state.status, RunStatus::Blocked);
11184 assert_eq!(state.land_armed_head.as_deref(), Some("a"));
11185 let why = state.merge.as_ref().unwrap().detail.clone();
11186 assert!(why.contains("disable exploded"), "{why}");
11187 }
11188}