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() {
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 && (a.head.eq_ignore_ascii_case(head)
1757 || q.resolution()
1758 .as_deref()
1759 .is_some_and(crate::merge_decision::stops))
1760 })
1761 });
1762 let reusable = match reusable {
1763 Some(q) if merge_consent_superseded(state, &q)? => None,
1764 other => other,
1765 };
1766 if reusable.is_none() {
1767 for stale in store
1768 .list()
1769 .into_iter()
1770 .filter(|q| q.run == state.id && q.node == APPROVAL_NODE && q.status.open())
1771 {
1772 let why =
1773 "the pull request head or operator decision changed; asked again for approval";
1774 if let Err(e) = store.update(&stale.id, |q| {
1775 q.abandon(why);
1776 Ok(())
1777 }) {
1778 tracing::warn!("could not retire the superseded approval question: {e:#}");
1779 }
1780 }
1781 }
1782
1783 let q = match reusable {
1784 Some(mut q) => {
1785 if upgrade_repair_choice(&mut q, state) {
1786 q = store
1787 .update(&q.id, |current| {
1788 upgrade_repair_choice(current, state);
1789 Ok(())
1790 })?
1791 .0;
1792 }
1793 q
1794 }
1795 None => {
1796 let worktree = match state.winner() {
1797 Some(w) => w.worktree.clone(),
1798 None => state.repo.clone(),
1799 };
1800 let head = if head.is_empty() {
1803 state
1804 .winner()
1805 .map_or_else(|| "HEAD".to_owned(), |w| w.branch.clone())
1806 } else {
1807 head.to_owned()
1808 };
1809 let remote = &state.config.merge.remote;
1812 let tracking = format!("{remote}/{}", state.base_branch);
1813 let base = if git::rev_exists(&worktree, &tracking).await {
1814 tracking
1815 } else {
1816 String::new()
1817 };
1818 let range = format!("{base}...{head}");
1819 let numstat = if base.is_empty() {
1823 String::new()
1824 } else {
1825 git::git_raw(&worktree, &["diff", "--numstat", "-M", &range])
1826 .await
1827 .map(|o| o.stdout)
1828 .unwrap_or_default()
1829 };
1830 let diff = if base.is_empty() {
1831 String::new()
1832 } else {
1833 git::diff(&worktree, &base, &head).await.unwrap_or_default()
1834 };
1835 let commits: Vec<String> = if base.is_empty() {
1836 Vec::new()
1837 } else {
1838 git::git_raw(
1839 &worktree,
1840 &[
1841 "log",
1842 "--reverse",
1843 "--format=%s",
1844 &format!("{base}..{head}"),
1845 ],
1846 )
1847 .await
1848 .map(|o| o.stdout)
1849 .unwrap_or_default()
1850 .lines()
1851 .filter(|l| !l.trim().is_empty())
1852 .map(str::to_owned)
1853 .collect()
1854 };
1855
1856 let w = words(&state.config.graph.language);
1857 let html = approval_panel(state, pr, &numstat, &diff, &commits, subject);
1858 let mut fresh = ask::Question::new(
1859 state.id.clone(),
1860 APPROVAL_NODE.to_owned(),
1861 "land".to_owned(),
1862 w.approval_summary(pr.number, subject),
1863 format!(
1864 "{}\n\n{}",
1865 approval_evidence(state),
1866 w.approval_detail(&pr.url, &state.base_branch, subject, contested)
1867 ),
1868 approval_choices(state),
1869 );
1870 fresh.merge_target = Some(crate::merge_decision::Target {
1871 pr: pr.url.clone(),
1872 head: head.clone(),
1873 language: state.config.graph.language.clone(),
1874 });
1875 if fresh.choices.iter().any(|c| c == REPAIR) {
1876 fresh.actions.insert(
1877 REPAIR.to_owned(),
1878 ask::ChoiceAction::Resume {
1879 run: state.id.clone(),
1880 },
1881 );
1882 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.");
1883 }
1884 for choice in fresh.choices.clone() {
1885 if crate::merge_decision::stops(&choice)
1886 && choice != HOLD
1887 && choice != crate::merge_decision::DISMISS
1888 {
1889 fresh.actions.insert(
1890 choice,
1891 ask::ChoiceAction::Resume {
1892 run: state.id.clone(),
1893 },
1894 );
1895 }
1896 }
1897 store
1898 .put_panel(&mut fresh, &html, &[])
1899 .context("write the merge approval panel")?;
1900 store
1901 .put_executable(&mut fresh)
1902 .context("file the merge approval question")?;
1903 state.land_approval = Some(LandApproval {
1904 question: fresh.id.clone(),
1905 head: head.clone(),
1906 });
1907 state.event(
1908 "land",
1909 format!("asking for merge approval ({})", fresh.short()),
1910 );
1911 state.save()?;
1912 if let Err(e) = ask::notify(&state.config.notify, &fresh).await {
1913 tracing::warn!(
1917 "could not notify about merge approval question {}: {e:#} - \
1918 the web UI is the only surface for it now",
1919 fresh.short()
1920 );
1921 }
1922 fresh
1923 }
1924 };
1925
1926 Ok(match q.status {
1927 ask::QuestionStatus::Open => ApprovalGate::Pending,
1928 ask::QuestionStatus::Abandoned => ApprovalGate::Held,
1932 ask::QuestionStatus::Answered => match approval(q.resolution().as_deref()) {
1936 Approval::Merge => ApprovalGate::Approved,
1937 Approval::Repair if !state.reviews.is_empty() => {
1938 if !state.merge_repairs.iter().any(|r| r.question == q.id) {
1939 state.merge_repairs.push(crate::run::MergeRepair {
1940 question: q.id.clone(),
1941 head: head.to_owned(),
1942 pr: pr.url.clone(),
1943 reviews: state.reviews.clone(),
1944 gate: state.gate.clone(),
1945 gate_head: state.gate_head.clone(),
1946 gate_fixes: state.gate_fixes.clone(),
1947 pre_gate: state.pre_gate.clone(),
1948 phase: crate::run::MergeRepairPhase::Requested,
1949 failure: None,
1950 });
1951 state.land_approval = None;
1952 state.event(
1953 "repair",
1954 "owner requested fix findings and re-review; merge is not approved",
1955 );
1956 state.save()?;
1957 }
1958 ApprovalGate::Repair
1959 }
1960 Approval::Repair | Approval::Hold => ApprovalGate::Held,
1961 },
1962 })
1963}
1964
1965fn rollup_verdict(rollup: &[GhCheck]) -> (Checks, Vec<String>) {
1968 let mut failing = Vec::new();
1969 let mut pending = false;
1970 let mut unknown = false;
1971 for check in rollup {
1972 match check.verdict() {
1973 Verdict::Pass => {}
1974 Verdict::Pending => pending = true,
1975 Verdict::Fail => failing.push(check.label()),
1976 Verdict::Unknown => unknown = true,
1977 }
1978 }
1979 let checks = if rollup.is_empty() {
1980 Checks::Unknown
1981 } else if pending {
1982 Checks::Pending
1983 } else if !failing.is_empty() {
1984 Checks::Red
1985 } else if unknown {
1986 Checks::Unknown
1987 } else {
1988 Checks::Green
1989 };
1990 (checks, failing)
1991}
1992
1993pub fn parse_pr(json: &str) -> Result<PrState> {
1996 let raw: GhPr = serde_json::from_str(json).context("parse `gh pr view --json ...` output")?;
1997 let state = match raw.state.to_ascii_uppercase().as_str() {
1998 "OPEN" => PrLifecycle::Open,
1999 "MERGED" => PrLifecycle::Merged,
2000 "CLOSED" => PrLifecycle::Closed,
2001 other => bail!("unknown pull request state `{other}`"),
2002 };
2003
2004 let (checks, failing) = rollup_verdict(&raw.status_check_rollup);
2005
2006 let mut review_comments = Vec::new();
2007 for r in raw.reviews {
2008 push_if_outstanding(
2009 &mut review_comments,
2010 ReviewComment {
2011 author: r.author.login,
2012 path: None,
2013 line: None,
2014 body: r.body,
2015 },
2016 );
2017 }
2018 for c in raw.comments {
2019 push_if_outstanding(
2020 &mut review_comments,
2021 ReviewComment {
2022 author: c.author.login,
2023 path: None,
2024 line: None,
2025 body: c.body,
2026 },
2027 );
2028 }
2029
2030 Ok(PrState {
2031 url: raw.url,
2032 number: raw.number,
2033 state,
2034 checks,
2035 failing,
2036 review_comments,
2037 blocking: Blocking::of(&raw.merge_state_status),
2038 })
2039}
2040
2041#[derive(Debug, Clone, PartialEq, Eq)]
2043pub(crate) struct CheckView {
2044 pub name: String,
2045 pub verdict: Verdict,
2046 pub run: Option<String>,
2048 pub url: Option<String>,
2049}
2050
2051#[derive(Debug, Clone, PartialEq, Eq)]
2055pub(crate) struct RollupView {
2056 pub url: String,
2057 pub number: u64,
2058 pub state: PrLifecycle,
2059 pub head: String,
2060 pub checks: Vec<CheckView>,
2061}
2062
2063pub(crate) fn parse_rollup(json: &str) -> Result<RollupView> {
2066 let raw: GhPr = serde_json::from_str(json).context("parse `gh pr view --json ...` output")?;
2067 let state = match raw.state.to_ascii_uppercase().as_str() {
2068 "OPEN" => PrLifecycle::Open,
2069 "MERGED" => PrLifecycle::Merged,
2070 "CLOSED" => PrLifecycle::Closed,
2071 other => bail!("unknown pull request state `{other}`"),
2072 };
2073 let checks = raw
2074 .status_check_rollup
2075 .iter()
2076 .map(|c| CheckView {
2077 name: c.label(),
2078 verdict: c.verdict(),
2079 run: c.url().and_then(run_of),
2080 url: c.url().map(str::to_owned),
2081 })
2082 .collect();
2083 Ok(RollupView {
2084 url: raw.url,
2085 number: raw.number,
2086 state,
2087 head: raw.head_ref_oid,
2088 checks,
2089 })
2090}
2091
2092pub async fn lifecycle(repo: &Path, pr_url: &str) -> Result<PrLifecycle> {
2102 let view = gh(
2103 repo,
2104 &[
2105 "pr".to_owned(),
2106 "view".to_owned(),
2107 pr_url.to_owned(),
2108 "--json".to_owned(),
2109 "state".to_owned(),
2110 ],
2111 )
2112 .await?;
2113 if !view.0 {
2114 bail!("gh pr view {pr_url}: {}", view.1);
2115 }
2116 Ok(parse_pr(&view.1)?.state)
2120}
2121
2122#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
2126pub struct ExternalMerge {
2127 pub url: String,
2129 pub number: u64,
2131}
2132
2133#[derive(Debug, Deserialize)]
2134#[serde(rename_all = "camelCase")]
2135struct GhMergedPr {
2136 url: String,
2137 number: u64,
2138 merged_at: String,
2139 base_ref_name: String,
2140}
2141
2142fn pick_merged_pr(
2156 json: &str,
2157 base_branch: &str,
2158 created_at: Timestamp,
2159) -> Result<Option<ExternalMerge>> {
2160 let raw: Vec<GhMergedPr> =
2161 serde_json::from_str(json).context("parse `gh pr list ... --json ...` output")?;
2162 let mut matches: Vec<ExternalMerge> = Vec::new();
2163 for pr in raw {
2164 if pr.base_ref_name != base_branch {
2165 continue;
2166 }
2167 let Ok(merged_at) = pr.merged_at.parse::<Timestamp>() else {
2168 continue;
2169 };
2170 if merged_at < created_at {
2171 continue;
2172 }
2173 matches.push(ExternalMerge {
2174 url: pr.url,
2175 number: pr.number,
2176 });
2177 }
2178 if matches.len() == 1 {
2179 Ok(matches.pop())
2180 } else {
2181 Ok(None)
2182 }
2183}
2184
2185#[derive(Debug, Clone, PartialEq, Eq)]
2187pub enum OpenPr {
2188 None,
2190 One {
2192 url: String,
2194 title: String,
2196 },
2197 Many(Vec<String>),
2199}
2200
2201#[derive(Debug, Deserialize)]
2202#[serde(rename_all = "camelCase")]
2203struct GhOpenPr {
2204 url: String,
2208 #[serde(default)]
2209 title: String,
2210 base_ref_name: String,
2211 #[serde(default)]
2214 is_cross_repository: bool,
2215}
2216
2217pub fn pick_open_pr(json: &str, base: &str) -> Result<OpenPr> {
2223 let raw: Vec<GhOpenPr> =
2224 serde_json::from_str(json).context("parse `gh pr list ... --json ...` output")?;
2225 let mut hits: Vec<GhOpenPr> = raw
2226 .into_iter()
2227 .filter(|p| p.base_ref_name == base && !p.is_cross_repository)
2228 .collect();
2229 Ok(match hits.len() {
2230 0 => OpenPr::None,
2231 1 => {
2232 let p = hits.remove(0);
2233 OpenPr::One {
2234 url: p.url,
2235 title: p.title,
2236 }
2237 }
2238 _ => OpenPr::Many(hits.into_iter().map(|p| p.url).collect()),
2239 })
2240}
2241
2242pub async fn find_open_pr(repo: &Path, branch: &str, base: &str) -> Result<OpenPr> {
2246 let (ok, out) = gh(
2247 repo,
2248 &[
2249 "pr".to_owned(),
2250 "list".to_owned(),
2251 "--head".to_owned(),
2252 branch.to_owned(),
2253 "--base".to_owned(),
2254 base.to_owned(),
2255 "--state".to_owned(),
2256 "open".to_owned(),
2257 "--json".to_owned(),
2258 "number,url,title,baseRefName,isCrossRepository".to_owned(),
2259 ],
2260 )
2261 .await?;
2262 if !ok {
2263 bail!("gh pr list failed: {out}");
2264 }
2265 pick_open_pr(&out, base)
2266}
2267
2268#[derive(Debug, Deserialize)]
2269#[serde(rename_all = "camelCase")]
2270struct GhPrHead {
2271 head_ref_name: String,
2272 base_ref_name: String,
2273 state: String,
2274 is_cross_repository: bool,
2277 head_ref_oid: String,
2280}
2281
2282#[derive(Debug, Clone, PartialEq, Eq)]
2284pub struct Refusal {
2285 pub retry: bool,
2288 pub why: String,
2290}
2291
2292impl Refusal {
2293 fn final_(why: String) -> Self {
2294 Self { retry: false, why }
2295 }
2296}
2297
2298pub fn closable(
2307 json: &str,
2308 branch: &str,
2309 base: &str,
2310 verified: &[String],
2311) -> std::result::Result<(), Refusal> {
2312 let pr: GhPrHead = serde_json::from_str(json).map_err(|e| Refusal {
2313 retry: true,
2314 why: format!("could not read the pull request ({e})"),
2315 })?;
2316 if pr.head_ref_name != branch {
2317 return Err(Refusal::final_(format!(
2318 "its head is `{}`, not this run's `{branch}`",
2319 pr.head_ref_name
2320 )));
2321 }
2322 if pr.is_cross_repository {
2323 return Err(Refusal::final_("its head lives in a fork".to_owned()));
2324 }
2325 if pr.base_ref_name != base {
2326 return Err(Refusal::final_(format!(
2327 "it targets `{}`, not `{base}`",
2328 pr.base_ref_name
2329 )));
2330 }
2331 if !pr.state.eq_ignore_ascii_case("open") {
2332 return Err(Refusal::final_(format!(
2333 "it is already {}",
2334 pr.state.to_ascii_lowercase()
2335 )));
2336 }
2337 if !verified.contains(&pr.head_ref_oid) {
2341 return Err(Refusal {
2342 retry: true,
2343 why: format!(
2344 "its head {} is not a commit this run checked against the base",
2345 crate::already::short_sha(&pr.head_ref_oid)
2346 ),
2347 });
2348 }
2349 Ok(())
2350}
2351
2352async fn remote_is_forge(repo: &Path, remote: &str) -> bool {
2357 let Ok(url) = git::git(repo, &["remote", "get-url", remote]).await else {
2358 return false;
2359 };
2360 is_forge_url(url.trim())
2361}
2362
2363fn is_forge_url(url: &str) -> bool {
2364 url.contains("://") && !url.starts_with("file://")
2365 || url
2366 .split_once(':')
2367 .is_some_and(|(host, _)| host.contains('@') && !host.contains(['/', '\\']))
2368}
2369
2370fn forge_unavailable(message: &str) -> bool {
2373 message.contains("known GitHub host") || message.contains("spawn gh")
2374}
2375
2376pub fn superseded_comment(base: &str, evidence: &crate::already::Evidence) -> String {
2379 let how = match evidence.proof {
2380 crate::already::Proof::PatchId => format!(
2381 "carried by commit {} on `{base}` with the same patch",
2382 evidence.names()
2383 ),
2384 crate::already::Proof::Ancestry => {
2385 format!("already in the history of `{base}` as {}", evidence.names())
2386 }
2387 crate::already::Proof::Tree => format!(
2388 "already part of `{base}` (merging this branch changes nothing at {})",
2389 crate::already::short_sha(&evidence.tip)
2390 ),
2391 };
2392 format!(
2393 "Closing: everything this branch adds is {how}, so there is nothing left to \
2394 land. This pull request was closed automatically after that was verified; \
2395 reopen it if you disagree."
2396 )
2397}
2398
2399pub async fn close_superseded_pr(
2411 state: &mut RunState,
2412 branch: &str,
2413 evidence: &crate::already::Evidence,
2414 verified: &[String],
2415) -> Result<std::result::Result<String, String>> {
2416 let repo = state.repo.clone();
2417 let base = state.base_branch.clone();
2418 let url = match state.pr.as_ref().filter(|p| p.state == "open") {
2419 Some(p) => p.url.clone(),
2420 None if !remote_is_forge(&repo, &state.config.merge.remote).await => {
2425 return Ok(Err(
2426 "the remote is not a forge, so there is no pull request".to_owned(),
2427 ));
2428 }
2429 None => match find_open_pr(&repo, branch, &base).await {
2430 Err(e) if forge_unavailable(&format!("{e:#}")) => {
2431 return Ok(Err(format!("no forge to ask: {e:#}")));
2432 }
2433 Err(e) => return Err(e),
2434 Ok(OpenPr::One { url, .. }) => url,
2435 Ok(OpenPr::None) => return Ok(Err("no open pull request".to_owned())),
2436 Ok(OpenPr::Many(urls)) => {
2437 return Ok(Err(format!(
2438 "{} open pull requests name it; not choosing between them",
2439 urls.len()
2440 )));
2441 }
2442 },
2443 };
2444 let (ok, view) = gh(
2445 &repo,
2446 &[
2447 "pr".to_owned(),
2448 "view".to_owned(),
2449 url.clone(),
2450 "--json".to_owned(),
2451 "headRefName,headRefOid,baseRefName,state,isCrossRepository".to_owned(),
2452 ],
2453 )
2454 .await?;
2455 if !ok {
2456 bail!("gh pr view {url} failed: {view}");
2457 }
2458 if let Err(refusal) = closable(&view, branch, &base, verified) {
2459 if refusal.retry {
2462 bail!("left {url} open: {}", refusal.why);
2463 }
2464 return Ok(Err(format!("left {url} open: {}", refusal.why)));
2465 }
2466 let (ok, out) = gh(
2467 &repo,
2468 &[
2469 "pr".to_owned(),
2470 "close".to_owned(),
2471 url.clone(),
2472 "--comment".to_owned(),
2473 superseded_comment(&base, evidence),
2474 ],
2475 )
2476 .await?;
2477 if !ok {
2478 bail!("gh pr close {url} failed: {out}");
2479 }
2480 if let Some(p) = state.pr.as_mut().filter(|p| p.url == url) {
2481 p.state = "closed".to_owned();
2482 }
2483 Ok(Ok(url))
2484}
2485
2486pub async fn set_pr_title(state: &mut RunState, repo: &Path, url: &str, title: &str) -> Result<()> {
2490 let (title, _) = crate::github_text::prepare(state, title, "");
2491 edit_pr_title(repo, url, &title).await
2492}
2493
2494pub async fn set_pr_title_verbatim(repo: &Path, url: &str, title: &str) -> Result<()> {
2498 edit_pr_title(repo, url, title).await
2499}
2500
2501pub async fn set_pr_text_verbatim(repo: &Path, url: &str, title: &str, body: &str) -> Result<()> {
2504 let (ok, _) = gh(
2505 repo,
2506 &[
2507 "pr".to_owned(),
2508 "edit".to_owned(),
2509 url.to_owned(),
2510 "--title".to_owned(),
2511 title.to_owned(),
2512 "--body".to_owned(),
2513 body.to_owned(),
2514 ],
2515 )
2516 .await
2517 .map_err(|_| anyhow::anyhow!("could not run gh pr edit for the chosen rewrite"))?;
2518 if !ok {
2519 bail!("gh pr edit failed while posting the chosen rewrite");
2521 }
2522 Ok(())
2523}
2524
2525async fn edit_pr_title(repo: &Path, url: &str, title: &str) -> Result<()> {
2526 let (ok, out) = gh(
2527 repo,
2528 &[
2529 "pr".to_owned(),
2530 "edit".to_owned(),
2531 url.to_owned(),
2532 "--title".to_owned(),
2533 title.to_owned(),
2534 ],
2535 )
2536 .await?;
2537 if !ok {
2538 bail!("gh pr edit failed: {out}");
2539 }
2540 Ok(())
2541}
2542
2543pub async fn find_external_merge(state: &RunState) -> Result<Option<ExternalMerge>> {
2556 let Some(winner) = state.winner() else {
2557 return Ok(None);
2558 };
2559 let branch = state.pr_branch().unwrap_or(&winner.branch).to_owned();
2560 let out = gh(
2561 &state.repo,
2562 &[
2563 "pr".to_owned(),
2564 "list".to_owned(),
2565 "--head".to_owned(),
2566 branch.clone(),
2567 "--state".to_owned(),
2568 "merged".to_owned(),
2569 "--json".to_owned(),
2570 "url,number,mergedAt,baseRefName".to_owned(),
2571 ],
2572 )
2573 .await?;
2574 if !out.0 {
2575 bail!("gh pr list --head {branch}: {}", out.1);
2576 }
2577 pick_merged_pr(&out.1, &state.base_branch, state.created_at)
2578}
2579
2580pub async fn branch_is_ancestor(repo: &Path, branch: &str, base_branch: &str) -> Result<bool> {
2592 let out = tokio::process::Command::new("git")
2593 .args(["merge-base", "--is-ancestor", branch, base_branch])
2594 .current_dir(repo)
2595 .quiet()
2596 .stdin(std::process::Stdio::null())
2597 .output()
2598 .await
2599 .context("spawn git merge-base --is-ancestor")?;
2600 Ok(out.status.success())
2601}
2602
2603fn forge_slug(url: &str) -> Option<(String, &str)> {
2611 let rest = url.rsplit("://").next()?;
2612 let (host, path) = rest.split_once('/')?;
2613 if host.is_empty() {
2614 return None;
2615 }
2616 Some((host.to_ascii_lowercase(), path))
2617}
2618
2619pub(crate) fn slug_of_pr_url(url: &str) -> Option<String> {
2627 let (host, path) = forge_slug(url)?;
2628 let mut segments = path.split('/');
2629 let owner = segments.next()?;
2630 let repo = segments.next()?;
2631 let kind = segments.next()?;
2632 if owner.is_empty() || repo.is_empty() || kind != "pull" {
2633 return None;
2634 }
2635 Some(format!("{host}/{owner}/{repo}"))
2636}
2637
2638fn slug_of_repo_url(url: &str) -> Option<String> {
2642 let (host, path) = forge_slug(url)?;
2643 let mut segments = path.split('/');
2644 let owner = segments.next()?;
2645 let repo = segments.next()?;
2646 if owner.is_empty() || repo.is_empty() {
2647 return None;
2648 }
2649 Some(format!("{host}/{owner}/{repo}"))
2650}
2651
2652pub(crate) fn ensure_same_repo(run_repo_slug: &str, pr_repo_slug: &str) -> Result<()> {
2673 if run_repo_slug.eq_ignore_ascii_case(pr_repo_slug) {
2674 return Ok(());
2675 }
2676 bail!(
2677 "refusing to correct this run: it is recorded against {run_repo_slug}, but the pull \
2678 request URL belongs to {pr_repo_slug} - pass the run id whose repository the URL \
2679 actually belongs to (or, if `origin` is a fork opened against a different upstream, \
2680 verify by hand before treating this as a false positive)"
2681 );
2682}
2683
2684async fn repo_slug(repo: &Path) -> Result<String> {
2695 let out = gh(
2696 repo,
2697 &[
2698 "repo".to_owned(),
2699 "view".to_owned(),
2700 "--json".to_owned(),
2701 "url".to_owned(),
2702 ],
2703 )
2704 .await?;
2705 if !out.0 {
2706 bail!("gh repo view --json url: {}", out.1);
2707 }
2708 #[derive(Debug, Deserialize)]
2709 struct GhRepo {
2710 url: String,
2711 }
2712 let parsed: GhRepo = serde_json::from_str(&out.1)
2713 .with_context(|| format!("parse `gh repo view` output: {}", out.1))?;
2714 slug_of_repo_url(&parsed.url)
2715 .with_context(|| format!("could not parse a host/owner/repo out of {}", parsed.url))
2716}
2717
2718pub async fn correct_manual_merge(
2766 state: &mut RunState,
2767 url: &str,
2768) -> Result<(RunStatus, RunStatus)> {
2769 let Some(pr_slug) = slug_of_pr_url(url) else {
2770 bail!(
2771 "could not parse an owner/repo out of {url}; refusing to guess which repository \
2772 this pull request belongs to"
2773 );
2774 };
2775 let run_slug = repo_slug(&state.repo).await?;
2776 ensure_same_repo(&run_slug, &pr_slug)?;
2777 correct_merge(state, url).await
2778}
2779
2780pub(crate) async fn correct_confirmed_external_merge(
2791 state: &mut RunState,
2792 url: &str,
2793) -> Result<(RunStatus, RunStatus)> {
2794 correct_merge(state, url).await
2795}
2796
2797fn names_same_pr(a: &RunState, url: &str, number: u64, repo: &Path) -> bool {
2799 let Some(pr) = a.pr.as_ref() else {
2800 return false;
2801 };
2802 if !url.is_empty()
2803 && pr
2804 .url
2805 .trim_end_matches('/')
2806 .eq_ignore_ascii_case(url.trim_end_matches('/'))
2807 {
2808 return true;
2809 }
2810 number > 0
2811 && pr.number == number
2812 && match (a.repo.canonicalize(), repo.canonicalize()) {
2813 (Ok(x), Ok(y)) => x == y,
2814 _ => a.repo == repo,
2815 }
2816}
2817
2818fn rewrite_open_prs(
2832 home: &Path,
2833 decide: &mut dyn FnMut(&RunState) -> Option<PrLifecycle>,
2834) -> usize {
2835 let now = Timestamp::now();
2836 let mut changed = 0;
2837 for id in crate::run::list_ids_in(&home.join("runs")) {
2838 let Ok(_owner) = crate::pr_head::owner_lock(home, &id) else {
2839 continue;
2840 };
2841 let path = home.join("runs").join(&id).join("run.json");
2842 let Ok(body) = std::fs::read_to_string(&path) else {
2843 continue;
2844 };
2845 let Ok(mut state) = serde_json::from_str::<RunState>(&body) else {
2846 continue;
2847 };
2848 if !state.status.done()
2849 || state.pr.as_ref().is_none_or(|p| p.state != "open")
2850 || state.liveness_under(home, crate::daemon::is_working_on(home, &id, now))
2851 != crate::run::Liveness::Dead
2852 {
2853 continue;
2854 }
2855 let Some(to @ (PrLifecycle::Merged | PrLifecycle::Closed)) = decide(&state) else {
2856 continue;
2857 };
2858 if let Some(pr) = state.pr.as_mut() {
2859 pr.state = to.as_str().to_owned();
2860 }
2861 let url = state.pr.as_ref().map(|p| p.url.clone()).unwrap_or_default();
2862 state.event(
2863 "land",
2864 format!("recorded {url} as {}: another run settled it", to.as_str()),
2865 );
2866 match state.save_under(home) {
2867 Ok(()) => changed += 1,
2868 Err(e) => tracing::warn!("write pr state through to run {id}: {e:#}"),
2869 }
2870 }
2871 changed
2872}
2873
2874pub(crate) fn write_pr_state_through(run: &RunState, to: PrLifecycle) {
2879 if to == PrLifecycle::Open {
2880 return;
2881 }
2882 let Some(home) = crate::run::try_home() else {
2883 return;
2884 };
2885 write_pr_state_through_in(&home, run, to);
2886}
2887
2888pub(crate) fn write_pr_state_through_in(home: &Path, run: &RunState, to: PrLifecycle) -> usize {
2889 let Some(pr) = run.pr.as_ref() else {
2890 return 0;
2891 };
2892 let (url, number) = (pr.url.clone(), pr.number);
2893 rewrite_open_prs(home, &mut |other| {
2894 (other.id != run.id && names_same_pr(other, &url, number, &run.repo)).then_some(to)
2895 })
2896}
2897
2898pub(crate) fn stale_open_prs(home: &Path) -> Vec<(String, PathBuf, String)> {
2901 let now = Timestamp::now();
2902 let mut out = Vec::new();
2903 for id in crate::run::list_ids_in(&home.join("runs")) {
2904 let path = home.join("runs").join(&id).join("run.json");
2905 let Ok(body) = std::fs::read_to_string(&path) else {
2906 continue;
2907 };
2908 let Ok(state) = serde_json::from_str::<RunState>(&body) else {
2909 continue;
2910 };
2911 if let Some(pr) = state.pr.as_ref()
2912 && state.status.done()
2913 && pr.state == "open"
2914 && !pr.url.is_empty()
2915 && !crate::daemon::is_working_on(home, &id, now)
2916 {
2917 out.push((id, state.repo.clone(), pr.url.clone()));
2918 }
2919 }
2920 out
2921}
2922
2923pub(crate) fn apply_pr_states(home: &Path, known: &BTreeMap<String, PrLifecycle>) -> usize {
2926 rewrite_open_prs(home, &mut |s| {
2927 s.pr.as_ref().and_then(|p| known.get(&p.url)).copied()
2928 })
2929}
2930
2931pub async fn repair_stale_pr_states(home: &Path, max_lookups: usize) -> (usize, usize) {
2938 let mut known = BTreeMap::new();
2939 let mut failed = 0;
2940 let mut seen = BTreeSet::new();
2941 for (_, repo, url) in stale_open_prs(home) {
2942 if known.len() + failed >= max_lookups || !seen.insert(url.clone()) {
2943 continue;
2944 }
2945 match lifecycle(&repo, &url).await {
2946 Ok(state) => {
2947 known.insert(url, state);
2948 }
2949 Err(e) => {
2950 tracing::warn!("repair pr state of {url}: {e:#}");
2951 failed += 1;
2952 }
2953 }
2954 }
2955 (apply_pr_states(home, &known), failed)
2956}
2957
2958async fn correct_merge(state: &mut RunState, url: &str) -> Result<(RunStatus, RunStatus)> {
2959 match lifecycle(&state.repo, url).await? {
2960 PrLifecycle::Merged => {}
2961 other => bail!(
2962 "{url} is {}, not merged; refusing to record {} as merged on a guess",
2963 other.as_str(),
2964 state.id
2965 ),
2966 }
2967 let before = state.status;
2968 if let Err(e) = land(state, url).await {
2969 state.status = RunStatus::Blocked;
2976 state.event("fold", format!("manual-merge correction failed: {e:#}"));
2977 state.save()?;
2978 return Err(e).context(format!("confirming the merge of {url}"));
2979 }
2980 state.event(
2981 "fold",
2982 "operator recorded this pull request as a manual merge; this run never \
2983 re-entered `land`, so `bump::after_merge` did not run for it - a release \
2984 bump this change might warrant has to be filed by hand",
2985 );
2986 if state.status == RunStatus::Merged {
2989 crate::followup::after_merge(state, url).await;
2990 }
2991 state.save()?;
2992 Ok((before, state.status))
2993}
2994
2995pub fn parse_inline_comments(json: &str) -> Result<Vec<ReviewComment>> {
3002 let raw: Vec<GhInline> =
3003 serde_json::from_str(json).context("parse `gh api .../pulls/<n>/comments` output")?;
3004 let mut out = Vec::new();
3005 for c in raw {
3006 push_if_outstanding(
3007 &mut out,
3008 ReviewComment {
3009 author: c.user.login,
3010 path: c.path,
3011 line: c.line,
3012 body: c.body,
3013 },
3014 );
3015 }
3016 Ok(out)
3017}
3018
3019fn push_if_outstanding(out: &mut Vec<ReviewComment>, comment: ReviewComment) {
3025 if comment.body.trim().is_empty() || comment.body.contains(MARKER) {
3026 return;
3027 }
3028 if comment.path.is_none() && is_noise(&comment.body) {
3029 return;
3030 }
3031 out.push(comment);
3032}
3033
3034pub fn is_noise(body: &str) -> bool {
3052 if NOT_A_REVIEW.iter().any(|m| body.contains(m)) {
3053 return true;
3054 }
3055 let mut content = false;
3056 for line in strip_blocks(body).lines() {
3057 let line = unquote(line);
3058 if line.is_empty() || is_checklist(line) || is_decoration(line) || is_banner(line) {
3059 continue;
3060 }
3061 content = true;
3062 break;
3063 }
3064 !content
3065}
3066
3067fn strip_blocks(body: &str) -> String {
3069 let mut out = String::with_capacity(body.len());
3070 let mut rest = body;
3071 loop {
3072 let open = ["<!--", "<details>"]
3073 .iter()
3074 .filter_map(|tag| rest.find(tag).map(|i| (i, *tag)))
3075 .min_by_key(|(i, _)| *i);
3076 let Some((at, tag)) = open else {
3077 out.push_str(rest);
3078 return out;
3079 };
3080 out.push_str(&rest[..at]);
3081 let after = &rest[at + tag.len()..];
3082 let close = if tag == "<!--" { "-->" } else { "</details>" };
3083 match after.find(close) {
3084 Some(end) => rest = &after[end + close.len()..],
3085 None => return out,
3087 }
3088 }
3089}
3090
3091fn unquote(line: &str) -> &str {
3093 let mut s = line.trim();
3094 while let Some(rest) = s.strip_prefix('>') {
3095 s = rest.trim_start();
3096 }
3097 s.trim()
3098}
3099
3100fn is_checklist(line: &str) -> bool {
3102 let rest = line
3103 .strip_prefix("- ")
3104 .or_else(|| line.strip_prefix("* "))
3105 .unwrap_or("");
3106 let rest = rest.trim_start();
3107 matches!(
3108 rest.get(..3),
3109 Some("[ ]") | Some("[x]") | Some("[X]") | Some("[*]")
3110 )
3111}
3112
3113fn is_decoration(line: &str) -> bool {
3115 line.starts_with('#')
3116 || line.starts_with("[!")
3117 || (line.len() >= 3 && line.chars().all(|c| matches!(c, '-' | '=' | '*' | '_')))
3118}
3119
3120fn is_banner(line: &str) -> bool {
3127 let plain = drop_spans(line, "**", "**");
3128 let plain = if plain.contains("](") {
3129 drop_spans(&plain, "[", ")")
3130 } else {
3131 plain
3132 };
3133 !plain.chars().any(char::is_alphanumeric)
3134}
3135
3136fn drop_spans(s: &str, open: &str, close: &str) -> String {
3140 let mut out = String::with_capacity(s.len());
3141 let mut rest = s;
3142 while let Some(at) = rest.find(open) {
3143 out.push_str(&rest[..at]);
3144 let after = &rest[at + open.len()..];
3145 match after.find(close) {
3146 Some(end) => rest = &after[end + close.len()..],
3147 None => return out,
3148 }
3149 }
3150 out.push_str(rest);
3151 out
3152}
3153
3154fn repo_merge_lock(repo: &Path) -> Arc<tokio::sync::Mutex<()>> {
3172 static LOCKS: std::sync::LazyLock<
3173 std::sync::Mutex<BTreeMap<PathBuf, Arc<tokio::sync::Mutex<()>>>>,
3174 > = std::sync::LazyLock::new(|| std::sync::Mutex::new(BTreeMap::new()));
3175 LOCKS
3176 .lock()
3177 .unwrap_or_else(std::sync::PoisonError::into_inner)
3178 .entry(repo.to_path_buf())
3179 .or_insert_with(|| Arc::new(tokio::sync::Mutex::new(())))
3180 .clone()
3181}
3182
3183fn repo_label(repo: &Path, pr_url: &str) -> String {
3186 let parts: Vec<&str> = pr_url.split('/').collect();
3187 if let Some(at) = parts.iter().rposition(|p| *p == "pull")
3188 && at >= 2
3189 && !parts[at - 1].is_empty()
3190 && !parts[at - 2].is_empty()
3191 {
3192 return format!("{}/{}", parts[at - 2], parts[at - 1]);
3193 }
3194 repo.file_name()
3195 .map(|n| n.to_string_lossy().into_owned())
3196 .unwrap_or_default()
3197}
3198
3199fn red_merge_summary(repo_name: &str, pr: &PrState) -> Option<String> {
3203 (pr.checks == Checks::Red).then(|| {
3204 let details = crate::notices::format_list(&pr.failing)
3205 .map(|names| format!(": {names}"))
3206 .unwrap_or_default();
3207 format!(
3208 "Merged {repo_name} PR #{} with red checks{details} ({})",
3209 pr.number, pr.url
3210 )
3211 })
3212}
3213
3214async fn announce_red_merge(state: &mut RunState, pr: &PrState) {
3218 let repo_name = repo_label(&state.repo, &pr.url);
3219 let Some(summary) = red_merge_summary(&repo_name, pr) else {
3220 return;
3221 };
3222 if let Some(rec) = state.pr.as_mut() {
3223 rec.red_at_merge = pr.failing.clone();
3224 }
3225 state.event("land", summary.clone());
3226 crate::notices::raise_with(
3229 crate::notices::merged_red(&state.id, &summary),
3230 &state.config.notify,
3231 );
3232}
3233
3234pub async fn land(state: &mut RunState, pr_url: &str) -> Result<PrState> {
3241 land_with(state, pr_url, &GhForge).await
3242}
3243
3244trait Forge {
3248 async fn close(&self, repo: &Path, pr_url: &str, comment: &str) -> Result<()> {
3249 let (ok, out) = gh(
3250 repo,
3251 &[
3252 "pr".into(),
3253 "close".into(),
3254 pr_url.into(),
3255 "--comment".into(),
3256 comment.into(),
3257 ],
3258 )
3259 .await?;
3260 if !ok {
3261 bail!("PR closure failed: {out}");
3262 }
3263 Ok(())
3264 }
3265 async fn attribution(&self, _state: &RunState, _seen: &Seen) -> Option<CiEvidence> {
3266 None
3267 }
3268 async fn view(&self, repo: &Path, pr_url: &str) -> Result<Seen>;
3269 async fn merge(&self, repo: &Path, argv: &[String]) -> Result<(bool, String)>;
3270 async fn poll(&self);
3271 async fn rerun(&self, repo: &Path, run: &str) -> Result<()>;
3273 fn now(&self) -> i64;
3275 async fn required_contexts(&self, repo: &Path, base: &str) -> Option<BTreeSet<String>>;
3278 #[allow(clippy::too_many_arguments)]
3279 async fn fix(
3280 &self,
3281 state: &mut RunState,
3282 pr: &PrState,
3283 round: usize,
3284 budget: usize,
3285 reason: &str,
3286 logs: &str,
3287 ) -> Result<Fixed>;
3288}
3289
3290struct GhForge;
3291
3292impl Forge for GhForge {
3293 async fn attribution(&self, state: &RunState, seen: &Seen) -> Option<CiEvidence> {
3294 collect_ci_evidence(state, seen).await
3295 }
3296 async fn view(&self, repo: &Path, pr_url: &str) -> Result<Seen> {
3297 observe(repo, pr_url).await
3298 }
3299 async fn merge(&self, repo: &Path, argv: &[String]) -> Result<(bool, String)> {
3300 gh(repo, argv).await
3301 }
3302 async fn poll(&self) {
3303 tokio::time::sleep(POLL).await;
3304 }
3305 async fn rerun(&self, repo: &Path, run: &str) -> Result<()> {
3306 let args = [
3307 "run".to_owned(),
3308 "rerun".to_owned(),
3309 run.to_owned(),
3310 "--failed".to_owned(),
3311 ];
3312 let (ok, out) = gh(repo, &args).await?;
3313 if !ok {
3314 bail!("gh run rerun {run}: {out}");
3315 }
3316 Ok(())
3317 }
3318 fn now(&self) -> i64 {
3319 jiff::Timestamp::now().as_second()
3320 }
3321 async fn required_contexts(&self, repo: &Path, base: &str) -> Option<BTreeSet<String>> {
3322 required_contexts_of(repo, base).await
3323 }
3324 async fn fix(
3325 &self,
3326 state: &mut RunState,
3327 pr: &PrState,
3328 round: usize,
3329 budget: usize,
3330 reason: &str,
3331 logs: &str,
3332 ) -> Result<Fixed> {
3333 fix_round(state, pr, round, budget, reason, logs).await
3334 }
3335}
3336
3337fn encode_path_segment(s: &str) -> String {
3339 let mut out = String::new();
3340 for b in s.bytes() {
3341 if b.is_ascii_alphanumeric() || matches!(b, b'-' | b'_' | b'.' | b'~') {
3342 out.push(b as char);
3343 } else {
3344 let _ = write!(out, "%{b:02X}");
3345 }
3346 }
3347 out
3348}
3349
3350async fn required_contexts_of(repo: &Path, base: &str) -> Option<BTreeSet<String>> {
3355 let enc = encode_path_segment(base);
3356 let mut all = BTreeSet::new();
3357 let classic = gh(
3360 repo,
3361 &[
3362 "api".to_owned(),
3363 format!("repos/{{owner}}/{{repo}}/branches/{enc}/protection/required_status_checks"),
3364 ],
3365 )
3366 .await
3367 .ok()?;
3368 if classic.0 {
3369 all.extend(parse_classic_required(&classic.1)?);
3370 } else if !classic.1.contains("404") {
3371 return None;
3372 }
3373 let rules = gh(
3374 repo,
3375 &[
3376 "api".to_owned(),
3377 format!("repos/{{owner}}/{{repo}}/rules/branches/{enc}"),
3378 ],
3379 )
3380 .await
3381 .ok()?;
3382 if !rules.0 {
3383 return None;
3384 }
3385 all.extend(parse_ruleset_required(&rules.1)?);
3386 Some(all)
3387}
3388
3389fn parse_classic_required(json: &str) -> Option<BTreeSet<String>> {
3392 let v: serde_json::Value = serde_json::from_str(json).ok()?;
3393 let mut out = BTreeSet::new();
3394 for c in v.get("contexts")?.as_array()? {
3395 out.insert(c.as_str()?.to_owned());
3396 }
3397 for c in v
3398 .get("checks")
3399 .and_then(|c| c.as_array())
3400 .into_iter()
3401 .flatten()
3402 {
3403 if let Some(name) = c.get("context").and_then(|n| n.as_str()) {
3404 out.insert(name.to_owned());
3405 }
3406 }
3407 Some(out)
3408}
3409
3410fn parse_ruleset_required(json: &str) -> Option<BTreeSet<String>> {
3412 let v: serde_json::Value = serde_json::from_str(json).ok()?;
3413 let mut out = BTreeSet::new();
3414 for rule in v.as_array()? {
3415 if rule.get("type").and_then(|t| t.as_str()) != Some("required_status_checks") {
3416 continue;
3417 }
3418 let checks = rule
3419 .pointer("/parameters/required_status_checks")?
3420 .as_array()?;
3421 for c in checks {
3422 out.insert(c.get("context")?.as_str()?.to_owned());
3423 }
3424 }
3425 Some(out)
3426}
3427
3428fn awaiting_new_head(awaiting: Option<&str>, observed: &str) -> bool {
3436 awaiting.is_some_and(|want| !observed.eq_ignore_ascii_case(want))
3437}
3438
3439fn bound_head<'a>(
3449 seen_head: &'a str,
3450 rollup_head: &str,
3451 awaiting: Option<&str>,
3452) -> Option<&'a str> {
3453 if seen_head.is_empty()
3454 || awaiting_new_head(awaiting, seen_head)
3455 || !rollup_head.eq_ignore_ascii_case(seen_head)
3456 {
3457 return None;
3458 }
3459 Some(seen_head)
3460}
3461
3462#[derive(Debug, Clone, Copy, PartialEq, Eq)]
3464enum Refused {
3465 Pending,
3467 Recheck,
3471 Final,
3474}
3475
3476fn classify_refusal(
3479 after: Option<&Seen>,
3480 rechecked: bool,
3481 observed_head: &str,
3482 ci: CiExpectation,
3483) -> Refused {
3484 let Some(after) = after else {
3485 return Refused::Pending;
3487 };
3488 if after.pr.state != PrLifecycle::Open {
3489 return Refused::Final;
3490 }
3491 if !after.head.eq_ignore_ascii_case(observed_head) {
3494 return Refused::Pending;
3495 }
3496 if bound_head(&after.head, &after.rollup_head, None).is_none() {
3498 return Refused::Pending;
3499 }
3500 let state = after.merge_state.to_ascii_uppercase();
3501 if (ci == CiExpectation::Expected
3502 && matches!(after.pr.checks, Checks::Pending | Checks::Unknown))
3503 || state.is_empty()
3504 || state == "UNKNOWN"
3505 {
3506 return Refused::Pending;
3507 }
3508 if rechecked {
3509 Refused::Final
3510 } else {
3511 Refused::Recheck
3512 }
3513}
3514
3515async fn disarm<F: Forge>(
3520 forge: &F,
3521 state: &mut RunState,
3522 repo: &Path,
3523 number: u64,
3524) -> std::result::Result<(), String> {
3525 let argv = disable_automerge_argv(number);
3526 let out = {
3527 let merge_lock = repo_merge_lock(repo);
3528 let _merge_slot = merge_lock.lock().await;
3529 forge.merge(repo, &argv).await
3530 };
3531 match out {
3532 Ok((true, _)) => {
3533 state.land_armed_head = None;
3534 state.event("land", "auto-merge disabled");
3535 state.save().map_err(|e| format!("{e:#}"))?;
3536 Ok(())
3537 }
3538 Ok((false, msg)) => Err(msg),
3539 Err(e) => Err(format!("{e:#}")),
3540 }
3541}
3542
3543async fn stop_disarmed<F: Forge>(
3547 forge: &F,
3548 state: &mut RunState,
3549 repo: &Path,
3550 pr: &PrState,
3551 why: &str,
3552) -> Result<()> {
3553 if state.land_armed_head.is_none() {
3554 return stop(state, repo, pr, why).await;
3555 }
3556 match disarm(forge, state, repo, pr.number).await {
3557 Ok(()) => stop(state, repo, pr, why).await,
3558 Err(e) => {
3559 let why = format!("{why} (auto-merge could not be disabled and may still fire: {e})");
3560 stop(state, repo, pr, &why).await
3561 }
3562 }
3563}
3564
3565fn owner_requested_stop(state: &RunState) -> Result<bool> {
3567 let Some(binding) = &state.land_approval else {
3568 return Ok(false);
3569 };
3570 let q = ask::Questions::open().get(&binding.question)?;
3571 Ok(q.run == state.id
3572 && q.node == APPROVAL_NODE
3573 && q.resolution()
3574 .as_deref()
3575 .is_some_and(crate::merge_decision::stops))
3576}
3577
3578async fn owner_stop<F: Forge>(state: &mut RunState, pr: &mut PrState, forge: &F) -> Result<bool> {
3581 use crate::merge_decision as md;
3582 let Some(binding) = &state.land_approval else {
3583 return Ok(false);
3584 };
3585 let q = ask::Questions::open().get(&binding.question)?;
3586 let Some(choice) = q.resolution().filter(|c| md::stops(c)) else {
3587 return Ok(false);
3588 };
3589 if q.run != state.id || q.node != APPROVAL_NODE {
3590 bail!("stop decision names another run");
3591 }
3592 let target = q.merge_target.clone().unwrap_or_else(|| md::Target {
3593 pr: pr.url.clone(),
3594 head: binding.head.clone(),
3595 language: state.config.graph.language.clone(),
3596 });
3597 if target.pr != pr.url {
3598 bail!("stop decision names another PR");
3599 }
3600 if state.merge_decision.is_none() {
3601 state.merge_decision = Some(md::Decision {
3602 question: q.id.clone(),
3603 target,
3604 choice: choice.clone(),
3605 closed: false,
3606 replacement_run: None,
3607 replacement_pr: None,
3608 });
3609 state.save()?;
3610 }
3611 let repo = state.repo.clone();
3612 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
3614 stop(state, &repo, pr, &format!("owner stop requested, but auto-merge could not be disabled: {e}; no repair or replacement started")).await?;
3615 return Ok(true);
3616 }
3617 if choice.eq_ignore_ascii_case(HOLD) {
3618 stop(
3619 state,
3620 &repo,
3621 pr,
3622 "owner held the decision: PR left open; no further repair or merge work",
3623 )
3624 .await?;
3625 return Ok(true);
3626 }
3627 if md::selected_agent(&choice).is_some()
3628 || state
3629 .origin
3630 .as_ref()
3631 .and_then(|o| o.task.as_ref())
3632 .is_some()
3633 {
3634 let owners: Vec<_> = crate::queue::Queue::open()
3635 .list()
3636 .into_iter()
3637 .filter(|task| task.runs.last() == Some(&state.id))
3638 .collect();
3639 let owner = (owners.len() == 1).then(|| &owners[0]);
3640 if !owner.is_some_and(|task| {
3641 task.runs.last() == Some(&state.id)
3642 && (!task
3643 .operator_decided_at
3644 .is_some_and(|at| at > q.answered_at.unwrap_or(q.asked_at))
3645 || task.resumption.as_ref().is_some_and(|release| {
3646 release.question_id.as_deref() == Some(q.id.as_str())
3647 && task.operator_decided_at == Some(release.at)
3648 }))
3649 }) {
3650 stop(state, &repo, pr, "replacement requires the current original queue task owner and an unsuperseded answer; PR left open").await?;
3651 return Ok(true);
3652 }
3653 }
3654 if pr.state == PrLifecycle::Merged {
3655 stop(
3656 state,
3657 &repo,
3658 pr,
3659 "PR already merged; withdrawal/replacement cannot be applied",
3660 )
3661 .await?;
3662 return Ok(true);
3663 }
3664 let comment = format!(
3665 "{MARKER}\nOwner decision on question {}: {}. Previous attempt: `{}`. Original instruction and review history remain in the task record.",
3666 q.id, choice, state.id
3667 );
3668 if pr.state == PrLifecycle::Open {
3669 if let Err(e) = forge.close(&repo, &pr.url, &comment).await {
3670 stop(
3671 state,
3672 &repo,
3673 pr,
3674 &format!(
3675 "owner requested closure but it failed: {e}; task held, no replacement started"
3676 ),
3677 )
3678 .await?;
3679 return Ok(true);
3680 }
3681 }
3682 let confirmed = forge.view(&repo, &pr.url).await?;
3683 if confirmed.pr.state != PrLifecycle::Closed {
3684 stop(
3685 state,
3686 &repo,
3687 pr,
3688 "PR closure was not confirmed; task held, no replacement started",
3689 )
3690 .await?;
3691 return Ok(true);
3692 }
3693 *pr = confirmed.pr;
3694 state.merge_decision.as_mut().unwrap().closed = true;
3695 if let Some(record) = &mut state.pr {
3696 record.state = "closed".into();
3697 }
3698 state.status = RunStatus::Superseded;
3699 state.merge = Some(MergeOutcome {
3700 mode: MergeMode::Pr,
3701 ok: false,
3702 detail: format!("owner decision: {choice}; PR closure confirmed"),
3703 empty: false,
3704 });
3705 state.event(
3706 "land",
3707 format!(
3708 "{} applied: PR closure confirmed; old execution retired",
3709 choice
3710 ),
3711 );
3712 state.save()?;
3713 Ok(true)
3714}
3715
3716fn check_landing_resources(
3718 state: &mut RunState,
3719 node: &str,
3720 outcomes: &[crate::run::CommandOutcome],
3721) -> Result<()> {
3722 if let Some(blocked) = outcomes.iter().find(|outcome| outcome.resource_blocked) {
3723 let detail = format!("{}: {}", blocked.command, blocked.output_tail);
3724 state
3725 .resource_block
3726 .get_or_insert_with(|| crate::run::ResourceBlock {
3727 cause: crate::run::ResourceBlockCause::Other,
3728 node: node.into(),
3729 kind: "shared build cache".into(),
3730 detail: detail.clone(),
3731 at: jiff::Timestamp::now(),
3732 });
3733 state.event("resource", &detail);
3734 state.save()?;
3735 bail!("landing verification could not start: {detail}");
3736 }
3737 Ok(())
3738}
3739
3740async fn publish_landing_head<F: Forge>(
3743 state: &mut RunState,
3744 observed: &str,
3745 pr_url: &str,
3746 forge: &F,
3747) -> Result<String> {
3748 crate::pr_head::ensure_owner(state)?;
3749 let winner = state.winner().cloned().context("landing has no winner")?;
3750 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
3751 let expected = state.pr_pushed_head.as_deref().unwrap_or(observed);
3752 anyhow::ensure!(
3753 observed == expected
3754 || (observed == head
3755 && state.gate_head.as_deref() == Some(&head)
3756 && state.gate_allows_progress()),
3757 "public head moved outside this run; refusing to overwrite it"
3758 );
3759 anyhow::ensure!(
3760 git::is_clean(&winner.worktree).await?,
3761 "landing worktree is dirty"
3762 );
3763 if state.gate_head.as_deref() != Some(&head)
3764 || !state.gate_ran
3765 || !state.gate_commands_allow_progress()
3766 {
3767 state.reconcile_verification_head(&head);
3768 state.gate.clear();
3769 state.gate_head = None;
3770 state.gate_ran = false;
3771 state.pre_gate.clear();
3772 state.pre_gate_commit = None;
3773 state.save()?;
3774 let inherited = crate::repo_lock::WaitPolicy::current();
3775 let wait = crate::repo_lock::WaitPolicy::new(
3776 Duration::from_secs(state.config.graph.timeout_resource_wait),
3777 move || inherited.cancelled(),
3778 );
3779 let mut outcomes = crate::graph::run_landing_gate(state, &winner, &wait).await?;
3780 loop {
3781 if outcomes.iter().any(|outcome| outcome.resource_blocked) {
3782 state.gate = outcomes.clone();
3783 check_landing_resources(state, "gate", &outcomes)?;
3784 }
3785 if outcomes.iter().all(|o| o.ok()) {
3786 break;
3787 }
3788 match Box::pin(crate::graph::repair_landing_gate(state, &winner, &outcomes)).await? {
3789 crate::graph::GateFix::Retry => {
3790 outcomes = crate::graph::run_landing_gate(state, &winner, &wait).await?;
3791 }
3792 crate::graph::GateFix::Stop => break,
3793 crate::graph::GateFix::Defer => {
3794 if let Some(e2e) = &state.gate_repair_e2e {
3798 let outcomes = e2e.outcomes.clone();
3799 check_landing_resources(state, "e2e", &outcomes)?;
3800 }
3801 bail!("landing gate repair deferred");
3802 }
3803 }
3804 }
3805 state.gate = outcomes;
3806 state.gate_ran = true;
3807 state.save()?;
3808 }
3809 let inherited = crate::repo_lock::WaitPolicy::current();
3810 let wait = crate::repo_lock::WaitPolicy::new(
3811 Duration::from_secs(state.config.graph.timeout_resource_wait),
3812 move || inherited.cancelled(),
3813 );
3814 let checked = state
3815 .gate_head
3816 .clone()
3817 .context("landing gate has no checked SHA")?;
3818 anyhow::ensure!(
3819 git::rev_parse(&winner.worktree, "HEAD").await? == checked
3820 && git::is_clean(&winner.worktree).await?,
3821 "landing tree changed after gate"
3822 );
3823 let e2e = crate::graph::check_gate_repair_e2e(state, &winner, &wait).await?;
3824 if matches!(e2e, crate::graph::GateFix::Defer) {
3825 let outcomes = state
3826 .gate_repair_e2e
3827 .as_ref()
3828 .context("deferred landing e2e has no outcomes")?
3829 .outcomes
3830 .clone();
3831 check_landing_resources(state, "e2e", &outcomes)?;
3832 }
3833 anyhow::ensure!(
3834 matches!(e2e, crate::graph::GateFix::Retry),
3835 "post-repair e2e has not passed on the landing head; nothing published"
3836 );
3837 anyhow::ensure!(
3838 git::rev_parse(&winner.worktree, "HEAD").await? == checked
3839 && git::is_clean(&winner.worktree).await?,
3840 "landing tree changed during post-repair e2e"
3841 );
3842 anyhow::ensure!(
3843 crate::graph::verify_current_head(state, &winner, &wait).await?,
3844 "current head e2e has not passed; nothing published"
3845 );
3846 anyhow::ensure!(
3847 state.gate_allows_progress(),
3848 "landing gate failed; nothing published"
3849 );
3850 crate::pr_head::ensure_owner(state)?;
3851 if owner_requested_stop(state)? {
3852 bail!("owner requested stop before publication");
3853 }
3854 let current = forge.view(&state.repo, pr_url).await?;
3855 anyhow::ensure!(
3856 current.pr.state == PrLifecycle::Open,
3857 "PR closed or merged while gating; nothing published"
3858 );
3859 anyhow::ensure!(
3860 current.head == observed || current.head == checked,
3861 "PR head changed while gating; nothing published"
3862 );
3863 anyhow::ensure!(
3864 crate::foreign_checkout::write_back(state, &checked).await?,
3865 "foreign checkout delivery is blocked; see the run events"
3866 );
3867 let public = state.pr_branch().unwrap_or(&winner.branch).to_owned();
3868 let lease = format!("--force-with-lease=refs/heads/{public}:{observed}");
3869 let refspec = format!("{checked}:refs/heads/{public}");
3870 let lock = repo_merge_lock(&state.repo);
3871 let _slot = lock.lock().await;
3872 let pushed = git::git_raw(
3873 &winner.worktree,
3874 &["push", &lease, &state.config.merge.remote, &refspec],
3875 )
3876 .await?;
3877 anyhow::ensure!(
3878 pushed.ok(),
3879 "publishing gated landing head failed: {}",
3880 pushed.stderr
3881 );
3882 state.pr_pushed_head = Some(checked.clone());
3883 state.land_sync_pending = false;
3884 state.save()?;
3885 Ok(checked)
3886}
3887
3888async fn restore_landing_worktree(state: &mut RunState) -> Result<()> {
3891 let winner = state.winner().cloned().context("landing has no winner")?;
3892 let inherited = crate::repo_lock::WaitPolicy::current();
3893 let wait = crate::repo_lock::WaitPolicy::new(
3894 Duration::from_secs(state.config.graph.timeout_resource_wait),
3895 move || inherited.cancelled(),
3896 );
3897 let _coordination = crate::repo_lock::SeatLease::operation_with(
3898 &winner.worktree,
3899 state.config.coordination.as_ref(),
3900 &wait,
3901 )
3902 .await?;
3903 if !git::is_clean(&winner.worktree).await? {
3904 let from = state
3905 .land_rebase_from
3906 .as_deref()
3907 .context("landing worktree is dirty")?;
3908 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
3909 anyhow::ensure!(head != from, "landing worktree is dirty");
3910 for args in [
3911 vec!["diff", "--cached", "--quiet", from],
3912 vec!["diff", "--quiet"],
3913 ] {
3914 anyhow::ensure!(
3915 git::git_raw(&winner.worktree, &args).await?.ok(),
3916 "landing worktree has edits beyond the interrupted rebase"
3917 );
3918 }
3919 let untracked = git::git(&winner.worktree, &["ls-files", "--others", "-z"]).await?;
3923 let tracked = git::git(
3924 &winner.worktree,
3925 &["ls-tree", "-r", "--name-only", "-z", "HEAD"],
3926 )
3927 .await?;
3928 for local in untracked.split('\0').filter(|p| !p.is_empty()) {
3929 anyhow::ensure!(
3930 !tracked.split('\0').filter(|p| !p.is_empty()).any(|path| {
3931 path == local
3932 || path
3933 .strip_prefix(local)
3934 .is_some_and(|rest| rest.starts_with('/'))
3935 || local
3936 .strip_prefix(path)
3937 .is_some_and(|rest| rest.starts_with('/'))
3938 }),
3939 "landing worktree has an untracked or ignored path conflicting with HEAD: {local}"
3940 );
3941 }
3942 git::git(&winner.worktree, &["read-tree", "-m", "-u", "HEAD"]).await?;
3943 }
3944 if let (Some(checkout), Some(from)) = (&state.foreign_checkout, &state.land_rebase_from) {
3945 anyhow::ensure!(
3946 git::is_ancestor(&winner.worktree, &checkout.synced_head, from).await,
3947 "landing synchronization started outside the foreign checkout history"
3948 );
3949 if !git::is_ancestor(&winner.worktree, from, "HEAD").await {
3950 git::git(
3956 &winner.worktree,
3957 &[
3958 "-c",
3959 "core.hooksPath=/dev/null",
3960 "merge",
3961 "--strategy=ours",
3962 "--no-ff",
3963 "--no-autostash",
3964 "--no-edit",
3965 "-m",
3966 "Merge pre-sync history into the repaired landing tree",
3967 from,
3968 ],
3969 )
3970 .await?;
3971 }
3972 }
3973 crate::worktree_setup::prepare(&state.config, &state.repo, &winner.worktree).await?;
3974 state.land_rebase_from = None;
3975 state.save()?;
3976 Ok(())
3977}
3978
3979async fn rebase_landing_worktree(
3980 state: &mut RunState,
3981 onto: &str,
3982) -> Result<crate::rebase::Rebased> {
3983 restore_landing_worktree(state).await?;
3984 let winner = state.winner().cloned().context("landing has no winner")?;
3985 state.land_sync_pending = true;
3986 state.land_rebase_from = Some(git::rev_parse(&winner.worktree, "HEAD").await?);
3987 state.save()?;
3988 let scratch = state.dir().join("rebase");
3989 let result = crate::rebase::rebase_with_fixer(state, &scratch, &winner.branch, onto).await?;
3990 if result == crate::rebase::Rebased::Applied {
3991 restore_landing_worktree(state).await?;
3992 }
3993 Ok(result)
3994}
3995
3996async fn resume_landing_head<F: Forge>(
3999 state: &mut RunState,
4000 observed: &str,
4001 pr_url: &str,
4002 forge: &F,
4003) -> Result<String> {
4004 crate::pr_head::ensure_owner(state)?;
4005 let winner = state.winner().cloned().context("landing has no winner")?;
4006 let local = git::rev_parse(&winner.worktree, "HEAD").await?;
4007 let expected = state
4008 .pr_pushed_head
4009 .as_deref()
4010 .or(state.gate_head.as_deref())
4011 .context("missing public head lease")?;
4012 anyhow::ensure!(
4013 observed == expected
4014 || (observed == local
4015 && ((state.gate_head.as_deref() == Some(&local) && state.gate_allows_progress())
4016 || git::is_ancestor(&winner.worktree, expected, &local).await)),
4017 "public head moved outside this run; refusing to sync"
4018 );
4019 state.pr_pushed_head = Some(observed.to_owned());
4026 state.save()?;
4027 restore_landing_worktree(state).await?;
4028 let remote = state.config.merge.remote.clone();
4029 let base = state.base_branch.clone();
4030 let fetched = git::fetch(&state.repo, &remote, &base).await?;
4031 anyhow::ensure!(
4032 fetched.ok(),
4033 "cannot fetch landing base: {}",
4034 fetched.stderr
4035 );
4036 let onto = format!("{remote}/{base}");
4037 let tip = git::rev_parse(&state.repo, &onto).await?;
4038 if !git::is_ancestor(&state.repo, &tip, &local).await {
4039 match rebase_landing_worktree(state, &onto).await? {
4040 crate::rebase::Rebased::Applied => {}
4041 crate::rebase::Rebased::Stopped(why) => bail!("landing rebase stopped: {why}"),
4042 }
4043 }
4044 publish_landing_head(state, observed, pr_url, forge).await
4045}
4046
4047async fn land_with<F: Forge>(state: &mut RunState, pr_url: &str, forge: &F) -> Result<PrState> {
4048 crate::pr_head::ensure_owner(state)?;
4049 state.land_unrelated = None;
4050 let reopening_hold = crate::merge_decision::resumable_hold(state);
4051 let repo = state.repo.clone();
4052 let budget = state.config.graph.land_rounds;
4053 let mut round = 0usize;
4054 let mut rebases = 0usize;
4057 let ci = state.config.merge.ci.expectation();
4058 if ci == CiExpectation::Absent {
4059 state.event(
4060 "land",
4061 "CI not expected ([merge] ci = \"none\"); check status ignored",
4062 );
4063 }
4064 let mut waited = Duration::ZERO;
4065 let mut shown: BTreeSet<String> = BTreeSet::new();
4070 let mut awaiting_head: Option<String> = state.pr_pushed_head.clone();
4072 let mut rechecked = false;
4074
4075 state.status = RunStatus::Landing;
4083 state.event("land", format!("watching {pr_url}"));
4084 state.save()?;
4085
4086 let mut resumed_armed = state.land_armed_head.is_some();
4090
4091 loop {
4092 let seen = forge.view(&repo, pr_url).await?;
4093 let mut pr = seen.pr.clone();
4094 pr.review_comments.retain(|c| !shown.contains(&c.body));
4095 state.pr = Some(crate::run::PrRecord {
4096 url: pr.url.clone(),
4097 number: pr.number,
4098 state: pr.state.as_str().to_owned(),
4099 checks: pr.checks.as_str().to_owned(),
4100 round,
4101 rounds: budget,
4102 red_at_merge: Vec::new(),
4103 });
4104 state.save()?;
4105
4106 if pr.state == PrLifecycle::Open {
4107 state.observe_branch_owner_holds(&seen.head).await;
4108 state.save()?;
4109 }
4110 crate::pr_head::ensure_owner(state)?;
4111 if reopening_hold {
4112 anyhow::ensure!(
4113 pr.state == PrLifecycle::Open,
4114 "held PR is no longer open; cannot request a fresh decision"
4115 );
4116 disarm(forge, state, &repo, pr.number)
4119 .await
4120 .map_err(anyhow::Error::msg)?;
4121 let previous = state.merge_decision.take();
4122 let binding = state.land_approval.take();
4123 state.config.graph.land_approval = true;
4124 let subject = merge_subject(
4125 crate::graph::landing_title(state, &seen.title),
4126 &crate::graph::landing_subject_source(state),
4127 );
4128 let contested = contested_to_ask(state);
4129 if let Err(error) =
4130 approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head).await
4131 {
4132 state.merge_decision = previous;
4133 state.land_approval = binding;
4134 return Err(error);
4135 }
4136 state.end_pass_parked(crate::run::ParkCause::Question);
4137 state.parked = true;
4138 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()));
4139 state.save()?;
4140 return Ok(pr);
4141 }
4142 if owner_stop(state, &mut pr, forge).await? {
4143 return Ok(pr);
4144 }
4145
4146 if std::mem::take(&mut resumed_armed) && pr.state == PrLifecycle::Open {
4147 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4152 let why = format!(
4153 "a previous pass may have armed auto-merge and it could not be disabled \
4154 on resume: {e}"
4155 );
4156 stop(state, &repo, &pr, &why).await?;
4157 return Ok(pr);
4158 }
4159 }
4160
4161 if pr.state == PrLifecycle::Open
4166 && !seen.head.is_empty()
4167 && state
4168 .land_armed_head
4169 .as_deref()
4170 .is_some_and(|armed| !armed.eq_ignore_ascii_case(&seen.head))
4171 {
4172 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4173 let why = format!(
4174 "the head moved while auto-merge was armed and it could not be disabled: {e}"
4175 );
4176 stop(state, &repo, &pr, &why).await?;
4177 return Ok(pr);
4178 }
4179 }
4180
4181 if state.land_sync_pending && pr.state == PrLifecycle::Open {
4182 if owner_stop(state, &mut pr, forge).await? {
4185 return Ok(pr);
4186 }
4187 let repair_answer = state.land_approval.as_ref().is_some_and(|binding| {
4188 binding.head.eq_ignore_ascii_case(&seen.head)
4189 && ask::Questions::open()
4190 .get(&binding.question)
4191 .is_ok_and(|q| {
4192 q.run == state.id
4193 && q.node == APPROVAL_NODE
4194 && q.status == ask::QuestionStatus::Answered
4195 && matches!(approval(q.resolution().as_deref()), Approval::Repair)
4196 })
4197 });
4198 if repair_answer {
4199 let subject = merge_subject(
4200 crate::graph::landing_title(state, &seen.title),
4201 &crate::graph::landing_subject_source(state),
4202 );
4203 let contested = contested_to_ask(state);
4204 if matches!(
4205 approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head).await?,
4206 ApprovalGate::Repair
4207 ) {
4208 if let Err(why) = disarm(forge, state, &repo, pr.number).await {
4209 state.event("repair", format!("auto-merge could not be disabled: {why}; repair preflight will retry"));
4210 state.save()?;
4211 }
4212 return Ok(pr);
4213 }
4214 }
4215 let synced = resume_landing_head(state, &seen.head, pr_url, forge).await;
4216 if owner_stop(state, &mut pr, forge).await? {
4219 return Ok(pr);
4220 }
4221 let head = synced?;
4222 awaiting_head = Some(head);
4223 waited = Duration::ZERO;
4224 rechecked = false;
4225 continue;
4227 }
4228
4229 if pr.state == PrLifecycle::Open {
4230 if bound_head(&seen.head, &seen.rollup_head, awaiting_head.as_deref()).is_none() {
4231 if waited >= WAIT_CEILING {
4232 let want = awaiting_head.as_deref().unwrap_or_default();
4233 let why = format!(
4234 "the pull request's checks were still not about one readable head after \
4235 {} minutes (expected {}, pull request points at {}, checks are for {}); \
4236 someone may have pushed over it",
4237 WAIT_CEILING.as_secs() / 60,
4238 if want.is_empty() { "any" } else { want },
4239 if seen.head.is_empty() {
4240 "nothing readable"
4241 } else {
4242 &seen.head
4243 },
4244 if seen.rollup_head.is_empty() {
4245 "nothing readable"
4246 } else {
4247 &seen.rollup_head
4248 },
4249 );
4250 stop_disarmed(forge, state, &repo, &pr, &why).await?;
4251 return Ok(pr);
4252 }
4253 waited += POLL;
4254 forge.poll().await;
4255 continue;
4256 }
4257 if awaiting_head.take().is_some() {
4260 waited = Duration::ZERO;
4263 }
4264 }
4265
4266 let decision_wait = if pr.checks == Checks::Red && pr.blocking == Blocking::Unsaid {
4269 let first = state
4270 .land_unsaid
4271 .get_or_insert_with(|| (seen.head.clone(), forge.now()));
4272 if !first.0.eq_ignore_ascii_case(&seen.head) {
4273 *first = (seen.head.clone(), forge.now());
4274 }
4275 let elapsed = Duration::from_secs(forge.now().saturating_sub(first.1).max(0) as u64);
4276 state.save()?;
4277 elapsed
4278 } else {
4279 waited
4280 };
4281 let proposed = decide_with(&pr, round, budget, decision_wait, ci);
4282 if pr.checks == Checks::Red && pr.blocking == Blocking::Unsaid && proposed == Step::Wait {
4283 if waited >= WAIT_CEILING {
4284 stop_disarmed(
4285 forge,
4286 state,
4287 &repo,
4288 &pr,
4289 "merge state remained unreadable; refusing to merge on a guess",
4290 )
4291 .await?;
4292 return Ok(pr);
4293 }
4294 waited += POLL;
4295 forge.poll().await;
4296 continue;
4297 }
4298
4299 if ci == CiExpectation::Expected
4304 && pr.state == PrLifecycle::Open
4305 && state.config.graph.rerun_flaky_checks
4306 {
4307 let include_optional = pr.checks == Checks::Red
4308 && matches!(proposed, Step::Fix { .. } | Step::GiveUp { .. });
4309 let failing = rerunnable_with(&seen.contexts, include_optional);
4310 let now = forge.now();
4311 match rerun_step(&failing, state.land_reruns.as_ref(), &seen.head, now) {
4312 RerunStep::Rerun(runs) => {
4313 let rec = state.land_reruns.get_or_insert_with(Default::default);
4314 if !rec.head.eq_ignore_ascii_case(&seen.head) {
4315 *rec = LandReruns {
4316 head: seen.head.clone(),
4317 runs: BTreeMap::new(),
4318 };
4319 }
4320 for run in &runs {
4321 rec.runs.insert(run.clone(), now);
4322 }
4323 state.save()?;
4327 let mut any = false;
4328 for run in &runs {
4329 let names = failing
4330 .iter()
4331 .filter(|(_, r)| r.as_deref() == Some(run))
4332 .map(|(l, _)| l.as_str())
4333 .collect::<Vec<_>>()
4334 .join(", ");
4335 match forge.rerun(&repo, run).await {
4336 Ok(()) => {
4337 any = true;
4338 state.event(
4339 "land",
4340 format!("reran failed check(s) {names} (run {run})"),
4341 );
4342 }
4343 Err(e) => state.event(
4345 "land",
4346 format!("could not rerun check(s) {names} (run {run}): {e:#}"),
4347 ),
4348 }
4349 }
4350 state.save()?;
4351 if any {
4352 waited = Duration::ZERO;
4353 forge.poll().await;
4354 continue;
4355 }
4356 }
4357 RerunStep::Grace => {
4358 if waited >= WAIT_CEILING {
4359 let why = format!(
4360 "checks were still failing after a rerun and {} minutes",
4361 WAIT_CEILING.as_secs() / 60
4362 );
4363 stop(state, &repo, &pr, &why).await?;
4364 return Ok(pr);
4365 }
4366 waited += POLL;
4367 forge.poll().await;
4368 continue;
4369 }
4370 RerunStep::Fix => {}
4371 }
4372 }
4373
4374 let step = proposed;
4375 let armed_here = state
4380 .land_armed_head
4381 .as_deref()
4382 .is_some_and(|armed| armed.eq_ignore_ascii_case(&seen.head));
4383 if armed_here && matches!(step, Step::Merge | Step::Wait) {
4384 if waited >= WAIT_CEILING {
4385 let required = if seen.base.is_empty() {
4386 None
4387 } else {
4388 forge.required_contexts(&repo, &seen.base).await
4389 };
4390 let why = format!(
4391 "auto-merge was armed on {} but the pull request did not merge within {} \
4392 minutes ({})",
4393 seen.head,
4394 WAIT_CEILING.as_secs() / 60,
4395 waiting_on(&seen.merge_state, &seen.contexts, required.as_ref())
4396 );
4397 stop_disarmed(forge, state, &repo, &pr, &why).await?;
4398 return Ok(pr);
4399 }
4400 waited += POLL;
4401 forge.poll().await;
4402 continue;
4403 }
4404 if armed_here && !matches!(step, Step::Done { .. }) {
4405 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4408 let why = format!("auto-merge could not be disabled: {e}");
4409 stop(state, &repo, &pr, &why).await?;
4410 return Ok(pr);
4411 }
4412 }
4413 if pr.checks == Checks::Red
4414 && matches!(step, Step::Fix { .. } | Step::GiveUp { .. })
4415 && pr.review_comments.is_empty()
4416 && let Some(evidence) = forge.attribution(state, &seen).await
4417 && evidence.unrelated(&seen.head, &pr.failing)
4418 {
4419 if owner_stop(state, &mut pr, forge).await? {
4420 return Ok(pr);
4421 }
4422 let fresh = forge.view(&repo, pr_url).await?;
4424 if fresh.head != seen.head
4425 || fresh.rollup_head != seen.rollup_head
4426 || fresh.pr.state != PrLifecycle::Open
4427 || fresh.pr.checks != Checks::Red
4428 || fresh.pr.failing != pr.failing
4429 || fresh
4430 .pr
4431 .review_comments
4432 .iter()
4433 .any(|c| !shown.contains(&c.body))
4434 {
4435 continue;
4436 }
4437 hold_unrelated(state, &pr, evidence).await?;
4438 return Ok(pr);
4439 }
4440 match step {
4441 Step::Wait => {
4442 if waited >= WAIT_CEILING {
4443 let why = format!(
4444 "checks were still running after {} minutes",
4445 WAIT_CEILING.as_secs() / 60
4446 );
4447 stop(state, &repo, &pr, &why).await?;
4448 return Ok(pr);
4449 }
4450 waited += POLL;
4451 forge.poll().await;
4452 }
4453 Step::Done { merged } => {
4454 if merged {
4455 state.pr_merged_head = (!seen.head.is_empty()).then(|| seen.head.clone());
4456 }
4457 if let Some(armed) = state.land_armed_head.take() {
4462 if merged && !seen.head.is_empty() && !armed.eq_ignore_ascii_case(&seen.head) {
4463 let msg = format!(
4464 "{} merged on {} but the owner approved {armed}; review what landed",
4465 pr.url, seen.head
4466 );
4467 tracing::warn!("{msg}");
4468 state.event("land", msg);
4469 crate::notices::raise_with(
4473 crate::notices::Notice::warn(
4474 &format!("merged-unapproved-head:{}", state.id),
4475 "A pull request merged on a commit the owner did not approve; \
4476 review what landed",
4477 )
4478 .link(crate::notices::Link::Run {
4479 id: state.id.clone(),
4480 }),
4481 &state.config.notify,
4482 );
4483 }
4484 }
4485 state.status = if merged {
4486 RunStatus::Merged
4487 } else {
4488 RunStatus::Ready
4489 };
4490 let detail = if merged {
4491 format!("{} was merged", pr.url)
4492 } else {
4493 format!("{} was closed without merging", pr.url)
4494 };
4495 state.merge = Some(MergeOutcome {
4496 mode: MergeMode::Pr,
4497 ok: merged,
4498 detail: detail.clone(),
4499 empty: false,
4500 });
4501 state.event("land", detail);
4502 state.save()?;
4503 write_pr_state_through(state, pr.state);
4504 return Ok(pr);
4505 }
4506 Step::Merge => {
4507 state.check_delivery_evidence(&seen.head)?;
4508 let subject = merge_subject(
4509 crate::graph::landing_title(state, &seen.title),
4510 &crate::graph::landing_subject_source(state),
4511 );
4512 let contested = contested_to_ask(state);
4518 if !approval_reasons(state).is_empty() {
4519 match approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head)
4520 .await?
4521 {
4522 ApprovalGate::Approved => {}
4523 ApprovalGate::Repair => {
4524 if let Err(why) = disarm(forge, state, &repo, pr.number).await {
4527 state.event("repair", format!("auto-merge could not be disabled: {why}; repair preflight will retry"));
4528 state.save()?;
4529 }
4530 return Ok(pr);
4531 }
4532 ApprovalGate::Held => {
4533 if owner_stop(state, &mut pr, forge).await? {
4536 return Ok(pr);
4537 }
4538 stop(
4539 state,
4540 &repo,
4541 &pr,
4542 "the owner did not approve the merge (held or unanswered)",
4543 )
4544 .await?;
4545 return Ok(pr);
4546 }
4547 ApprovalGate::Pending => {
4555 state.end_pass_parked(crate::run::ParkCause::Question);
4556 state.parked = true;
4557 state.event(
4558 "land",
4559 "parked awaiting merge approval - resumes once answered",
4560 );
4561 state.save()?;
4562 return Ok(pr);
4563 }
4564 }
4565 }
4566 let observed_head = seen.head.clone();
4577 {
4580 let fresh = forge.view(&repo, pr_url).await.ok();
4581 if !direct_merge_is_safe(
4582 fresh.as_ref(),
4583 &observed_head,
4584 &shown,
4585 round,
4586 budget,
4587 waited,
4588 ci,
4589 ) {
4590 if waited >= WAIT_CEILING {
4591 let why = "the pull request did not settle on the approved head \
4592 before it could be merged";
4593 stop(state, &repo, &pr, why).await?;
4594 return Ok(pr);
4595 }
4596 state.event(
4597 "land",
4598 "the pull request changed before merging; looking again",
4599 );
4600 waited += POLL;
4601 forge.poll().await;
4602 continue;
4603 }
4604 }
4605 let argv = merge_argv_at(pr.number, &subject, &observed_head);
4606 let out = {
4607 let merge_lock = repo_merge_lock(&repo);
4608 let _merge_slot = merge_lock.lock().await;
4609 crate::pr_head::ensure_owner(state)?;
4610 if let Some(task_id) = state
4611 .origin
4612 .as_ref()
4613 .and_then(|origin| origin.task.as_ref())
4614 {
4615 let task = crate::queue::Queue::open()
4616 .get(task_id)
4617 .context("cannot verify the task owner immediately before merge")?;
4618 if task.runs.last() != Some(&state.id)
4619 || task.operator_held()
4620 || task.status == crate::queue::TaskStatus::Done
4621 {
4622 bail!(
4623 "task ownership or an operator hold superseded this merge approval"
4624 );
4625 }
4626 }
4627 if let Some(binding) = &state.land_approval {
4628 let current = ask::Questions::open().get(&binding.question)?;
4629 if merge_consent_superseded(state, ¤t)?
4630 || current.run != state.id
4631 || !binding.head.eq_ignore_ascii_case(&observed_head)
4632 || approval(current.resolution().as_deref()) != Approval::Merge
4633 || current.merge_target.as_ref().is_some_and(|t| {
4634 t.pr != pr.url || !t.head.eq_ignore_ascii_case(&observed_head)
4635 })
4636 {
4637 bail!(
4638 "merge decision is stale or no longer authorizes the reviewed head"
4639 );
4640 }
4641 }
4642 forge.merge(&repo, &argv).await?
4643 };
4644 if out.0 {
4645 let confirmed = forge.view(&repo, pr_url).await.is_ok_and(|c| {
4651 if c.pr.state == PrLifecycle::Merged {
4652 state.pr_merged_head = (!c.head.is_empty()).then_some(c.head);
4653 true
4654 } else {
4655 false
4656 }
4657 });
4658 if !confirmed {
4659 if waited >= WAIT_CEILING {
4660 let why = "the merge request succeeded but the pull request \
4661 could not be confirmed merged after waiting";
4662 stop(state, &repo, &pr, why).await?;
4663 return Ok(pr);
4664 }
4665 state.event(
4666 "land",
4667 "merge accepted but the pull request is not confirmed merged yet; waiting",
4668 );
4669 state.save()?;
4670 waited += POLL;
4671 forge.poll().await;
4672 continue;
4673 }
4674 pr.state = PrLifecycle::Merged;
4675 state.status = RunStatus::Merged;
4676 state.merge = Some(MergeOutcome {
4677 mode: MergeMode::Pr,
4678 ok: true,
4679 detail: format!("gh {}", argv.join(" ")),
4680 empty: false,
4681 });
4682 if let Some(pr_record) = state.pr.as_mut() {
4687 pr_record.state = pr.state.as_str().to_owned();
4688 }
4689 state.event("land", format!("merged {} as `{subject}`", pr.url));
4690 announce_red_merge(state, &pr).await;
4691 state.save()?;
4692 write_pr_state_through(state, pr.state);
4693 return Ok(pr);
4694 }
4695 let after_seen = forge.view(&repo, pr_url).await.ok();
4696 let after = after_seen.as_ref().map(|s| s.pr.state);
4697 if let Some(outcome) = merged_after_all(&argv, &out.1, after) {
4698 state.pr_merged_head = after_seen
4699 .as_ref()
4700 .map(|s| s.head.clone())
4701 .filter(|h| !h.is_empty());
4702 pr.state = PrLifecycle::Merged;
4703 state.status = RunStatus::Merged;
4704 state.merge = Some(outcome);
4705 if let Some(pr_record) = state.pr.as_mut() {
4706 pr_record.state = pr.state.as_str().to_owned();
4707 }
4708 state.event("land", format!("merged {} as `{subject}`", pr.url));
4709 announce_red_merge(state, &pr).await;
4710 state.save()?;
4711 write_pr_state_through(state, pr.state);
4712 return Ok(pr);
4713 }
4714 let verdict = classify_refusal(after_seen.as_ref(), rechecked, &observed_head, ci);
4715 match verdict {
4716 Refused::Final => {
4717 let merge_state = after_seen
4718 .as_ref()
4719 .map(|s| s.merge_state.as_str())
4720 .filter(|m| !m.is_empty())
4721 .unwrap_or("unknown");
4722 let why = format!(
4726 "the merge was refused: {} (merge state: {merge_state})",
4727 out.1
4728 );
4729 stop(state, &repo, &pr, &why).await?;
4730 return Ok(pr);
4731 }
4732 verdict => {
4733 if waited >= WAIT_CEILING {
4738 let why = format!(
4739 "the merge was still refused after {} minutes: {}",
4740 WAIT_CEILING.as_secs() / 60,
4741 out.1
4742 );
4743 stop(state, &repo, &pr, &why).await?;
4744 return Ok(pr);
4745 }
4746 if verdict == Refused::Recheck {
4747 rechecked = true;
4748 }
4749 state.event(
4750 "land",
4751 "merge refused while the branch policy is not satisfied yet; waiting",
4752 );
4753 state.save()?;
4754 waited += POLL;
4755 forge.poll().await;
4756 }
4757 }
4758 }
4759 Step::Rebase => {
4760 if rebases >= budget {
4766 let why = format!(
4767 "the base moved under this branch {budget} time(s) and it still does \
4768 not merge; rebasing again would only race it"
4769 );
4770 stop(state, &repo, &pr, &why).await?;
4771 return Ok(pr);
4772 }
4773 rebases += 1;
4774 let Some(branch) = state.winner().map(|w| w.branch.clone()) else {
4775 stop(
4776 state,
4777 &repo,
4778 &pr,
4779 "the pull request conflicts and this run has no winning branch to rebase",
4780 )
4781 .await?;
4782 return Ok(pr);
4783 };
4784 let base = state.base_branch.clone();
4785 state.event(
4786 "land",
4787 format!("{} no longer merges; rebasing onto {base}", pr.url),
4788 );
4789 state.save()?;
4790
4791 let remote = state.config.merge.remote.clone();
4795 git::fetch(&repo, &remote, &base).await.ok();
4796 if owner_stop(state, &mut pr, forge).await? {
4797 return Ok(pr);
4798 }
4799 let onto = format!("{remote}/{base}");
4800 let rebased = match rebase_landing_worktree(state, &onto).await {
4801 Ok(crate::rebase::Rebased::Applied) => Ok(None),
4802 Ok(crate::rebase::Rebased::Stopped(why)) => Ok(Some(why)),
4803 Err(e) => Err(e),
4804 };
4805 if owner_stop(state, &mut pr, forge).await? {
4806 return Ok(pr);
4807 }
4808 match rebased {
4809 Ok(None) => {
4810 let published =
4811 publish_landing_head(state, &seen.head, pr_url, forge).await;
4812 if owner_stop(state, &mut pr, forge).await? {
4813 return Ok(pr);
4814 }
4815 let head = published?;
4816 crate::graph::refresh_reviewed_commits(state, &branch).await;
4817 state.pr_pushed_head = Some(head.clone());
4818 awaiting_head = Some(head);
4819 rechecked = false;
4820 state.event("land", format!("rebased {branch} onto {base}"));
4821 state.save()?;
4822 waited = Duration::ZERO;
4825 tokio::time::sleep(POLL).await;
4826 }
4827 Ok(Some(conflict)) => {
4830 let why = format!(
4831 "{} conflicts with {base} and the rebase did not apply: {}",
4832 pr.url,
4833 conflict.chars().take(600).collect::<String>()
4834 );
4835 stop(state, &repo, &pr, &why).await?;
4836 return Ok(pr);
4837 }
4838 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
4839 Err(e) => {
4840 let why = format!("could not rebase {branch} onto {base}: {e:#}");
4841 stop(state, &repo, &pr, &why).await?;
4842 return Ok(pr);
4843 }
4844 }
4845 }
4846 Step::GiveUp { reason } => {
4847 stop(state, &repo, &pr, &reason).await?;
4848 return Ok(pr);
4849 }
4850 Step::Fix { reason } => {
4851 round += 1;
4852 waited = Duration::ZERO;
4853 for c in &pr.review_comments {
4854 shown.insert(c.body.clone());
4855 }
4856 state.event("land", format!("round {round}: {reason}"));
4857 state.save()?;
4858
4859 let logs = failing_logs(&repo, &seen.failing_urls).await;
4860 let was_red = pr.checks == Checks::Red;
4861 if owner_stop(state, &mut pr, forge).await? {
4862 return Ok(pr);
4863 }
4864 let fixed = forge.fix(state, &pr, round, budget, &reason, &logs).await?;
4865 if owner_stop(state, &mut pr, forge).await? {
4866 return Ok(pr);
4867 }
4868 match fixed {
4869 Fixed::Committed { head } => {
4870 state.pr_pushed_head = Some(head.clone());
4873 awaiting_head = Some(head);
4874 rechecked = false;
4875 waited = Duration::ZERO;
4876 forge.poll().await;
4877 }
4878 Fixed::Declined if was_red => {
4879 if let Some(evidence) = forge.attribution(state, &seen).await
4884 && evidence.unrelated(&seen.head, &pr.failing)
4885 {
4886 let fresh = forge.view(&repo, pr_url).await?;
4887 if fresh.head != seen.head
4888 || fresh.rollup_head != seen.rollup_head
4889 || fresh.pr.state != PrLifecycle::Open
4890 || fresh.pr.checks != Checks::Red
4891 || fresh.pr.failing != pr.failing
4892 || fresh
4893 .pr
4894 .review_comments
4895 .iter()
4896 .any(|c| !shown.contains(&c.body))
4897 {
4898 continue;
4899 }
4900 if owner_stop(state, &mut pr, forge).await? {
4901 return Ok(pr);
4902 }
4903 hold_unrelated(state, &pr, evidence).await?;
4904 return Ok(pr);
4905 }
4906 let why = format!(
4907 "the fixer produced no commit while {} check(s) were failing \
4908 ({}); stopping instead of looping on an unchanged tree",
4909 pr.failing.len(),
4910 pr.failing.join(", ")
4911 );
4912 stop(state, &repo, &pr, &why).await?;
4913 return Ok(pr);
4914 }
4915 Fixed::Declined => state.event(
4920 "land",
4921 format!("round {round}: fixer declined the comments, nothing committed"),
4922 ),
4923 Fixed::Failed(why) => {
4924 stop(state, &repo, &pr, &format!("the fix round failed: {why}")).await?;
4925 return Ok(pr);
4926 }
4927 }
4928 state.save()?;
4929 }
4930 }
4931 }
4932}
4933
4934pub const CI_HOLD_NODE: &str = "land-ci-unrelated";
4936
4937#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4939pub struct CiHold {
4940 pub head: String,
4942 pub question: String,
4944 pub evidence: CiEvidence,
4946}
4947
4948#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
4950struct CiFailure {
4951 path: String,
4952 start_line: u64,
4953 end_line: u64,
4954 title: String,
4955 message: String,
4956}
4957
4958#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4959struct CiCheckEvidence {
4960 label: String,
4961 head_check: u64,
4962 base_check: u64,
4963 app: u64,
4964 run: String,
4965 base_run: String,
4966 head_failures: Vec<CiFailure>,
4967 base_failures: Vec<CiFailure>,
4968 rerun_exhausted: bool,
4969}
4970
4971#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4973pub struct CiEvidence {
4974 head: String,
4975 base: String,
4976 changed: Vec<String>,
4977 checks: Vec<CiCheckEvidence>,
4978}
4979
4980impl CiEvidence {
4981 fn unrelated(&self, head: &str, failing: &[String]) -> bool {
4984 if self.head != head
4985 || self.base.is_empty()
4986 || failing.is_empty()
4987 || self.changed.iter().any(|p| {
4988 p.starts_with(".github/")
4989 || p.starts_with(".config/")
4990 || p.starts_with(".cargo/")
4991 || matches!(
4992 p.rsplit('/').next().unwrap_or(p),
4993 "Cargo.toml"
4994 | "Cargo.lock"
4995 | "Makefile.toml"
4996 | "build.rs"
4997 | "rust-toolchain.toml"
4998 )
4999 })
5000 {
5001 return false;
5002 }
5003 failing.iter().all(|label| {
5004 let matches: Vec<_> = self.checks.iter().filter(|c| &c.label == label).collect();
5005 matches.len() == 1
5006 && matches[0].rerun_exhausted
5007 && !matches[0].head_failures.is_empty()
5008 && matches[0].head_failures.iter().all(|f| {
5009 !f.path.is_empty()
5012 && !f.path.starts_with('.')
5013 && !f.path.contains("..")
5014 && !f.path.starts_with('/')
5015 && !self.changed.contains(&f.path)
5016 && matches[0].base_failures.contains(f)
5017 })
5018 })
5019 }
5020}
5021
5022async fn ci_json(repo: &Path, endpoint: String) -> Option<serde_json::Value> {
5023 let (ok, body) = gh(repo, &["api".into(), endpoint]).await.ok()?;
5024 if !ok {
5025 return None;
5026 }
5027 serde_json::from_str(&body).ok()
5028}
5029
5030async fn ci_annotations(repo: &Path, check: &serde_json::Value) -> Option<Vec<CiFailure>> {
5031 let count = check.pointer("/output/annotations_count")?.as_u64()?;
5032 if count == 0 || count >= 100 {
5033 return None;
5034 }
5035 let id = check.get("id")?.as_u64()?;
5036 let value = ci_json(
5037 repo,
5038 format!("repos/{{owner}}/{{repo}}/check-runs/{id}/annotations?per_page=100"),
5039 )
5040 .await?;
5041 let annotations = value.as_array()?;
5042 if annotations.len() != count as usize {
5043 return None;
5044 }
5045 annotations
5046 .iter()
5047 .filter(|a| a["annotation_level"] == "failure")
5048 .map(|a| {
5049 Some(CiFailure {
5050 path: a["path"].as_str()?.into(),
5051 start_line: a["start_line"].as_u64()?,
5052 end_line: a["end_line"].as_u64()?,
5053 title: a["title"].as_str()?.into(),
5054 message: a["message"].as_str()?.into(),
5055 })
5056 })
5057 .collect()
5058}
5059
5060async fn ci_runs(repo: &Path, sha: &str) -> Option<Vec<serde_json::Value>> {
5061 let value = ci_json(
5062 repo,
5063 format!("repos/{{owner}}/{{repo}}/commits/{sha}/check-runs?per_page=100&filter=latest"),
5064 )
5065 .await?;
5066 let runs = value["check_runs"].as_array()?;
5067 if value["total_count"].as_u64()? != runs.len() as u64 || runs.len() >= 100 {
5068 return None;
5069 }
5070 Some(runs.clone())
5071}
5072
5073async fn collect_ci_evidence(state: &RunState, seen: &Seen) -> Option<CiEvidence> {
5074 let repo = &state.repo;
5075 let base_ref = format!("refs/remotes/{}/{}", state.config.merge.remote, seen.base);
5076 let base = git::git_raw(repo, &["rev-parse", "--verify", &base_ref])
5077 .await
5078 .ok()?;
5079 if !base.ok() {
5080 return None;
5081 }
5082 let range = format!("{}...{}", base.stdout, seen.head);
5083 let diff = git::git_raw(
5085 repo,
5086 &["diff", "--no-renames", "--name-only", "-z", &range, "--"],
5087 )
5088 .await
5089 .ok()?;
5090 if !diff.ok() {
5091 return None;
5092 }
5093 let head_runs = ci_runs(repo, &seen.head).await?;
5094 let base_runs = ci_runs(repo, &base.stdout).await?;
5095 let mut checks = Vec::new();
5096 for label in &seen.pr.failing {
5097 let matching = |runs: &[serde_json::Value]| {
5098 runs.iter()
5099 .filter(|r| r["name"].as_str() == Some(label))
5100 .cloned()
5101 .collect::<Vec<_>>()
5102 };
5103 let heads = matching(&head_runs);
5104 let bases = matching(&base_runs);
5105 if heads.len() != 1 || bases.len() != 1 {
5106 return None;
5107 }
5108 let h = &heads[0];
5109 let b = &bases[0];
5110 if h["conclusion"] != "failure"
5111 || b["conclusion"] != "failure"
5112 || h["status"] != "completed"
5113 || b["status"] != "completed"
5114 || h["head_sha"].as_str()? != seen.head
5115 || b["head_sha"].as_str()? != base.stdout
5116 || h.pointer("/app/id")?.as_u64()? != b.pointer("/app/id")?.as_u64()?
5117 {
5118 return None;
5119 }
5120 let run = run_of(h["details_url"].as_str()?)?;
5121 let contexts: Vec<_> = seen.contexts.iter().filter(|c| &c.label == label).collect();
5122 if contexts.len() != 1
5123 || contexts[0].run.as_ref() != Some(&run)
5124 || contexts[0].verdict != Verdict::Fail
5125 {
5126 return None;
5127 }
5128 let workflow =
5131 ci_json(repo, format!("repos/{{owner}}/{{repo}}/actions/runs/{run}")).await?;
5132 let base_run = run_of(b["details_url"].as_str()?)?;
5133 let base_workflow = ci_json(
5134 repo,
5135 format!("repos/{{owner}}/{{repo}}/actions/runs/{base_run}"),
5136 )
5137 .await?;
5138 if base_workflow["head_sha"].as_str()? != base.stdout
5139 || base_workflow["head_branch"].as_str()? != seen.base
5140 || base_workflow["status"] != "completed"
5141 || base_workflow["conclusion"] != "failure"
5142 || base_workflow["workflow_id"].as_u64()? != workflow["workflow_id"].as_u64()?
5143 {
5144 return None;
5145 }
5146 let exhausted = state
5147 .land_reruns
5148 .as_ref()
5149 .is_some_and(|r| r.head == seen.head && r.runs.contains_key(&run))
5150 && workflow["head_sha"].as_str()? == seen.head
5151 && workflow["run_attempt"].as_u64()? > 1
5152 && workflow["status"] == "completed";
5153 checks.push(CiCheckEvidence {
5154 label: label.clone(),
5155 head_check: h["id"].as_u64()?,
5156 base_check: b["id"].as_u64()?,
5157 app: h.pointer("/app/id")?.as_u64()?,
5158 run,
5159 base_run,
5160 head_failures: ci_annotations(repo, h).await?,
5161 base_failures: ci_annotations(repo, b).await?,
5162 rerun_exhausted: exhausted,
5163 });
5164 }
5165 Some(CiEvidence {
5166 head: seen.head.clone(),
5167 base: base.stdout,
5168 changed: diff
5169 .stdout
5170 .split('\0')
5171 .filter(|p| !p.is_empty())
5172 .map(str::to_owned)
5173 .collect(),
5174 checks,
5175 })
5176}
5177
5178async fn hold_unrelated(state: &mut RunState, pr: &PrState, evidence: CiEvidence) -> Result<()> {
5179 let detail = serde_json::to_string(&evidence)?;
5180 let resume = "daemon: CI を確認して同じ run を再開する".to_owned();
5181 let hold = "operator: 保留して後で判断する".to_owned();
5182 let mut q = ask::Question::new(
5183 state.id.clone(),
5184 CI_HOLD_NODE.into(),
5185 "land".into(),
5186 "base でも再現する CI の失敗を検出したため、試行を消費せず保留しました".into(),
5187 format!(
5188 "必須チェックや承認は省略しません。再開時にも同じ workflow run は自動再実行しません。\n構造化された判定根拠:\n{detail}"
5189 ),
5190 vec![resume.clone(), hold.clone()],
5191 );
5192 q.actions.insert(
5193 resume,
5194 ask::ChoiceAction::Resume {
5195 run: state.id.clone(),
5196 },
5197 );
5198 q.actions.insert(hold, ask::ChoiceAction::Hold);
5199 ask::Questions::open().put_executable(&mut q)?;
5200 state.land_unrelated = Some(CiHold {
5201 head: evidence.head.clone(),
5202 question: q.id.clone(),
5203 evidence,
5204 });
5205 state.event("land", format!("[ci-unrelated] base reproduces every located failure after rerun; owner question {}: {detail}", q.id));
5206 state.end_pass_parked(crate::run::ParkCause::Question);
5207 state.parked = true;
5208 state.save()?;
5209 if let Err(e) = ask::notify(&state.config.notify, &q).await {
5210 tracing::warn!("could not notify about CI hold: {e:#}");
5211 }
5212 let body = stop_comment(
5214 &state.id,
5215 "CI failures independently reproduced on the base; awaiting an owner decision without charging the task attempt",
5216 );
5217 let (_, body) = crate::github_text::prepare(state, "", &body);
5218 gh(
5219 &state.repo,
5220 &[
5221 "pr".into(),
5222 "comment".into(),
5223 pr.number.to_string(),
5224 "--body".into(),
5225 body,
5226 ],
5227 )
5228 .await
5229 .ok();
5230 Ok(())
5231}
5232
5233#[derive(Clone)]
5237struct Seen {
5238 pr: PrState,
5239 title: String,
5240 failing_urls: Vec<(String, String)>,
5241 head: String,
5243 rollup_head: String,
5246 merge_state: String,
5249 contexts: Vec<CheckInfo>,
5251 base: String,
5253}
5254
5255#[derive(Clone)]
5257struct CheckInfo {
5258 label: String,
5259 verdict: Verdict,
5260 required: Option<bool>,
5261 run: Option<String>,
5263}
5264
5265#[derive(Debug, Clone, PartialEq, Eq)]
5267enum RerunStep {
5268 Rerun(Vec<String>),
5270 Grace,
5272 Fix,
5274}
5275
5276#[cfg(test)]
5280fn rerunnable(contexts: &[CheckInfo]) -> Vec<(String, Option<String>)> {
5281 rerunnable_with(contexts, false)
5282}
5283
5284fn rerunnable_with(
5285 contexts: &[CheckInfo],
5286 include_optional: bool,
5287) -> Vec<(String, Option<String>)> {
5288 contexts
5289 .iter()
5290 .filter(|c| c.verdict == Verdict::Fail && (include_optional || c.required != Some(false)))
5291 .filter(|c| {
5293 c.run.as_ref().is_none_or(|r| {
5294 !contexts.iter().any(|o| {
5295 matches!(o.verdict, Verdict::Pending | Verdict::Unknown)
5296 && o.run.as_ref() == Some(r)
5297 })
5298 })
5299 })
5300 .map(|c| (c.label.clone(), c.run.clone()))
5301 .collect()
5302}
5303
5304fn rerun_step(
5306 failing: &[(String, Option<String>)],
5307 record: Option<&LandReruns>,
5308 head: &str,
5309 now: i64,
5310) -> RerunStep {
5311 if failing.is_empty() || failing.iter().any(|(_, run)| run.is_none()) {
5314 return RerunStep::Fix;
5315 }
5316 let record = record.filter(|r| r.head.eq_ignore_ascii_case(head));
5318 let mut fresh: Vec<String> = Vec::new();
5319 let mut recent = false;
5320 for run in failing.iter().filter_map(|(_, run)| run.as_deref()) {
5321 match record.and_then(|r| r.runs.get(run)) {
5322 None => {
5323 if !fresh.iter().any(|f| f == run) {
5324 fresh.push(run.to_owned());
5325 }
5326 }
5327 Some(&at) if now - at < crate::release_watch::RERUN_GRACE => recent = true,
5328 Some(_) => {}
5329 }
5330 }
5331 if !fresh.is_empty() {
5332 RerunStep::Rerun(fresh)
5333 } else if recent {
5334 RerunStep::Grace
5335 } else {
5336 RerunStep::Fix
5337 }
5338}
5339
5340async fn observe(repo: &Path, pr_url: &str) -> Result<Seen> {
5344 let view = gh(
5345 repo,
5346 &[
5347 "pr".to_owned(),
5348 "view".to_owned(),
5349 pr_url.to_owned(),
5350 "--json".to_owned(),
5351 "url,number,state,title,reviews,comments,mergeStateStatus,headRefOid,baseRefName"
5352 .to_owned(),
5353 ],
5354 )
5355 .await?;
5356 if !view.0 {
5357 bail!("gh pr view {pr_url}: {}", view.1);
5358 }
5359 let number = parse_pr(&view.1)?.number;
5360 let node = last_commit_node(repo, number).await;
5361 let mut seen = seen_from(&view.1, node.as_deref())?;
5362
5363 let inline = gh(
5364 repo,
5365 &[
5366 "api".to_owned(),
5367 format!("repos/{{owner}}/{{repo}}/pulls/{}/comments", seen.pr.number),
5368 ],
5369 )
5370 .await?;
5371 if inline.0 {
5372 match parse_inline_comments(&inline.1) {
5373 Ok(mut comments) => seen.pr.review_comments.append(&mut comments),
5374 Err(e) => tracing::warn!("inline review comments unreadable: {e}"),
5377 }
5378 } else {
5379 tracing::warn!("gh api pulls/{}/comments: {}", seen.pr.number, inline.1);
5380 }
5381 Ok(seen)
5382}
5383
5384fn seen_from(view_json: &str, node_json: Option<&str>) -> Result<Seen> {
5395 let mut pr = parse_pr(view_json)?;
5396 let raw: GhPr = serde_json::from_str(view_json).context("re-read pull request json")?;
5397
5398 let mut rollup_head = String::new();
5399 let mut failing_urls = Vec::new();
5400 let mut contexts = Vec::new();
5401 let mut checks = Checks::Unknown;
5402 let mut failing = Vec::new();
5403 if let Some((oid, rollup)) = node_json.and_then(parse_last_commit_node) {
5404 (checks, failing) = rollup_verdict(&rollup);
5405 failing_urls = rollup
5406 .iter()
5407 .filter(|c| c.verdict() == Verdict::Fail)
5408 .filter_map(|c| c.url().map(|u| (c.label(), u.to_owned())))
5409 .collect();
5410 contexts = rollup
5411 .iter()
5412 .map(|c| CheckInfo {
5413 label: c.label(),
5414 verdict: c.verdict(),
5415 required: c.is_required,
5416 run: c.url().and_then(run_of),
5417 })
5418 .collect();
5419 rollup_head = oid;
5420 }
5421 pr.checks = checks;
5422 pr.failing = failing;
5423
5424 Ok(Seen {
5425 pr,
5426 title: raw.title,
5427 failing_urls,
5428 head: raw.head_ref_oid,
5429 rollup_head,
5430 merge_state: raw.merge_state_status,
5431 contexts,
5432 base: raw.base_ref_name,
5433 })
5434}
5435
5436fn parse_last_commit_node(json: &str) -> Option<(String, Vec<GhCheck>)> {
5439 let v: serde_json::Value = serde_json::from_str(json).ok()?;
5440 if v.get("errors").is_some_and(|e| !e.is_null()) {
5441 return None;
5442 }
5443 let commit = v.pointer("/data/repository/pullRequest/commits/nodes/0/commit")?;
5444 let oid = commit.get("oid")?.as_str().filter(|o| !o.is_empty())?;
5445 let contexts = commit.pointer("/statusCheckRollup/contexts");
5446 let Some(contexts) = contexts.filter(|c| !c.is_null()) else {
5447 return Some((oid.to_owned(), Vec::new()));
5449 };
5450 if contexts.pointer("/pageInfo/hasNextPage")?.as_bool()? {
5451 return None;
5452 }
5453 let nodes = contexts.get("nodes")?.as_array()?;
5454 let rollup = nodes
5455 .iter()
5456 .map(|n| serde_json::from_value::<GhCheck>(n.clone()))
5457 .collect::<Result<Vec<_>, _>>()
5458 .ok()?;
5459 Some((oid.to_owned(), rollup))
5460}
5461
5462async fn last_commit_node(repo: &Path, number: u64) -> Option<String> {
5465 let out = gh(
5466 repo,
5467 &[
5468 "api".to_owned(),
5469 "graphql".to_owned(),
5470 "-F".to_owned(),
5471 "owner={owner}".to_owned(),
5472 "-F".to_owned(),
5473 "repo={repo}".to_owned(),
5474 "-F".to_owned(),
5475 format!("number={number}"),
5476 "-f".to_owned(),
5477 "query=query($owner:String!,$repo:String!,$number:Int!){repository(owner:$owner,\
5478 name:$repo){pullRequest(number:$number){commits(last:1){nodes{commit{oid \
5479 statusCheckRollup{contexts(first:100){pageInfo{hasNextPage} nodes{\
5480 ... on CheckRun{name status conclusion detailsUrl \
5481 isRequired(pullRequestNumber:$number)} \
5482 ... on StatusContext{context state targetUrl \
5483 isRequired(pullRequestNumber:$number)}}}}}}}}}}"
5484 .to_owned(),
5485 ],
5486 )
5487 .await
5488 .ok()?;
5489 out.0.then_some(out.1)
5490}
5491
5492#[doc(hidden)]
5494#[derive(Debug, PartialEq)]
5495pub enum Fixed {
5496 Committed {
5498 head: String,
5500 },
5501 Declined,
5503 Failed(String),
5505}
5506
5507#[doc(hidden)]
5513pub async fn fix_round(
5514 state: &mut RunState,
5515 pr: &PrState,
5516 round: usize,
5517 budget: usize,
5518 reason: &str,
5519 logs: &str,
5520) -> Result<Fixed> {
5521 let winner = state
5522 .winner()
5523 .cloned()
5524 .context("landing needs a winning candidate; none is recorded on this run")?;
5525 let roles = state
5526 .config
5527 .resolve_roles()
5528 .context("resolve the roster for the fix round")?;
5529 let attempts = crate::fixer::attempts(state, &roles, &winner);
5533 let ids: Vec<String> = attempts.iter().map(|(s, _)| s.id.clone()).collect();
5534
5535 let prompt = fix_prompt(state, pr, round, budget, reason, logs);
5536 let mut artifacts = agent::artifacts_dir(&state.dir());
5537 if let Some(request) = state
5538 .merge_repairs
5539 .last()
5540 .filter(|r| r.phase == crate::run::MergeRepairPhase::Fixing)
5541 {
5542 artifacts = artifacts.join(format!("merge-repair-{}", request.question));
5543 }
5544 let prompt = if state.config.cache_dir().is_some() {
5545 format!("{prompt}\n\n{}", prompt::build_cache_note("fix", true))
5546 } else {
5547 prompt
5548 };
5549 let before = git::rev_parse(&winner.worktree, "HEAD").await?;
5553 let mut last = None;
5557 for (i, (spec, seat_key)) in attempts.into_iter().enumerate() {
5558 if owner_requested_stop(state)? {
5559 return Ok(Fixed::Declined);
5560 }
5561 let mut seat = seat_of(state, &seat_key, &spec.id);
5562 let stem = if i == 0 {
5563 format!("land-{round}")
5564 } else {
5565 format!("land-{round}-{}", spec.id)
5566 };
5567 let out = agent::invoke(
5568 &spec,
5569 &mut seat,
5570 &Invocation {
5571 coordination: state.config.coordination.as_ref(),
5572 fetched_base: state.fetched_base.as_ref(),
5573 cwd: &winner.worktree,
5574 prompt: &prompt,
5575 timeout: Duration::from_secs(state.config.graph.timeout_fix),
5576 allow_write: true,
5577 sessions: state.config.graph.sessions,
5578 artifacts: &artifacts,
5579 stem: &stem,
5580 run: &state.id,
5581 node: "land",
5582 cache_dir: state.config.cache_dir().as_deref(),
5583 attachments: &[],
5584 writable: &[],
5585 },
5586 )
5587 .await;
5588 state.seats.insert(seat.key.clone(), seat);
5589 if let Some(next) = ids.get(i + 1)
5590 && agent::chain_advances(&out)
5591 {
5592 let (class, why) = crate::fixer::failure_of(&out);
5593 crate::graph::record_handover(state, "land", &seat_key, &spec.id, next, &class, &why);
5594 continue;
5595 }
5596 last = Some(out);
5597 break;
5598 }
5599 let out = last.expect("the fixer chain always has an entry");
5600
5601 match out {
5602 Ok(o) if o.quota_exhausted() => {
5603 return Ok(Fixed::Failed(
5604 "rate limited (quota); the fixer could not run".to_owned(),
5605 ));
5606 }
5607 Ok(o) if !o.usable() => {
5608 return Ok(Fixed::Failed(format!(
5609 "the fixer produced nothing usable ({})",
5610 crate::notices::turn_status(o.exit_code, o.timed_out, o.quota_exhausted())
5611 )));
5612 }
5613 Ok(_) => {}
5614 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
5615 Err(e) => return Ok(Fixed::Failed(format!("{e:#}"))),
5616 }
5617
5618 if owner_requested_stop(state)? {
5619 return Ok(Fixed::Declined);
5620 }
5621
5622 let wait = crate::repo_lock::WaitPolicy::new(
5625 Duration::from_secs(state.config.graph.timeout_resource_wait),
5626 || false,
5627 );
5628 let coordination = crate::repo_lock::SeatLease::operation_with(
5629 &winner.worktree,
5630 state.config.coordination.as_ref(),
5631 &wait,
5632 )
5633 .await?;
5634 match git::rescue_commit(
5635 &winner.worktree,
5636 &format!("magi: land round {round} fixes (uncommitted work)"),
5637 )
5638 .await
5639 {
5640 Ok(r) => state.note_withheld("land", &r.withheld),
5641 Err(e)
5642 if state
5643 .merge_repairs
5644 .last()
5645 .is_some_and(|r| r.phase == crate::run::MergeRepairPhase::Fixing) =>
5646 {
5647 return Ok(Fixed::Failed(format!("saving repair commit failed: {e:#}")));
5648 }
5649 Err(_) => {}
5650 }
5651 let after = git::rev_parse(&winner.worktree, "HEAD").await?;
5652 drop(coordination);
5653 if after == before {
5654 return Ok(Fixed::Declined);
5655 }
5656
5657 if owner_requested_stop(state)? {
5658 return Ok(Fixed::Declined);
5659 }
5660 crate::pr_head::ensure_owner(state)?;
5661 let remote = state.config.merge.remote.clone();
5662 anyhow::ensure!(
5663 crate::foreign_checkout::write_back(state, &after).await?,
5664 "foreign checkout delivery is blocked; see the run events"
5665 );
5666 let public_head = state.pr_branch().unwrap_or(&winner.branch).to_owned();
5667 let push = if state.pr_head.is_some() {
5668 let expected = state
5669 .pr_pushed_head
5670 .as_deref()
5671 .context("missing public head lease")?;
5672 git::push_as(
5673 &winner.worktree,
5674 &remote,
5675 &winner.branch,
5676 &public_head,
5677 expected,
5678 )
5679 .await?
5680 } else {
5681 git::push(&winner.worktree, &remote, &winner.branch).await?
5682 };
5683 if !push.ok() {
5684 return Ok(Fixed::Failed(format!(
5685 "pushing {} to {remote} failed: {}",
5686 public_head, push.stderr
5687 )));
5688 }
5689 state.event(
5690 "land",
5691 format!("round {round}: pushed a fix to {public_head}"),
5692 );
5693 state.pr_pushed_head = Some(after.clone());
5694 state.save()?;
5695 Ok(Fixed::Committed { head: after })
5696}
5697
5698pub(crate) fn seat_of(state: &mut RunState, key: &str, agent: &str) -> SeatState {
5700 crate::fixer::seat_for(state, key, agent)
5701}
5702
5703pub(crate) async fn repair_preflight(state: &RunState, url: &str, head: &str) -> Result<PrState> {
5706 let seen = observe(&state.repo, url).await?;
5707 let winner = state.winner().context("no winning branch to repair")?;
5708 if seen.pr.state != PrLifecycle::Open || seen.head != head {
5709 anyhow::bail!(
5710 "PR is closed or its head changed; review the current head before requesting repair again"
5711 );
5712 }
5713 if git::rev_parse(&winner.worktree, "HEAD").await? != head
5714 || !git::is_clean(&winner.worktree).await?
5715 {
5716 anyhow::bail!(
5717 "repair worktree is missing, dirty or at a different head; restore the reviewed branch and resume this run"
5718 );
5719 }
5720 let view = gh(
5723 &state.repo,
5724 &[
5725 "pr".into(),
5726 "view".into(),
5727 url.into(),
5728 "--json".into(),
5729 "autoMergeRequest,headRefOid,state,headRefName,baseRefName,isCrossRepository".into(),
5730 ],
5731 )
5732 .await?;
5733 if !view.0 {
5734 bail!("cannot check auto-merge: {}", view.1);
5735 }
5736 let live: serde_json::Value = serde_json::from_str(&view.1)?;
5737 let public = state.pr_branch().unwrap_or(&winner.branch);
5738 if live["state"] != "OPEN"
5739 || live["headRefOid"] != head
5740 || live["headRefName"] != public
5741 || live["baseRefName"] != state.base_branch
5742 || live["isCrossRepository"] != false
5743 {
5744 bail!("PR changed during repair preflight; review its current head explicitly");
5745 }
5746 let auto_merge = live
5747 .get("autoMergeRequest")
5748 .context("cannot read the PR auto-merge reservation; repair held")?;
5749 if !auto_merge.is_null() {
5750 let out = gh(&state.repo, &disable_automerge_argv(seen.pr.number)).await?;
5751 if !out.0 {
5752 bail!("cannot disable auto-merge; repair held: {}", out.1);
5753 }
5754 }
5755 Ok(seen.pr)
5756}
5757
5758fn fix_prompt(
5760 state: &RunState,
5761 pr: &PrState,
5762 round: usize,
5763 budget: usize,
5764 reason: &str,
5765 logs: &str,
5766) -> String {
5767 let mut s = format!(
5768 "Your patch is open as a pull request and it is not landing. Land round \
5769 {round} of {budget}.\n\n\
5770 Pull request: {}\n\n\
5771 What is holding it: {reason}\n\n\
5772 # The task\n\n{}\n",
5773 pr.url, state.instruction
5774 );
5775
5776 if pr.failing.is_empty() {
5777 s.push_str("\n# Failing checks\n\n(none)\n");
5778 } else {
5779 let _ = write!(s, "\n# Failing checks\n\n- {}\n", pr.failing.join("\n- "));
5780 if logs.trim().is_empty() {
5781 s.push_str(
5782 "\nNo log could be read; investigate the failure with necessary focused checks.\n",
5783 );
5784 } else {
5785 let _ = write!(s, "\n## Failing log tails\n\n{logs}\n");
5786 }
5787 }
5788
5789 if pr.review_comments.is_empty() {
5790 s.push_str("\n# Review comments\n\n(none)\n");
5791 } else {
5792 s.push_str("\n# Review comments\n");
5793 for c in &pr.review_comments {
5794 let where_ = match (&c.path, c.line) {
5795 (Some(p), Some(l)) => format!(" ({p}:{l})"),
5796 (Some(p), None) => format!(" ({p})"),
5797 _ => String::new(),
5798 };
5799 let _ = write!(s, "\n## {}{where_}\n\n{}\n", c.author, c.body.trim());
5800 }
5801 }
5802
5803 s.push_str(
5804 "\n# Rules\n\n\
5805 1. Fix the cause, never the symptom. Do not delete, skip, or weaken a \
5806 failing test; do not silence a lint with an allow attribute; do not \
5807 stretch a timeout to hide a race. If the check is right, the code is \
5808 wrong.\n\
5809 2. Change nothing the checks and the comments did not raise. A \
5810 drive-by refactor turns a one-line fix into a pull request that \
5811 needs reviewing again.\n\
5812 3. If a comment is wrong, say so with a checkable argument and change \
5813 nothing for it. A declined comment with a reason is a correct \
5814 outcome; a change made to appease a reviewer is not.\n\
5815 4. Commit in this worktree. magi pushes to the pull request's branch \
5816 for you; do not push, merge, or close anything yourself.\n\
5817 5. Never name yourself, your vendor, or your model, anywhere.\n\n\
5818 # Output\n\n\
5819 Say what you changed and why, and what you declined and why.",
5820 );
5821
5822 let language = &state.config.graph.language;
5823 if !(language.trim().is_empty() || language.eq_ignore_ascii_case("en")) {
5824 let _ = write!(s, "\n\nWrite all prose in {language}.");
5825 }
5826 s.push_str(&crate::prompt::github_rule(
5828 language,
5829 &state.config.graph.github_language,
5830 ));
5831 if let Some(overlay) = state.config.prompts.overlay("fix") {
5832 let _ = write!(s, "\n\n{overlay}");
5833 }
5834 s.push('\n');
5835 s.push_str(crate::prompt::child_run_ownership());
5836 s
5837}
5838
5839async fn failing_logs(repo: &Path, failing: &[(String, String)]) -> String {
5842 let mut out = String::new();
5843 for (name, url) in failing.iter().take(MAX_LOGS) {
5844 let args = match (job_of(url), run_of(url)) {
5845 (Some(job), _) => vec![
5846 "run".to_owned(),
5847 "view".to_owned(),
5848 "--log-failed".to_owned(),
5849 "--job".to_owned(),
5850 job,
5851 ],
5852 (None, Some(run)) => vec![
5853 "run".to_owned(),
5854 "view".to_owned(),
5855 run,
5856 "--log-failed".to_owned(),
5857 ],
5858 (None, None) => continue,
5860 };
5861 let (ok, body) = match gh(repo, &args).await {
5862 Ok(v) => v,
5863 Err(e) => (false, format!("{e:#}")),
5864 };
5865 if !ok && body.trim().is_empty() {
5866 continue;
5867 }
5868 let _ = write!(out, "### {name}\n\n```\n{}\n```\n\n", tail(&body, LOG_TAIL));
5869 }
5870 out
5871}
5872
5873fn job_of(details_url: &str) -> Option<String> {
5876 let after = details_url.split("/job/").nth(1)?;
5877 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
5878 (!id.is_empty()).then_some(id)
5879}
5880
5881pub(crate) fn run_of(details_url: &str) -> Option<String> {
5883 let after = details_url.split("/actions/runs/").nth(1)?;
5884 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
5885 (!id.is_empty()).then_some(id)
5886}
5887
5888fn stop_comment(run_id: &str, why: &str) -> String {
5892 format!(
5893 "{MARKER}\nmagi stopped landing this pull request: {why}\n\n\
5894 The branch is untouched and the run is `{run_id}`. Nothing was merged."
5895 )
5896}
5897
5898async fn stop(state: &mut RunState, repo: &Path, pr: &PrState, why: &str) -> Result<()> {
5903 let body = stop_comment(&state.id, why);
5904 let (_, mut body) = crate::github_text::prepare(state, "", &body);
5905 if !body.contains(MARKER) {
5906 body = format!("{MARKER}\n{body}");
5907 }
5908 let posted = gh(
5909 repo,
5910 &[
5911 "pr".to_owned(),
5912 "comment".to_owned(),
5913 pr.number.to_string(),
5914 "--body".to_owned(),
5915 body,
5916 ],
5917 )
5918 .await;
5919 match posted {
5920 Ok((true, _)) => {}
5921 Ok((false, out)) => tracing::warn!("could not comment on {}: {out}", pr.url),
5922 Err(e) => tracing::warn!("could not comment on {}: {e:#}", pr.url),
5923 }
5924 state.status = RunStatus::Blocked;
5925 state.merge = Some(MergeOutcome {
5926 mode: MergeMode::Pr,
5927 ok: false,
5928 detail: why.to_owned(),
5929 empty: false,
5930 });
5931 state.event("land", format!("stopped: {why}"));
5932 state.save()?;
5933 Ok(())
5934}
5935
5936pub(crate) async fn gh(cwd: &Path, args: &[String]) -> Result<(bool, String)> {
5952 let out = tokio::process::Command::new("gh")
5953 .args(args)
5954 .current_dir(cwd)
5955 .env_remove("GH_REPO")
5956 .quiet()
5957 .stdin(std::process::Stdio::null())
5958 .output()
5959 .await
5960 .with_context(|| format!("spawn gh {}", args.join(" ")))?;
5961 let mut body = String::from_utf8_lossy(&out.stdout).into_owned();
5962 let err = String::from_utf8_lossy(&out.stderr);
5963 if body.trim().is_empty() {
5964 body = err.into_owned();
5965 } else if !err.trim().is_empty() {
5966 body.push_str(&err);
5967 }
5968 Ok((out.status.success(), body.trim().to_owned()))
5969}
5970
5971#[derive(Debug, Clone, Copy, PartialEq, Eq)]
5973pub(crate) enum Verdict {
5974 Pass,
5975 Fail,
5976 Pending,
5977 Unknown,
5978}
5979
5980impl Verdict {
5981 pub(crate) fn label(self) -> &'static str {
5983 match self {
5984 Self::Pass => "passed",
5985 Self::Fail => "failed",
5986 Self::Pending => "pending",
5987 Self::Unknown => "unknown",
5988 }
5989 }
5990}
5991
5992#[derive(Debug, Deserialize)]
5993#[serde(rename_all = "camelCase")]
5994struct GhPr {
5995 #[serde(default)]
5996 url: String,
5997 #[serde(default)]
5998 number: u64,
5999 #[serde(default)]
6000 state: String,
6001 #[serde(default)]
6002 title: String,
6003 #[serde(default)]
6004 status_check_rollup: Vec<GhCheck>,
6005 #[serde(default)]
6012 merge_state_status: String,
6013 #[serde(default)]
6017 head_ref_oid: String,
6018 #[serde(default)]
6019 base_ref_name: String,
6020 #[serde(default)]
6021 reviews: Vec<GhReview>,
6022 #[serde(default)]
6023 comments: Vec<GhComment>,
6024}
6025
6026#[derive(Debug, Deserialize)]
6031#[serde(rename_all = "camelCase")]
6032struct GhCheck {
6033 #[serde(default)]
6034 name: Option<String>,
6035 #[serde(default)]
6036 context: Option<String>,
6037 #[serde(default)]
6038 status: Option<String>,
6039 #[serde(default)]
6040 conclusion: Option<String>,
6041 #[serde(default)]
6042 state: Option<String>,
6043 #[serde(default)]
6044 details_url: Option<String>,
6045 #[serde(default)]
6046 target_url: Option<String>,
6047 #[serde(default)]
6050 is_required: Option<bool>,
6051}
6052
6053impl GhCheck {
6054 fn label(&self) -> String {
6056 self.name
6057 .clone()
6058 .or_else(|| self.context.clone())
6059 .unwrap_or_else(|| "(unnamed check)".to_owned())
6060 }
6061
6062 fn url(&self) -> Option<&str> {
6064 self.details_url
6065 .as_deref()
6066 .or(self.target_url.as_deref())
6067 .filter(|u| !u.is_empty())
6068 }
6069
6070 fn verdict(&self) -> Verdict {
6078 if let Some(status) = self.status.as_deref() {
6079 if !status.eq_ignore_ascii_case("COMPLETED") {
6080 return Verdict::Pending;
6081 }
6082 }
6083 let outcome = self
6084 .conclusion
6085 .as_deref()
6086 .or(self.state.as_deref())
6087 .unwrap_or("");
6088 match outcome.to_ascii_uppercase().as_str() {
6089 "SUCCESS" | "SKIPPED" | "NEUTRAL" => Verdict::Pass,
6090 "FAILURE" | "ERROR" | "TIMED_OUT" | "CANCELLED" | "STARTUP_FAILURE"
6091 | "ACTION_REQUIRED" => Verdict::Fail,
6092 "PENDING" | "EXPECTED" | "QUEUED" | "IN_PROGRESS" | "WAITING" | "REQUESTED" => {
6093 Verdict::Pending
6094 }
6095 _ => Verdict::Unknown,
6096 }
6097 }
6098}
6099
6100#[derive(Debug, Deserialize)]
6101struct GhAuthor {
6102 #[serde(default)]
6103 login: String,
6104}
6105
6106#[derive(Debug, Deserialize)]
6107struct GhReview {
6108 #[serde(default)]
6109 author: GhAuthor,
6110 #[serde(default)]
6111 body: String,
6112}
6113
6114#[derive(Debug, Deserialize)]
6115struct GhComment {
6116 #[serde(default)]
6117 author: GhAuthor,
6118 #[serde(default)]
6119 body: String,
6120}
6121
6122#[derive(Debug, Deserialize)]
6123struct GhUser {
6124 #[serde(default)]
6125 login: String,
6126}
6127
6128#[derive(Debug, Deserialize)]
6129struct GhInline {
6130 #[serde(default)]
6131 user: GhUser,
6132 #[serde(default)]
6133 path: Option<String>,
6134 #[serde(default)]
6135 line: Option<u64>,
6136 #[serde(default)]
6137 body: String,
6138}
6139
6140impl Default for GhAuthor {
6141 fn default() -> Self {
6142 Self {
6143 login: "(unknown)".to_owned(),
6144 }
6145 }
6146}
6147
6148impl Default for GhUser {
6149 fn default() -> Self {
6150 Self {
6151 login: "(unknown)".to_owned(),
6152 }
6153 }
6154}
6155
6156#[cfg(test)]
6157pub(crate) mod tests {
6158 use super::*;
6159 use crate::run::{Candidate, ReviewRecord, ReviewRound, Tally};
6160
6161 fn head_json(head: &str, base: &str, state: &str, cross: bool) -> String {
6162 format!(
6163 r#"{{"headRefName":"{head}","headRefOid":"aaa","baseRefName":"{base}","state":"{state}","isCrossRepository":{cross}}}"#
6164 )
6165 }
6166
6167 #[test]
6168 fn a_pull_request_is_closed_only_when_its_head_is_exactly_the_runs_branch() {
6169 let ok = head_json("magi/27b2/A", "main", "OPEN", false);
6170 assert_eq!(
6171 closable(&ok, "magi/27b2/A", "main", &["aaa".to_owned()]),
6172 Ok(())
6173 );
6174 for (json, why) in [
6175 (head_json("magi/27b2/B", "main", "OPEN", false), "head"),
6176 (head_json("magi/27b2/A-2", "main", "OPEN", false), "head"),
6177 (head_json("magi/27b2/A", "main", "OPEN", true), "fork"),
6178 (head_json("magi/27b2/A", "dev", "OPEN", false), "targets"),
6179 (head_json("magi/27b2/A", "main", "MERGED", false), "already"),
6180 (head_json("magi/27b2/A", "main", "CLOSED", false), "already"),
6181 ] {
6182 let err = closable(&json, "magi/27b2/A", "main", &["aaa".to_owned()])
6183 .unwrap_err()
6184 .why;
6185 assert!(err.contains(why), "{json}: {err}");
6186 }
6187 let moved = head_json("magi/27b2/A", "main", "OPEN", false);
6189 let err = closable(&moved, "magi/27b2/A", "main", &["bbb".to_owned()]).unwrap_err();
6190 assert!(err.retry && err.why.contains("not a commit"), "{err:?}");
6191 assert!(
6192 !closable(
6193 &head_json("x", "main", "OPEN", false),
6194 "magi/27b2/A",
6195 "main",
6196 &[]
6197 )
6198 .unwrap_err()
6199 .retry
6200 );
6201 assert!(is_forge_url("https://github.com/o/r.git"));
6202 assert!(is_forge_url("git@github.com:o/r.git"));
6203 assert!(!is_forge_url("/tmp/origin.git"));
6204 assert!(!is_forge_url("C:\\work\\origin.git"));
6205 assert!(!is_forge_url("file:///tmp/origin.git"));
6206 assert!(forge_unavailable(
6207 "gh pr list failed: none of the git remotes configured for this repository point to a known GitHub host."
6208 ));
6209 assert!(!forge_unavailable(
6210 "gh pr list failed: error connecting to api.github.com"
6211 ));
6212 assert!(closable("not json", "magi/27b2/A", "main", &[]).is_err());
6213 assert!(
6215 closable(
6216 r#"{"headRefName":"b","headRefOid":"aaa","baseRefName":"main","state":"OPEN"}"#,
6217 "b",
6218 "main",
6219 &["aaa".to_owned()]
6220 )
6221 .is_err()
6222 );
6223 }
6224
6225 #[test]
6226 fn the_close_comment_names_the_commit_on_the_base() {
6227 let e = crate::already::Evidence {
6228 proof: crate::already::Proof::PatchId,
6229 tip: "1234567890".to_owned(),
6230 commits: vec!["0e368de0000".to_owned()],
6231 };
6232 let c = superseded_comment("main", &e);
6233 assert!(c.contains("0e368de") && c.contains("`main`"), "{c}");
6234 }
6235
6236 const GREEN_OPEN: &str = r####"{
6238 "url": "https://github.com/yukimemi/magi/pull/10",
6239 "number": 10,
6240 "state": "OPEN",
6241 "mergeStateStatus": "CLEAN",
6242 "statusCheckRollup": [
6243 {
6244 "__typename": "CheckRun",
6245 "conclusion": "SKIPPED",
6246 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278334/job/99378963755",
6247 "name": "review",
6248 "status": "COMPLETED",
6249 "workflowName": "claude-review"
6250 },
6251 {
6252 "__typename": "CheckRun",
6253 "conclusion": "SUCCESS",
6254 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963144",
6255 "name": "check (ubuntu-latest)",
6256 "status": "COMPLETED",
6257 "workflowName": "CI"
6258 },
6259 {
6260 "__typename": "CheckRun",
6261 "conclusion": "SUCCESS",
6262 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963095",
6263 "name": "rustfmt",
6264 "status": "COMPLETED",
6265 "workflowName": "CI"
6266 },
6267 {
6268 "__typename": "StatusContext",
6269 "context": "CodeRabbit",
6270 "state": "SUCCESS",
6271 "targetUrl": ""
6272 }
6273 ],
6274 "reviews": [],
6275 "comments": [
6276 {
6277 "author": {
6278 "login": "coderabbitai"
6279 },
6280 "authorAssociation": "NONE",
6281 "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"
6282 }
6283 ]
6284}"####;
6285
6286 const RED_OPEN: &str = r####"{
6288 "url": "https://github.com/yukimemi/magi/pull/9",
6289 "number": 9,
6290 "state": "OPEN",
6291 "mergeStateStatus": "UNSTABLE",
6292 "statusCheckRollup": [
6293 {
6294 "__typename": "CheckRun",
6295 "conclusion": "SUCCESS",
6296 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
6297 "name": "check (ubuntu-latest)",
6298 "status": "COMPLETED",
6299 "workflowName": "CI"
6300 },
6301 {
6302 "__typename": "CheckRun",
6303 "conclusion": "SUCCESS",
6304 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
6305 "name": "rustfmt",
6306 "status": "COMPLETED",
6307 "workflowName": "CI"
6308 },
6309 {
6310 "__typename": "CheckRun",
6311 "conclusion": "FAILURE",
6312 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
6313 "name": "editorconfig",
6314 "status": "COMPLETED",
6315 "workflowName": "CI"
6316 },
6317 {
6318 "__typename": "StatusContext",
6319 "context": "CodeRabbit",
6320 "state": "SUCCESS",
6321 "targetUrl": ""
6322 }
6323 ],
6324 "reviews": [],
6325 "comments": [
6326 {
6327 "author": {
6328 "login": "coderabbitai"
6329 },
6330 "authorAssociation": "NONE",
6331 "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"
6332 }
6333 ]
6334}"####;
6335
6336 const PENDING_OPEN: &str = r####"{
6338 "url": "https://github.com/yukimemi/magi/pull/9",
6339 "number": 9,
6340 "state": "OPEN",
6341 "statusCheckRollup": [
6342 {
6343 "__typename": "CheckRun",
6344 "conclusion": "SUCCESS",
6345 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
6346 "name": "check (ubuntu-latest)",
6347 "status": "COMPLETED",
6348 "workflowName": "CI"
6349 },
6350 {
6351 "__typename": "CheckRun",
6352 "conclusion": "SUCCESS",
6353 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
6354 "name": "rustfmt",
6355 "status": "COMPLETED",
6356 "workflowName": "CI"
6357 },
6358 {
6359 "__typename": "CheckRun",
6360 "conclusion": null,
6361 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
6362 "name": "editorconfig",
6363 "status": "IN_PROGRESS",
6364 "workflowName": "CI"
6365 },
6366 {
6367 "__typename": "StatusContext",
6368 "context": "CodeRabbit",
6369 "state": "SUCCESS",
6370 "targetUrl": ""
6371 }
6372 ],
6373 "reviews": [],
6374 "comments": []
6375}"####;
6376
6377 const MERGED: &str = r####"{
6379 "url": "https://github.com/yukimemi/magi/pull/16",
6380 "number": 16,
6381 "state": "MERGED",
6382 "statusCheckRollup": [
6383 {
6384 "__typename": "CheckRun",
6385 "conclusion": "SUCCESS",
6386 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587933/job/100268878095",
6387 "name": "check (ubuntu-latest)",
6388 "status": "COMPLETED",
6389 "workflowName": "CI"
6390 },
6391 {
6392 "__typename": "CheckRun",
6393 "conclusion": "SUCCESS",
6394 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587918/job/100268876427",
6395 "name": "review",
6396 "status": "COMPLETED",
6397 "workflowName": "claude-review"
6398 }
6399 ],
6400 "reviews": [],
6401 "comments": []
6402}"####;
6403
6404 const REVIEWED_OPEN: &str = r####"{
6406 "url": "https://github.com/yukimemi/magi/pull/12",
6407 "number": 12,
6408 "state": "OPEN",
6409 "statusCheckRollup": [
6410 {
6411 "__typename": "CheckRun",
6412 "conclusion": "SUCCESS",
6413 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212506/job/100065355258",
6414 "name": "check (ubuntu-latest)",
6415 "status": "COMPLETED",
6416 "workflowName": "CI"
6417 },
6418 {
6419 "__typename": "CheckRun",
6420 "conclusion": "SUCCESS",
6421 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212566/job/100065355810",
6422 "name": "review",
6423 "status": "COMPLETED",
6424 "workflowName": "claude-review"
6425 }
6426 ],
6427 "reviews": [
6428 {
6429 "author": {
6430 "login": "claude"
6431 },
6432 "state": "COMMENTED",
6433 "body": ""
6434 }
6435 ],
6436 "comments": [
6437 {
6438 "author": {
6439 "login": "coderabbitai"
6440 },
6441 "authorAssociation": "NONE",
6442 "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"
6443 },
6444 {
6445 "author": {
6446 "login": "claude"
6447 },
6448 "authorAssociation": "NONE",
6449 "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"
6450 }
6451 ]
6452}"####;
6453
6454 const INLINE: &str = r####"[
6456 {
6457 "user": {
6458 "login": "claude[bot]"
6459 },
6460 "path": "src/graph.rs",
6461 "line": 231,
6462 "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"
6463 }
6464]"####;
6465
6466 const CODERABBIT_TRIGGER: &str = r####"<!-- This is an auto-generated comment: summarize by coderabbit.ai -->
6468<!-- This is an auto-generated comment: skip review by coderabbit.ai -->
6469
6470> [!IMPORTANT]
6471> - [ ] <!-- {"checkboxId":"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe"} --> 🔍 Trigger review
6472>
6473> This repository does not receive automatic reviews because it has fewer than 10 stars.
6474>
6475> <details>
6476> <summary>⚙️ Run configuration</summary>
6477>
6478> **Configuration used**: defaults
6479>
6480> **Review profile**: CHILL
6481>
6482> **Plan**: Team
6483>
6484> **Run ID**: `c1e2a68f-87fc-4b35-9ec4-e75c7854966a`
6485>
6486> </details>
6487
6488<!-- end of auto-generated comment: skip review by coderabbit.ai -->
6489
6490<!-- tips_start -->
6491
6492---
6493
6494Thanks 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.
6495
6496<details>
6497<summary>❤️ Share</summary>
6498
6499- [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"####;
6500
6501 const CLAUDE_CHECKLIST: &str = r####"**Claude finished @yukimemi's task in 4m 14s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33636587918)
6503
6504---
6505### Reviewing PR #16
6506
6507- [x] Read AGENTS.md conventions
6508- [x] Review `src/daemon.rs` changes
6509- [x] Review `src/main.rs` changes (new `doctor` reporting)
6510- [x] Review `src/web.rs` changes (reuse of unreadable-run count)
6511- [x] Check test coverage for new behavior
6512- [x] Run verification commands (blocked — see note)
6513- [x] Post findings"####;
6514
6515 const CLAUDE_FINDING: &str = r####"**Claude finished @yukimemi's task in 3m 52s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33571212566)
6517
6518---
6519### Review: `magi review <branch>` — cheap-half-only graph
6520
6521Read 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.
6522
6523**Correctness**
6524
6525- 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"####;
6526
6527 fn pr(checks: Checks, failing: &[&str], comments: usize) -> PrState {
6528 PrState {
6529 url: "https://github.com/yukimemi/magi/pull/16".to_owned(),
6530 number: 16,
6531 state: PrLifecycle::Open,
6532 checks,
6533 blocking: if matches!(checks, Checks::Red) {
6537 Blocking::Yes
6538 } else {
6539 Blocking::No
6540 },
6541 failing: failing.iter().map(|s| (*s).to_owned()).collect(),
6542 review_comments: (0..comments)
6543 .map(|i| ReviewComment {
6544 author: "coderabbitai".to_owned(),
6545 path: Some("src/graph.rs".to_owned()),
6546 line: Some(231),
6547 body: format!("finding {i}"),
6548 })
6549 .collect(),
6550 }
6551 }
6552
6553 #[test]
6554 fn expected_ci_is_exactly_decide_and_absent_ci_never_waits_for_checks() {
6555 use CiExpectation::{Absent, Expected};
6556 for checks in [Checks::Pending, Checks::Unknown, Checks::Green, Checks::Red] {
6557 let p = pr(checks, &["x"], 0);
6558 for waited in [Duration::ZERO, CHECKS_GRACE] {
6559 assert_eq!(
6560 decide_with(&p, 0, 4, waited, Expected),
6561 decide(&p, 0, 4, waited)
6562 );
6563 }
6564 }
6565 for checks in [Checks::Pending, Checks::Unknown, Checks::Red] {
6567 let p = pr(checks, &["x"], 0);
6568 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Merge);
6569 assert_eq!(decide_with(&p, 4, 4, CHECKS_GRACE, Absent), Step::Merge);
6570 }
6571 for comments in [0, 1] {
6573 for round in [0, 4] {
6574 let absent = decide_with(
6575 &pr(Checks::Unknown, &[], comments),
6576 round,
6577 4,
6578 CHECKS_GRACE,
6579 Absent,
6580 );
6581 for checks in [Checks::Green, Checks::Red, Checks::Pending] {
6582 assert_eq!(
6583 decide_with(
6584 &pr(checks, &["third-party"], comments),
6585 round,
6586 4,
6587 Duration::ZERO,
6588 Absent
6589 ),
6590 absent
6591 );
6592 }
6593 if comments != 0 {
6594 assert!(matches!(absent, Step::Fix { .. } | Step::GiveUp { .. }));
6595 assert_eq!(matches!(absent, Step::GiveUp { .. }), round == 4);
6596 }
6597 }
6598 }
6599 let empty = pr(Checks::Unknown, &[], 0);
6600 for waited in [Duration::ZERO, CHECKS_GRACE + POLL] {
6601 assert_eq!(decide_with(&empty, 0, 4, waited, Absent), Step::Merge);
6602 }
6603 assert_eq!(
6604 decide_with(&empty, 0, 4, Duration::ZERO, Expected),
6605 Step::Wait
6606 );
6607 assert_eq!(
6608 decide_with(&empty, 0, 4, CHECKS_GRACE, Expected),
6609 Step::GiveUp { reason: "no check status is readable on the pull request after 3 minute(s); refusing to merge on a guess".to_owned() }
6610 );
6611 let mut p = pr(Checks::Unknown, &[], 0);
6613 p.blocking = Blocking::Conflict;
6614 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Rebase);
6615 p.state = PrLifecycle::Merged;
6617 assert_eq!(
6618 decide_with(&p, 0, 4, Duration::ZERO, Absent),
6619 Step::Done { merged: true }
6620 );
6621 }
6622
6623 #[test]
6624 fn a_green_pull_request_with_nothing_outstanding_parses_as_ready_to_merge() {
6625 let state = parse_pr(GREEN_OPEN).expect("green fixture parses");
6626 assert_eq!(state.number, 10);
6627 assert_eq!(state.state, PrLifecycle::Open);
6628 assert_eq!(state.checks, Checks::Green);
6629 assert!(state.failing.is_empty());
6630 assert!(
6631 state.review_comments.is_empty(),
6632 "the only comment is CodeRabbit's trigger notice: {:?}",
6633 state.review_comments
6634 );
6635 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Merge);
6636 }
6637
6638 #[test]
6639 fn a_failing_check_parses_as_red_and_is_named() {
6640 let state = parse_pr(RED_OPEN).expect("red fixture parses");
6641 assert_eq!(state.checks, Checks::Red);
6642 assert_eq!(state.failing, vec!["editorconfig".to_owned()]);
6643 let mut blocking = state.clone();
6650 blocking.blocking = Blocking::Yes;
6651 match decide(&blocking, 0, 4, Duration::ZERO) {
6652 Step::Fix { reason } => {
6653 assert!(reason.contains("editorconfig"), "reason: {reason}");
6654 assert!(reason.contains("failing"), "reason: {reason}");
6655 }
6656 other => panic!("expected a fix round, got {other:?}"),
6657 }
6658 }
6659
6660 #[test]
6661 fn a_check_still_running_parses_as_pending_and_is_waited_for() {
6662 let state = parse_pr(PENDING_OPEN).expect("pending fixture parses");
6663 assert_eq!(state.checks, Checks::Pending);
6664 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Wait);
6665 }
6666
6667 #[test]
6668 fn a_pull_request_merged_underneath_us_is_done_rather_than_a_failure() {
6669 let state = parse_pr(MERGED).expect("merged fixture parses");
6670 assert_eq!(state.state, PrLifecycle::Merged);
6671 assert_eq!(
6672 decide(&state, 0, 4, Duration::ZERO),
6673 Step::Done { merged: true }
6674 );
6675 }
6676
6677 #[test]
6678 fn a_review_that_found_something_is_outstanding_and_holds_the_merge() {
6679 let state = parse_pr(REVIEWED_OPEN).expect("reviewed fixture parses");
6680 assert_eq!(state.checks, Checks::Green);
6681 let authors: Vec<&str> = state
6682 .review_comments
6683 .iter()
6684 .map(|c| c.author.as_str())
6685 .collect();
6686 assert_eq!(
6687 authors,
6688 vec!["claude"],
6689 "CodeRabbit's walkthrough is machinery; Claude's review is a finding"
6690 );
6691 match decide(&state, 0, 4, Duration::ZERO) {
6692 Step::Fix { reason } => assert!(reason.contains("unresolved"), "reason: {reason}"),
6693 other => panic!("expected a fix round, got {other:?}"),
6694 }
6695 }
6696
6697 #[test]
6698 fn inline_review_comments_keep_their_file_and_line() {
6699 let comments = parse_inline_comments(INLINE).expect("inline fixture parses");
6700 assert_eq!(comments.len(), 1);
6701 assert_eq!(comments[0].author, "claude[bot]");
6702 assert_eq!(comments[0].path.as_deref(), Some("src/graph.rs"));
6703 assert_eq!(comments[0].line, Some(231));
6704 assert!(comments[0].body.contains("empty"), "{}", comments[0].body);
6705 }
6706
6707 #[test]
6708 fn a_status_only_bot_comment_does_not_trigger_a_fix_round() {
6709 assert!(
6710 is_noise(CODERABBIT_TRIGGER),
6711 "CodeRabbit's trigger notice declares itself not a review"
6712 );
6713 assert!(
6714 is_noise(CLAUDE_CHECKLIST),
6715 "a progress checklist asks for nothing"
6716 );
6717 assert!(
6718 !is_noise(CLAUDE_FINDING),
6719 "a review that names a bug is input, not noise"
6720 );
6721
6722 let mut clean = pr(Checks::Green, &[], 0);
6723 clean.review_comments.push(ReviewComment {
6724 author: "coderabbitai".to_owned(),
6725 path: None,
6726 line: None,
6727 body: CODERABBIT_TRIGGER.to_owned(),
6728 });
6729 clean.review_comments.retain(|c| !is_noise(&c.body));
6730 assert_eq!(decide(&clean, 0, 4, Duration::ZERO), Step::Merge);
6731
6732 let mut found = pr(Checks::Green, &[], 0);
6733 found.review_comments.push(ReviewComment {
6734 author: "claude".to_owned(),
6735 path: None,
6736 line: None,
6737 body: CLAUDE_FINDING.to_owned(),
6738 });
6739 found.review_comments.retain(|c| !is_noise(&c.body));
6740 assert!(matches!(
6741 decide(&found, 0, 4, Duration::ZERO),
6742 Step::Fix { .. }
6743 ));
6744 }
6745
6746 #[test]
6747 fn the_policy_table_holds_for_every_combination_that_matters() {
6748 let cases: Vec<(&str, PrState, usize, usize, Duration, Step)> = vec![
6749 (
6750 "pending checks are waited for, even on the last round",
6751 pr(Checks::Pending, &[], 0),
6752 4,
6753 4,
6754 Duration::ZERO,
6755 Step::Wait,
6756 ),
6757 (
6758 "red checks are fixed",
6759 pr(Checks::Red, &["editorconfig"], 0),
6760 0,
6761 4,
6762 Duration::ZERO,
6763 Step::Fix {
6764 reason: "1 check(s) failing: editorconfig".to_owned(),
6765 },
6766 ),
6767 (
6768 "green with comments is fixed, not merged",
6769 pr(Checks::Green, &[], 2),
6770 1,
6771 4,
6772 Duration::ZERO,
6773 Step::Fix {
6774 reason: "checks are green but 2 review comment(s) are unresolved: coderabbitai"
6775 .to_owned(),
6776 },
6777 ),
6778 (
6779 "green and clean merges",
6780 pr(Checks::Green, &[], 0),
6781 3,
6782 4,
6783 Duration::ZERO,
6784 Step::Merge,
6785 ),
6786 (
6787 "an unreadable rollup is waited on while the grace lasts",
6788 pr(Checks::Unknown, &[], 0),
6789 0,
6790 4,
6791 Duration::ZERO,
6792 Step::Wait,
6793 ),
6794 (
6795 "an unreadable rollup is never merged once the grace is spent",
6796 pr(Checks::Unknown, &[], 0),
6797 0,
6798 4,
6799 CHECKS_GRACE,
6800 Step::GiveUp {
6801 reason: "no check status is readable on the pull request after 3 minute(s); \
6802 refusing to merge on a guess"
6803 .to_owned(),
6804 },
6805 ),
6806 ];
6807 for (what, state, round, budget, waited, want) in cases {
6808 assert_eq!(decide(&state, round, budget, waited), want, "{what}");
6809 }
6810 }
6811
6812 #[test]
6813 fn the_forge_verdict_survives_the_round_trip_from_gh() {
6814 let green = parse_pr(GREEN_OPEN).expect("parse");
6818 assert_eq!(green.blocking, Blocking::No);
6819 let red = parse_pr(RED_OPEN).expect("parse");
6820 assert_eq!(
6821 red.blocking,
6822 Blocking::No,
6823 "`UNSTABLE` is mergeable: the red check is one nobody requires"
6824 );
6825 assert_eq!(red.checks, Checks::Red, "and it is still reported as red");
6826 let quiet =
6828 parse_pr(&GREEN_OPEN.replace("\"mergeStateStatus\": \"CLEAN\",", "")).expect("parse");
6829 assert_eq!(quiet.blocking, Blocking::Unsaid);
6830 }
6831
6832 #[test]
6833 fn a_red_check_nobody_requires_does_not_buy_a_fix_round() {
6834 let mut nonblocking = pr(Checks::Red, &["editorconfig", "coverage"], 0);
6840 nonblocking.blocking = Blocking::No;
6841 assert_eq!(
6842 decide(&nonblocking, 0, 4, Duration::ZERO),
6843 Step::Merge,
6844 "the forge says nothing is in the way, so nothing is"
6845 );
6846
6847 let mut blocking = pr(Checks::Red, &["test (ubuntu-latest)"], 0);
6849 blocking.blocking = Blocking::Yes;
6850 assert!(matches!(
6851 decide(&blocking, 0, 4, Duration::ZERO),
6852 Step::Fix { .. }
6853 ));
6854
6855 let mut commented = pr(Checks::Red, &["coverage"], 1);
6858 commented.blocking = Blocking::No;
6859 assert!(matches!(
6860 decide(&commented, 0, 4, Duration::ZERO),
6861 Step::Fix { .. }
6862 ));
6863
6864 let mut unsaid = pr(Checks::Red, &["coverage"], 0);
6866 unsaid.blocking = Blocking::Unsaid;
6867 assert_eq!(decide(&unsaid, 0, 4, Duration::ZERO), Step::Wait);
6868 assert!(matches!(
6869 decide(&unsaid, 0, 4, CHECKS_GRACE),
6870 Step::Fix { .. }
6871 ));
6872 }
6873
6874 #[test]
6875 fn a_red_merge_is_announced_with_every_failing_check_and_a_green_one_is_not() {
6876 let mut red = pr(Checks::Red, &["test (windows-latest)", "coverage"], 0);
6877 red.blocking = Blocking::No;
6878 assert_eq!(
6879 decide(&red, 0, 4, Duration::ZERO),
6880 Step::Merge,
6881 "announcing must not change the decision"
6882 );
6883 let said = red_merge_summary("yukimemi/magi", &red).expect("red merge is announced");
6884 assert!(said.contains("yukimemi/magi"), "{said}");
6885 assert!(said.contains("#16"), "{said}");
6886 assert!(
6887 said.contains("https://github.com/yukimemi/magi/pull/16"),
6888 "{said}"
6889 );
6890 assert!(
6891 said.contains("test (windows-latest)") && said.contains("coverage"),
6892 "{said}"
6893 );
6894
6895 let green = pr(Checks::Green, &["stale"], 0);
6897 assert_eq!(red_merge_summary("yukimemi/magi", &green), None);
6898 }
6899
6900 #[test]
6901 fn red_merge_notices_omit_empty_check_details() {
6902 for checks in [vec![], vec!["", " "]] {
6903 let red = pr(Checks::Red, &checks, 0);
6904 let summary = red_merge_summary("owner/repo", &red).unwrap();
6905 let notice = crate::notices::merged_red("run-1", &summary);
6906 assert_eq!(
6907 notice.message,
6908 format!("Merged owner/repo PR #16 with red checks ({})", red.url)
6909 );
6910 assert_eq!(notice.severity, crate::notices::Severity::Warn);
6911 }
6912 let red = pr(Checks::Red, &["", " test ", " "], 0);
6913 let summary = red_merge_summary("owner/repo", &red).unwrap();
6914 assert!(summary.contains("with red checks: test ("), "{summary}");
6915 }
6916
6917 #[test]
6918 fn the_repo_label_comes_from_the_pull_request_url() {
6919 let p = Path::new("/tmp/checkout");
6920 assert_eq!(
6921 repo_label(p, "https://github.com/yukimemi/magi/pull/16"),
6922 "yukimemi/magi"
6923 );
6924 assert_eq!(repo_label(p, "not a url"), "checkout");
6925 }
6926
6927 #[test]
6928 fn a_branch_the_base_moved_under_is_rebased_not_fixed() {
6929 let mut conflicted = pr(Checks::Green, &[], 0);
6934 conflicted.blocking = Blocking::Conflict;
6935 assert_eq!(decide(&conflicted, 0, 4, Duration::ZERO), Step::Rebase);
6936
6937 let mut red = pr(Checks::Red, &["test (ubuntu-latest)"], 2);
6941 red.blocking = Blocking::Conflict;
6942 assert_eq!(decide(&red, 4, 4, Duration::ZERO), Step::Rebase);
6943
6944 let mut merged = pr(Checks::Red, &[], 0);
6946 merged.blocking = Blocking::Conflict;
6947 merged.state = PrLifecycle::Merged;
6948 assert_eq!(
6949 decide(&merged, 0, 4, Duration::ZERO),
6950 Step::Done { merged: true }
6951 );
6952 }
6953
6954 #[test]
6955 fn the_forge_verdict_is_read_off_merge_state_status() {
6956 for ok in ["CLEAN", "UNSTABLE", "unstable", "HAS_HOOKS"] {
6959 assert_eq!(Blocking::of(ok), Blocking::No, "{ok}");
6960 assert!(!Blocking::of(ok).stops_a_merge(), "{ok}");
6961 }
6962 assert_eq!(Blocking::of("DIRTY"), Blocking::Conflict);
6963 assert_eq!(Blocking::of("BLOCKED"), Blocking::Yes);
6964 assert_eq!(Blocking::of("BEHIND"), Blocking::Yes);
6965 for quiet in ["", "UNKNOWN"] {
6968 assert_eq!(Blocking::of(quiet), Blocking::Unsaid);
6969 assert!(Blocking::of(quiet).stops_a_merge());
6970 }
6971 }
6972
6973 #[test]
6974 fn a_merge_command_that_failed_after_merging_is_still_a_merge() {
6975 let argv = merge_argv(28, "fix: retry uploads on transient network errors");
6976 let jj = "could not determine current branch: failed to run git: not on any branch";
6978
6979 let landed = merged_after_all(&argv, jj, Some(PrLifecycle::Merged))
6980 .expect("the forge says merged, so it merged");
6981 assert!(landed.ok);
6982 assert!(
6983 landed.detail.contains("but the pull request is merged"),
6984 "the record must not read as a clean success: {}",
6985 landed.detail
6986 );
6987 assert!(
6988 landed.detail.contains("not on any branch"),
6989 "and it must keep what the command actually said: {}",
6990 landed.detail
6991 );
6992
6993 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Open)).is_none());
6995 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Closed)).is_none());
6996 assert!(merged_after_all(&argv, jj, None).is_none());
6998 }
6999
7000 #[test]
7001 fn a_pull_request_closed_underneath_us_is_done_and_not_merged() {
7002 let mut state = pr(Checks::Red, &["editorconfig"], 3);
7003 state.state = PrLifecycle::Closed;
7004 assert_eq!(
7005 decide(&state, 0, 4, Duration::ZERO),
7006 Step::Done { merged: false },
7007 "a human closing the pull request ends the loop, whatever CI says"
7008 );
7009 }
7010
7011 #[test]
7012 fn the_last_round_gives_up_with_a_reason_naming_what_is_still_failing() {
7013 let red = decide(
7014 &pr(Checks::Red, &["editorconfig", "test (macos)"], 0),
7015 4,
7016 4,
7017 Duration::ZERO,
7018 );
7019 match red {
7020 Step::GiveUp { reason } => {
7021 assert!(reason.contains("editorconfig"), "reason: {reason}");
7022 assert!(reason.contains("test (macos)"), "reason: {reason}");
7023 assert!(reason.contains("4 fix round(s)"), "reason: {reason}");
7024 }
7025 other => panic!("expected a give-up, got {other:?}"),
7026 }
7027
7028 let commented = decide(&pr(Checks::Green, &[], 1), 2, 2, Duration::ZERO);
7029 match commented {
7030 Step::GiveUp { reason } => {
7031 assert!(reason.contains("unresolved"), "reason: {reason}");
7032 assert!(reason.contains("2 fix round(s)"), "reason: {reason}");
7033 }
7034 other => panic!("expected a give-up, got {other:?}"),
7035 }
7036 }
7037
7038 #[test]
7039 fn the_merge_command_squashes_deletes_the_branch_and_sets_its_own_subject() {
7040 let candidate_commit = "magi: candidate A (uncommitted work)";
7041 let subject = merge_subject(candidate_commit, "add retries to the uploader");
7042 let argv = merge_argv(16, &subject);
7043
7044 assert!(argv.contains(&"--squash".to_owned()));
7045 assert!(argv.contains(&"--delete-branch".to_owned()));
7046 assert!(argv.contains(&"--subject".to_owned()));
7047 assert_eq!(
7048 argv.last().map(String::as_str),
7049 Some("add retries to the uploader"),
7050 "the subject must not be the candidate commit message"
7051 );
7052 assert_ne!(subject, candidate_commit);
7053 }
7054
7055 #[test]
7056 fn a_real_pull_request_title_is_used_as_the_squash_subject_verbatim() {
7057 assert_eq!(
7058 merge_subject("feat: a queue, an unattended loop, and a phone UI", "task"),
7059 "feat: a queue, an unattended loop, and a phone UI"
7060 );
7061 assert_eq!(
7062 merge_subject("", "# port the retry logic\n\ndetails"),
7063 "port the retry logic",
7064 "an empty title falls back to the task's first line, heading marks stripped"
7065 );
7066 }
7067
7068 #[test]
7069 fn a_failing_checks_details_url_yields_the_job_to_read_logs_from() {
7070 let url = "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572";
7071 assert_eq!(job_of(url).as_deref(), Some("100114323572"));
7072 assert_eq!(run_of(url).as_deref(), Some("33587406996"));
7073 assert_eq!(job_of("https://coderabbit.ai/status"), None);
7074 assert_eq!(run_of(""), None);
7075 }
7076
7077 #[test]
7078 fn magis_own_stop_comment_is_never_read_back_as_a_finding() {
7079 let mut out = Vec::new();
7080 push_if_outstanding(
7081 &mut out,
7082 ReviewComment {
7083 author: "yukimemi".to_owned(),
7084 path: None,
7085 line: None,
7086 body: format!("{MARKER}\nmagi stopped landing this pull request: 1 check failing"),
7087 },
7088 );
7089 assert!(out.is_empty());
7090 }
7091
7092 fn run_state() -> RunState {
7096 let mut state = RunState::new(
7097 std::path::PathBuf::from("/repo/magi"),
7098 "main".to_owned(),
7099 "abcdef1234".to_owned(),
7100 "add retries to the uploader".to_owned(),
7101 crate::config::Config::default(),
7102 );
7103 static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
7108 let nanos = std::time::SystemTime::now()
7109 .duration_since(std::time::UNIX_EPOCH)
7110 .map_or(0, |d| d.subsec_nanos() % 1_000_000);
7111 state.id = format!(
7112 "20261004-{nanos:06}-{:04x}",
7113 NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
7114 );
7115 state
7116 }
7117
7118 fn green_pr() -> PrState {
7119 PrState {
7120 url: "https://github.com/yukimemi/magi/pull/42".to_owned(),
7121 number: 42,
7122 state: PrLifecycle::Open,
7123 checks: Checks::Green,
7124 blocking: Blocking::No,
7126 failing: Vec::new(),
7127 review_comments: vec![ReviewComment {
7128 author: "coderabbitai".to_owned(),
7129 path: Some("src/land.rs".to_owned()),
7130 line: Some(212),
7131 body: "this branch never checks the exit code".to_owned(),
7132 }],
7133 }
7134 }
7135
7136 #[test]
7137 fn land_fixer_defers_review_and_verification_without_a_cache() {
7138 let state = run_state();
7139 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7140 assert!(p.contains(crate::prompt::child_run_ownership()), "{p}");
7141 assert!(p.contains("Commit in this worktree"), "{p}");
7142 }
7143
7144 #[test]
7145 fn github_facing_land_text_is_english_whatever_the_language() {
7146 let mut state = run_state();
7147 state.config.graph.language = "ja".to_owned();
7148 let comment = stop_comment(&state.id, "checks are still red");
7149 assert!(crate::github_text::check("", &comment).is_empty());
7150 assert!(comment.is_ascii(), "{comment}");
7151 assert!(comment.starts_with(MARKER));
7152
7153 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7154 let ja_at = p.find("Write all prose in ja").unwrap();
7155 let rule_at = p.find(crate::prompt::GITHUB_ENGLISH_HEADING).unwrap();
7156 assert!(ja_at < rule_at, "{p}");
7157 assert!(p.contains("stays in Japanese"), "{p}");
7158
7159 state.config.graph.language = "en".to_owned();
7160 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7161 assert!(p.contains(crate::prompt::GITHUB_ENGLISH_HEADING), "{p}");
7162 assert!(!p.contains("does not apply"), "{p}");
7163 }
7164
7165 const NUMSTAT: &str = "12\t3\tsrc/land.rs\n40\t1\tsrc/web.rs\n-\t-\tassets/logo.png";
7166
7167 fn panel() -> String {
7168 approval_panel(
7169 &run_state(),
7170 &green_pr(),
7171 NUMSTAT,
7172 "diff --git a/src/land.rs b/src/land.rs\n@@ -1,2 +1,2 @@\n-old line\n+new line\n context",
7173 &[
7174 "land: ask before merging".to_owned(),
7175 "land: colour the diff".to_owned(),
7176 ],
7177 "feat: merge approval from the phone",
7178 )
7179 }
7180
7181 #[test]
7182 fn the_approval_panel_carries_the_whole_case_for_the_merge() {
7183 let html = panel();
7184 for needle in [
7185 "42",
7186 "main",
7187 "src/land.rs",
7188 "src/web.rs",
7189 "assets/logo.png",
7190 "feat: merge approval from the phone",
7191 "land: ask before merging",
7192 "land: colour the diff",
7193 "coderabbitai",
7194 "this branch never checks the exit code",
7195 "green",
7196 ] {
7197 assert!(html.contains(needle), "the panel must state `{needle}`");
7198 }
7199 }
7200
7201 async fn landing_git_fixture() -> (tempfile::TempDir, RunState, String) {
7202 crate::run::pin_test_home();
7203 let tmp = tempfile::tempdir().unwrap();
7204 let repo = tmp.path().join("repo");
7205 let remote = tmp.path().join("remote.git");
7206 std::fs::create_dir(&repo).unwrap();
7207 git::git(tmp.path(), &["init", "--bare", remote.to_str().unwrap()])
7208 .await
7209 .unwrap();
7210 git::git(&repo, &["init", "-b", "main"]).await.unwrap();
7211 git::git(&repo, &["config", "user.name", "Test"])
7212 .await
7213 .unwrap();
7214 git::git(&repo, &["config", "user.email", "test@example.test"])
7215 .await
7216 .unwrap();
7217 std::fs::write(repo.join("base"), "base").unwrap();
7218 git::git(&repo, &["add", "."]).await.unwrap();
7219 git::git(&repo, &["commit", "-m", "base"]).await.unwrap();
7220 git::git(
7221 &repo,
7222 &["remote", "add", "origin", remote.to_str().unwrap()],
7223 )
7224 .await
7225 .unwrap();
7226 git::git(&repo, &["push", "origin", "main"]).await.unwrap();
7227 git::git(&repo, &["checkout", "-b", "winner"])
7228 .await
7229 .unwrap();
7230 std::fs::write(repo.join("change"), "change").unwrap();
7231 git::git(&repo, &["add", "."]).await.unwrap();
7232 git::git(&repo, &["commit", "-m", "change"]).await.unwrap();
7233 let head = git::rev_parse(&repo, "HEAD").await.unwrap();
7234 git::git(&repo, &["push", "origin", "HEAD:refs/heads/task-head"])
7235 .await
7236 .unwrap();
7237 let mut state = run_state();
7238 state.repo = repo.clone();
7239 state.base_commit = git::rev_parse(&repo, "origin/main").await.unwrap();
7240 state.config.graph.land = true;
7241 state.config.graph.land_approval = true;
7242 state.pr_head = Some("task-head".into());
7243 state.pr_pushed_head = Some(head.clone());
7244 state.candidates = vec![winning_candidate("change")];
7245 state.candidates[0].worktree = repo;
7246 state.candidates[0].branch = "winner".into();
7247 state.tally = Some(uncontested_tally());
7248 state.gate_ran = true;
7249 state.gate_head = Some(head.clone());
7250 state.land_sync_pending = true;
7251 state.save().unwrap();
7252 (tmp, state, head)
7253 }
7254
7255 async fn resume_observed_head(state: &mut RunState, head: &str) -> Result<String> {
7256 let forge = Scripted::new(vec![seen(head, Checks::Green, "CLEAN", false)], vec![]);
7257 resume_landing_head(state, head, &green_pr().url, &forge).await
7258 }
7259
7260 async fn advance_landing_base(state: &RunState) {
7261 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7262 std::fs::write(state.repo.join("advance"), "advance").unwrap();
7263 git::git(&state.repo, &["add", "."]).await.unwrap();
7264 git::git(&state.repo, &["commit", "-m", "advance base"])
7265 .await
7266 .unwrap();
7267 git::git(&state.repo, &["push", "origin", "main"])
7268 .await
7269 .unwrap();
7270 git::git(&state.repo, &["checkout", "winner"])
7271 .await
7272 .unwrap();
7273 }
7274
7275 async fn foreign_landing_fixture() -> (tempfile::TempDir, RunState, String, std::path::PathBuf)
7276 {
7277 let (tmp, mut state, old) = landing_git_fixture().await;
7278 let path = tmp.path().join("foreign");
7279 git::worktree_add_branch(&state.repo, &path, "task-head", &old)
7280 .await
7281 .unwrap();
7282 state.foreign_checkout = Some(
7283 crate::foreign_checkout::inspect(&state.repo, "task-head", &path)
7284 .await
7285 .unwrap(),
7286 );
7287 state.config.merge.mode = crate::config::MergeMode::Pr;
7288 state.save().unwrap();
7289 (tmp, state, old, path)
7290 }
7291
7292 #[tokio::test]
7293 async fn foreign_landing_sync_and_interrupted_resumes_preserve_delivery_ancestry() {
7294 for phase in 0..4 {
7295 let (_tmp, mut state, old, path) = foreign_landing_fixture().await;
7296 advance_landing_base(&state).await;
7297 state.config.verify.gate = vec!["test -f advance && test -f change".into()];
7298 if phase == 0 {
7299 assert_eq!(
7302 rebase_landing_worktree(&mut state, "origin/main")
7303 .await
7304 .unwrap(),
7305 crate::rebase::Rebased::Applied
7306 );
7307 } else {
7308 interrupt_landing_rebase(&mut state).await;
7309 let repaired_tree = git::tree_of(&state.repo, "HEAD").await.unwrap();
7310 if phase == 2 {
7311 git::sync_to_head(&state.repo).await.unwrap();
7312 } else if phase == 3 {
7313 restore_landing_worktree(&mut state).await.unwrap();
7316 let joined = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7317 state.land_rebase_from = Some(old.clone());
7318 state.save().unwrap();
7319 restore_landing_worktree(&mut state).await.unwrap();
7320 assert_eq!(git::rev_parse(&state.repo, "HEAD").await.unwrap(), joined);
7321 }
7322 state.save().unwrap();
7323 state = RunState::load(&state.id).unwrap();
7324 restore_landing_worktree(&mut state).await.unwrap();
7325 assert_eq!(
7326 git::tree_of(&state.repo, "HEAD").await.unwrap(),
7327 repaired_tree
7328 );
7329 }
7330 let head = if phase == 0 {
7331 let forge = Scripted::new(vec![seen(&old, Checks::Green, "CLEAN", false)], vec![]);
7332 publish_landing_head(&mut state, &old, &green_pr().url, &forge)
7333 .await
7334 .unwrap()
7335 } else {
7336 resume_observed_head(&mut state, &old).await.unwrap()
7337 };
7338 assert!(git::is_ancestor(&state.repo, &old, &head).await);
7339 assert!(git::is_ancestor(&state.repo, "origin/main", &head).await);
7340 assert_eq!(git::rev_parse(&path, "HEAD").await.unwrap(), head);
7341 assert_eq!(
7342 git::remote_head(&state.repo, "origin", "task-head")
7343 .await
7344 .unwrap(),
7345 Some(head.clone())
7346 );
7347 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7348 assert_eq!(state.foreign_checkout.as_ref().unwrap().synced_head, head);
7349 assert!(state.gate_allows_progress());
7350 assert!(state.land_rebase_from.is_none());
7351 assert!(!state.land_sync_pending);
7352 assert!(git::is_clean(&path).await.unwrap());
7353 }
7354 }
7355
7356 #[tokio::test]
7357 async fn foreign_landing_conflict_repair_can_resume_and_publish_without_losing_ancestry() {
7358 let (_tmp, mut state, old, path) = foreign_landing_fixture().await;
7359 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7360 std::fs::write(state.repo.join("change"), "conflicting base change").unwrap();
7361 git::commit_all(&state.repo, "conflicting base")
7362 .await
7363 .unwrap();
7364 git::git(&state.repo, &["push", "origin", "main"])
7365 .await
7366 .unwrap();
7367 git::git(&state.repo, &["checkout", "winner"])
7368 .await
7369 .unwrap();
7370 landing_gate_fixer(
7371 &mut state,
7372 "cat >/dev/null; printf resolved > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"resolved\"}'",
7373 );
7374 state.config.graph.gate_fix_rounds = 0;
7375 state.config.verify.gate = vec!["exit 1".into()];
7376 assert!(resume_observed_head(&mut state, &old).await.is_err());
7377 assert!(state.rebase_fixes.iter().any(|fix| fix.finished));
7378 let repaired = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7379 assert!(git::is_ancestor(&state.repo, &old, &repaired).await);
7380 assert_eq!(
7381 std::fs::read_to_string(state.repo.join("change")).unwrap(),
7382 "resolved"
7383 );
7384 assert_eq!(git::rev_parse(&path, "HEAD").await.unwrap(), old);
7386 assert_eq!(
7387 git::remote_head(&state.repo, "origin", "task-head")
7388 .await
7389 .unwrap(),
7390 Some(old.clone())
7391 );
7392 state = RunState::load(&state.id).unwrap();
7393 state.config.verify.gate = vec!["grep -q resolved change".into()];
7394 let head = resume_observed_head(&mut state, &old).await.unwrap();
7395 assert_eq!(head, repaired);
7396 assert_eq!(git::rev_parse(&path, "HEAD").await.unwrap(), head);
7397 assert_eq!(
7398 std::fs::read_to_string(path.join("change")).unwrap(),
7399 "resolved"
7400 );
7401 assert_eq!(
7402 git::remote_head(&state.repo, "origin", "task-head")
7403 .await
7404 .unwrap(),
7405 Some(head.clone())
7406 );
7407 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7408 assert!(git::is_ancestor(&state.repo, "origin/main", &head).await);
7409 assert!(git::is_clean(&path).await.unwrap());
7410 }
7411
7412 #[tokio::test]
7413 async fn landing_resume_gates_rebased_sha_and_publishes_it_to_the_existing_head() {
7414 let (_tmp, mut state, old) = landing_git_fixture().await;
7415 advance_landing_base(&state).await;
7416 state.config.verify.gate = vec!["test -f advance".into()];
7417 let head = resume_observed_head(&mut state, &old).await.unwrap();
7418 assert_ne!(head, old);
7419 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7420 assert!(state.gate_allows_progress());
7421 assert_eq!(
7422 git::remote_head(&state.repo, "origin", "task-head")
7423 .await
7424 .unwrap(),
7425 Some(head.clone())
7426 );
7427 assert_eq!(state.pr_pushed_head, Some(head));
7428 assert!(!state.land_sync_pending);
7429 assert!(state.config.graph.land_approval);
7430 }
7431
7432 fn landing_gate_fixer(state: &mut RunState, script: &str) {
7433 state.config.disk.min_free_bytes = 0;
7434 state.config.graph.gate_fix_rounds = 1;
7435 state.config.agents = vec![crate::config::AgentSpec {
7436 id: "mock".into(),
7437 kind: crate::config::AgentKind::Command,
7438 model: None,
7439 command: vec!["sh".into(), "-c".into(), script.into()],
7440 extra_args: Vec::new(),
7441 env: Default::default(),
7442 prompt_delivery: None,
7443 max_turn_secs: None,
7444 }];
7445 state.candidates[0].agent = "mock".into();
7446 }
7447
7448 #[tokio::test]
7449 async fn landing_resume_revalidates_an_operator_published_winner_extension() {
7450 let (_tmp, mut state, old) = landing_git_fixture().await;
7451 std::fs::write(state.repo.join("change"), "operator update").unwrap();
7452 git::commit_all(&state.repo, "extend winner").await.unwrap();
7453 let updated = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7454 git::git(
7455 &state.repo,
7456 &["push", "origin", "HEAD:refs/heads/task-head"],
7457 )
7458 .await
7459 .unwrap();
7460 state.config.verify.gate = vec!["exit 1".into()];
7461 state.config.graph.gate_fix_rounds = 0;
7462 assert!(resume_observed_head(&mut state, &updated).await.is_err());
7463 assert_ne!(old, updated);
7464 assert_eq!(state.gate_head.as_ref(), Some(&updated));
7465 assert!(!state.gate_allows_progress());
7466 assert!(state.land_sync_pending);
7467 state.config.verify.gate = vec!["grep -q 'operator update' change".into()];
7468 let head = resume_observed_head(&mut state, &updated).await.unwrap();
7469 assert_eq!(head, updated);
7470 assert!(state.gate_allows_progress());
7471 assert!(!state.land_sync_pending);
7472 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7473 land_with(&mut state, &green_pr().url, &forge)
7474 .await
7475 .unwrap();
7476 assert!(state.parked);
7477 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7478 assert!(forge.argvs().is_empty());
7479 }
7480
7481 #[tokio::test]
7482 async fn landing_resume_refuses_remote_only_and_divergent_operator_updates() {
7483 for divergent in [false, true] {
7484 let (_tmp, mut state, old) = landing_git_fixture().await;
7485 if divergent {
7486 git::git(&state.repo, &["reset", "--hard", "origin/main"])
7487 .await
7488 .unwrap();
7489 }
7490 std::fs::write(state.repo.join("external"), "external").unwrap();
7491 git::commit_all(&state.repo, "external update")
7492 .await
7493 .unwrap();
7494 let external = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7495 git::git(
7496 &state.repo,
7497 &["push", "--force", "origin", "HEAD:refs/heads/task-head"],
7498 )
7499 .await
7500 .unwrap();
7501 if !divergent {
7502 git::git(&state.repo, &["reset", "--hard", &old])
7503 .await
7504 .unwrap();
7505 }
7506 let error = resume_observed_head(&mut state, &external)
7507 .await
7508 .unwrap_err();
7509 assert!(
7510 error
7511 .to_string()
7512 .contains("public head moved outside this run")
7513 );
7514 assert_eq!(state.pr_pushed_head.as_ref(), Some(&old));
7515 assert_eq!(
7516 git::remote_head(&state.repo, "origin", "task-head")
7517 .await
7518 .unwrap(),
7519 Some(external)
7520 );
7521 }
7522 }
7523
7524 #[tokio::test]
7525 async fn landing_resume_repairs_a_failed_rebased_gate_before_publication() {
7526 let (_tmp, mut state, old) = landing_git_fixture().await;
7527 advance_landing_base(&state).await;
7528 landing_gate_fixer(
7529 &mut state,
7530 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7531 );
7532 state.config.verify.gate =
7533 vec!["grep -q fixed change || { echo 'change needs repair'; exit 1; }".into()];
7534 state.config.verify.e2e = vec!["test -f advance".into()];
7535 state.config.graph.gate_fix_rounds = 0;
7538 assert!(resume_observed_head(&mut state, &old).await.is_err());
7539 assert_eq!(
7540 git::remote_head(&state.repo, "origin", "task-head")
7541 .await
7542 .unwrap(),
7543 Some(old.clone())
7544 );
7545 state.config.graph.gate_fix_rounds = 1;
7546 let head = resume_observed_head(&mut state, &old).await.unwrap();
7547 assert_eq!(state.gate_fixes.len(), 1);
7548 assert!(state.gate_fixes[0].committed);
7549 assert!(state.gate_allows_progress());
7550 assert_eq!(state.gate_head.as_ref(), Some(&head));
7551 assert_eq!(
7552 git::remote_head(&state.repo, "origin", "task-head")
7553 .await
7554 .unwrap(),
7555 Some(head.clone())
7556 );
7557 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7558 land_with(&mut state, &green_pr().url, &forge)
7559 .await
7560 .unwrap();
7561 assert!(state.parked);
7562 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7563 assert!(forge.argvs().is_empty());
7564 }
7565
7566 #[tokio::test]
7567 async fn landing_gate_repairs_stop_at_the_saved_budget_without_publishing() {
7568 let (_tmp, mut state, old) = landing_git_fixture().await;
7569 advance_landing_base(&state).await;
7570 landing_gate_fixer(
7571 &mut state,
7572 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7573 );
7574 state.config.verify.gate = vec!["echo still red; exit 1".into()];
7575 for _ in 0..2 {
7576 assert!(resume_observed_head(&mut state, &old).await.is_err());
7577 assert_eq!(state.gate_fixes.len(), 1);
7578 assert_eq!(
7579 git::remote_head(&state.repo, "origin", "task-head")
7580 .await
7581 .unwrap(),
7582 Some(old.clone())
7583 );
7584 }
7585 }
7586
7587 #[tokio::test]
7588 async fn landing_gate_repair_cannot_publish_failed_e2e_on_repeated_resumes() {
7589 let (_tmp, mut state, old) = landing_git_fixture().await;
7590 advance_landing_base(&state).await;
7591 landing_gate_fixer(
7592 &mut state,
7593 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7594 );
7595 state.config.verify.gate =
7596 vec!["grep -q fixed change || { echo 'change needs repair'; exit 1; }".into()];
7597 state.config.verify.e2e = vec!["grep -q '^change$' change".into()];
7599 for resume in 0..3 {
7600 assert!(resume_observed_head(&mut state, &old).await.is_err());
7601 state = RunState::load(&state.id).unwrap();
7602 let evidence = state.gate_repair_e2e.as_ref().unwrap();
7603 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7604 assert_eq!(evidence.head, head);
7605 assert!(!evidence.passed);
7606 assert!(evidence.outcomes.iter().any(|o| !o.ok()));
7607 assert_eq!(state.gate_fixes.len(), 1);
7608 assert_eq!(
7609 git::remote_head(&state.repo, "origin", "task-head")
7610 .await
7611 .unwrap(),
7612 Some(old.clone())
7613 );
7614 if resume > 0 {
7615 assert!(
7616 state.gate_allows_progress(),
7617 "a green gate must not bypass red e2e"
7618 );
7619 }
7620 }
7621 state.config.verify.e2e = vec!["grep -q fixed change".into()];
7624 let head = resume_observed_head(&mut state, &old).await.unwrap();
7625 assert!(state.gate_repair_e2e.as_ref().unwrap().passed);
7626 assert_eq!(state.gate_repair_e2e.as_ref().unwrap().head, head);
7627 assert_eq!(state.gate_fixes.len(), 1);
7628 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7629 land_with(&mut state, &green_pr().url, &forge)
7630 .await
7631 .unwrap();
7632 assert!(state.parked);
7633 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7634 assert!(forge.argvs().is_empty());
7635 }
7636
7637 #[tokio::test]
7638 async fn landing_resumes_recheck_pending_deferred_and_stale_repair_e2e() {
7639 for phase in 0..3 {
7640 let (_tmp, mut state, old) = landing_git_fixture().await;
7641 advance_landing_base(&state).await;
7642 let head = resume_observed_head(&mut state, &old).await.unwrap();
7643 state.land_sync_pending = true;
7646 state.config.verify.e2e = vec!["echo e2e is red; exit 1".into()];
7647 state.gate_repair_e2e = Some(crate::run::GateRepairE2e {
7648 head: if phase == 2 {
7649 old.clone()
7650 } else {
7651 head.clone()
7652 },
7653 passed: phase == 2,
7654 outcomes: if phase == 1 {
7655 vec![crate::run::CommandOutcome {
7656 command: state.config.verify.e2e[0].clone(),
7657 code: None,
7658 output_tail: "verification resource unavailable".into(),
7659 duration_ms: 0,
7660 resource_blocked: true,
7661 }]
7662 } else {
7663 Vec::new()
7664 },
7665 });
7666 state.save().unwrap();
7667 for _ in 0..2 {
7668 state = RunState::load(&state.id).unwrap();
7669 assert!(resume_observed_head(&mut state, &head).await.is_err());
7670 let evidence = state.gate_repair_e2e.as_ref().unwrap();
7671 assert_eq!(evidence.head, head);
7672 assert!(!evidence.passed);
7673 assert!(!evidence.outcomes.is_empty());
7674 assert_eq!(
7675 git::remote_head(&state.repo, "origin", "task-head")
7676 .await
7677 .unwrap(),
7678 Some(head.clone())
7679 );
7680 assert!(state.land_sync_pending);
7681 }
7682 }
7683 }
7684
7685 async fn interrupt_landing_rebase(state: &mut RunState) {
7686 state.land_rebase_from = Some(git::rev_parse(&state.repo, "HEAD").await.unwrap());
7687 state.save().unwrap();
7688 let scratch = state.dir().join("rebase");
7689 assert_eq!(
7690 crate::rebase::rebase_with_fixer(state, &scratch, "winner", "origin/main")
7691 .await
7692 .unwrap(),
7693 crate::rebase::Rebased::Applied
7694 );
7695 assert!(!git::is_clean(&state.repo).await.unwrap());
7696 }
7697
7698 async fn landing_setup(state: &mut RunState) {
7699 git::git(
7700 &state.repo,
7701 &["config", "extensions.worktreeConfig", "true"],
7702 )
7703 .await
7704 .unwrap();
7705 state.config.worktree.setup =
7706 vec![toml::from_str("run = \"printf secret > .env\"").unwrap()];
7707 crate::worktree_setup::prepare(&state.config, &state.repo, &state.repo)
7708 .await
7709 .unwrap();
7710 state.config.verify.gate = vec!["test -f advance && test -f .env".into()];
7711 }
7712
7713 #[tokio::test]
7714 async fn landing_resume_restores_setup_after_both_fresh_and_interrupted_rebases() {
7715 for phase in 0..3 {
7716 let (_tmp, mut state, old) = landing_git_fixture().await;
7717 advance_landing_base(&state).await;
7718 landing_setup(&mut state).await;
7719 if phase > 0 {
7720 interrupt_landing_rebase(&mut state).await;
7721 if phase == 2 {
7722 git::sync_to_head(&state.repo).await.unwrap();
7724 assert!(!state.repo.join(".env").exists());
7725 }
7726 state = RunState::load(&state.id).unwrap();
7727 }
7728 let head = resume_observed_head(&mut state, &old).await.unwrap();
7729 assert_ne!(head, old);
7730 assert!(state.gate_allows_progress());
7731 assert!(state.land_rebase_from.is_none());
7732 assert_eq!(
7733 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7734 "secret"
7735 );
7736 assert!(git::is_clean(&state.repo).await.unwrap());
7737 assert!(
7738 !git::git(&state.repo, &["ls-tree", "--name-only", "HEAD"])
7739 .await
7740 .unwrap()
7741 .contains(".env")
7742 );
7743 }
7744 }
7745
7746 #[tokio::test]
7747 async fn landing_restoration_protects_ignored_files_outside_setup_products() {
7748 let (_tmp, mut state, _) = landing_git_fixture().await;
7749 advance_landing_base(&state).await;
7750 landing_setup(&mut state).await;
7751 interrupt_landing_rebase(&mut state).await;
7752 let locals = [
7755 "local notes",
7756 #[cfg(unix)]
7757 "local\nnotes",
7758 ];
7759 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7760 .await
7761 .unwrap();
7762 std::fs::write(state.repo.join(excludes), "local*\n").unwrap();
7763 for local in locals {
7764 std::fs::write(state.repo.join(local), "keep these notes").unwrap();
7765 assert!(
7766 git::git_raw(&state.repo, &["check-ignore", "--quiet", local])
7767 .await
7768 .unwrap()
7769 .ok()
7770 );
7771 }
7772 restore_landing_worktree(&mut state).await.unwrap();
7773 for local in locals {
7774 assert_eq!(
7775 std::fs::read_to_string(state.repo.join(local)).unwrap(),
7776 "keep these notes"
7777 );
7778 }
7779 assert_eq!(
7780 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7781 "secret"
7782 );
7783 assert!(git::is_clean(&state.repo).await.unwrap());
7784 assert!(state.land_rebase_from.is_none());
7785 }
7786
7787 #[tokio::test]
7788 async fn landing_restoration_rejects_ignored_paths_conflicting_with_the_new_tree() {
7789 for local in ["advance", "advance/notes", "new-directory"] {
7790 let (_tmp, mut state, _) = landing_git_fixture().await;
7791 advance_landing_base(&state).await;
7792 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7794 std::fs::create_dir(state.repo.join("new-directory")).unwrap();
7795 std::fs::write(state.repo.join("new-directory/tracked"), "new").unwrap();
7796 git::git(&state.repo, &["add", "."]).await.unwrap();
7797 git::git(&state.repo, &["commit", "-m", "add directory"])
7798 .await
7799 .unwrap();
7800 git::git(&state.repo, &["push", "origin", "main"])
7801 .await
7802 .unwrap();
7803 git::git(&state.repo, &["checkout", "winner"])
7804 .await
7805 .unwrap();
7806 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7807 .await
7808 .unwrap();
7809 std::fs::write(state.repo.join(excludes), "advance\nnew-directory\n").unwrap();
7810 let path = state.repo.join(local);
7811 std::fs::create_dir_all(path.parent().unwrap()).unwrap();
7812 std::fs::write(&path, "local notes").unwrap();
7813 interrupt_landing_rebase(&mut state).await;
7814 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7815 let checkpoint = state.land_rebase_from.clone();
7816 let error = restore_landing_worktree(&mut state).await.unwrap_err();
7817 assert!(
7818 error.to_string().contains("conflicting with HEAD"),
7819 "{error:#}"
7820 );
7821 assert_eq!(std::fs::read_to_string(&path).unwrap(), "local notes");
7822 assert_eq!(
7823 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7824 before
7825 );
7826 assert_eq!(state.land_rebase_from, checkpoint);
7827 }
7828 }
7829
7830 #[tokio::test]
7831 async fn landing_resume_preserves_ignored_gate_artifacts_without_setup() {
7832 for interrupted in [false, true] {
7833 let (_tmp, mut state, old) = landing_git_fixture().await;
7834 assert!(state.config.worktree.setup.is_empty());
7835 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7837 .await
7838 .unwrap();
7839 std::fs::write(state.repo.join(excludes), "target/\n").unwrap();
7840 state.config.verify.gate =
7841 vec!["mkdir -p target && printf artifact > target/probe".into()];
7842 state.gate_ran = false;
7843 resume_observed_head(&mut state, &old).await.unwrap();
7844 assert_eq!(
7845 std::fs::read_to_string(state.repo.join("target/probe")).unwrap(),
7846 "artifact"
7847 );
7848 advance_landing_base(&state).await;
7849 if interrupted {
7850 interrupt_landing_rebase(&mut state).await;
7851 state = RunState::load(&state.id).unwrap();
7852 }
7853 state.config.verify.gate =
7854 vec!["test -f advance && test \"$(cat target/probe)\" = artifact".into()];
7855 let head = resume_observed_head(&mut state, &old).await.unwrap();
7856 assert_ne!(head, old);
7857 assert!(state.gate_allows_progress());
7858 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7859 assert_eq!(
7860 std::fs::read_to_string(state.repo.join("target/probe")).unwrap(),
7861 "artifact"
7862 );
7863 assert!(state.land_rebase_from.is_none());
7864 assert_eq!(
7865 git::remote_head(&state.repo, "origin", "task-head")
7866 .await
7867 .unwrap(),
7868 Some(head.clone())
7869 );
7870 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7871 land_with(&mut state, &green_pr().url, &forge)
7872 .await
7873 .unwrap();
7874 assert!(state.parked);
7875 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7876 assert!(forge.argvs().is_empty());
7877 }
7878 }
7879
7880 #[tokio::test]
7881 #[cfg(unix)]
7882 async fn landing_restoration_waits_for_external_coordination_before_changing_files() {
7883 use std::os::fd::AsRawFd as _;
7884
7885 for interrupted in [false, true] {
7886 let (_tmp, mut state, _) = landing_git_fixture().await;
7887 advance_landing_base(&state).await;
7888 landing_setup(&mut state).await;
7889 if interrupted {
7890 interrupt_landing_rebase(&mut state).await;
7891 }
7892 state.config.worktree.setup =
7893 vec![toml::from_str("run = \"printf restored > .env\"").unwrap()];
7894 let common = crate::repo_lock::common_dir(&state.repo)
7895 .await
7896 .unwrap()
7897 .unwrap();
7898 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
7899 state.config.coordination = crate::config::test_coordination();
7900 state.config.graph.timeout_resource_wait = 0;
7901 let external = std::fs::OpenOptions::new()
7902 .read(true)
7903 .write(true)
7904 .create(true)
7905 .truncate(false)
7906 .open(common.join("updater.lock"))
7907 .unwrap();
7908 let locked =
7910 unsafe { libc::flock(external.as_raw_fd(), libc::LOCK_EX | libc::LOCK_NB) };
7911 assert_eq!(locked, 0);
7912 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7913 let checkpoint = state.land_rebase_from.clone();
7914 let error = restore_landing_worktree(&mut state).await.unwrap_err();
7915 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
7916 assert_eq!(
7917 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7918 before
7919 );
7920 assert_eq!(state.land_rebase_from, checkpoint);
7921 assert_eq!(
7922 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7923 "secret"
7924 );
7925
7926 drop(external);
7927 state.config.graph.timeout_resource_wait = 2;
7928 restore_landing_worktree(&mut state).await.unwrap();
7929 assert!(git::is_clean(&state.repo).await.unwrap());
7930 assert!(state.land_rebase_from.is_none());
7931 assert_eq!(
7932 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7933 "restored"
7934 );
7935 }
7936 }
7937
7938 #[tokio::test]
7939 #[cfg(unix)]
7940 async fn landing_restoration_inherits_cancellation_while_waiting_for_a_local_seat() {
7941 use std::sync::atomic::{AtomicBool, Ordering};
7942
7943 let (_tmp, mut state, _) = landing_git_fixture().await;
7944 advance_landing_base(&state).await;
7945 landing_setup(&mut state).await;
7946 interrupt_landing_rebase(&mut state).await;
7947 let common = crate::repo_lock::common_dir(&state.repo)
7948 .await
7949 .unwrap()
7950 .unwrap();
7951 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
7952 state.config.coordination = crate::config::test_coordination();
7953 let holder = crate::repo_lock::SeatLease::for_checkout(
7954 &state.repo,
7955 true,
7956 state.config.coordination.as_ref(),
7957 )
7958 .await
7959 .unwrap();
7960 assert!(holder.is_some());
7961 let cancelled = Arc::new(AtomicBool::new(false));
7962 let signal = cancelled.clone();
7963 let wait = crate::repo_lock::WaitPolicy::new(Duration::from_secs(30), move || {
7964 signal.load(Ordering::SeqCst)
7965 });
7966 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7967 let checkpoint = state.land_rebase_from.clone();
7968 let (result, ()) = tokio::join!(
7969 tokio::time::timeout(
7970 Duration::from_secs(2),
7971 wait.scope(restore_landing_worktree(&mut state)),
7972 ),
7973 async {
7974 tokio::time::sleep(Duration::from_millis(100)).await;
7975 cancelled.store(true, Ordering::SeqCst);
7976 }
7977 );
7978 let error = result
7979 .expect("cancellation must release the waiting driver")
7980 .unwrap_err();
7981 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
7982 assert_eq!(
7983 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7984 before
7985 );
7986 assert_eq!(state.land_rebase_from, checkpoint);
7987 assert_eq!(
7988 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7989 "secret"
7990 );
7991 drop(holder);
7992 restore_landing_worktree(&mut state).await.unwrap();
7993 assert!(state.land_rebase_from.is_none());
7994 assert!(git::is_clean(&state.repo).await.unwrap());
7995 }
7996
7997 #[tokio::test]
7998 #[cfg(unix)]
7999 async fn landing_verification_inherits_cancellation_while_waiting_for_a_local_seat() {
8000 use std::sync::atomic::{AtomicBool, Ordering};
8001
8002 for e2e in [false, true] {
8003 let (_tmp, mut state, head) = landing_git_fixture().await;
8004 let common = crate::repo_lock::common_dir(&state.repo)
8005 .await
8006 .unwrap()
8007 .unwrap();
8008 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
8009 state.config.coordination = crate::config::test_coordination();
8010 if e2e {
8011 state.config.verify.e2e = vec!["true".into()];
8012 state.gate_repair_e2e = Some(crate::run::GateRepairE2e {
8013 head: head.clone(),
8014 passed: false,
8015 outcomes: Vec::new(),
8016 });
8017 } else {
8018 state.config.verify.gate = vec!["true".into()];
8019 state.gate_ran = false;
8020 }
8021 let holder = crate::repo_lock::SeatLease::for_checkout(
8022 &state.repo,
8023 true,
8024 state.config.coordination.as_ref(),
8025 )
8026 .await
8027 .unwrap();
8028 assert!(holder.is_some());
8029 let cancelled = Arc::new(AtomicBool::new(false));
8030 let signal = cancelled.clone();
8031 let wait = crate::repo_lock::WaitPolicy::new(Duration::from_secs(30), move || {
8032 signal.load(Ordering::SeqCst)
8033 });
8034 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
8035 let url = green_pr().url;
8036 let (result, ()) = tokio::join!(
8037 tokio::time::timeout(
8038 Duration::from_secs(2),
8039 wait.scope(publish_landing_head(&mut state, &head, &url, &forge)),
8040 ),
8041 async {
8042 tokio::time::sleep(Duration::from_millis(100)).await;
8043 cancelled.store(true, Ordering::SeqCst);
8044 }
8045 );
8046 let error = result
8047 .expect("cancellation must release the verification waiter")
8048 .unwrap_err();
8049 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
8050 assert!(forge.argvs().is_empty());
8051 assert_eq!(
8052 git::remote_head(&state.repo, "origin", "task-head")
8053 .await
8054 .unwrap(),
8055 Some(head.clone())
8056 );
8057 drop(holder);
8058 assert_eq!(
8060 publish_landing_head(&mut state, &head, &url, &forge)
8061 .await
8062 .unwrap(),
8063 head
8064 );
8065 }
8066 }
8067
8068 #[tokio::test]
8069 async fn landing_resume_preserves_user_edits_after_an_interrupted_rebase() {
8070 for staged in [false, true] {
8071 let (_tmp, mut state, old) = landing_git_fixture().await;
8072 advance_landing_base(&state).await;
8073 interrupt_landing_rebase(&mut state).await;
8074 std::fs::write(state.repo.join("change"), "user edit").unwrap();
8075 if staged {
8076 git::git(&state.repo, &["add", "change"]).await.unwrap();
8077 }
8078 assert!(resume_observed_head(&mut state, &old).await.is_err());
8079 assert_eq!(
8080 std::fs::read_to_string(state.repo.join("change")).unwrap(),
8081 "user edit"
8082 );
8083 assert_eq!(
8084 git::remote_head(&state.repo, "origin", "task-head")
8085 .await
8086 .unwrap(),
8087 Some(old)
8088 );
8089 }
8090 }
8091
8092 #[tokio::test]
8093 async fn landing_resume_returns_to_approval_wait_and_closed_pr_skips_sync() {
8094 let (_tmp, mut state, head) = landing_git_fixture().await;
8095 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
8096 let id = state.id.clone();
8097 let pr = land_with(&mut state, &green_pr().url, &forge)
8098 .await
8099 .unwrap();
8100 assert_eq!(pr.state, PrLifecycle::Open);
8101 assert_eq!(state.id, id);
8102 assert!(state.parked);
8103 assert_eq!(state.status, RunStatus::Landing);
8104 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
8105 assert!(forge.argvs().is_empty());
8106
8107 state.land_sync_pending = true;
8108 std::fs::write(state.repo.join("dirty"), "do not touch").unwrap();
8109 let mut closed = seen("foreign", Checks::Green, "CLEAN", false);
8110 closed.pr.state = PrLifecycle::Closed;
8111 let forge = Scripted::new(vec![closed], vec![]);
8112 assert_eq!(
8113 land_with(&mut state, &green_pr().url, &forge)
8114 .await
8115 .unwrap()
8116 .state,
8117 PrLifecycle::Closed
8118 );
8119 assert_eq!(
8120 std::fs::read_to_string(state.repo.join("dirty")).unwrap(),
8121 "do not touch"
8122 );
8123 assert!(forge.argvs().is_empty());
8124 }
8125
8126 #[tokio::test]
8127 async fn landing_resume_does_not_publish_a_failed_rebased_gate() {
8128 let (_tmp, mut state, old) = landing_git_fixture().await;
8129 advance_landing_base(&state).await;
8130 state.config.verify.gate = vec!["exit 1".into()];
8131 assert!(resume_observed_head(&mut state, &old).await.is_err());
8132 assert_ne!(state.gate_head.as_deref(), Some(old.as_str()));
8133 assert!(!state.gate_allows_progress());
8134 assert_eq!(
8135 git::remote_head(&state.repo, "origin", "task-head")
8136 .await
8137 .unwrap(),
8138 Some(old)
8139 );
8140 assert!(state.land_sync_pending);
8141 }
8142
8143 #[tokio::test]
8144 async fn landing_publication_recovers_a_push_before_save_and_refuses_a_lease_conflict() {
8145 let (_tmp, mut state, old) = landing_git_fixture().await;
8146 advance_landing_base(&state).await;
8147 let pushed = resume_observed_head(&mut state, &old).await.unwrap();
8148 state.pr_pushed_head = Some(old.clone());
8150 state.land_sync_pending = true;
8151 assert_eq!(
8152 resume_observed_head(&mut state, &pushed).await.unwrap(),
8153 pushed
8154 );
8155 git::git(
8158 &state.repo,
8159 &["push", "--force", "origin", "main:refs/heads/task-head"],
8160 )
8161 .await
8162 .unwrap();
8163 assert!(
8164 publish_landing_head(
8165 &mut state,
8166 &pushed,
8167 &green_pr().url,
8168 &Scripted::new(vec![seen(&pushed, Checks::Green, "CLEAN", false)], vec![])
8169 )
8170 .await
8171 .unwrap_err()
8172 .to_string()
8173 .contains("publishing gated")
8174 );
8175 assert!(
8176 resume_observed_head(&mut state, "foreign-head")
8177 .await
8178 .is_err()
8179 );
8180 }
8181 #[tokio::test]
8182 async fn landing_publication_refuses_a_pr_closed_during_gate() {
8183 let (_tmp, mut state, head) = landing_git_fixture().await;
8184 let mut closed = seen(&head, Checks::Green, "CLEAN", false);
8185 closed.pr.state = PrLifecycle::Closed;
8186 let forge = Scripted::new(vec![closed], vec![]);
8187 assert!(
8188 publish_landing_head(&mut state, &head, &green_pr().url, &forge)
8189 .await
8190 .unwrap_err()
8191 .to_string()
8192 .contains("PR closed or merged")
8193 );
8194 }
8195
8196 fn winning_candidate(summary: &str) -> Candidate {
8198 Candidate {
8199 index: 0,
8200 label: 'A',
8201 agent: "opus".to_owned(),
8202 branch: "magi/x/A".to_owned(),
8203 worktree: PathBuf::from("/wt/A"),
8204 summary: summary.to_owned(),
8205 stat: String::new(),
8206 files: 1,
8207 commits: 1,
8208 empty: false,
8209 failed: None,
8210 verified_noop: None,
8211 duration_ms: 0,
8212 folded: false,
8213 }
8214 }
8215
8216 fn uncontested_tally() -> Tally {
8217 Tally {
8218 first_choice: BTreeMap::from([('A', 1)]),
8219 borda: BTreeMap::new(),
8220 winner: 'A',
8221 rankings: 1,
8222 unanimous_initial: true,
8223 deliberated: false,
8224 changed_votes: 0,
8225 unanimous_final: true,
8226 tie_break: None,
8227 judges: 1,
8228 present: 1,
8229 quorum: 1,
8230 met_quorum: true,
8231 uncontested: None,
8232 }
8233 }
8234
8235 fn review_record(reviewer: usize, agent: &str, summary: &str) -> ReviewRecord {
8236 ReviewRecord {
8237 attempts: 0,
8238 reviewer,
8239 agent: agent.to_owned(),
8240 summary: summary.to_owned(),
8241 findings: Vec::new(),
8242 vote: None,
8243 failed: None,
8244 duration_ms: 0,
8245 }
8246 }
8247
8248 fn review_round(round: usize, reviews: Vec<ReviewRecord>) -> ReviewRound {
8249 let answered = reviews.len();
8250 ReviewRound {
8251 round,
8252 head: "abc1234".to_owned(),
8253 verified_head: None,
8254 verified_at: None,
8255 reviews,
8256 e2e: Vec::new(),
8257 verify_retried: false,
8258 e2e_deferred: false,
8259 e2e_defer_reason: None,
8260 fix: None,
8261 blocking: 0,
8262 answered,
8263 expected: answered,
8264 clean: true,
8265 progressed: false,
8266 vote_split: false,
8267 reconsideration: Vec::new(),
8268 verdict: None,
8269 }
8270 }
8271
8272 #[test]
8273 fn the_approval_panel_states_the_task_verbatim_in_either_language() {
8274 let en = panel();
8275 assert!(en.contains("Task"), "{en}");
8276 assert!(en.contains("add retries to the uploader"), "{en}");
8277
8278 let mut state = run_state();
8279 state.config.graph.language = "ja".to_owned();
8280 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8281 assert!(ja.contains("タスク"), "{ja}");
8282 assert!(
8283 ja.contains("add retries to the uploader"),
8284 "the task itself is not translated: {ja}"
8285 );
8286 }
8287
8288 #[test]
8289 fn the_approval_panel_omits_what_changed_and_review_verdict_with_no_data() {
8290 let html = panel();
8294 assert!(!html.contains("What changed"), "{html}");
8295 assert!(!html.contains("Review verdict"), "{html}");
8296 }
8297
8298 #[test]
8299 fn the_approval_panel_omits_what_changed_when_the_winners_summary_is_empty() {
8300 let mut state = run_state();
8301 state.candidates = vec![winning_candidate("")];
8302 state.tally = Some(uncontested_tally());
8303 let html = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8304 assert!(
8305 !html.contains("What changed"),
8306 "an empty summary must not render an empty box: {html}"
8307 );
8308 }
8309
8310 #[test]
8311 fn the_approval_panel_shows_the_winners_own_account_in_either_language() {
8312 let mut state = run_state();
8313 state.candidates = vec![winning_candidate(
8314 "Added a retry loop around the uploader PUT call.",
8315 )];
8316 state.tally = Some(uncontested_tally());
8317 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8318 assert!(en.contains("What changed"), "{en}");
8319 assert!(
8320 en.contains("Added a retry loop around the uploader PUT call."),
8321 "{en}"
8322 );
8323
8324 state.config.graph.language = "ja".to_owned();
8325 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8326 assert!(ja.contains("変更内容"), "{ja}");
8327 assert!(
8328 ja.contains("Added a retry loop around the uploader PUT call."),
8329 "{ja}"
8330 );
8331 }
8332
8333 #[test]
8334 fn the_approval_panel_shows_only_the_last_review_rounds_verdict() {
8335 let mut state = run_state();
8336 state.reviews = vec![
8337 review_round(
8338 1,
8339 vec![review_record(1, "alpha", "found a race, sent back")],
8340 ),
8341 review_round(2, vec![review_record(1, "alpha", "race is fixed, clean")]),
8342 ];
8343 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8344 assert!(en.contains("Review verdict"), "{en}");
8345 assert!(en.contains("race is fixed, clean"), "{en}");
8346 assert!(
8347 !en.contains("found a race, sent back"),
8348 "only the round that actually cleared the merge should show: {en}"
8349 );
8350
8351 state.config.graph.language = "ja".to_owned();
8352 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8353 assert!(ja.contains("レビューの結論"), "{ja}");
8354 assert!(ja.contains("レビュアー"), "{ja}");
8355 assert!(ja.contains("race is fixed, clean"), "{ja}");
8356 }
8357
8358 fn unanswered_review_record(reviewer: usize, agent: &str, reason: &str) -> ReviewRecord {
8364 ReviewRecord {
8365 attempts: 0,
8366 reviewer,
8367 agent: agent.to_owned(),
8368 summary: String::new(),
8369 findings: Vec::new(),
8370 vote: None,
8371 failed: Some(reason.to_owned()),
8372 duration_ms: 0,
8373 }
8374 }
8375
8376 #[test]
8377 fn the_approval_panel_never_shows_an_unanswered_seat_as_a_blank_verdict() {
8378 let mut state = run_state();
8379 state.reviews = vec![review_round(
8380 1,
8381 vec![
8382 review_record(1, "alpha", "clean, nothing to add"),
8383 unanswered_review_record(2, "beta", "timed out"),
8384 ],
8385 )];
8386 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8387 assert!(en.contains("clean, nothing to add"), "{en}");
8388 assert!(
8389 en.contains("produced no answer: timed out"),
8390 "a seat that never answered must say so, not render a blank box: {en}"
8391 );
8392 assert!(
8393 !en.contains("<div style=\"white-space:pre-wrap;font-size:13px\"></div>"),
8394 "no reviewer box may be left empty: {en}"
8395 );
8396
8397 state.config.graph.language = "ja".to_owned();
8398 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8399 assert!(ja.contains("回答なし: timed out"), "{ja}");
8400 }
8401
8402 #[test]
8403 fn the_approval_panel_contains_nothing_the_frames_policy_would_block() {
8404 let html = panel();
8405 assert!(!html.contains("<script"), "no script survives the csp");
8406 assert!(!html.contains("<form"), "form-action is 'none'");
8407 let pr = green_pr();
8408 assert_eq!(
8409 html.matches("http").count(),
8410 html.matches(pr.url.as_str()).count(),
8411 "the only http url in the panel is the pull request's own link"
8412 );
8413 assert!(
8414 html.contains("target=\"_blank\""),
8415 "the PR link must open in a new tab so it escapes the iframe"
8416 );
8417 assert!(
8418 html.contains("rel=\"noopener noreferrer\""),
8419 "external links opening in new tabs must carry noopener noreferrer"
8420 );
8421 }
8422
8423 #[test]
8424 fn added_and_removed_diff_lines_are_distinguishable_without_colour() {
8425 let html = panel();
8426 assert!(
8427 html.contains(">+</span>"),
8428 "an added line carries a `+` in the gutter, not only a background"
8429 );
8430 assert!(
8431 html.contains(">-</span>"),
8432 "a removed line carries a `-` in the gutter, not only a background"
8433 );
8434 assert!(
8435 html.contains(">new line</span>"),
8436 "the marker is moved to the gutter, so the body is printed once without it"
8437 );
8438 }
8439
8440 #[test]
8441 fn a_diff_past_the_threshold_is_cut_with_an_honest_count() {
8442 let total = DIFF_MAX_LINES + 100;
8443 let diff: String = (0..total).map(|i| format!("+line {i}\n")).collect();
8444 let html = approval_panel(
8445 &run_state(),
8446 &green_pr(),
8447 NUMSTAT,
8448 &diff,
8449 &[],
8450 "feat: something long",
8451 );
8452 assert!(
8453 html.contains(&format!("100 of {total} diff lines omitted")),
8454 "the note must say exactly how much was cut"
8455 );
8456 assert!(html.contains(&format!("line {}", DIFF_MAX_LINES - 1)));
8457 assert!(
8458 !html.contains(&format!("line {DIFF_MAX_LINES}")),
8459 "nothing past the threshold is rendered"
8460 );
8461 assert!(
8462 html.contains("/repo/magi"),
8463 "the note says where the rest is"
8464 );
8465 }
8466
8467 #[test]
8468 fn a_path_with_html_metacharacters_is_escaped_rather_than_rendered() {
8469 let html = approval_panel(
8470 &run_state(),
8471 &green_pr(),
8472 "1\t2\tsrc/<b>&\"x\"'.rs",
8473 "",
8474 &[],
8475 "subject",
8476 );
8477 assert!(html.contains("src/<b>&"x"'.rs"));
8478 assert!(
8479 !html.contains("<b>"),
8480 "an agent-influenced path must never become markup"
8481 );
8482 }
8483
8484 #[tokio::test]
8485 async fn the_merge_lock_serialises_one_repository_but_never_a_different_one() {
8486 let a = std::path::PathBuf::from("/repo/a");
8487 let b = std::path::PathBuf::from("/repo/b");
8488
8489 let held = repo_merge_lock(&a).lock_owned().await;
8490
8491 assert!(
8494 repo_merge_lock(&a).try_lock().is_err(),
8495 "a second merge into the same repository must not proceed concurrently"
8496 );
8497
8498 assert!(
8502 repo_merge_lock(&b).try_lock().is_ok(),
8503 "a different repository's merge lock must be independent"
8504 );
8505
8506 drop(held);
8507 assert!(
8508 repo_merge_lock(&a).try_lock().is_ok(),
8509 "the lock is released once the holder is done"
8510 );
8511 }
8512
8513 pub(crate) fn repair_state(major: bool, reject: bool) -> RunState {
8514 let mut state = landing_state();
8515 let mut rec = review_record(1, "alpha", "precise rejection reason");
8516 rec.vote = Some(if reject {
8517 crate::verdict::ReviewVote::Reject
8518 } else {
8519 crate::verdict::ReviewVote::Approve
8520 });
8521 if major {
8522 rec.findings = contested().findings;
8523 }
8524 let mut round = review_round(1, vec![rec]);
8525 round.clean = false;
8526 round.blocking = usize::from(major);
8527 state.reviews.push(round);
8528 state.config.graph.review_rounds = 1;
8529 state
8530 }
8531
8532 #[test]
8533 fn approval_policy_controls_are_independent_and_keep_all_reasons() {
8534 for every in [false, true] {
8535 for contested in [false, true] {
8536 for major in [false, true] {
8537 for reject in [false, true] {
8538 let mut state = repair_state(major, reject);
8539 state.config.graph.land_approval = every;
8540 state.config.graph.hold_contested_merge = contested;
8541 let reasons = approval_reasons(&state);
8542 assert_eq!(reasons.contains(&ApprovalReason::EveryMerge), every);
8543 assert_eq!(
8544 reasons.contains(&ApprovalReason::OpenBlockingFindings),
8545 contested && major
8546 );
8547 assert_eq!(
8548 reasons.contains(&ApprovalReason::FinalReject),
8549 contested && reject
8550 );
8551 assert_eq!(
8552 reasons.len(),
8553 usize::from(every)
8554 + usize::from(contested && major)
8555 + usize::from(contested && reject)
8556 );
8557 }
8558 }
8559 }
8560 }
8561 }
8562
8563 #[test]
8564 fn approval_policy_and_rendering_follow_reconsideration_in_both_directions() {
8565 use crate::verdict::ReviewVote::{Approve, Reject};
8566 for (initial_reject, final_vote) in [(true, Approve), (false, Reject)] {
8567 let mut state = repair_state(false, initial_reject);
8568 state.reviews[0]
8569 .reconsideration
8570 .push(crate::run::ReviewRevoteRecord {
8571 reviewer: 1,
8572 agent: "alpha".into(),
8573 vote: Some(final_vote),
8574 reason: "changed after reading the panel <evidence>".into(),
8575 failed: None,
8576 });
8577 assert_eq!(
8578 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8579 final_vote == Reject
8580 );
8581 for language in ["en", "ja"] {
8582 state.config.graph.language = language.into();
8583 let evidence = approval_evidence(&state);
8584 assert!(evidence.contains(&format!("→ {}", final_vote.label())));
8585 assert!(evidence.contains("changed after reading the panel <evidence>"));
8586 let html = approval_panel(&state, &green_pr(), "", "", &[], "subject");
8587 assert!(html.contains("changed after reading the panel <evidence>"));
8588 assert!(!html.contains("<evidence>"));
8589 }
8590 state.reviews[0].reconsideration[0].vote = None;
8591 state.reviews[0].reconsideration[0].failed = Some("timed out".into());
8592 assert_eq!(
8593 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8594 initial_reject
8595 );
8596 assert!(approval_evidence(&state).contains("timed out"));
8597 }
8598 }
8599
8600 #[tokio::test]
8601 async fn approval_merge_paths_apply_controls_to_major_and_reject_independently() {
8602 for every in [false, true] {
8603 for contested in [false, true] {
8604 for (major, reject) in [(false, false), (false, true), (true, false), (true, true)]
8605 {
8606 let mut state = repair_state(major, reject);
8607 state.config.graph.land_approval = every;
8608 state.config.graph.hold_contested_merge = contested;
8609 let forge = Scripted::new(
8610 vec![seen("abc", Checks::Green, "CLEAN", false)],
8611 vec![(true, "")],
8612 );
8613 land_with(&mut state, URL, &forge).await.unwrap();
8614 let expected = every || (contested && (major || reject));
8615 assert_eq!(state.land_approval.is_some(), expected);
8616 assert_eq!(forge.calls().contains(&"merge"), !expected);
8617 if expected {
8618 assert!(state.parked);
8619 }
8620 }
8621 }
8622 }
8623 }
8624
8625 #[tokio::test]
8626 async fn reviewed_branch_hold_is_read_before_landing_decision() {
8627 for (base, control) in [
8628 (false, "land_approval"),
8629 (true, "land_approval"),
8630 (false, "hold_contested_merge"),
8631 ] {
8632 let (_tmp, mut state, _) = landing_git_fixture().await;
8633 state.config.graph.land_approval = base;
8634 state.config.graph.hold_contested_merge = false;
8635 state.reviewed_commits = Some(Vec::new());
8636 if control == "hold_contested_merge" {
8637 state.reviews = repair_state(false, true).reviews;
8638 }
8639 std::fs::write(
8640 state.repo.join("magi.toml"),
8641 format!("[graph]\n{control} = {}\n", !base),
8642 )
8643 .unwrap();
8644 git::git(&state.repo, &["add", "magi.toml"]).await.unwrap();
8645 git::git(&state.repo, &["commit", "-m", "approval policy"])
8646 .await
8647 .unwrap();
8648 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8649 state.land_sync_pending = false;
8650 state.pr_pushed_head = Some(head.clone());
8651 state.gate_head = Some(head.clone());
8652 let forge = Scripted::new(
8653 vec![seen(&head, Checks::Green, "CLEAN", false)],
8654 vec![(true, "")],
8655 );
8656 land_with(&mut state, URL, &forge).await.unwrap();
8657 assert!(
8658 state.land_approval.is_some(),
8659 "base={base}, control={control}"
8660 );
8661 assert!(!forge.calls().contains(&"merge"));
8662 if !base {
8663 let question = ask::Questions::open()
8664 .get(&state.land_approval.as_ref().unwrap().question)
8665 .unwrap();
8666 assert!(question.detail.contains(&format!(
8667 "{control}=true from the reviewed branch's magi.toml"
8668 )));
8669 }
8670 }
8671 }
8672
8673 #[tokio::test]
8674 async fn reviewed_branch_hold_asks_and_survives_removal_and_resume() {
8675 for file in ["magi.toml", ".magi/config.toml"] {
8676 for control in crate::config::OwnerHold::ALL {
8677 let (_tmp, mut state, _) = landing_git_fixture().await;
8678 state.config.graph.land_approval = false;
8679 state.config.graph.hold_contested_merge = false;
8680 state.reviewed_commits = Some(Vec::new());
8681 if control == crate::config::OwnerHold::HoldContestedMerge {
8682 state.reviews = repair_state(false, true).reviews;
8683 }
8684 let config = state.repo.join(file);
8685 std::fs::create_dir_all(config.parent().unwrap()).unwrap();
8686 std::fs::write(
8687 &config,
8688 format!(
8689 "[graph]\n{} = true\n[verify]\ngate = ['untrusted']\n",
8690 control.key()
8691 ),
8692 )
8693 .unwrap();
8694 git::git(&state.repo, &["add", file]).await.unwrap();
8695 git::git(&state.repo, &["commit", "-m", "require approval"])
8696 .await
8697 .unwrap();
8698 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8699 let gate = state.config.verify.gate.clone();
8700 state.observe_branch_owner_holds(&head).await;
8701 assert_eq!(state.config.verify.gate, gate);
8702 assert!(state.owner_hold(control));
8703 let holds = state.branch_owner_holds.clone();
8704 git::git(&state.repo, &["rm", file]).await.unwrap();
8705 git::git(&state.repo, &["commit", "-m", "remove config"])
8706 .await
8707 .unwrap();
8708 let later = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8709 state.save().unwrap();
8710 state = RunState::load(&state.id).unwrap();
8711 state.observe_branch_owner_holds(&later).await;
8712 assert_eq!(state.branch_owner_holds, holds);
8713 assert_eq!(state.branch_owner_holds[0].head, head);
8714 state.land_sync_pending = false;
8715 state.pr_pushed_head = Some(later.clone());
8716 state.gate_head = Some(later.clone());
8717 let forge = Scripted::new(
8718 vec![seen(&later, Checks::Green, "CLEAN", false)],
8719 vec![(true, "")],
8720 );
8721 land_with(&mut state, URL, &forge).await.unwrap();
8722 assert!(!forge.calls().contains(&"merge"));
8723 assert!(state.parked);
8724 let question = ask::Questions::open()
8725 .get(&state.land_approval.as_ref().unwrap().question)
8726 .unwrap();
8727 assert!(question.detail.contains("Approval required because:"));
8728 assert!(question.detail.contains(&format!(
8729 "{}=true from the reviewed branch's {file}",
8730 control.key()
8731 )));
8732 assert_eq!(state.branch_owner_holds, holds);
8733 state.save().unwrap();
8734 let resumed = RunState::load(&state.id).unwrap();
8735 assert!(resumed.owner_hold(control));
8736 assert_eq!(resumed.branch_owner_holds, holds);
8737 assert_eq!(
8738 resumed.land_approval.unwrap().question,
8739 state.land_approval.unwrap().question
8740 );
8741 }
8742 }
8743 }
8744
8745 #[tokio::test]
8746 async fn approval_snapshot_exposes_minor_findings_and_survives_disabled_controls() {
8747 let mut state = repair_state(false, true);
8748 state.reviews[0].clean = true;
8749 let mut finding = contested().findings.remove(0);
8750 finding.severity = crate::verdict::Severity::Minor;
8751 state.reviews[0].reviews[0].findings.push(finding);
8752 assert!(state.open_findings().is_empty());
8753 let mut pr = green_pr();
8754 pr.review_comments.clear();
8755 for language in ["en", "ja"] {
8756 state.config.graph.language = language.into();
8757 let html = approval_panel(&state, &pr, "", "", &[], "subject");
8758 assert!(html.contains("[R3-1-1] minor"));
8759 assert!(html.contains(if language == "ja" {
8760 "内部指摘の解決を意味するものではありません"
8761 } else {
8762 "This does not mean internal findings are resolved"
8763 }));
8764 assert!(
8765 html.find(if language == "ja" {
8766 "承認が必要な理由:"
8767 } else {
8768 "Approval required because:"
8769 })
8770 .unwrap()
8771 < html.find("[R3-1-1]").unwrap()
8772 );
8773 }
8774 state.config.graph.language = "en".into();
8775 let observed = seen("abc", Checks::Green, "CLEAN", false);
8776 assert_eq!(
8777 approval_gate(&mut state, &observed.pr, "subject", None, "abc")
8778 .await
8779 .unwrap(),
8780 ApprovalGate::Pending
8781 );
8782 let id = state.land_approval.as_ref().unwrap().question.clone();
8783 let q = ask::Questions::open().get(&id).unwrap();
8784 assert!(q.detail.starts_with("Approval required because:"));
8785 assert!(q.detail.contains("final reviewer reject"));
8786 assert!(q.detail.contains("[R3-1-1] minor"));
8787 assert!(
8788 q.detail
8789 .contains("No adoption or resolution evidence recorded")
8790 );
8791 state.config.graph.land_approval = false;
8792 state.config.graph.hold_contested_merge = false;
8793 state.reviews.clear();
8794 assert_eq!(approval_reasons(&state), [ApprovalReason::ExistingDecision]);
8795 assert!(deputy_brief(&q, Some(&state)).contains("final reviewer reject"));
8796 assert!(deputy_brief(&q, None).contains("[R3-1-1] minor"));
8797 let forge = Scripted::new(vec![observed], vec![]);
8798 land_with(&mut state, URL, &forge).await.unwrap();
8799 assert!(!forge.calls().contains(&"merge"));
8800 assert_eq!(state.land_approval.as_ref().unwrap().question, id);
8801 assert_eq!(ask::Questions::open().get(&id).unwrap().detail, q.detail);
8802 }
8803
8804 #[tokio::test]
8805 async fn approval_evidence_keeps_all_findings_and_bounds_unicode_prose() {
8806 let mut state = repair_state(false, true);
8807 state.config.graph.land_approval = false;
8808 let long_reason = format!("{}REASON_TAIL", "拒否🦀".repeat(200));
8809 let long_detail = format!("{}DETAIL_TAIL", "詳細🦀".repeat(200));
8810 let long_title = format!("{}TITLE_TAIL", "題🦀".repeat(100));
8811 state.reviews[0].reviews[0].summary = long_reason.clone();
8812 for i in 1..=10 {
8813 let mut finding = contested().findings.remove(0);
8814 finding.id = format!("R1-1-{i}");
8815 finding.severity = if i == 9 {
8816 crate::verdict::Severity::Major
8817 } else {
8818 crate::verdict::Severity::Minor
8819 };
8820 finding.title = long_title.clone();
8821 finding.detail = long_detail.clone();
8822 state.reviews[0].reviews[0].findings.push(finding);
8823 }
8824 state.reviews[0].fix = Some(crate::run::FixRecord {
8825 agent: "fixer".into(),
8826 addressed: vec!["R1-1-9".into()],
8827 rejected: vec![crate::verdict::Rejection {
8828 id: "R1-1-10".into(),
8829 why: long_reason.clone(),
8830 }],
8831 notes: long_detail.clone(),
8832 committed: false,
8833 failed: None,
8834 duration_ms: 0,
8835 continuation: None,
8836 });
8837 assert_eq!(
8838 approval_reasons(&state),
8839 [
8840 ApprovalReason::OpenBlockingFindings,
8841 ApprovalReason::FinalReject
8842 ]
8843 );
8844 let excerpt = approval_excerpt(&long_reason, 300);
8845 assert_eq!(excerpt.chars().count(), 300);
8846 assert!(excerpt.ends_with('…'));
8847 let boundary = "拒".repeat(300);
8848 assert_eq!(approval_excerpt(&boundary, 300), boundary);
8849 for language in ["en", "ja"] {
8850 state.config.graph.language = language.into();
8851 for revote in [
8852 None,
8853 Some(crate::verdict::ReviewVote::Reject),
8854 Some(crate::verdict::ReviewVote::Approve),
8855 ] {
8856 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Reject);
8857 state.reviews[0].reconsideration.clear();
8858 if let Some(vote) = revote {
8859 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Approve);
8860 state.reviews[0]
8861 .reconsideration
8862 .push(crate::run::ReviewRevoteRecord {
8863 reviewer: 1,
8864 agent: "alpha".into(),
8865 vote: Some(vote),
8866 reason: long_reason.clone(),
8867 failed: None,
8868 });
8869 }
8870 let evidence = approval_evidence(&state);
8871 let final_vote = revote.unwrap_or(crate::verdict::ReviewVote::Reject);
8872 assert!(evidence.contains(&format!("#1 (alpha): {}", final_vote.label())));
8873 assert!(approval_reasons(&state).contains(&ApprovalReason::OpenBlockingFindings));
8874 assert_eq!(
8875 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8876 final_vote == crate::verdict::ReviewVote::Reject
8877 );
8878 assert!(evidence.contains(&excerpt));
8879 assert!(evidence.contains("[R1-1-8] minor"));
8880 assert!(evidence.contains("[R1-1-9] major"));
8881 assert!(evidence.contains("[R1-1-10] minor"));
8882 for tail in ["REASON_TAIL", "DETAIL_TAIL", "TITLE_TAIL"] {
8883 assert!(!evidence.contains(tail));
8884 }
8885 assert!(evidence.contains(if language == "ja" {
8886 "採用申告(解決未確認)"
8887 } else {
8888 "claimed addressed (resolution unconfirmed)"
8889 }));
8890 assert!(evidence.contains(if language == "ja" {
8891 "不採用理由"
8892 } else {
8893 "declined"
8894 }));
8895 let major_evidence = evidence
8896 .split("[R1-1-9] major")
8897 .nth(1)
8898 .unwrap()
8899 .split("[R1-1-10]")
8900 .next()
8901 .unwrap();
8902 assert!(major_evidence.contains(if language == "ja" {
8903 "採用申告(解決未確認)"
8904 } else {
8905 "claimed addressed (resolution unconfirmed)"
8906 }));
8907 let last_evidence = evidence.split("[R1-1-10] minor").nth(1).unwrap();
8908 assert!(last_evidence.contains(if language == "ja" {
8909 "不採用理由"
8910 } else {
8911 "declined"
8912 }));
8913 let html = approval_panel(&state, &green_pr(), "", "", &[], "subject");
8914 assert!(html.contains(&esc(&evidence)));
8915 assert_eq!(
8916 approval_gate(&mut state, &green_pr(), "subject", None, "abc")
8917 .await
8918 .unwrap(),
8919 ApprovalGate::Pending
8920 );
8921 let id = &state.land_approval.take().unwrap().question;
8922 let q = ask::Questions::open().get(id).unwrap();
8923 assert!(q.detail.starts_with(&evidence));
8924 }
8925 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Reject);
8926 }
8927 }
8928
8929 #[test]
8930 fn merge_repair_choice_covers_major_only_and_reject_only_without_contested_and() {
8931 for (major, reject) in [(true, false), (false, true), (true, true)] {
8932 let state = repair_state(major, reject);
8933 assert!(repair_available(&state));
8934 assert_eq!(&approval_choices(&state)[..3], [APPROVE, HOLD, REPAIR]);
8935 }
8936 assert!(!repair_available(&repair_state(false, false)));
8937 let mut clean = repair_state(true, false);
8938 clean.reviews[0].clean = true;
8939 assert_eq!(&approval_choices(&clean)[..3], [APPROVE, HOLD, REPAIR]);
8940 assert_eq!(approval(Some(REPAIR)), Approval::Repair);
8941 }
8942
8943 #[tokio::test]
8944 async fn merge_repair_upgrades_legacy_questions_and_snapshots_exact_evidence_once() {
8945 let mut state = repair_state(true, false);
8946 let pr = green_pr();
8947 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8948 .await
8949 .unwrap();
8950 let store = ask::Questions::open();
8951 let id = state.land_approval.as_ref().unwrap().question.clone();
8952 store
8954 .update(&id, |q| {
8955 q.choices = vec![APPROVE.into(), HOLD.into()];
8956 Ok(())
8957 })
8958 .unwrap();
8959 let upgraded = store.get(&id).unwrap();
8960 assert_eq!(upgraded.choices, approval_choices(&state));
8961 assert!(!upgraded.actions.contains_key(HOLD));
8962 assert_eq!(store.get(&id).unwrap().choices, upgraded.choices);
8963 assert!(
8964 store
8965 .list()
8966 .iter()
8967 .any(|q| q.id == id && q.choices == upgraded.choices)
8968 );
8969 assert!(
8970 crate::prompt::chat_consult(&upgraded).contains("--reply 'fix findings and re-review'")
8971 );
8972 assert!(deputy_brief(&upgraded, Some(&state)).contains("never approves a merge"));
8973 store
8974 .update(&id, |q| q.answer(ask::Answer::Choice(REPAIR.into())))
8975 .unwrap();
8976 store
8979 .update(&id, |q| {
8980 q.actions.clear();
8981 Ok(())
8982 })
8983 .unwrap();
8984 assert_eq!(
8985 store.get(&id).unwrap().chosen_action(),
8986 Some(&ask::ChoiceAction::Resume {
8987 run: state.id.clone()
8988 })
8989 );
8990 let binding = state.land_approval.clone();
8991 assert_eq!(
8992 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8993 .await
8994 .unwrap(),
8995 ApprovalGate::Repair
8996 );
8997 assert!(state.land_approval.is_none());
8998 assert_eq!(state.merge_repairs.len(), 1);
8999 let request = &state.merge_repairs[0];
9000 assert_eq!(request.question, id);
9001 assert_eq!(request.head, "abc");
9002 assert_eq!(request.pr, pr.url);
9003 assert_eq!(
9004 request.reviews[0].reviews[0].summary,
9005 "precise rejection reason"
9006 );
9007 assert_eq!(request.reviews[0].reviews[0].findings[0].id, "R3-1-1");
9008 assert_eq!(
9009 request.reviews[0].reviews[0].findings[0].detail,
9010 state.reviews[0].reviews[0].findings[0].detail
9011 );
9012 state.land_approval = binding;
9014 assert_eq!(
9015 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9016 .await
9017 .unwrap(),
9018 ApprovalGate::Repair
9019 );
9020 assert_eq!(state.merge_repairs.len(), 1);
9021 state.land_approval = None;
9022 state.config.graph.land_approval = false;
9023 state.config.graph.hold_contested_merge = false;
9024 state.reviews.clear();
9025 assert_eq!(approval_reasons(&state), [ApprovalReason::AfterRepair]);
9026 assert_eq!(
9027 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9028 .await
9029 .unwrap(),
9030 ApprovalGate::Pending
9031 );
9032 let fresh_id = &state.land_approval.as_ref().unwrap().question;
9033 assert_ne!(fresh_id, &id);
9034 let fresh = store.get(fresh_id).unwrap();
9035 assert!(
9036 fresh
9037 .detail
9038 .contains("fresh owner approval after merge repair")
9039 );
9040 assert!(fresh.detail.contains("No review recorded"));
9041 assert!(!fresh.detail.contains("precise rejection reason"));
9042 }
9043
9044 #[tokio::test]
9045 async fn merge_repair_answer_never_merges_and_hold_never_requests_repair() {
9046 for choice in [REPAIR, HOLD] {
9047 let mut state = repair_state(false, true);
9048 let observed = seen("abc", Checks::Green, "CLEAN", false);
9049 approval_gate(&mut state, &observed.pr, "feat: x", None, "abc")
9050 .await
9051 .unwrap();
9052 let id = state.land_approval.as_ref().unwrap().question.clone();
9053 ask::Questions::open()
9054 .update(&id, |q| q.answer(ask::Answer::Choice(choice.into())))
9055 .unwrap();
9056 let forge = Scripted::new(vec![observed], vec![(true, "")]);
9057 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9058 .await
9059 .unwrap();
9060 assert!(
9061 forge
9062 .argvs()
9063 .iter()
9064 .all(|a| a.iter().any(|s| s == "--disable-auto"))
9065 );
9066 assert!(!forge.calls().contains(&"fix"));
9067 assert_eq!(state.merge_repairs.len(), usize::from(choice == REPAIR));
9068 assert_ne!(state.status, RunStatus::Merged);
9069 }
9070 }
9071
9072 #[test]
9073 fn only_the_merge_choice_merges_and_silence_holds() {
9074 let table = [
9075 (None, Approval::Hold),
9076 (Some("merge"), Approval::Merge),
9077 (Some(" merge\n"), Approval::Merge),
9078 (Some("hold"), Approval::Hold),
9079 (Some(""), Approval::Hold),
9080 (Some("yes"), Approval::Hold),
9081 ];
9082 for (answer, want) in table {
9083 assert_eq!(
9084 approval(answer),
9085 want,
9086 "answer {answer:?} must resolve to {want:?}"
9087 );
9088 }
9089 }
9090
9091 #[tokio::test]
9092 async fn a_first_visit_to_the_merge_gate_files_a_question_and_returns_pending_at_once() {
9093 let mut state = landing_state();
9094 state.config.graph.land_approval = true;
9095 let pr = green_pr();
9096
9097 let gate = approval_gate(&mut state, &pr, "feat: x", None, "abc")
9098 .await
9099 .unwrap();
9100 assert_eq!(gate, ApprovalGate::Pending, "nobody has answered yet");
9101 assert!(
9102 !state.parked,
9103 "approval_gate itself never sets `parked`; only its caller does"
9104 );
9105
9106 let store = ask::Questions::open();
9107 let filed: Vec<_> = store
9108 .list()
9109 .into_iter()
9110 .filter(|q| q.run == state.id)
9111 .collect();
9112 assert_eq!(filed.len(), 1, "exactly one question is filed");
9113 assert_eq!(filed[0].node, APPROVAL_NODE);
9114 assert_eq!(filed[0].choices, approval_choices(&state));
9115 assert!(filed[0].status.open());
9116
9117 let again = approval_gate(&mut state, &pr, "feat: x", None, "abc")
9121 .await
9122 .unwrap();
9123 assert_eq!(again, ApprovalGate::Pending);
9124 let still_one = store
9125 .list()
9126 .into_iter()
9127 .filter(|q| q.run == state.id)
9128 .count();
9129 assert_eq!(
9130 still_one, 1,
9131 "asking twice must not double-file the question"
9132 );
9133 }
9134
9135 #[tokio::test]
9136 async fn approving_the_existing_question_is_read_back_as_approved() {
9137 crate::run::pin_test_home();
9138 let mut state = run_state();
9139 state.config.graph.land_approval = true;
9140 let pr = green_pr();
9141 assert_eq!(
9142 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9143 .await
9144 .unwrap(),
9145 ApprovalGate::Pending
9146 );
9147
9148 let store = ask::Questions::open();
9149 let mut q = store
9150 .list()
9151 .into_iter()
9152 .find(|q| q.run == state.id)
9153 .expect("filed above");
9154 let talks = crate::talk::Talks::open();
9155 let cfg = crate::config::Config {
9156 agents: vec![crate::config::AgentSpec {
9157 id: "mock".into(),
9158 kind: crate::config::AgentKind::Command,
9159 model: None,
9160 command: vec!["true".into()],
9161 extra_args: Vec::new(),
9162 env: Default::default(),
9163 prompt_delivery: None,
9164 max_turn_secs: None,
9165 }],
9166 ..crate::config::Config::default()
9167 };
9168 let mut talk = crate::talk::begin(&talks, &cfg, state.repo.clone(), Some("mock")).unwrap();
9169 crate::consult::begin(&store, &talks, &q, &talk).unwrap();
9170 crate::talk::drain(&mut talk, &talks).unwrap();
9171 assert_eq!(
9172 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9173 .await
9174 .unwrap(),
9175 ApprovalGate::Pending,
9176 "consultation cannot approve or hold the merge"
9177 );
9178 q = store.get(&q.id).unwrap();
9179 assert!(q.answer.is_none());
9180 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
9182 store.put(&mut q).unwrap();
9183
9184 assert_eq!(
9185 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9186 .await
9187 .unwrap(),
9188 ApprovalGate::Approved
9189 );
9190 }
9191
9192 #[tokio::test]
9193 async fn legacy_hold_actions_are_removed_on_get_and_list_before_answering() {
9194 crate::run::pin_test_home();
9195 let store = ask::Questions::open();
9196 for via_list in [false, true] {
9197 let mut state = repair_state(false, true);
9198 let pr = green_pr();
9199 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9200 .await
9201 .unwrap();
9202 let id = state.land_approval.as_ref().unwrap().question.clone();
9203 store
9204 .update(&id, |q| {
9205 q.actions.insert(
9206 HOLD.to_owned(),
9207 ask::ChoiceAction::Resume {
9208 run: state.id.clone(),
9209 },
9210 );
9211 Ok(())
9212 })
9213 .unwrap();
9214 let q = if via_list {
9215 store.list().into_iter().find(|q| q.id == id).unwrap()
9216 } else {
9217 store.get(&id).unwrap()
9218 };
9219 assert!(!q.actions.contains_key(HOLD));
9220 store
9221 .update(&id, |q| {
9222 assert!(!q.actions.contains_key(HOLD));
9224 assert!(!upgrade_repair_choice(q, &state));
9225 q.answer(ask::Answer::Choice(HOLD.to_owned()))
9226 })
9227 .unwrap();
9228 assert!(store.get(&id).unwrap().chosen_action().is_none());
9229 assert_eq!(
9230 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9231 .await
9232 .unwrap(),
9233 ApprovalGate::Held
9234 );
9235 }
9236 }
9237
9238 #[tokio::test]
9239 async fn explicit_hold_stays_held_but_expired_approval_is_reasked() {
9240 crate::run::pin_test_home();
9241 let store = ask::Questions::open();
9242
9243 let mut held_state = run_state();
9244 held_state.config.graph.land_approval = true;
9245 let pr = green_pr();
9246 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
9247 .await
9248 .unwrap();
9249 let mut q = store
9250 .list()
9251 .into_iter()
9252 .find(|q| q.run == held_state.id)
9253 .expect("filed above");
9254 q.answer(ask::Answer::Choice(HOLD.to_owned())).unwrap();
9255 store.put(&mut q).unwrap();
9256 assert_eq!(
9257 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
9258 .await
9259 .unwrap(),
9260 ApprovalGate::Held
9261 );
9262
9263 let mut abandoned_state = run_state();
9264 abandoned_state.config.graph.land_approval = true;
9265 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
9266 .await
9267 .unwrap();
9268 let mut q = store
9269 .list()
9270 .into_iter()
9271 .find(|q| q.run == abandoned_state.id)
9272 .expect("filed above");
9273 q.abandon("no answer within the timeout");
9274 store.put(&mut q).unwrap();
9275 assert_eq!(
9276 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
9277 .await
9278 .unwrap(),
9279 ApprovalGate::Pending,
9280 "an expired approval must ask again without merging"
9281 );
9282 assert_eq!(
9283 store.get(&q.id).unwrap().status,
9284 ask::QuestionStatus::Abandoned
9285 );
9286 assert_ne!(
9287 abandoned_state.land_approval.as_ref().unwrap().question,
9288 q.id
9289 );
9290 }
9291
9292 fn contested() -> ContestedHandoff {
9293 let finding = |id: &str, n: u32| crate::verdict::Finding {
9294 id: id.to_owned(),
9295 severity: crate::verdict::Severity::Major,
9296 file: Some("src/a.rs".to_owned()),
9297 line: Some(n),
9298 title: format!("problem {id}"),
9299 detail: String::new(),
9300 };
9301 ContestedHandoff {
9302 findings: (1..=7).map(|n| finding(&format!("R3-1-{n}"), n)).collect(),
9303 rejecters: vec![(1, "alpha".to_owned())],
9304 }
9305 }
9306
9307 #[test]
9308 fn the_contested_record_is_asked_about_unless_the_switch_is_off() {
9309 let mut state = run_state();
9310 assert!(contested_to_ask(&state).is_none(), "nothing recorded");
9311 state.contested_handoff = Some(contested());
9312 assert!(contested_to_ask(&state).is_some());
9313 state.config.graph.hold_contested_merge = false;
9314 assert!(
9315 contested_to_ask(&state).is_none(),
9316 "the switch restores today"
9317 );
9318 }
9319
9320 #[test]
9321 fn the_deputy_brief_carries_the_pr_the_findings_and_names_what_is_missing() {
9322 let q = ask::Question::new(
9323 "run-1".to_owned(),
9324 APPROVAL_NODE.to_owned(),
9325 "land".to_owned(),
9326 "Merge?".to_owned(),
9327 String::new(),
9328 vec![APPROVE.to_owned(), HOLD.to_owned()],
9329 );
9330 let none = deputy_brief(&q, None);
9331 assert!(none.contains("could not be read"), "{none}");
9332 assert!(none.contains("Silence is a hold"), "{none}");
9333
9334 let mut state = run_state();
9335 state.pr = Some(crate::run::PrRecord {
9336 url: "https://example.test/pull/7".to_owned(),
9337 number: 7,
9338 state: "open".to_owned(),
9339 checks: "green".to_owned(),
9340 round: 0,
9341 rounds: 3,
9342 red_at_merge: Vec::new(),
9343 });
9344 state.contested_handoff = Some(contested());
9345 let b = deputy_brief(&q, Some(&state));
9346 assert!(b.contains("https://example.test/pull/7"), "{b}");
9347 assert!(b.contains("not recorded in this legacy question"), "{b}");
9348 assert!(!b.contains("This question was filed although"));
9349 state.contested_handoff = None;
9350 assert!(deputy_brief(&q, Some(&state)).contains("not recorded in this legacy question"));
9351 }
9352
9353 #[test]
9354 fn the_contested_question_names_the_pr_the_findings_and_the_rejecter() {
9355 for lang in ["en", "ja"] {
9356 let mut cfg = crate::config::Config::default();
9357 cfg.graph.language = lang.to_owned();
9358 let w = words(&cfg.graph.language);
9359 let text = w.approval_detail(
9360 "https://github.com/yukimemi/magi/pull/42",
9361 "main",
9362 "feat: x",
9363 Some(&contested()),
9364 );
9365 assert!(text.contains("pull/42"), "{text}");
9366 assert!(
9367 text.contains("R3-1-1 major src/a.rs:1: problem R3-1-1"),
9368 "{text}"
9369 );
9370 assert!(text.contains("R3-1-5"), "{text}");
9371 assert!(!text.contains("R3-1-6"), "the list is capped: {text}");
9372 assert!(text.contains("2"), "the rest are counted: {text}");
9373 assert!(text.contains("#1 (alpha)"), "{text}");
9374 }
9375 let plain = words("en").approval_detail("u", "main", "s", None);
9376 assert!(!plain.contains("reject"), "{plain}");
9377 }
9378
9379 #[tokio::test]
9380 async fn a_contested_question_is_filed_once_and_a_resume_finds_the_same_one() {
9381 crate::run::pin_test_home();
9382 let mut state = run_state();
9383 state.config.graph.land_approval = false;
9384 state.contested_handoff = Some(contested());
9385 let pr = green_pr();
9386 let c = contested_to_ask(&state);
9387 assert_eq!(
9388 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9389 .await
9390 .unwrap(),
9391 ApprovalGate::Pending,
9392 "silence is a hold"
9393 );
9394 let store = ask::Questions::open();
9395 let filed: Vec<_> = store
9396 .list()
9397 .into_iter()
9398 .filter(|q| q.run == state.id)
9399 .collect();
9400 assert_eq!(filed.len(), 1);
9401 assert!(filed[0].detail.contains("R3-1-1"), "{}", filed[0].detail);
9402
9403 assert_eq!(
9404 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9405 .await
9406 .unwrap(),
9407 ApprovalGate::Pending
9408 );
9409 let mut q = store
9410 .list()
9411 .into_iter()
9412 .find(|q| q.run == state.id)
9413 .unwrap();
9414 assert_eq!(q.id, filed[0].id, "the same question after a resume");
9415 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
9416 store.put(&mut q).unwrap();
9417 assert_eq!(
9418 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9419 .await
9420 .unwrap(),
9421 ApprovalGate::Approved
9422 );
9423 }
9424
9425 #[test]
9426 fn the_diffstat_table_is_ordered_by_churn_with_binaries_last() {
9427 let rows = parse_numstat(NUMSTAT);
9428 assert_eq!(
9429 rows.iter().map(|r| r.path.as_str()).collect::<Vec<_>>(),
9430 ["src/web.rs", "src/land.rs", "assets/logo.png"]
9431 );
9432 assert_eq!(rows[2].added, None, "a binary file has no line counts");
9433 }
9434 #[test]
9435 fn the_approval_speaks_the_language_the_repository_is_configured_for() {
9436 let mut state = run_state();
9440 state.config.graph.language = "ja".to_owned();
9441 let pr = green_pr();
9442 let commits = ["c1".to_owned()];
9443
9444 let ja = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
9445 assert!(ja.contains("lang=\"ja\""), "the document must declare it");
9446 assert!(ja.contains("squash されるコミット"), "{ja}");
9447 assert!(ja.contains("レビューコメント"), "{ja}");
9448 assert!(ja.contains("差分"), "{ja}");
9449 assert!(
9450 !ja.contains("Commits being squashed"),
9451 "no English left over"
9452 );
9453
9454 let w = words("ja");
9455 assert!(w.approval_summary(17, "feat: x").contains("マージ"));
9456 assert!(
9457 w.approval_detail("http://x/1", "main", "feat: x", None)
9458 .contains("パネル")
9459 );
9460
9461 assert!(ja.contains("src/a.rs"), "the diffstat is not prose");
9463 assert!(ja.contains("feat: x"), "nor is the merge subject");
9464
9465 state.config.graph.language = "en".to_owned();
9468 let en = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
9469 assert!(en.contains("Commits being squashed"), "{en}");
9470 assert_eq!(words("Klingon").html_lang, "en");
9471 }
9472
9473 #[test]
9477 fn pick_open_pr_classifies_by_count_and_base() {
9478 let one = r#"[{"number":58,"url":"https://x/pull/58","title":"t","baseRefName":"main"}]"#;
9479 assert_eq!(
9480 pick_open_pr(one, "main").unwrap(),
9481 OpenPr::One {
9482 url: "https://x/pull/58".into(),
9483 title: "t".into()
9484 }
9485 );
9486 assert_eq!(pick_open_pr("[]", "main").unwrap(), OpenPr::None);
9487 assert_eq!(pick_open_pr(one, "dev").unwrap(), OpenPr::None);
9488 let two = r#"[{"number":1,"url":"u1","title":"","baseRefName":"main"},
9489 {"number":2,"url":"u2","title":"","baseRefName":"main"}]"#;
9490 assert_eq!(
9491 pick_open_pr(two, "main").unwrap(),
9492 OpenPr::Many(vec!["u1".into(), "u2".into()])
9493 );
9494 let fork = r#"[{"url":"f","baseRefName":"main","isCrossRepository":true}]"#;
9496 assert_eq!(pick_open_pr(fork, "main").unwrap(), OpenPr::None);
9497 assert!(pick_open_pr("not json", "main").is_err());
9498 assert!(pick_open_pr(r#"[{"url":"u","title":"t"}]"#, "main").is_err());
9500 assert!(pick_open_pr(r#"[{"title":"t","baseRefName":"main"}]"#, "main").is_err());
9501 }
9502
9503 #[test]
9504 fn pick_merged_pr_picks_the_unique_match() {
9505 let json = r#"[
9506 {"url": "https://github.com/o/r/pull/42", "number": 42,
9507 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"}
9508 ]"#;
9509 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9510 let found = pick_merged_pr(json, "main", created_at)
9511 .expect("valid json")
9512 .expect("one unambiguous match");
9513 assert_eq!(found.url, "https://github.com/o/r/pull/42");
9514 assert_eq!(found.number, 42);
9515 }
9516
9517 #[test]
9521 fn pick_merged_pr_refuses_when_more_than_one_candidate_survives() {
9522 let json = r#"[
9523 {"url": "https://github.com/o/r/pull/42", "number": 42,
9524 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"},
9525 {"url": "https://github.com/o/r/pull/43", "number": 43,
9526 "mergedAt": "2026-09-21T10:00:00Z", "baseRefName": "main"}
9527 ]"#;
9528 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9529 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9530 }
9531
9532 #[test]
9536 fn pick_merged_pr_ignores_a_different_base_branch() {
9537 let json = r#"[
9538 {"url": "https://github.com/o/r/pull/42", "number": 42,
9539 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "release"}
9540 ]"#;
9541 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9542 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9543 }
9544
9545 #[test]
9548 fn pick_merged_pr_ignores_a_merge_that_predates_the_run() {
9549 let json = r#"[
9550 {"url": "https://github.com/o/r/pull/42", "number": 42,
9551 "mergedAt": "2026-09-18T10:00:00Z", "baseRefName": "main"}
9552 ]"#;
9553 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9554 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9555 }
9556
9557 #[test]
9558 fn slug_of_pr_url_reads_host_owner_and_repo() {
9559 assert_eq!(
9560 slug_of_pr_url("https://github.com/yukimemi/shun/pull/272").as_deref(),
9561 Some("github.com/yukimemi/shun")
9562 );
9563 }
9564
9565 #[test]
9566 fn slug_of_pr_url_refuses_a_url_with_no_pull_segment() {
9567 assert_eq!(slug_of_pr_url("https://github.com/yukimemi/shun"), None);
9568 assert_eq!(slug_of_pr_url("not a url at all"), None);
9569 assert_eq!(slug_of_pr_url("https://github.com"), None);
9570 }
9571
9572 #[test]
9573 fn slug_of_repo_url_reads_host_owner_and_repo() {
9574 assert_eq!(
9575 slug_of_repo_url("https://github.com/yukimemi/magi").as_deref(),
9576 Some("github.com/yukimemi/magi")
9577 );
9578 assert_eq!(slug_of_repo_url("https://github.com"), None);
9579 }
9580
9581 #[test]
9582 fn ensure_same_repo_accepts_a_matching_slug_regardless_of_case() {
9583 ensure_same_repo("github.com/yukimemi/magi", "GitHub.Com/YukiMemi/Magi")
9584 .expect("same repo, different case");
9585 }
9586
9587 #[test]
9592 fn ensure_same_repo_refuses_a_different_repo() {
9593 let err =
9594 ensure_same_repo("github.com/yukimemi/magi", "github.com/yukimemi/shun").unwrap_err();
9595 let msg = format!("{err:#}");
9596 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
9597 assert!(msg.contains("github.com/yukimemi/shun"), "{msg}");
9598 }
9599
9600 #[test]
9605 fn ensure_same_repo_refuses_the_same_slug_on_a_different_host() {
9606 let err = ensure_same_repo(
9607 "github.com/yukimemi/magi",
9608 "github.example.com/yukimemi/magi",
9609 )
9610 .unwrap_err();
9611 let msg = format!("{err:#}");
9612 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
9613 assert!(msg.contains("github.example.com/yukimemi/magi"), "{msg}");
9614 }
9615
9616 #[tokio::test]
9621 async fn find_external_merge_returns_none_without_a_winner() {
9622 let state = RunState::new(
9623 PathBuf::from("/no/such/repo"),
9624 "main".to_owned(),
9625 "0000000000000000000000000000000000000000".to_owned(),
9626 "irrelevant".to_owned(),
9627 crate::config::Config::default(),
9628 );
9629 assert_eq!(find_external_merge(&state).await.unwrap(), None);
9630 }
9631
9632 fn pr_run(home: &Path, id: &str, repo: &str, status: RunStatus, url: &str, state: &str) {
9633 let mut run = RunState::new(
9634 PathBuf::from(repo),
9635 "main".to_owned(),
9636 "abcdef1234".to_owned(),
9637 "x".to_owned(),
9638 crate::config::Config::default(),
9639 );
9640 run.id = id.to_owned();
9641 run.status = status;
9642 run.driver_exited = true;
9643 run.pr = Some(crate::run::PrRecord {
9644 number: url.rsplit('/').next().unwrap().parse().unwrap(),
9645 url: url.to_owned(),
9646 state: state.to_owned(),
9647 checks: "red".to_owned(),
9648 round: 0,
9649 rounds: 2,
9650 red_at_merge: Vec::new(),
9651 });
9652 run.save_under(home).unwrap();
9653 }
9654
9655 fn recorded(home: &Path, id: &str) -> String {
9656 let body = std::fs::read_to_string(home.join("runs").join(id).join("run.json")).unwrap();
9657 serde_json::from_str::<RunState>(&body)
9658 .unwrap()
9659 .pr
9660 .unwrap()
9661 .state
9662 }
9663
9664 const PR: &str = "https://github.com/o/r/pull/7";
9665
9666 #[test]
9667 fn write_through_updates_predecessors_and_siblings_only() {
9668 let tmp = tempfile::tempdir().unwrap();
9669 let h = tmp.path();
9670 pr_run(
9671 h,
9672 "20261004-100000-aaaa",
9673 "/repo/r",
9674 RunStatus::Superseded,
9675 PR,
9676 "open",
9677 );
9678 pr_run(
9679 h,
9680 "20261004-100100-bbbb",
9681 "/repo/r",
9682 RunStatus::Blocked,
9683 PR,
9684 "open",
9685 );
9686 pr_run(
9688 h,
9689 "20261004-100200-cccc",
9690 "/repo/r",
9691 RunStatus::Landing,
9692 PR,
9693 "open",
9694 );
9695 pr_run(
9697 h,
9698 "20261004-100300-dddd",
9699 "/repo/other",
9700 RunStatus::Blocked,
9701 "https://github.com/o/other/pull/7",
9702 "open",
9703 );
9704 pr_run(
9706 h,
9707 "20261004-100400-eeee",
9708 "/repo/r",
9709 RunStatus::Blocked,
9710 "https://github.com/o/r/pull/8",
9711 "open",
9712 );
9713 pr_run(
9714 h,
9715 "20261004-100500-ffff",
9716 "/repo/r",
9717 RunStatus::Merged,
9718 PR,
9719 "open",
9720 );
9721 let source = RunState::load_under("20261004-100500-ffff", h).unwrap();
9722
9723 assert_eq!(
9724 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
9725 2
9726 );
9727 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
9728 assert_eq!(recorded(h, "20261004-100100-bbbb"), "merged");
9729 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
9730 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
9731 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
9732 assert_eq!(recorded(h, "20261004-100500-ffff"), "open");
9734 assert_eq!(
9736 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
9737 0
9738 );
9739 let hit = RunState::load_under("20261004-100000-aaaa", h).unwrap();
9740 assert!(hit.events.iter().any(|e| e.message.contains("merged")));
9741 }
9742
9743 #[test]
9744 fn lifecycle_updates_preserve_live_and_unknown_terminal_drivers() {
9745 let home = tempfile::tempdir().unwrap();
9746 let live_id = "20261004-100000-aaaa";
9747 let unknown_id = "20261004-100100-bbbb";
9748 for id in [live_id, unknown_id] {
9749 pr_run(home.path(), id, "repo", RunStatus::Ready, PR, "open");
9750 let mut s = RunState::load_under(id, home.path()).unwrap();
9751 s.driver_exited = false;
9752 s.driver_claimed = None;
9754 if id == live_id {
9755 s.driver_pid = Some(std::process::id());
9756 s.driver_started_at = crate::proc::process_started_at(std::process::id());
9757 }
9758 s.save_under(home.path()).unwrap();
9759 if id == unknown_id {
9760 assert_eq!(
9761 s.liveness_under(home.path(), false),
9762 crate::run::Liveness::Unknown
9763 );
9764 }
9765 }
9766 let known = BTreeMap::from([(PR.to_owned(), PrLifecycle::Merged)]);
9767 assert_eq!(apply_pr_states(home.path(), &known), 0);
9768 for id in [live_id, unknown_id] {
9769 assert_eq!(recorded(home.path(), id), "open");
9770 }
9771 }
9772
9773 #[test]
9774 fn repair_rewrites_merged_and_closed_and_leaves_open_and_unknown() {
9775 let tmp = tempfile::tempdir().unwrap();
9776 let h = tmp.path();
9777 let url = |n: u32| format!("https://github.com/o/r/pull/{n}");
9778 pr_run(
9779 h,
9780 "20261004-100000-aaaa",
9781 "/repo/r",
9782 RunStatus::Superseded,
9783 &url(1),
9784 "open",
9785 );
9786 pr_run(
9787 h,
9788 "20261004-100100-bbbb",
9789 "/repo/r",
9790 RunStatus::Blocked,
9791 &url(2),
9792 "open",
9793 );
9794 pr_run(
9795 h,
9796 "20261004-100200-cccc",
9797 "/repo/r",
9798 RunStatus::Ready,
9799 &url(3),
9800 "open",
9801 );
9802 pr_run(
9803 h,
9804 "20261004-100300-dddd",
9805 "/repo/r",
9806 RunStatus::Ready,
9807 &url(4),
9808 "open",
9809 );
9810 pr_run(
9811 h,
9812 "20261004-100400-eeee",
9813 "/repo/r",
9814 RunStatus::Implementing,
9815 &url(1),
9816 "open",
9817 );
9818 assert_eq!(stale_open_prs(h).len(), 4);
9819
9820 let mut known = BTreeMap::new();
9821 known.insert(url(1), PrLifecycle::Merged);
9822 known.insert(url(2), PrLifecycle::Closed);
9823 known.insert(url(3), PrLifecycle::Open);
9824 assert_eq!(apply_pr_states(h, &known), 2);
9826 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
9827 assert_eq!(recorded(h, "20261004-100100-bbbb"), "closed");
9828 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
9829 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
9830 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
9831 assert_eq!(apply_pr_states(h, &known), 0);
9832 }
9833
9834 use std::collections::VecDeque;
9837 use std::sync::Mutex;
9838
9839 struct Scripted {
9842 evidence: Mutex<Option<CiEvidence>>,
9843 views: Mutex<VecDeque<Seen>>,
9844 merges: Mutex<VecDeque<(bool, String)>>,
9845 fix: Mutex<Option<Fixed>>,
9846 log: Mutex<Vec<&'static str>>,
9847 argvs: Mutex<Vec<Vec<String>>>,
9848 required: Mutex<Option<BTreeSet<String>>>,
9849 merged: Mutex<bool>,
9852 queued: Mutex<bool>,
9853 unreadable_after_merge: Mutex<bool>,
9855 reruns: Mutex<Vec<String>>,
9857 rerun_fails: Mutex<bool>,
9858 clock: Mutex<i64>,
9860 }
9861
9862 impl Scripted {
9863 fn new(views: Vec<Seen>, merges: Vec<(bool, &str)>) -> Self {
9864 Self {
9865 evidence: Mutex::new(None),
9866 views: Mutex::new(views.into()),
9867 merges: Mutex::new(
9868 merges
9869 .into_iter()
9870 .map(|(ok, m)| (ok, m.to_owned()))
9871 .collect(),
9872 ),
9873 fix: Mutex::new(None),
9874 log: Mutex::new(Vec::new()),
9875 argvs: Mutex::new(Vec::new()),
9876 required: Mutex::new(None),
9877 merged: Mutex::new(false),
9878 queued: Mutex::new(false),
9879 unreadable_after_merge: Mutex::new(false),
9880 reruns: Mutex::new(Vec::new()),
9881 rerun_fails: Mutex::new(false),
9882 clock: Mutex::new(1_000),
9883 }
9884 }
9885 fn argvs(&self) -> Vec<Vec<String>> {
9886 self.argvs.lock().unwrap().clone()
9887 }
9888 fn calls(&self) -> Vec<&'static str> {
9889 self.log.lock().unwrap().clone()
9890 }
9891 }
9892
9893 impl Forge for Scripted {
9894 async fn attribution(&self, _state: &RunState, _seen: &Seen) -> Option<CiEvidence> {
9895 self.evidence.lock().unwrap().clone()
9896 }
9897 async fn view(&self, _repo: &Path, _url: &str) -> Result<Seen> {
9898 self.log.lock().unwrap().push("view");
9899 if *self.unreadable_after_merge.lock().unwrap()
9900 && !self.argvs.lock().unwrap().is_empty()
9901 {
9902 anyhow::bail!("forge unreachable");
9903 }
9904 let mut v = self.views.lock().unwrap();
9905 let mut seen = if v.len() > 1 {
9906 v.pop_front().unwrap()
9907 } else {
9908 v[0].clone()
9909 };
9910 if *self.merged.lock().unwrap() {
9911 seen.pr.state = PrLifecycle::Merged;
9912 }
9913 Ok(seen)
9914 }
9915 async fn merge(&self, _repo: &Path, argv: &[String]) -> Result<(bool, String)> {
9916 self.log.lock().unwrap().push("merge");
9917 self.argvs.lock().unwrap().push(argv.to_vec());
9918 let out = self
9919 .merges
9920 .lock()
9921 .unwrap()
9922 .pop_front()
9923 .expect("unscripted merge");
9924 if out.0 && !*self.queued.lock().unwrap() && !argv.iter().any(|a| a == "--disable-auto")
9925 {
9926 *self.merged.lock().unwrap() = true;
9927 }
9928 Ok(out)
9929 }
9930 async fn poll(&self) {
9931 self.log.lock().unwrap().push("poll");
9932 *self.clock.lock().unwrap() += POLL.as_secs() as i64;
9933 }
9934 async fn rerun(&self, _repo: &Path, run: &str) -> Result<()> {
9935 self.log.lock().unwrap().push("rerun");
9936 self.reruns.lock().unwrap().push(run.to_owned());
9937 if *self.rerun_fails.lock().unwrap() {
9938 anyhow::bail!("gh run rerun: no");
9939 }
9940 Ok(())
9941 }
9942 fn now(&self) -> i64 {
9943 *self.clock.lock().unwrap()
9944 }
9945 async fn required_contexts(&self, _repo: &Path, _base: &str) -> Option<BTreeSet<String>> {
9946 self.required.lock().unwrap().clone()
9947 }
9948 async fn fix(
9949 &self,
9950 _state: &mut RunState,
9951 _pr: &PrState,
9952 _round: usize,
9953 _budget: usize,
9954 _reason: &str,
9955 _logs: &str,
9956 ) -> Result<Fixed> {
9957 self.log.lock().unwrap().push("fix");
9958 Ok(self.fix.lock().unwrap().take().expect("unscripted fix"))
9959 }
9960 }
9961
9962 const REFUSED: &str =
9963 "X Pull request #42 is not mergeable: the base branch policy prohibits the merge.";
9964
9965 fn seen(head: &str, checks: Checks, merge_state: &str, comments: bool) -> Seen {
9966 let mut pr = green_pr();
9967 pr.checks = checks;
9968 pr.blocking = Blocking::of(merge_state);
9969 if !comments {
9970 pr.review_comments.clear();
9971 }
9972 Seen {
9973 pr,
9974 title: "feat: x".to_owned(),
9975 failing_urls: Vec::new(),
9976 head: head.to_owned(),
9977 rollup_head: head.to_owned(),
9978 merge_state: merge_state.to_owned(),
9979 contexts: Vec::new(),
9980 base: "main".to_owned(),
9981 }
9982 }
9983
9984 fn landing_state() -> RunState {
9985 crate::run::pin_test_home();
9986 let mut state = run_state();
9987 state.config.graph.land_approval = false;
9988 state
9989 }
9990
9991 #[test]
9992 fn a_pushed_head_is_awaited_case_insensitively_and_an_unreadable_one_is_not_a_match() {
9993 assert!(!awaiting_new_head(None, "aaa"));
9994 assert!(!awaiting_new_head(Some("abc123"), "ABC123"));
9995 assert!(awaiting_new_head(Some("abc123"), "def456"));
9996 assert!(awaiting_new_head(Some("abc123"), ""));
9997 }
9998
9999 #[test]
10000 fn a_refusal_is_judged_by_the_pull_requests_state_not_by_its_wording() {
10001 let open = |c, m: &str| seen("a", c, m, false);
10002 let table = [
10003 (None, false, Refused::Pending),
10004 (
10005 Some(open(Checks::Pending, "BLOCKED")),
10006 false,
10007 Refused::Pending,
10008 ),
10009 (
10010 Some(open(Checks::Unknown, "BLOCKED")),
10011 false,
10012 Refused::Pending,
10013 ),
10014 (
10015 Some(open(Checks::Green, "UNKNOWN")),
10016 false,
10017 Refused::Pending,
10018 ),
10019 (Some(open(Checks::Green, "")), false, Refused::Pending),
10020 (
10021 Some(open(Checks::Green, "BLOCKED")),
10022 false,
10023 Refused::Recheck,
10024 ),
10025 (Some(open(Checks::Green, "BLOCKED")), true, Refused::Final),
10026 ];
10027 for (after, rechecked, want) in table {
10028 assert_eq!(
10029 classify_refusal(after.as_ref(), rechecked, "a", CiExpectation::Expected),
10030 want
10031 );
10032 }
10033 let mut closed = open(Checks::Green, "CLEAN");
10034 closed.pr.state = PrLifecycle::Closed;
10035 assert_eq!(
10036 classify_refusal(Some(&closed), false, "a", CiExpectation::Expected),
10037 Refused::Final
10038 );
10039 }
10040
10041 #[tokio::test]
10042 async fn a_normal_landing_merges_on_the_first_look() {
10043 let mut state = landing_state();
10044 let forge = Scripted::new(
10045 vec![seen("a", Checks::Green, "CLEAN", false)],
10046 vec![(true, "")],
10047 );
10048 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10049 .await
10050 .unwrap();
10051 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10053 assert_eq!(state.status, RunStatus::Merged);
10054 }
10055
10056 #[tokio::test]
10057 async fn a_successful_merge_command_that_only_queued_is_not_a_merge() {
10058 let mut state = landing_state();
10059 let forge = Scripted::new(
10060 vec![seen("a", Checks::Green, "CLEAN", false)],
10061 std::iter::repeat_n((true, ""), 100).collect(),
10062 );
10063 *forge.queued.lock().unwrap() = true;
10064 let task = async {
10065 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10066 .await
10067 .unwrap();
10068 };
10069 task.await;
10072 assert_ne!(state.status, RunStatus::Merged);
10073 }
10074
10075 #[tokio::test]
10076 async fn an_unreadable_forge_after_a_merge_command_is_not_a_confirmation() {
10077 let mut state = landing_state();
10078 let forge = Scripted::new(
10079 vec![seen("a", Checks::Green, "CLEAN", false)],
10080 std::iter::repeat_n((true, ""), 100).collect(),
10081 );
10082 *forge.unreadable_after_merge.lock().unwrap() = true;
10083 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10084 .await
10085 .ok();
10086 assert_ne!(state.status, RunStatus::Merged);
10087 }
10088
10089 #[tokio::test]
10090 async fn a_task_public_head_is_awaited_on_land_entry() {
10091 let mut state = landing_state();
10092 state.pr_head = Some("magi/task-abcd-1234".into());
10093 state.pr_pushed_head = Some("new".into());
10094 let forge = Scripted::new(
10095 vec![
10096 seen("old", Checks::Green, "CLEAN", false),
10097 seen("new", Checks::Green, "CLEAN", false),
10098 ],
10099 vec![(true, "")],
10100 );
10101 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10102 .await
10103 .unwrap();
10104 assert_eq!(
10105 forge.calls(),
10106 ["view", "poll", "view", "view", "merge", "view"]
10107 );
10108 assert_eq!(state.status, RunStatus::Merged);
10109 }
10110
10111 #[tokio::test]
10112 async fn a_superseded_public_head_owner_cannot_reenter_land() {
10113 let mut state = landing_state();
10114 state.pr_taken_over_by = Some("next".into());
10115 let forge = Scripted::new(vec![seen("a", Checks::Green, "CLEAN", false)], vec![]);
10116 assert!(
10117 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10118 .await
10119 .is_err()
10120 );
10121 assert!(forge.calls().is_empty());
10122 }
10123
10124 #[tokio::test]
10125 async fn after_a_pushed_fix_no_merge_is_tried_until_the_head_matches() {
10126 let mut state = landing_state();
10127 let forge = Scripted::new(
10128 vec![
10129 seen("old", Checks::Green, "CLEAN", true),
10130 seen("old", Checks::Green, "CLEAN", true),
10132 seen("new", Checks::Pending, "BLOCKED", true),
10133 seen("new", Checks::Green, "CLEAN", true),
10134 ],
10135 vec![(true, "")],
10136 );
10137 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10138 head: "NEW".to_owned(),
10139 });
10140 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10141 .await
10142 .unwrap();
10143 assert_eq!(
10144 forge.calls(),
10145 [
10146 "view", "fix", "poll", "view", "poll", "view", "poll", "view", "view", "merge",
10147 "view"
10148 ]
10149 );
10150 assert_eq!(state.status, RunStatus::Merged);
10151 }
10152
10153 #[tokio::test]
10154 async fn a_head_that_never_arrives_stops_naming_both_commits() {
10155 let mut state = landing_state();
10156 let forge = Scripted::new(
10157 vec![
10158 seen("old", Checks::Green, "CLEAN", true),
10159 seen("someone-elses", Checks::Green, "CLEAN", true),
10160 ],
10161 vec![],
10162 );
10163 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10164 head: "mine".to_owned(),
10165 });
10166 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10167 .await
10168 .unwrap();
10169 assert!(!forge.calls().contains(&"merge"));
10170 let why = state.merge.as_ref().unwrap().detail.clone();
10171 assert!(
10172 why.contains("mine") && why.contains("someone-elses"),
10173 "{why}"
10174 );
10175 assert_eq!(state.status, RunStatus::Blocked);
10176 }
10177
10178 #[tokio::test]
10179 async fn a_policy_refusal_while_checks_run_waits_and_then_merges() {
10180 let mut state = landing_state();
10181 let forge = Scripted::new(
10182 vec![
10183 seen("a", Checks::Green, "CLEAN", false),
10184 seen("a", Checks::Green, "CLEAN", false),
10185 seen("a", Checks::Pending, "BLOCKED", false),
10186 seen("a", Checks::Pending, "BLOCKED", false),
10187 seen("a", Checks::Green, "CLEAN", false),
10188 ],
10189 vec![(false, REFUSED), (true, "")],
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", "view", "merge", "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_refusal_that_outlives_settled_checks_stops_with_the_merge_state() {
10206 let mut state = landing_state();
10207 let forge = Scripted::new(
10208 vec![
10209 seen("a", Checks::Green, "CLEAN", false),
10210 seen("a", Checks::Green, "BLOCKED", false),
10211 ],
10212 vec![(false, REFUSED), (false, REFUSED)],
10213 );
10214 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10215 .await
10216 .unwrap();
10217 assert_eq!(forge.calls().iter().filter(|c| **c == "merge").count(), 2);
10219 let why = state.merge.as_ref().unwrap().detail.clone();
10220 assert!(
10221 why.contains("policy prohibits") && why.contains("BLOCKED") && why.contains("refused"),
10222 "{why}"
10223 );
10224 assert_eq!(state.status, RunStatus::Blocked);
10225 }
10226
10227 #[test]
10228 fn a_decision_is_bound_to_a_head_only_when_every_signal_agrees() {
10229 assert_eq!(bound_head("abc", "abc", None), Some("abc"));
10230 assert_eq!(bound_head("abc", "ABC", Some("abc")), Some("abc"));
10231 assert_eq!(bound_head("old", "old", Some("new")), None);
10233 assert_eq!(bound_head("new", "old", Some("new")), None);
10235 assert_eq!(bound_head("new", "old", None), None);
10236 assert_eq!(bound_head("", "", None), None);
10238 assert_eq!(bound_head("", "", Some("new")), None);
10239 assert_eq!(bound_head("abc", "", None), None);
10240 }
10241
10242 fn view_json(head: &str) -> String {
10243 format!(
10244 r#"{{"url":"https://github.com/o/r/pull/42","number":42,"state":"OPEN",
10245 "title":"t","headRefOid":"{head}","mergeStateStatus":"CLEAN",
10246 "reviews":[],"comments":[]}}"#
10247 )
10248 }
10249
10250 fn node_json(oid: &str, check: &str, has_next: bool) -> String {
10251 format!(
10252 r#"{{"data":{{"repository":{{"pullRequest":{{"commits":{{"nodes":[{{"commit":
10253 {{"oid":"{oid}","statusCheckRollup":{{"contexts":{{"pageInfo":{{"hasNextPage":{has_next}}},
10254 "nodes":[{{"__typename":"CheckRun","name":"ci","status":"COMPLETED",
10255 "conclusion":"{check}","detailsUrl":"https://example.test/1"}}]}}}}}}}}]}}}}}}}}}}"#
10256 )
10257 }
10258
10259 #[test]
10260 fn rollup_is_bound_to_the_commit_in_the_same_node() {
10261 let s = seen_from(&view_json("new"), Some(&node_json("old", "FAILURE", false))).unwrap();
10264 assert_eq!(s.rollup_head, "old");
10265 assert_eq!(s.pr.checks, Checks::Red);
10266 assert_eq!(bound_head(&s.head, &s.rollup_head, Some("new")), None);
10267 assert_eq!(s.failing_urls.len(), 1);
10268 }
10269
10270 #[test]
10271 fn checks_come_from_the_node_not_the_view() {
10272 let view = view_json("new").replace(
10273 r#""reviews""#,
10274 r#""statusCheckRollup":[{"name":"ci","status":"COMPLETED","conclusion":"FAILURE"}],"reviews""#,
10275 );
10276 let s = seen_from(&view, Some(&node_json("new", "SUCCESS", false))).unwrap();
10277 assert_eq!(s.pr.checks, Checks::Green);
10278 assert!(s.pr.failing.is_empty());
10279 assert_eq!(
10280 bound_head(&s.head, &s.rollup_head, Some("new")),
10281 Some("new")
10282 );
10283 }
10284
10285 #[test]
10286 fn an_unreadable_or_paged_node_leaves_the_head_unbound() {
10287 for node in [
10288 None,
10289 Some("not json".to_owned()),
10290 Some(r#"{"errors":[{"message":"x"}]}"#.to_owned()),
10291 Some(node_json("new", "SUCCESS", true)),
10292 ] {
10293 let s = seen_from(&view_json("new"), node.as_deref()).unwrap();
10294 assert!(s.rollup_head.is_empty());
10295 assert_eq!(s.pr.checks, Checks::Unknown);
10296 assert_eq!(bound_head(&s.head, &s.rollup_head, None), None);
10297 }
10298 }
10299
10300 #[test]
10301 fn the_merge_command_is_pinned_to_the_observed_head() {
10302 let argv = merge_argv_at(7, "feat: x", "deadbeef");
10303 let at = argv
10304 .iter()
10305 .position(|a| a == "--match-head-commit")
10306 .unwrap();
10307 assert_eq!(argv[at + 1], "deadbeef");
10308 }
10309
10310 #[tokio::test]
10311 async fn stale_checks_after_a_fix_push_never_reach_a_merge() {
10312 let mut state = landing_state();
10313 let mut stale = seen("new", Checks::Red, "CLEAN", false);
10316 stale.rollup_head = "old".to_owned();
10317 let forge = Scripted::new(
10318 vec![seen("old", Checks::Green, "CLEAN", true), stale],
10319 vec![],
10320 );
10321 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10322 head: "new".to_owned(),
10323 });
10324 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10325 .await
10326 .unwrap();
10327 assert!(!forge.calls().contains(&"merge"));
10328 assert_eq!(state.status, RunStatus::Blocked);
10329 let why = state.merge.as_ref().unwrap().detail.clone();
10330 assert!(why.contains("new") && why.contains("old"), "{why}");
10331 }
10332
10333 #[test]
10334 fn a_refusal_read_against_another_commits_checks_is_pending() {
10335 let mut after = seen("a", Checks::Green, "BLOCKED", false);
10336 after.rollup_head = "old".to_owned();
10337 assert_eq!(
10338 classify_refusal(Some(&after), true, "a", CiExpectation::Expected),
10339 Refused::Pending
10340 );
10341 }
10342
10343 #[tokio::test]
10344 async fn absent_ci_empty_rollup_reaches_approval_then_merges_on_the_approved_head() {
10345 let mut state = landing_state();
10346 state.config.merge.ci = crate::config::MergeCi::None;
10347 state.config.graph.land_approval = true;
10348 let forge = Scripted::new(
10349 vec![seen("a", Checks::Unknown, "CLEAN", false)],
10350 vec![(true, "")],
10351 );
10352 land_with(&mut state, URL, &forge).await.unwrap();
10353 assert!(state.parked);
10354 assert_eq!(forge.calls(), ["view"]);
10355 let store = ask::Questions::open();
10356 let mut q = store
10357 .get(&state.land_approval.as_ref().unwrap().question)
10358 .unwrap();
10359 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
10360 store.put(&mut q).unwrap();
10361
10362 land_with(&mut state, URL, &forge).await.unwrap();
10363 assert_eq!(forge.calls(), ["view", "view", "view", "merge", "view"]);
10364 assert_eq!(state.status, RunStatus::Merged);
10365 assert_eq!(
10366 value_of(&forge.argvs()[0], "--match-head-commit"),
10367 Some("a")
10368 );
10369 }
10370
10371 #[tokio::test]
10372 async fn absent_ci_ignores_failed_workflow_runs_without_rerunning_them() {
10373 let mut state = landing_state();
10374 state.config.merge.ci = crate::config::MergeCi::None;
10375 let forge = Scripted::new(vec![red("a", Some("7"))], vec![(true, "")]);
10376 land_with(&mut state, URL, &forge).await.unwrap();
10377 assert!(forge.reruns.lock().unwrap().is_empty());
10378 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10379 assert_eq!(state.status, RunStatus::Merged);
10380 }
10381
10382 #[test]
10383 fn absent_ci_still_requires_a_readable_matching_head_and_resolved_comments() {
10384 let shown = BTreeSet::new();
10385 let guard = |s: Option<&Seen>| {
10386 direct_merge_is_safe(s, "a", &shown, 0, 4, Duration::ZERO, CiExpectation::Absent)
10387 };
10388 let mut fresh = seen("a", Checks::Unknown, "CLEAN", false);
10389 assert!(guard(Some(&fresh)));
10390 assert!(!guard(None));
10391 fresh.rollup_head = "old".to_owned();
10392 assert!(!guard(Some(&fresh)));
10393 fresh.rollup_head = "a".to_owned();
10394 fresh.head = "b".to_owned();
10395 assert!(!guard(Some(&fresh)));
10396 assert!(!guard(Some(&seen("a", Checks::Unknown, "CLEAN", true))));
10397 assert!(!guard(Some(&seen("a", Checks::Unknown, "DIRTY", false))));
10398 }
10399
10400 #[test]
10401 fn absent_ci_refusal_does_not_wait_for_third_party_checks() {
10402 for checks in [Checks::Unknown, Checks::Pending, Checks::Red, Checks::Green] {
10403 let after = seen("a", checks, "BLOCKED", false);
10404 assert_eq!(
10405 classify_refusal(Some(&after), false, "a", CiExpectation::Absent),
10406 Refused::Recheck
10407 );
10408 assert_eq!(
10409 classify_refusal(Some(&after), true, "a", CiExpectation::Absent),
10410 Refused::Final
10411 );
10412 }
10413 }
10414
10415 #[tokio::test]
10416 async fn a_matching_head_with_red_non_required_checks_still_merges() {
10417 let mut state = landing_state();
10418 let forge = Scripted::new(
10419 vec![seen("a", Checks::Red, "CLEAN", false)],
10420 vec![(true, "")],
10421 );
10422 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10423 .await
10424 .unwrap();
10425 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10426 assert_eq!(state.status, RunStatus::Merged);
10427 }
10428
10429 #[tokio::test]
10430 async fn a_merge_refused_because_the_head_moved_looks_again_instead_of_failing() {
10431 let mut state = landing_state();
10432 let forge = Scripted::new(
10433 vec![
10434 seen("a", Checks::Green, "CLEAN", false),
10435 seen("a", Checks::Green, "CLEAN", false),
10436 seen("b", Checks::Green, "BLOCKED", false),
10438 seen("b", Checks::Green, "CLEAN", false),
10439 ],
10440 vec![(false, REFUSED), (true, "")],
10441 );
10442 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10443 .await
10444 .unwrap();
10445 assert_eq!(
10446 forge.calls(),
10447 [
10448 "view", "view", "merge", "view", "poll", "view", "view", "merge", "view"
10449 ]
10450 );
10451 assert_eq!(state.status, RunStatus::Merged);
10452 }
10453
10454 fn merged_view(head: &str) -> Seen {
10455 let mut m = seen(head, Checks::Green, "CLEAN", false);
10456 m.pr.state = PrLifecycle::Merged;
10457 m
10458 }
10459
10460 fn has(argv: &[String], flag: &str) -> bool {
10461 argv.iter().any(|a| a == flag)
10462 }
10463
10464 fn value_of<'a>(argv: &'a [String], flag: &str) -> Option<&'a str> {
10465 let at = argv.iter().position(|a| a == flag)?;
10466 argv.get(at + 1).map(String::as_str)
10467 }
10468
10469 const URL: &str = "https://github.com/o/r/pull/42";
10470
10471 #[tokio::test]
10472 async fn the_merge_step_merges_directly_on_the_observed_head_and_never_arms() {
10473 let mut state = landing_state();
10474 let forge = Scripted::new(
10475 vec![
10476 seen("abc", Checks::Green, "CLEAN", false),
10477 seen("abc", Checks::Green, "CLEAN", false),
10478 ],
10479 vec![(true, "")],
10480 );
10481 land_with(&mut state, URL, &forge).await.unwrap();
10482 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10483 let argv = &forge.argvs()[0];
10484 assert!(has(argv, "--squash") && has(argv, "--subject"));
10485 assert!(!has(argv, "--auto") && !has(argv, "--admin"));
10486 assert_eq!(value_of(argv, "--match-head-commit"), Some("abc"));
10487 assert_eq!(state.status, RunStatus::Merged);
10488 assert!(state.land_armed_head.is_none());
10489 }
10490
10491 #[tokio::test]
10492 async fn a_resume_disables_an_arm_left_by_an_older_build_before_merging() {
10493 let mut state = landing_state();
10494 state.land_armed_head = Some("a".to_owned());
10495 let forge = Scripted::new(
10496 vec![seen("a", Checks::Green, "CLEAN", false)],
10497 vec![(true, ""), (true, "")],
10498 );
10499 land_with(&mut state, URL, &forge).await.unwrap();
10500 let argvs = forge.argvs();
10501 assert!(has(&argvs[0], "--disable-auto"));
10502 assert!(!has(&argvs[1], "--auto"));
10503 assert_eq!(value_of(&argvs[1], "--match-head-commit"), Some("a"));
10504 assert_eq!(state.status, RunStatus::Merged);
10505 assert!(state.land_armed_head.is_none());
10506 }
10507
10508 #[tokio::test]
10509 async fn an_approval_never_carries_over_to_a_new_head() {
10510 crate::run::pin_test_home();
10511 let mut state = run_state();
10512 state.config.graph.land_approval = true;
10513 let pr = green_pr();
10514 let store = ask::Questions::open();
10515
10516 approval_gate(&mut state, &pr, "feat: x", None, "aaa")
10517 .await
10518 .unwrap();
10519 let mut q = store
10520 .list()
10521 .into_iter()
10522 .find(|q| q.run == state.id)
10523 .unwrap();
10524 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
10525 store.put(&mut q).unwrap();
10526 assert_eq!(
10527 approval_gate(&mut state, &pr, "feat: x", None, "AAA")
10528 .await
10529 .unwrap(),
10530 ApprovalGate::Approved,
10531 "the same head keeps its approval"
10532 );
10533
10534 assert_eq!(
10536 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
10537 .await
10538 .unwrap(),
10539 ApprovalGate::Pending
10540 );
10541 let all: Vec<_> = store
10542 .list()
10543 .into_iter()
10544 .filter(|q| q.run == state.id)
10545 .collect();
10546 assert_eq!(all.len(), 2);
10547
10548 state.land_approval = None;
10550 assert_eq!(
10551 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
10552 .await
10553 .unwrap(),
10554 ApprovalGate::Pending
10555 );
10556 let open = store
10557 .list()
10558 .into_iter()
10559 .filter(|q| q.run == state.id && q.status.open())
10560 .count();
10561 assert_eq!(open, 1, "the superseded question was retired");
10562 }
10563
10564 #[tokio::test]
10565 async fn the_merge_is_bound_to_the_head_it_was_decided_on() {
10566 let mut state = landing_state();
10567 let forge = Scripted::new(
10568 vec![
10569 seen("a", Checks::Green, "CLEAN", false),
10570 seen("b", Checks::Green, "CLEAN", false),
10572 ],
10573 vec![(true, "")],
10574 );
10575 land_with(&mut state, URL, &forge).await.unwrap();
10576 let argvs = forge.argvs();
10577 assert_eq!(argvs.len(), 1, "no merge was tried on the moved head");
10578 assert!(!has(&argvs[0], "--auto"));
10579 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("b"));
10580 assert_eq!(state.status, RunStatus::Merged);
10581 }
10582
10583 fn passing(label: &str) -> CheckInfo {
10584 CheckInfo {
10585 label: label.to_owned(),
10586 verdict: Verdict::Pass,
10587 required: Some(false),
10588 run: None,
10589 }
10590 }
10591
10592 fn failing(label: &str, run: Option<&str>) -> (String, Option<String>) {
10593 (label.to_owned(), run.map(str::to_owned))
10594 }
10595
10596 fn reran(head: &str, runs: &[(&str, i64)]) -> LandReruns {
10597 LandReruns {
10598 head: head.to_owned(),
10599 runs: runs.iter().map(|(r, at)| ((*r).to_owned(), *at)).collect(),
10600 }
10601 }
10602
10603 #[test]
10604 fn a_failed_run_is_rerun_once_then_waited_on_then_left_to_the_fixer() {
10605 let f = [failing("test (macos)", Some("7"))];
10606 assert_eq!(
10607 rerun_step(&f, None, "h", 100),
10608 RerunStep::Rerun(vec!["7".to_owned()])
10609 );
10610 let rec = reran("h", &[("7", 100)]);
10611 let grace = crate::release_watch::RERUN_GRACE;
10612 assert_eq!(
10613 rerun_step(&f, Some(&rec), "h", 100 + grace - 1),
10614 RerunStep::Grace
10615 );
10616 assert_eq!(rerun_step(&f, Some(&rec), "h", 100 + grace), RerunStep::Fix);
10617 }
10618
10619 #[test]
10620 fn a_failure_without_a_run_id_goes_to_the_fixer() {
10621 let f = [failing("a", Some("7")), failing("ci/external", None)];
10622 assert_eq!(rerun_step(&f, None, "h", 0), RerunStep::Fix);
10623 assert_eq!(rerun_step(&[], None, "h", 0), RerunStep::Fix);
10624 }
10625
10626 #[test]
10627 fn a_moved_head_forgets_the_reruns() {
10628 let f = [failing("a", Some("7"))];
10629 let rec = reran("old", &[("7", 100)]);
10630 assert_eq!(
10631 rerun_step(&f, Some(&rec), "new", 101),
10632 RerunStep::Rerun(vec!["7".to_owned()])
10633 );
10634 }
10635
10636 #[test]
10637 fn only_unrerun_runs_are_rerun_and_duplicates_collapse() {
10638 let f = [
10639 failing("a", Some("7")),
10640 failing("b", Some("7")),
10641 failing("c", Some("8")),
10642 ];
10643 assert_eq!(
10644 rerun_step(&f, None, "h", 0),
10645 RerunStep::Rerun(vec!["7".to_owned(), "8".to_owned()])
10646 );
10647 let rec = reran("h", &[("7", 0)]);
10648 assert_eq!(
10649 rerun_step(&f, Some(&rec), "h", 1),
10650 RerunStep::Rerun(vec!["8".to_owned()])
10651 );
10652 }
10653
10654 #[test]
10655 fn only_blocking_failures_are_candidates_for_a_rerun() {
10656 let check = |label: &str, verdict, required, run: &str| CheckInfo {
10657 label: label.to_owned(),
10658 verdict,
10659 required,
10660 run: Some(run.to_owned()),
10661 };
10662 let got = rerunnable(&[
10663 check("passed", Verdict::Pass, Some(true), "1"),
10664 check("optional", Verdict::Fail, Some(false), "2"),
10665 check("required", Verdict::Fail, Some(true), "3"),
10666 check("unknown", Verdict::Fail, None, "4"),
10667 ]);
10668 let labels: Vec<_> = got.iter().map(|(l, _)| l.as_str()).collect();
10669 assert_eq!(labels, ["required", "unknown"]);
10670 }
10671
10672 fn unrelated_ci_fixture() -> CiEvidence {
10673 let failure = CiFailure {
10674 path: "tests/web_render.rs".into(),
10675 start_line: 42,
10676 end_line: 42,
10677 title: "question_identity_disclosure_copy_and_live_updates".into(),
10678 message: "assertion failed".into(),
10679 };
10680 CiEvidence {
10681 head: "a".into(),
10682 base: "base-sha".into(),
10683 changed: vec![
10684 "AGENTS.md".into(),
10685 "src/talk.rs".into(),
10686 "tests/consult_investigation.rs".into(),
10687 ],
10688 checks: vec![CiCheckEvidence {
10689 label: "coverage".into(),
10690 head_check: 70,
10691 base_check: 60,
10692 app: 1,
10693 run: "7".into(),
10694 base_run: "6".into(),
10695 head_failures: vec![failure.clone()],
10696 base_failures: vec![failure],
10697 rerun_exhausted: true,
10698 }],
10699 }
10700 }
10701
10702 #[test]
10703 fn unrelated_ci_requires_complete_structural_evidence_for_every_failure() {
10704 let good = unrelated_ci_fixture();
10705 let red = vec!["coverage".into()];
10706 assert!(good.unrelated("a", &red));
10707 assert!(!good.unrelated("another-head", &red));
10708 assert!(!good.unrelated("a", &["coverage".into(), "test".into()]));
10709 assert!(!good.unrelated("a", &[]));
10710 for mutation in 0..8 {
10711 let mut bad = good.clone();
10712 match mutation {
10713 0 => bad.checks[0].rerun_exhausted = false,
10714 1 => bad.checks[0].base_failures.clear(),
10715 2 => bad.checks[0].head_failures.clear(),
10716 3 => bad.changed.push("tests/web_render.rs".into()),
10717 4 => bad.changed.push(".github/workflows/ci.yml".into()),
10718 5 => bad.checks[0].base_failures[0].message = "different failure".into(),
10719 6 => bad.checks.push(bad.checks[0].clone()),
10720 _ => bad.base.clear(),
10721 }
10722 assert!(!bad.unrelated("a", &red), "mutation {mutation}");
10723 }
10724 }
10725
10726 #[test]
10727 fn red_unknown_merge_state_waits_before_repair_but_never_implies_merge() {
10728 let pr = seen("a", Checks::Red, "UNKNOWN", false).pr;
10729 assert_eq!(decide(&pr, 0, 2, Duration::ZERO), Step::Wait);
10730 assert!(matches!(decide(&pr, 0, 2, CHECKS_GRACE), Step::Fix { .. }));
10731 assert!(matches!(
10732 decide(&pr, 2, 2, CHECKS_GRACE),
10733 Step::GiveUp { .. }
10734 ));
10735 let optional = CheckInfo {
10736 label: "coverage".into(),
10737 verdict: Verdict::Fail,
10738 required: Some(false),
10739 run: Some("7".into()),
10740 };
10741 assert!(rerunnable_with(std::slice::from_ref(&optional), false).is_empty());
10742 assert_eq!(
10743 rerunnable_with(&[optional], true),
10744 vec![("coverage".into(), Some("7".into()))]
10745 );
10746 }
10747
10748 #[tokio::test]
10749 async fn unrelated_ci_after_a_comment_round_does_not_charge_a_no_commit_stop() {
10750 let mut state = landing_state();
10751 let mut red = coverage_unknown();
10752 red.pr = seen("a", Checks::Red, "BLOCKED", true).pr;
10753 red.pr.failing = vec!["coverage".into()];
10754 let forge = Scripted::new(vec![red], vec![]);
10755 *forge.evidence.lock().unwrap() = Some(unrelated_ci_fixture());
10756 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10757 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10758 assert!(forge.calls().contains(&"fix"));
10759 assert!(state.land_unrelated.is_some());
10760 assert!(state.parked);
10761 assert!(
10762 !state
10763 .events
10764 .iter()
10765 .any(|e| e.message.contains("fixer produced no commit"))
10766 );
10767 }
10768
10769 fn coverage_unknown() -> Seen {
10770 let mut s = red("a", Some("7"));
10771 s.pr.blocking = Blocking::Unsaid;
10772 s.merge_state = "UNKNOWN".into();
10773 s.pr.failing = vec!["coverage".into()];
10774 s.contexts[0].label = "coverage".into();
10775 s.contexts[0].required = Some(false);
10776 s
10777 }
10778
10779 #[tokio::test]
10780 async fn run_196c_unknown_then_unstable_does_not_spend_a_fix_round() {
10781 let mut state = landing_state();
10782 let unknown = coverage_unknown();
10783 let mut unstable = unknown.clone();
10784 unstable.pr.blocking = Blocking::of("UNSTABLE");
10785 unstable.merge_state = "UNSTABLE".into();
10786 let forge = Scripted::new(vec![unknown, unstable], vec![(true, "")]);
10787 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10788 assert!(!forge.calls().contains(&"fix"));
10789 assert!(!forge.calls().contains(&"rerun"));
10790 assert_eq!(state.status, RunStatus::Merged);
10791 assert_eq!(state.pr.unwrap().round, 0);
10792 }
10793
10794 #[tokio::test]
10795 async fn run_196c_persistent_unknown_reruns_optional_once_then_parks_with_evidence() {
10796 let mut state = landing_state();
10797 let forge = Scripted::new(vec![coverage_unknown()], vec![]);
10798 *forge.evidence.lock().unwrap() = Some(unrelated_ci_fixture());
10799 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10800 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10801 assert!(!forge.calls().contains(&"fix"));
10802 assert!(state.parked);
10803 assert_eq!(state.status, RunStatus::Landing);
10804 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10805 let hold = state.land_unrelated.as_ref().unwrap();
10806 let q = ask::Questions::open().get(&hold.question).unwrap();
10807 assert!(
10808 q.actions
10809 .values()
10810 .any(|a| matches!(a, ask::ChoiceAction::Resume { .. }))
10811 );
10812 assert!(
10813 state
10814 .events
10815 .iter()
10816 .any(|e| e.message.contains("[ci-unrelated]") && e.message.contains("base-sha"))
10817 );
10818 let first = state.land_unsaid.clone();
10819 state.parked = false;
10821 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10822 assert_eq!(state.land_unsaid, first);
10823 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10824 }
10825
10826 fn red(head: &str, run: Option<&str>) -> Seen {
10827 let mut s = seen(head, Checks::Red, "BLOCKED", false);
10828 s.pr.failing = vec!["test (macos)".to_owned()];
10829 s.contexts = vec![CheckInfo {
10830 label: "test (macos)".to_owned(),
10831 verdict: Verdict::Fail,
10832 required: Some(true),
10833 run: run.map(str::to_owned),
10834 }];
10835 s
10836 }
10837
10838 const RERUN_PR: &str = "https://github.com/o/r/pull/42";
10839
10840 #[tokio::test]
10841 async fn a_flaky_red_check_is_rerun_without_a_fix_round_and_then_merges() {
10842 let mut state = landing_state();
10843 let forge = Scripted::new(
10844 vec![
10845 red("a", Some("7")),
10846 seen("a", Checks::Pending, "BLOCKED", false),
10847 seen("a", Checks::Green, "CLEAN", false),
10848 ],
10849 vec![(true, "")],
10850 );
10851 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10852 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10853 assert!(!forge.calls().contains(&"fix"));
10854 assert_eq!(state.status, RunStatus::Merged);
10855 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10856 let argvs = forge.argvs();
10857 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("a"));
10858 assert!(
10859 state
10860 .events
10861 .iter()
10862 .any(|e| e.message.contains("test (macos)") && e.message.contains("run 7"))
10863 );
10864 }
10865
10866 #[tokio::test]
10867 async fn still_red_after_the_grace_goes_to_the_fixer_and_a_run_is_not_rerun_twice() {
10868 let mut state = landing_state();
10869 let forge = Scripted::new(
10870 vec![
10871 red("a", Some("7")),
10872 seen("a", Checks::Green, "CLEAN", false),
10873 ],
10874 vec![(true, "")],
10875 );
10876 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10877 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10879 assert_eq!(forge.reruns.lock().unwrap().len(), 1);
10880 let calls = forge.calls();
10881 let rerun_at = calls.iter().position(|c| *c == "rerun").unwrap();
10882 let fix_at = calls.iter().position(|c| *c == "fix");
10883 assert!(fix_at.is_none_or(|f| f > rerun_at));
10884 }
10885
10886 #[tokio::test]
10887 async fn a_failed_run_is_rerun_while_another_run_is_still_pending() {
10888 let mut state = landing_state();
10889 let mut v = red("a", Some("7"));
10890 v.pr.checks = Checks::Pending;
10891 v.contexts.push(CheckInfo {
10892 label: "slow".to_owned(),
10893 verdict: Verdict::Pending,
10894 required: Some(true),
10895 run: Some("8".to_owned()),
10896 });
10897 let forge = Scripted::new(
10898 vec![v, seen("a", Checks::Green, "CLEAN", false)],
10899 vec![(true, "")],
10900 );
10901 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10902 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10903 assert_eq!(state.status, RunStatus::Merged);
10904 }
10905
10906 #[test]
10907 fn a_run_with_a_job_still_going_is_not_rerun_yet() {
10908 let mut v = red("a", Some("7"));
10909 v.contexts.push(CheckInfo {
10910 label: "same run, still going".to_owned(),
10911 verdict: Verdict::Pending,
10912 required: Some(true),
10913 run: Some("7".to_owned()),
10914 });
10915 assert!(rerunnable(&v.contexts).is_empty());
10916 }
10917
10918 #[tokio::test]
10919 async fn the_rerun_is_made_even_when_the_fix_budget_is_spent() {
10920 let mut state = landing_state();
10921 state.config.graph.land_rounds = 0;
10922 let forge = Scripted::new(
10923 vec![
10924 red("a", Some("7")),
10925 seen("a", Checks::Green, "CLEAN", false),
10926 ],
10927 vec![(true, "")],
10928 );
10929 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10930 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10931 assert_eq!(state.status, RunStatus::Merged);
10932 assert!(!forge.calls().contains(&"fix"));
10933 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10934 }
10935
10936 #[tokio::test]
10937 async fn the_last_fix_rounds_new_head_gets_its_rerun() {
10938 let mut state = landing_state();
10939 state.config.graph.land_rounds = 1;
10940 let forge = Scripted::new(
10941 vec![
10942 seen("a", Checks::Green, "CLEAN", true),
10943 red("b", Some("7")),
10944 seen("b", Checks::Green, "CLEAN", false),
10945 ],
10946 vec![(true, "")],
10947 );
10948 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10949 head: "b".to_owned(),
10950 });
10951 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10952 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10953 assert_eq!(forge.calls().iter().filter(|c| **c == "fix").count(), 1);
10954 assert_eq!(state.pr.as_ref().unwrap().round, 1);
10955 assert_eq!(state.status, RunStatus::Merged);
10956 assert_eq!(state.land_reruns.as_ref().unwrap().head, "b");
10957 assert_eq!(
10958 value_of(&forge.argvs()[0], "--match-head-commit"),
10959 Some("b")
10960 );
10961 }
10962
10963 #[tokio::test]
10964 async fn a_failed_rerun_call_falls_through_to_the_fix_in_the_same_lap() {
10965 let mut state = landing_state();
10966 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
10967 *forge.rerun_fails.lock().unwrap() = true;
10968 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10969 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10970 assert_eq!(forge.reruns.lock().unwrap().len(), 1, "never retried");
10971 assert_eq!(
10972 forge.calls().iter().filter(|c| **c == "fix").count(),
10973 1,
10974 "{:?}",
10975 forge.calls()
10976 );
10977 }
10978
10979 #[tokio::test]
10980 async fn a_saved_rerun_record_stops_a_restart_from_rerunning() {
10981 let mut state = landing_state();
10982 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
10983 state.land_reruns = Some(reran("a", &[("7", *forge.clock.lock().unwrap())]));
10985 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10986 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10987 assert!(forge.reruns.lock().unwrap().is_empty());
10988 }
10989
10990 #[tokio::test]
10991 async fn the_switch_off_and_a_missing_run_id_go_straight_to_the_fixer() {
10992 let mut state = landing_state();
10993 state.config.graph.rerun_flaky_checks = false;
10994 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
10995 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10996 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10997 assert!(forge.reruns.lock().unwrap().is_empty());
10998 assert!(forge.calls().contains(&"fix"));
10999
11000 let mut state = landing_state();
11001 let forge = Scripted::new(vec![red("a", None)], vec![]);
11002 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
11003 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
11004 assert!(forge.reruns.lock().unwrap().is_empty());
11005 assert!(forge.calls().contains(&"fix"));
11006 }
11007
11008 fn names(xs: &[&str]) -> BTreeSet<String> {
11009 xs.iter().map(|x| (*x).to_owned()).collect()
11010 }
11011
11012 #[test]
11013 fn a_required_check_the_rollup_never_listed_is_named() {
11014 let req = names(&["build"]);
11015 let why = waiting_on("BLOCKED", &[passing("review")], Some(&req));
11016 assert!(why.contains("never reported: build"), "{why}");
11017 assert!(!why.contains("probably waiting for a review"), "{why}");
11018 }
11019
11020 #[test]
11021 fn an_unreadable_required_list_is_not_read_as_a_review_wait() {
11022 let why = waiting_on("BLOCKED", &[passing("review")], None);
11023 assert!(why.contains("could not be read"), "{why}");
11024 assert!(!why.contains("probably waiting for a review"), "{why}");
11025 }
11026
11027 #[test]
11028 fn all_required_reported_keeps_the_review_guess() {
11029 let req = names(&["build"]);
11030 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
11031 assert!(why.contains("probably waiting for a review"), "{why}");
11032 assert!(!why.contains("never reported"), "{why}");
11033 }
11034
11035 #[test]
11036 fn required_names_match_the_rollup_ignoring_case_only() {
11037 let req = names(&["Build"]);
11038 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
11039 assert!(!why.contains("never reported"), "{why}");
11040 }
11041
11042 #[test]
11043 fn required_contexts_are_read_from_protection_and_rulesets() {
11044 let classic = r#"{"contexts":["build"],"checks":[{"context":"lint","app_id":1}]}"#;
11045 assert_eq!(
11046 parse_classic_required(classic),
11047 Some(names(&["build", "lint"]))
11048 );
11049 let rules = r#"[{"type":"pull_request","parameters":{}},
11050 {"type":"required_status_checks","parameters":{"required_status_checks":[{"context":"test"}]}}]"#;
11051 assert_eq!(parse_ruleset_required(rules), Some(names(&["test"])));
11052 assert_eq!(parse_ruleset_required("nope"), None);
11053 assert_eq!(encode_path_segment("release/1.x"), "release%2F1.x");
11054 }
11055
11056 #[test]
11057 fn the_direct_merge_guard_needs_the_approved_head_bound_to_its_checks() {
11058 let shown = BTreeSet::new();
11059 let ok = seen("a", Checks::Green, "CLEAN", false);
11060 let guard = |s: Option<&Seen>| {
11061 direct_merge_is_safe(
11062 s,
11063 "A",
11064 &shown,
11065 0,
11066 4,
11067 Duration::ZERO,
11068 CiExpectation::Expected,
11069 )
11070 };
11071 assert!(guard(Some(&ok)));
11072 assert!(!guard(None));
11073 assert!(!guard(Some(&seen("b", Checks::Green, "CLEAN", false))));
11074 let mut stale = ok.clone();
11075 stale.rollup_head = "old".to_owned();
11076 assert!(!guard(Some(&stale)));
11077 assert!(!guard(Some(&seen("a", Checks::Pending, "BLOCKED", false))));
11078 assert!(!guard(Some(&merged_view("a"))));
11079 }
11080
11081 #[test]
11082 fn the_rollup_node_carries_whether_each_check_is_required() {
11083 let node = node_json("new", "SUCCESS", false)
11084 .replace(r#""name":"ci","#, r#""name":"ci","isRequired":true,"#);
11085 let s = seen_from(&view_json("new"), Some(&node)).unwrap();
11086 assert_eq!(s.contexts.len(), 1);
11087 assert_eq!(s.contexts[0].required, Some(true));
11088 let s = seen_from(&view_json("new"), Some(&node_json("new", "SUCCESS", false))).unwrap();
11089 assert_eq!(s.contexts[0].required, None);
11090 }
11091
11092 #[tokio::test]
11093 async fn a_resume_that_cannot_disable_a_recorded_arm_stops_and_keeps_the_record() {
11094 let mut state = landing_state();
11095 state.land_armed_head = Some("a".to_owned());
11096 let forge = Scripted::new(
11097 vec![seen("a", Checks::Green, "CLEAN", true)],
11098 vec![(false, "disable exploded")],
11099 );
11100 land_with(&mut state, URL, &forge).await.unwrap();
11101 assert!(!forge.calls().contains(&"fix"));
11102 assert_eq!(state.status, RunStatus::Blocked);
11103 assert_eq!(state.land_armed_head.as_deref(), Some("a"));
11104 let why = state.merge.as_ref().unwrap().detail.clone();
11105 assert!(why.contains("disable exploded"), "{why}");
11106 }
11107}