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 let public = state.pr_branch().unwrap_or(&winner.branch).to_owned();
3864 let lease = format!("--force-with-lease=refs/heads/{public}:{observed}");
3865 let refspec = format!("{checked}:refs/heads/{public}");
3866 let lock = repo_merge_lock(&state.repo);
3867 let _slot = lock.lock().await;
3868 let pushed = git::git_raw(
3869 &winner.worktree,
3870 &["push", &lease, &state.config.merge.remote, &refspec],
3871 )
3872 .await?;
3873 anyhow::ensure!(
3874 pushed.ok(),
3875 "publishing gated landing head failed: {}",
3876 pushed.stderr
3877 );
3878 state.pr_pushed_head = Some(checked.clone());
3879 state.land_sync_pending = false;
3880 state.save()?;
3881 Ok(checked)
3882}
3883
3884async fn restore_landing_worktree(state: &mut RunState) -> Result<()> {
3887 let winner = state.winner().cloned().context("landing has no winner")?;
3888 let inherited = crate::repo_lock::WaitPolicy::current();
3889 let wait = crate::repo_lock::WaitPolicy::new(
3890 Duration::from_secs(state.config.graph.timeout_resource_wait),
3891 move || inherited.cancelled(),
3892 );
3893 let _coordination = crate::repo_lock::SeatLease::operation_with(
3894 &winner.worktree,
3895 state.config.coordination.as_ref(),
3896 &wait,
3897 )
3898 .await?;
3899 if !git::is_clean(&winner.worktree).await? {
3900 let from = state
3901 .land_rebase_from
3902 .as_deref()
3903 .context("landing worktree is dirty")?;
3904 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
3905 anyhow::ensure!(head != from, "landing worktree is dirty");
3906 for args in [
3907 vec!["diff", "--cached", "--quiet", from],
3908 vec!["diff", "--quiet"],
3909 ] {
3910 anyhow::ensure!(
3911 git::git_raw(&winner.worktree, &args).await?.ok(),
3912 "landing worktree has edits beyond the interrupted rebase"
3913 );
3914 }
3915 let untracked = git::git(&winner.worktree, &["ls-files", "--others", "-z"]).await?;
3919 let tracked = git::git(
3920 &winner.worktree,
3921 &["ls-tree", "-r", "--name-only", "-z", "HEAD"],
3922 )
3923 .await?;
3924 for local in untracked.split('\0').filter(|p| !p.is_empty()) {
3925 anyhow::ensure!(
3926 !tracked.split('\0').filter(|p| !p.is_empty()).any(|path| {
3927 path == local
3928 || path
3929 .strip_prefix(local)
3930 .is_some_and(|rest| rest.starts_with('/'))
3931 || local
3932 .strip_prefix(path)
3933 .is_some_and(|rest| rest.starts_with('/'))
3934 }),
3935 "landing worktree has an untracked or ignored path conflicting with HEAD: {local}"
3936 );
3937 }
3938 git::git(&winner.worktree, &["read-tree", "-m", "-u", "HEAD"]).await?;
3939 }
3940 crate::worktree_setup::prepare(&state.config, &state.repo, &winner.worktree).await?;
3941 state.land_rebase_from = None;
3942 state.save()?;
3943 Ok(())
3944}
3945
3946async fn rebase_landing_worktree(
3947 state: &mut RunState,
3948 onto: &str,
3949) -> Result<crate::rebase::Rebased> {
3950 restore_landing_worktree(state).await?;
3951 let winner = state.winner().cloned().context("landing has no winner")?;
3952 state.land_sync_pending = true;
3953 state.land_rebase_from = Some(git::rev_parse(&winner.worktree, "HEAD").await?);
3954 state.save()?;
3955 let scratch = state.dir().join("rebase");
3956 let result = crate::rebase::rebase_with_fixer(state, &scratch, &winner.branch, onto).await?;
3957 if result == crate::rebase::Rebased::Applied {
3958 restore_landing_worktree(state).await?;
3959 }
3960 Ok(result)
3961}
3962
3963async fn resume_landing_head<F: Forge>(
3966 state: &mut RunState,
3967 observed: &str,
3968 pr_url: &str,
3969 forge: &F,
3970) -> Result<String> {
3971 crate::pr_head::ensure_owner(state)?;
3972 let winner = state.winner().cloned().context("landing has no winner")?;
3973 let local = git::rev_parse(&winner.worktree, "HEAD").await?;
3974 let expected = state
3975 .pr_pushed_head
3976 .as_deref()
3977 .or(state.gate_head.as_deref())
3978 .context("missing public head lease")?;
3979 anyhow::ensure!(
3980 observed == expected
3981 || (observed == local
3982 && ((state.gate_head.as_deref() == Some(&local) && state.gate_allows_progress())
3983 || git::is_ancestor(&winner.worktree, expected, &local).await)),
3984 "public head moved outside this run; refusing to sync"
3985 );
3986 state.pr_pushed_head = Some(observed.to_owned());
3993 state.save()?;
3994 restore_landing_worktree(state).await?;
3995 let remote = state.config.merge.remote.clone();
3996 let base = state.base_branch.clone();
3997 let fetched = git::fetch(&state.repo, &remote, &base).await?;
3998 anyhow::ensure!(
3999 fetched.ok(),
4000 "cannot fetch landing base: {}",
4001 fetched.stderr
4002 );
4003 let onto = format!("{remote}/{base}");
4004 let tip = git::rev_parse(&state.repo, &onto).await?;
4005 if !git::is_ancestor(&state.repo, &tip, &local).await {
4006 match rebase_landing_worktree(state, &onto).await? {
4007 crate::rebase::Rebased::Applied => {}
4008 crate::rebase::Rebased::Stopped(why) => bail!("landing rebase stopped: {why}"),
4009 }
4010 }
4011 publish_landing_head(state, observed, pr_url, forge).await
4012}
4013
4014async fn land_with<F: Forge>(state: &mut RunState, pr_url: &str, forge: &F) -> Result<PrState> {
4015 crate::pr_head::ensure_owner(state)?;
4016 state.land_unrelated = None;
4017 let reopening_hold = crate::merge_decision::resumable_hold(state);
4018 let repo = state.repo.clone();
4019 let budget = state.config.graph.land_rounds;
4020 let mut round = 0usize;
4021 let mut rebases = 0usize;
4024 let ci = state.config.merge.ci.expectation();
4025 if ci == CiExpectation::Absent {
4026 state.event(
4027 "land",
4028 "CI not expected ([merge] ci = \"none\"); check status ignored",
4029 );
4030 }
4031 let mut waited = Duration::ZERO;
4032 let mut shown: BTreeSet<String> = BTreeSet::new();
4037 let mut awaiting_head: Option<String> = state.pr_pushed_head.clone();
4039 let mut rechecked = false;
4041
4042 state.status = RunStatus::Landing;
4050 state.event("land", format!("watching {pr_url}"));
4051 state.save()?;
4052
4053 let mut resumed_armed = state.land_armed_head.is_some();
4057
4058 loop {
4059 let seen = forge.view(&repo, pr_url).await?;
4060 let mut pr = seen.pr.clone();
4061 pr.review_comments.retain(|c| !shown.contains(&c.body));
4062 state.pr = Some(crate::run::PrRecord {
4063 url: pr.url.clone(),
4064 number: pr.number,
4065 state: pr.state.as_str().to_owned(),
4066 checks: pr.checks.as_str().to_owned(),
4067 round,
4068 rounds: budget,
4069 red_at_merge: Vec::new(),
4070 });
4071 state.save()?;
4072
4073 if pr.state == PrLifecycle::Open {
4074 state.observe_branch_owner_holds(&seen.head).await;
4075 state.save()?;
4076 }
4077 crate::pr_head::ensure_owner(state)?;
4078 if reopening_hold {
4079 anyhow::ensure!(
4080 pr.state == PrLifecycle::Open,
4081 "held PR is no longer open; cannot request a fresh decision"
4082 );
4083 disarm(forge, state, &repo, pr.number)
4086 .await
4087 .map_err(anyhow::Error::msg)?;
4088 let previous = state.merge_decision.take();
4089 let binding = state.land_approval.take();
4090 state.config.graph.land_approval = true;
4091 let subject = merge_subject(
4092 crate::graph::landing_title(state, &seen.title),
4093 &crate::graph::landing_subject_source(state),
4094 );
4095 let contested = contested_to_ask(state);
4096 if let Err(error) =
4097 approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head).await
4098 {
4099 state.merge_decision = previous;
4100 state.land_approval = binding;
4101 return Err(error);
4102 }
4103 state.end_pass_parked(crate::run::ParkCause::Question);
4104 state.parked = true;
4105 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()));
4106 state.save()?;
4107 return Ok(pr);
4108 }
4109 if owner_stop(state, &mut pr, forge).await? {
4110 return Ok(pr);
4111 }
4112
4113 if std::mem::take(&mut resumed_armed) && pr.state == PrLifecycle::Open {
4114 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4119 let why = format!(
4120 "a previous pass may have armed auto-merge and it could not be disabled \
4121 on resume: {e}"
4122 );
4123 stop(state, &repo, &pr, &why).await?;
4124 return Ok(pr);
4125 }
4126 }
4127
4128 if pr.state == PrLifecycle::Open
4133 && !seen.head.is_empty()
4134 && state
4135 .land_armed_head
4136 .as_deref()
4137 .is_some_and(|armed| !armed.eq_ignore_ascii_case(&seen.head))
4138 {
4139 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4140 let why = format!(
4141 "the head moved while auto-merge was armed and it could not be disabled: {e}"
4142 );
4143 stop(state, &repo, &pr, &why).await?;
4144 return Ok(pr);
4145 }
4146 }
4147
4148 if state.land_sync_pending && pr.state == PrLifecycle::Open {
4149 if owner_stop(state, &mut pr, forge).await? {
4152 return Ok(pr);
4153 }
4154 let repair_answer = state.land_approval.as_ref().is_some_and(|binding| {
4155 binding.head.eq_ignore_ascii_case(&seen.head)
4156 && ask::Questions::open()
4157 .get(&binding.question)
4158 .is_ok_and(|q| {
4159 q.run == state.id
4160 && q.node == APPROVAL_NODE
4161 && q.status == ask::QuestionStatus::Answered
4162 && matches!(approval(q.resolution().as_deref()), Approval::Repair)
4163 })
4164 });
4165 if repair_answer {
4166 let subject = merge_subject(
4167 crate::graph::landing_title(state, &seen.title),
4168 &crate::graph::landing_subject_source(state),
4169 );
4170 let contested = contested_to_ask(state);
4171 if matches!(
4172 approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head).await?,
4173 ApprovalGate::Repair
4174 ) {
4175 if let Err(why) = disarm(forge, state, &repo, pr.number).await {
4176 state.event("repair", format!("auto-merge could not be disabled: {why}; repair preflight will retry"));
4177 state.save()?;
4178 }
4179 return Ok(pr);
4180 }
4181 }
4182 let synced = resume_landing_head(state, &seen.head, pr_url, forge).await;
4183 if owner_stop(state, &mut pr, forge).await? {
4186 return Ok(pr);
4187 }
4188 let head = synced?;
4189 awaiting_head = Some(head);
4190 waited = Duration::ZERO;
4191 rechecked = false;
4192 continue;
4194 }
4195
4196 if pr.state == PrLifecycle::Open {
4197 if bound_head(&seen.head, &seen.rollup_head, awaiting_head.as_deref()).is_none() {
4198 if waited >= WAIT_CEILING {
4199 let want = awaiting_head.as_deref().unwrap_or_default();
4200 let why = format!(
4201 "the pull request's checks were still not about one readable head after \
4202 {} minutes (expected {}, pull request points at {}, checks are for {}); \
4203 someone may have pushed over it",
4204 WAIT_CEILING.as_secs() / 60,
4205 if want.is_empty() { "any" } else { want },
4206 if seen.head.is_empty() {
4207 "nothing readable"
4208 } else {
4209 &seen.head
4210 },
4211 if seen.rollup_head.is_empty() {
4212 "nothing readable"
4213 } else {
4214 &seen.rollup_head
4215 },
4216 );
4217 stop_disarmed(forge, state, &repo, &pr, &why).await?;
4218 return Ok(pr);
4219 }
4220 waited += POLL;
4221 forge.poll().await;
4222 continue;
4223 }
4224 if awaiting_head.take().is_some() {
4227 waited = Duration::ZERO;
4230 }
4231 }
4232
4233 let decision_wait = if pr.checks == Checks::Red && pr.blocking == Blocking::Unsaid {
4236 let first = state
4237 .land_unsaid
4238 .get_or_insert_with(|| (seen.head.clone(), forge.now()));
4239 if !first.0.eq_ignore_ascii_case(&seen.head) {
4240 *first = (seen.head.clone(), forge.now());
4241 }
4242 let elapsed = Duration::from_secs(forge.now().saturating_sub(first.1).max(0) as u64);
4243 state.save()?;
4244 elapsed
4245 } else {
4246 waited
4247 };
4248 let proposed = decide_with(&pr, round, budget, decision_wait, ci);
4249 if pr.checks == Checks::Red && pr.blocking == Blocking::Unsaid && proposed == Step::Wait {
4250 if waited >= WAIT_CEILING {
4251 stop_disarmed(
4252 forge,
4253 state,
4254 &repo,
4255 &pr,
4256 "merge state remained unreadable; refusing to merge on a guess",
4257 )
4258 .await?;
4259 return Ok(pr);
4260 }
4261 waited += POLL;
4262 forge.poll().await;
4263 continue;
4264 }
4265
4266 if ci == CiExpectation::Expected
4271 && pr.state == PrLifecycle::Open
4272 && state.config.graph.rerun_flaky_checks
4273 {
4274 let include_optional = pr.checks == Checks::Red
4275 && matches!(proposed, Step::Fix { .. } | Step::GiveUp { .. });
4276 let failing = rerunnable_with(&seen.contexts, include_optional);
4277 let now = forge.now();
4278 match rerun_step(&failing, state.land_reruns.as_ref(), &seen.head, now) {
4279 RerunStep::Rerun(runs) => {
4280 let rec = state.land_reruns.get_or_insert_with(Default::default);
4281 if !rec.head.eq_ignore_ascii_case(&seen.head) {
4282 *rec = LandReruns {
4283 head: seen.head.clone(),
4284 runs: BTreeMap::new(),
4285 };
4286 }
4287 for run in &runs {
4288 rec.runs.insert(run.clone(), now);
4289 }
4290 state.save()?;
4294 let mut any = false;
4295 for run in &runs {
4296 let names = failing
4297 .iter()
4298 .filter(|(_, r)| r.as_deref() == Some(run))
4299 .map(|(l, _)| l.as_str())
4300 .collect::<Vec<_>>()
4301 .join(", ");
4302 match forge.rerun(&repo, run).await {
4303 Ok(()) => {
4304 any = true;
4305 state.event(
4306 "land",
4307 format!("reran failed check(s) {names} (run {run})"),
4308 );
4309 }
4310 Err(e) => state.event(
4312 "land",
4313 format!("could not rerun check(s) {names} (run {run}): {e:#}"),
4314 ),
4315 }
4316 }
4317 state.save()?;
4318 if any {
4319 waited = Duration::ZERO;
4320 forge.poll().await;
4321 continue;
4322 }
4323 }
4324 RerunStep::Grace => {
4325 if waited >= WAIT_CEILING {
4326 let why = format!(
4327 "checks were still failing after a rerun and {} minutes",
4328 WAIT_CEILING.as_secs() / 60
4329 );
4330 stop(state, &repo, &pr, &why).await?;
4331 return Ok(pr);
4332 }
4333 waited += POLL;
4334 forge.poll().await;
4335 continue;
4336 }
4337 RerunStep::Fix => {}
4338 }
4339 }
4340
4341 let step = proposed;
4342 let armed_here = state
4347 .land_armed_head
4348 .as_deref()
4349 .is_some_and(|armed| armed.eq_ignore_ascii_case(&seen.head));
4350 if armed_here && matches!(step, Step::Merge | Step::Wait) {
4351 if waited >= WAIT_CEILING {
4352 let required = if seen.base.is_empty() {
4353 None
4354 } else {
4355 forge.required_contexts(&repo, &seen.base).await
4356 };
4357 let why = format!(
4358 "auto-merge was armed on {} but the pull request did not merge within {} \
4359 minutes ({})",
4360 seen.head,
4361 WAIT_CEILING.as_secs() / 60,
4362 waiting_on(&seen.merge_state, &seen.contexts, required.as_ref())
4363 );
4364 stop_disarmed(forge, state, &repo, &pr, &why).await?;
4365 return Ok(pr);
4366 }
4367 waited += POLL;
4368 forge.poll().await;
4369 continue;
4370 }
4371 if armed_here && !matches!(step, Step::Done { .. }) {
4372 if let Err(e) = disarm(forge, state, &repo, pr.number).await {
4375 let why = format!("auto-merge could not be disabled: {e}");
4376 stop(state, &repo, &pr, &why).await?;
4377 return Ok(pr);
4378 }
4379 }
4380 if pr.checks == Checks::Red
4381 && matches!(step, Step::Fix { .. } | Step::GiveUp { .. })
4382 && pr.review_comments.is_empty()
4383 && let Some(evidence) = forge.attribution(state, &seen).await
4384 && evidence.unrelated(&seen.head, &pr.failing)
4385 {
4386 if owner_stop(state, &mut pr, forge).await? {
4387 return Ok(pr);
4388 }
4389 let fresh = forge.view(&repo, pr_url).await?;
4391 if fresh.head != seen.head
4392 || fresh.rollup_head != seen.rollup_head
4393 || fresh.pr.state != PrLifecycle::Open
4394 || fresh.pr.checks != Checks::Red
4395 || fresh.pr.failing != pr.failing
4396 || fresh
4397 .pr
4398 .review_comments
4399 .iter()
4400 .any(|c| !shown.contains(&c.body))
4401 {
4402 continue;
4403 }
4404 hold_unrelated(state, &pr, evidence).await?;
4405 return Ok(pr);
4406 }
4407 match step {
4408 Step::Wait => {
4409 if waited >= WAIT_CEILING {
4410 let why = format!(
4411 "checks were still running after {} minutes",
4412 WAIT_CEILING.as_secs() / 60
4413 );
4414 stop(state, &repo, &pr, &why).await?;
4415 return Ok(pr);
4416 }
4417 waited += POLL;
4418 forge.poll().await;
4419 }
4420 Step::Done { merged } => {
4421 if merged {
4422 state.pr_merged_head = (!seen.head.is_empty()).then(|| seen.head.clone());
4423 }
4424 if let Some(armed) = state.land_armed_head.take() {
4429 if merged && !seen.head.is_empty() && !armed.eq_ignore_ascii_case(&seen.head) {
4430 let msg = format!(
4431 "{} merged on {} but the owner approved {armed}; review what landed",
4432 pr.url, seen.head
4433 );
4434 tracing::warn!("{msg}");
4435 state.event("land", msg);
4436 crate::notices::raise_with(
4440 crate::notices::Notice::warn(
4441 &format!("merged-unapproved-head:{}", state.id),
4442 "A pull request merged on a commit the owner did not approve; \
4443 review what landed",
4444 )
4445 .link(crate::notices::Link::Run {
4446 id: state.id.clone(),
4447 }),
4448 &state.config.notify,
4449 );
4450 }
4451 }
4452 state.status = if merged {
4453 RunStatus::Merged
4454 } else {
4455 RunStatus::Ready
4456 };
4457 let detail = if merged {
4458 format!("{} was merged", pr.url)
4459 } else {
4460 format!("{} was closed without merging", pr.url)
4461 };
4462 state.merge = Some(MergeOutcome {
4463 mode: MergeMode::Pr,
4464 ok: merged,
4465 detail: detail.clone(),
4466 empty: false,
4467 });
4468 state.event("land", detail);
4469 state.save()?;
4470 write_pr_state_through(state, pr.state);
4471 return Ok(pr);
4472 }
4473 Step::Merge => {
4474 state.check_delivery_evidence(&seen.head)?;
4475 let subject = merge_subject(
4476 crate::graph::landing_title(state, &seen.title),
4477 &crate::graph::landing_subject_source(state),
4478 );
4479 let contested = contested_to_ask(state);
4485 if !approval_reasons(state).is_empty() {
4486 match approval_gate(state, &pr, &subject, contested.as_ref(), &seen.head)
4487 .await?
4488 {
4489 ApprovalGate::Approved => {}
4490 ApprovalGate::Repair => {
4491 if let Err(why) = disarm(forge, state, &repo, pr.number).await {
4494 state.event("repair", format!("auto-merge could not be disabled: {why}; repair preflight will retry"));
4495 state.save()?;
4496 }
4497 return Ok(pr);
4498 }
4499 ApprovalGate::Held => {
4500 if owner_stop(state, &mut pr, forge).await? {
4503 return Ok(pr);
4504 }
4505 stop(
4506 state,
4507 &repo,
4508 &pr,
4509 "the owner did not approve the merge (held or unanswered)",
4510 )
4511 .await?;
4512 return Ok(pr);
4513 }
4514 ApprovalGate::Pending => {
4522 state.end_pass_parked(crate::run::ParkCause::Question);
4523 state.parked = true;
4524 state.event(
4525 "land",
4526 "parked awaiting merge approval - resumes once answered",
4527 );
4528 state.save()?;
4529 return Ok(pr);
4530 }
4531 }
4532 }
4533 let observed_head = seen.head.clone();
4544 {
4547 let fresh = forge.view(&repo, pr_url).await.ok();
4548 if !direct_merge_is_safe(
4549 fresh.as_ref(),
4550 &observed_head,
4551 &shown,
4552 round,
4553 budget,
4554 waited,
4555 ci,
4556 ) {
4557 if waited >= WAIT_CEILING {
4558 let why = "the pull request did not settle on the approved head \
4559 before it could be merged";
4560 stop(state, &repo, &pr, why).await?;
4561 return Ok(pr);
4562 }
4563 state.event(
4564 "land",
4565 "the pull request changed before merging; looking again",
4566 );
4567 waited += POLL;
4568 forge.poll().await;
4569 continue;
4570 }
4571 }
4572 let argv = merge_argv_at(pr.number, &subject, &observed_head);
4573 let out = {
4574 let merge_lock = repo_merge_lock(&repo);
4575 let _merge_slot = merge_lock.lock().await;
4576 crate::pr_head::ensure_owner(state)?;
4577 if let Some(task_id) = state
4578 .origin
4579 .as_ref()
4580 .and_then(|origin| origin.task.as_ref())
4581 {
4582 let task = crate::queue::Queue::open()
4583 .get(task_id)
4584 .context("cannot verify the task owner immediately before merge")?;
4585 if task.runs.last() != Some(&state.id)
4586 || task.operator_held()
4587 || task.status == crate::queue::TaskStatus::Done
4588 {
4589 bail!(
4590 "task ownership or an operator hold superseded this merge approval"
4591 );
4592 }
4593 }
4594 if let Some(binding) = &state.land_approval {
4595 let current = ask::Questions::open().get(&binding.question)?;
4596 if merge_consent_superseded(state, ¤t)?
4597 || current.run != state.id
4598 || !binding.head.eq_ignore_ascii_case(&observed_head)
4599 || approval(current.resolution().as_deref()) != Approval::Merge
4600 || current.merge_target.as_ref().is_some_and(|t| {
4601 t.pr != pr.url || !t.head.eq_ignore_ascii_case(&observed_head)
4602 })
4603 {
4604 bail!(
4605 "merge decision is stale or no longer authorizes the reviewed head"
4606 );
4607 }
4608 }
4609 forge.merge(&repo, &argv).await?
4610 };
4611 if out.0 {
4612 let confirmed = forge.view(&repo, pr_url).await.is_ok_and(|c| {
4618 if c.pr.state == PrLifecycle::Merged {
4619 state.pr_merged_head = (!c.head.is_empty()).then_some(c.head);
4620 true
4621 } else {
4622 false
4623 }
4624 });
4625 if !confirmed {
4626 if waited >= WAIT_CEILING {
4627 let why = "the merge request succeeded but the pull request \
4628 could not be confirmed merged after waiting";
4629 stop(state, &repo, &pr, why).await?;
4630 return Ok(pr);
4631 }
4632 state.event(
4633 "land",
4634 "merge accepted but the pull request is not confirmed merged yet; waiting",
4635 );
4636 state.save()?;
4637 waited += POLL;
4638 forge.poll().await;
4639 continue;
4640 }
4641 pr.state = PrLifecycle::Merged;
4642 state.status = RunStatus::Merged;
4643 state.merge = Some(MergeOutcome {
4644 mode: MergeMode::Pr,
4645 ok: true,
4646 detail: format!("gh {}", argv.join(" ")),
4647 empty: false,
4648 });
4649 if let Some(pr_record) = state.pr.as_mut() {
4654 pr_record.state = pr.state.as_str().to_owned();
4655 }
4656 state.event("land", format!("merged {} as `{subject}`", pr.url));
4657 announce_red_merge(state, &pr).await;
4658 state.save()?;
4659 write_pr_state_through(state, pr.state);
4660 return Ok(pr);
4661 }
4662 let after_seen = forge.view(&repo, pr_url).await.ok();
4663 let after = after_seen.as_ref().map(|s| s.pr.state);
4664 if let Some(outcome) = merged_after_all(&argv, &out.1, after) {
4665 state.pr_merged_head = after_seen
4666 .as_ref()
4667 .map(|s| s.head.clone())
4668 .filter(|h| !h.is_empty());
4669 pr.state = PrLifecycle::Merged;
4670 state.status = RunStatus::Merged;
4671 state.merge = Some(outcome);
4672 if let Some(pr_record) = state.pr.as_mut() {
4673 pr_record.state = pr.state.as_str().to_owned();
4674 }
4675 state.event("land", format!("merged {} as `{subject}`", pr.url));
4676 announce_red_merge(state, &pr).await;
4677 state.save()?;
4678 write_pr_state_through(state, pr.state);
4679 return Ok(pr);
4680 }
4681 let verdict = classify_refusal(after_seen.as_ref(), rechecked, &observed_head, ci);
4682 match verdict {
4683 Refused::Final => {
4684 let merge_state = after_seen
4685 .as_ref()
4686 .map(|s| s.merge_state.as_str())
4687 .filter(|m| !m.is_empty())
4688 .unwrap_or("unknown");
4689 let why = format!(
4693 "the merge was refused: {} (merge state: {merge_state})",
4694 out.1
4695 );
4696 stop(state, &repo, &pr, &why).await?;
4697 return Ok(pr);
4698 }
4699 verdict => {
4700 if waited >= WAIT_CEILING {
4705 let why = format!(
4706 "the merge was still refused after {} minutes: {}",
4707 WAIT_CEILING.as_secs() / 60,
4708 out.1
4709 );
4710 stop(state, &repo, &pr, &why).await?;
4711 return Ok(pr);
4712 }
4713 if verdict == Refused::Recheck {
4714 rechecked = true;
4715 }
4716 state.event(
4717 "land",
4718 "merge refused while the branch policy is not satisfied yet; waiting",
4719 );
4720 state.save()?;
4721 waited += POLL;
4722 forge.poll().await;
4723 }
4724 }
4725 }
4726 Step::Rebase => {
4727 if rebases >= budget {
4733 let why = format!(
4734 "the base moved under this branch {budget} time(s) and it still does \
4735 not merge; rebasing again would only race it"
4736 );
4737 stop(state, &repo, &pr, &why).await?;
4738 return Ok(pr);
4739 }
4740 rebases += 1;
4741 let Some(branch) = state.winner().map(|w| w.branch.clone()) else {
4742 stop(
4743 state,
4744 &repo,
4745 &pr,
4746 "the pull request conflicts and this run has no winning branch to rebase",
4747 )
4748 .await?;
4749 return Ok(pr);
4750 };
4751 let base = state.base_branch.clone();
4752 state.event(
4753 "land",
4754 format!("{} no longer merges; rebasing onto {base}", pr.url),
4755 );
4756 state.save()?;
4757
4758 let remote = state.config.merge.remote.clone();
4762 git::fetch(&repo, &remote, &base).await.ok();
4763 if owner_stop(state, &mut pr, forge).await? {
4764 return Ok(pr);
4765 }
4766 let onto = format!("{remote}/{base}");
4767 let rebased = match rebase_landing_worktree(state, &onto).await {
4768 Ok(crate::rebase::Rebased::Applied) => Ok(None),
4769 Ok(crate::rebase::Rebased::Stopped(why)) => Ok(Some(why)),
4770 Err(e) => Err(e),
4771 };
4772 if owner_stop(state, &mut pr, forge).await? {
4773 return Ok(pr);
4774 }
4775 match rebased {
4776 Ok(None) => {
4777 let published =
4778 publish_landing_head(state, &seen.head, pr_url, forge).await;
4779 if owner_stop(state, &mut pr, forge).await? {
4780 return Ok(pr);
4781 }
4782 let head = published?;
4783 crate::graph::refresh_reviewed_commits(state, &branch).await;
4784 state.pr_pushed_head = Some(head.clone());
4785 awaiting_head = Some(head);
4786 rechecked = false;
4787 state.event("land", format!("rebased {branch} onto {base}"));
4788 state.save()?;
4789 waited = Duration::ZERO;
4792 tokio::time::sleep(POLL).await;
4793 }
4794 Ok(Some(conflict)) => {
4797 let why = format!(
4798 "{} conflicts with {base} and the rebase did not apply: {}",
4799 pr.url,
4800 conflict.chars().take(600).collect::<String>()
4801 );
4802 stop(state, &repo, &pr, &why).await?;
4803 return Ok(pr);
4804 }
4805 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
4806 Err(e) => {
4807 let why = format!("could not rebase {branch} onto {base}: {e:#}");
4808 stop(state, &repo, &pr, &why).await?;
4809 return Ok(pr);
4810 }
4811 }
4812 }
4813 Step::GiveUp { reason } => {
4814 stop(state, &repo, &pr, &reason).await?;
4815 return Ok(pr);
4816 }
4817 Step::Fix { reason } => {
4818 round += 1;
4819 waited = Duration::ZERO;
4820 for c in &pr.review_comments {
4821 shown.insert(c.body.clone());
4822 }
4823 state.event("land", format!("round {round}: {reason}"));
4824 state.save()?;
4825
4826 let logs = failing_logs(&repo, &seen.failing_urls).await;
4827 let was_red = pr.checks == Checks::Red;
4828 if owner_stop(state, &mut pr, forge).await? {
4829 return Ok(pr);
4830 }
4831 let fixed = forge.fix(state, &pr, round, budget, &reason, &logs).await?;
4832 if owner_stop(state, &mut pr, forge).await? {
4833 return Ok(pr);
4834 }
4835 match fixed {
4836 Fixed::Committed { head } => {
4837 state.pr_pushed_head = Some(head.clone());
4840 awaiting_head = Some(head);
4841 rechecked = false;
4842 waited = Duration::ZERO;
4843 forge.poll().await;
4844 }
4845 Fixed::Declined if was_red => {
4846 if let Some(evidence) = forge.attribution(state, &seen).await
4851 && evidence.unrelated(&seen.head, &pr.failing)
4852 {
4853 let fresh = forge.view(&repo, pr_url).await?;
4854 if fresh.head != seen.head
4855 || fresh.rollup_head != seen.rollup_head
4856 || fresh.pr.state != PrLifecycle::Open
4857 || fresh.pr.checks != Checks::Red
4858 || fresh.pr.failing != pr.failing
4859 || fresh
4860 .pr
4861 .review_comments
4862 .iter()
4863 .any(|c| !shown.contains(&c.body))
4864 {
4865 continue;
4866 }
4867 if owner_stop(state, &mut pr, forge).await? {
4868 return Ok(pr);
4869 }
4870 hold_unrelated(state, &pr, evidence).await?;
4871 return Ok(pr);
4872 }
4873 let why = format!(
4874 "the fixer produced no commit while {} check(s) were failing \
4875 ({}); stopping instead of looping on an unchanged tree",
4876 pr.failing.len(),
4877 pr.failing.join(", ")
4878 );
4879 stop(state, &repo, &pr, &why).await?;
4880 return Ok(pr);
4881 }
4882 Fixed::Declined => state.event(
4887 "land",
4888 format!("round {round}: fixer declined the comments, nothing committed"),
4889 ),
4890 Fixed::Failed(why) => {
4891 stop(state, &repo, &pr, &format!("the fix round failed: {why}")).await?;
4892 return Ok(pr);
4893 }
4894 }
4895 state.save()?;
4896 }
4897 }
4898 }
4899}
4900
4901pub const CI_HOLD_NODE: &str = "land-ci-unrelated";
4903
4904#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4906pub struct CiHold {
4907 pub head: String,
4909 pub question: String,
4911 pub evidence: CiEvidence,
4913}
4914
4915#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
4917struct CiFailure {
4918 path: String,
4919 start_line: u64,
4920 end_line: u64,
4921 title: String,
4922 message: String,
4923}
4924
4925#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4926struct CiCheckEvidence {
4927 label: String,
4928 head_check: u64,
4929 base_check: u64,
4930 app: u64,
4931 run: String,
4932 base_run: String,
4933 head_failures: Vec<CiFailure>,
4934 base_failures: Vec<CiFailure>,
4935 rerun_exhausted: bool,
4936}
4937
4938#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
4940pub struct CiEvidence {
4941 head: String,
4942 base: String,
4943 changed: Vec<String>,
4944 checks: Vec<CiCheckEvidence>,
4945}
4946
4947impl CiEvidence {
4948 fn unrelated(&self, head: &str, failing: &[String]) -> bool {
4951 if self.head != head
4952 || self.base.is_empty()
4953 || failing.is_empty()
4954 || self.changed.iter().any(|p| {
4955 p.starts_with(".github/")
4956 || p.starts_with(".config/")
4957 || p.starts_with(".cargo/")
4958 || matches!(
4959 p.rsplit('/').next().unwrap_or(p),
4960 "Cargo.toml"
4961 | "Cargo.lock"
4962 | "Makefile.toml"
4963 | "build.rs"
4964 | "rust-toolchain.toml"
4965 )
4966 })
4967 {
4968 return false;
4969 }
4970 failing.iter().all(|label| {
4971 let matches: Vec<_> = self.checks.iter().filter(|c| &c.label == label).collect();
4972 matches.len() == 1
4973 && matches[0].rerun_exhausted
4974 && !matches[0].head_failures.is_empty()
4975 && matches[0].head_failures.iter().all(|f| {
4976 !f.path.is_empty()
4979 && !f.path.starts_with('.')
4980 && !f.path.contains("..")
4981 && !f.path.starts_with('/')
4982 && !self.changed.contains(&f.path)
4983 && matches[0].base_failures.contains(f)
4984 })
4985 })
4986 }
4987}
4988
4989async fn ci_json(repo: &Path, endpoint: String) -> Option<serde_json::Value> {
4990 let (ok, body) = gh(repo, &["api".into(), endpoint]).await.ok()?;
4991 if !ok {
4992 return None;
4993 }
4994 serde_json::from_str(&body).ok()
4995}
4996
4997async fn ci_annotations(repo: &Path, check: &serde_json::Value) -> Option<Vec<CiFailure>> {
4998 let count = check.pointer("/output/annotations_count")?.as_u64()?;
4999 if count == 0 || count >= 100 {
5000 return None;
5001 }
5002 let id = check.get("id")?.as_u64()?;
5003 let value = ci_json(
5004 repo,
5005 format!("repos/{{owner}}/{{repo}}/check-runs/{id}/annotations?per_page=100"),
5006 )
5007 .await?;
5008 let annotations = value.as_array()?;
5009 if annotations.len() != count as usize {
5010 return None;
5011 }
5012 annotations
5013 .iter()
5014 .filter(|a| a["annotation_level"] == "failure")
5015 .map(|a| {
5016 Some(CiFailure {
5017 path: a["path"].as_str()?.into(),
5018 start_line: a["start_line"].as_u64()?,
5019 end_line: a["end_line"].as_u64()?,
5020 title: a["title"].as_str()?.into(),
5021 message: a["message"].as_str()?.into(),
5022 })
5023 })
5024 .collect()
5025}
5026
5027async fn ci_runs(repo: &Path, sha: &str) -> Option<Vec<serde_json::Value>> {
5028 let value = ci_json(
5029 repo,
5030 format!("repos/{{owner}}/{{repo}}/commits/{sha}/check-runs?per_page=100&filter=latest"),
5031 )
5032 .await?;
5033 let runs = value["check_runs"].as_array()?;
5034 if value["total_count"].as_u64()? != runs.len() as u64 || runs.len() >= 100 {
5035 return None;
5036 }
5037 Some(runs.clone())
5038}
5039
5040async fn collect_ci_evidence(state: &RunState, seen: &Seen) -> Option<CiEvidence> {
5041 let repo = &state.repo;
5042 let base_ref = format!("refs/remotes/{}/{}", state.config.merge.remote, seen.base);
5043 let base = git::git_raw(repo, &["rev-parse", "--verify", &base_ref])
5044 .await
5045 .ok()?;
5046 if !base.ok() {
5047 return None;
5048 }
5049 let range = format!("{}...{}", base.stdout, seen.head);
5050 let diff = git::git_raw(
5052 repo,
5053 &["diff", "--no-renames", "--name-only", "-z", &range, "--"],
5054 )
5055 .await
5056 .ok()?;
5057 if !diff.ok() {
5058 return None;
5059 }
5060 let head_runs = ci_runs(repo, &seen.head).await?;
5061 let base_runs = ci_runs(repo, &base.stdout).await?;
5062 let mut checks = Vec::new();
5063 for label in &seen.pr.failing {
5064 let matching = |runs: &[serde_json::Value]| {
5065 runs.iter()
5066 .filter(|r| r["name"].as_str() == Some(label))
5067 .cloned()
5068 .collect::<Vec<_>>()
5069 };
5070 let heads = matching(&head_runs);
5071 let bases = matching(&base_runs);
5072 if heads.len() != 1 || bases.len() != 1 {
5073 return None;
5074 }
5075 let h = &heads[0];
5076 let b = &bases[0];
5077 if h["conclusion"] != "failure"
5078 || b["conclusion"] != "failure"
5079 || h["status"] != "completed"
5080 || b["status"] != "completed"
5081 || h["head_sha"].as_str()? != seen.head
5082 || b["head_sha"].as_str()? != base.stdout
5083 || h.pointer("/app/id")?.as_u64()? != b.pointer("/app/id")?.as_u64()?
5084 {
5085 return None;
5086 }
5087 let run = run_of(h["details_url"].as_str()?)?;
5088 let contexts: Vec<_> = seen.contexts.iter().filter(|c| &c.label == label).collect();
5089 if contexts.len() != 1
5090 || contexts[0].run.as_ref() != Some(&run)
5091 || contexts[0].verdict != Verdict::Fail
5092 {
5093 return None;
5094 }
5095 let workflow =
5098 ci_json(repo, format!("repos/{{owner}}/{{repo}}/actions/runs/{run}")).await?;
5099 let base_run = run_of(b["details_url"].as_str()?)?;
5100 let base_workflow = ci_json(
5101 repo,
5102 format!("repos/{{owner}}/{{repo}}/actions/runs/{base_run}"),
5103 )
5104 .await?;
5105 if base_workflow["head_sha"].as_str()? != base.stdout
5106 || base_workflow["head_branch"].as_str()? != seen.base
5107 || base_workflow["status"] != "completed"
5108 || base_workflow["conclusion"] != "failure"
5109 || base_workflow["workflow_id"].as_u64()? != workflow["workflow_id"].as_u64()?
5110 {
5111 return None;
5112 }
5113 let exhausted = state
5114 .land_reruns
5115 .as_ref()
5116 .is_some_and(|r| r.head == seen.head && r.runs.contains_key(&run))
5117 && workflow["head_sha"].as_str()? == seen.head
5118 && workflow["run_attempt"].as_u64()? > 1
5119 && workflow["status"] == "completed";
5120 checks.push(CiCheckEvidence {
5121 label: label.clone(),
5122 head_check: h["id"].as_u64()?,
5123 base_check: b["id"].as_u64()?,
5124 app: h.pointer("/app/id")?.as_u64()?,
5125 run,
5126 base_run,
5127 head_failures: ci_annotations(repo, h).await?,
5128 base_failures: ci_annotations(repo, b).await?,
5129 rerun_exhausted: exhausted,
5130 });
5131 }
5132 Some(CiEvidence {
5133 head: seen.head.clone(),
5134 base: base.stdout,
5135 changed: diff
5136 .stdout
5137 .split('\0')
5138 .filter(|p| !p.is_empty())
5139 .map(str::to_owned)
5140 .collect(),
5141 checks,
5142 })
5143}
5144
5145async fn hold_unrelated(state: &mut RunState, pr: &PrState, evidence: CiEvidence) -> Result<()> {
5146 let detail = serde_json::to_string(&evidence)?;
5147 let resume = "daemon: CI を確認して同じ run を再開する".to_owned();
5148 let hold = "operator: 保留して後で判断する".to_owned();
5149 let mut q = ask::Question::new(
5150 state.id.clone(),
5151 CI_HOLD_NODE.into(),
5152 "land".into(),
5153 "base でも再現する CI の失敗を検出したため、試行を消費せず保留しました".into(),
5154 format!(
5155 "必須チェックや承認は省略しません。再開時にも同じ workflow run は自動再実行しません。\n構造化された判定根拠:\n{detail}"
5156 ),
5157 vec![resume.clone(), hold.clone()],
5158 );
5159 q.actions.insert(
5160 resume,
5161 ask::ChoiceAction::Resume {
5162 run: state.id.clone(),
5163 },
5164 );
5165 q.actions.insert(hold, ask::ChoiceAction::Hold);
5166 ask::Questions::open().put_executable(&mut q)?;
5167 state.land_unrelated = Some(CiHold {
5168 head: evidence.head.clone(),
5169 question: q.id.clone(),
5170 evidence,
5171 });
5172 state.event("land", format!("[ci-unrelated] base reproduces every located failure after rerun; owner question {}: {detail}", q.id));
5173 state.end_pass_parked(crate::run::ParkCause::Question);
5174 state.parked = true;
5175 state.save()?;
5176 if let Err(e) = ask::notify(&state.config.notify, &q).await {
5177 tracing::warn!("could not notify about CI hold: {e:#}");
5178 }
5179 let body = stop_comment(
5181 &state.id,
5182 "CI failures independently reproduced on the base; awaiting an owner decision without charging the task attempt",
5183 );
5184 let (_, body) = crate::github_text::prepare(state, "", &body);
5185 gh(
5186 &state.repo,
5187 &[
5188 "pr".into(),
5189 "comment".into(),
5190 pr.number.to_string(),
5191 "--body".into(),
5192 body,
5193 ],
5194 )
5195 .await
5196 .ok();
5197 Ok(())
5198}
5199
5200#[derive(Clone)]
5204struct Seen {
5205 pr: PrState,
5206 title: String,
5207 failing_urls: Vec<(String, String)>,
5208 head: String,
5210 rollup_head: String,
5213 merge_state: String,
5216 contexts: Vec<CheckInfo>,
5218 base: String,
5220}
5221
5222#[derive(Clone)]
5224struct CheckInfo {
5225 label: String,
5226 verdict: Verdict,
5227 required: Option<bool>,
5228 run: Option<String>,
5230}
5231
5232#[derive(Debug, Clone, PartialEq, Eq)]
5234enum RerunStep {
5235 Rerun(Vec<String>),
5237 Grace,
5239 Fix,
5241}
5242
5243#[cfg(test)]
5247fn rerunnable(contexts: &[CheckInfo]) -> Vec<(String, Option<String>)> {
5248 rerunnable_with(contexts, false)
5249}
5250
5251fn rerunnable_with(
5252 contexts: &[CheckInfo],
5253 include_optional: bool,
5254) -> Vec<(String, Option<String>)> {
5255 contexts
5256 .iter()
5257 .filter(|c| c.verdict == Verdict::Fail && (include_optional || c.required != Some(false)))
5258 .filter(|c| {
5260 c.run.as_ref().is_none_or(|r| {
5261 !contexts.iter().any(|o| {
5262 matches!(o.verdict, Verdict::Pending | Verdict::Unknown)
5263 && o.run.as_ref() == Some(r)
5264 })
5265 })
5266 })
5267 .map(|c| (c.label.clone(), c.run.clone()))
5268 .collect()
5269}
5270
5271fn rerun_step(
5273 failing: &[(String, Option<String>)],
5274 record: Option<&LandReruns>,
5275 head: &str,
5276 now: i64,
5277) -> RerunStep {
5278 if failing.is_empty() || failing.iter().any(|(_, run)| run.is_none()) {
5281 return RerunStep::Fix;
5282 }
5283 let record = record.filter(|r| r.head.eq_ignore_ascii_case(head));
5285 let mut fresh: Vec<String> = Vec::new();
5286 let mut recent = false;
5287 for run in failing.iter().filter_map(|(_, run)| run.as_deref()) {
5288 match record.and_then(|r| r.runs.get(run)) {
5289 None => {
5290 if !fresh.iter().any(|f| f == run) {
5291 fresh.push(run.to_owned());
5292 }
5293 }
5294 Some(&at) if now - at < crate::release_watch::RERUN_GRACE => recent = true,
5295 Some(_) => {}
5296 }
5297 }
5298 if !fresh.is_empty() {
5299 RerunStep::Rerun(fresh)
5300 } else if recent {
5301 RerunStep::Grace
5302 } else {
5303 RerunStep::Fix
5304 }
5305}
5306
5307async fn observe(repo: &Path, pr_url: &str) -> Result<Seen> {
5311 let view = gh(
5312 repo,
5313 &[
5314 "pr".to_owned(),
5315 "view".to_owned(),
5316 pr_url.to_owned(),
5317 "--json".to_owned(),
5318 "url,number,state,title,reviews,comments,mergeStateStatus,headRefOid,baseRefName"
5319 .to_owned(),
5320 ],
5321 )
5322 .await?;
5323 if !view.0 {
5324 bail!("gh pr view {pr_url}: {}", view.1);
5325 }
5326 let number = parse_pr(&view.1)?.number;
5327 let node = last_commit_node(repo, number).await;
5328 let mut seen = seen_from(&view.1, node.as_deref())?;
5329
5330 let inline = gh(
5331 repo,
5332 &[
5333 "api".to_owned(),
5334 format!("repos/{{owner}}/{{repo}}/pulls/{}/comments", seen.pr.number),
5335 ],
5336 )
5337 .await?;
5338 if inline.0 {
5339 match parse_inline_comments(&inline.1) {
5340 Ok(mut comments) => seen.pr.review_comments.append(&mut comments),
5341 Err(e) => tracing::warn!("inline review comments unreadable: {e}"),
5344 }
5345 } else {
5346 tracing::warn!("gh api pulls/{}/comments: {}", seen.pr.number, inline.1);
5347 }
5348 Ok(seen)
5349}
5350
5351fn seen_from(view_json: &str, node_json: Option<&str>) -> Result<Seen> {
5362 let mut pr = parse_pr(view_json)?;
5363 let raw: GhPr = serde_json::from_str(view_json).context("re-read pull request json")?;
5364
5365 let mut rollup_head = String::new();
5366 let mut failing_urls = Vec::new();
5367 let mut contexts = Vec::new();
5368 let mut checks = Checks::Unknown;
5369 let mut failing = Vec::new();
5370 if let Some((oid, rollup)) = node_json.and_then(parse_last_commit_node) {
5371 (checks, failing) = rollup_verdict(&rollup);
5372 failing_urls = rollup
5373 .iter()
5374 .filter(|c| c.verdict() == Verdict::Fail)
5375 .filter_map(|c| c.url().map(|u| (c.label(), u.to_owned())))
5376 .collect();
5377 contexts = rollup
5378 .iter()
5379 .map(|c| CheckInfo {
5380 label: c.label(),
5381 verdict: c.verdict(),
5382 required: c.is_required,
5383 run: c.url().and_then(run_of),
5384 })
5385 .collect();
5386 rollup_head = oid;
5387 }
5388 pr.checks = checks;
5389 pr.failing = failing;
5390
5391 Ok(Seen {
5392 pr,
5393 title: raw.title,
5394 failing_urls,
5395 head: raw.head_ref_oid,
5396 rollup_head,
5397 merge_state: raw.merge_state_status,
5398 contexts,
5399 base: raw.base_ref_name,
5400 })
5401}
5402
5403fn parse_last_commit_node(json: &str) -> Option<(String, Vec<GhCheck>)> {
5406 let v: serde_json::Value = serde_json::from_str(json).ok()?;
5407 if v.get("errors").is_some_and(|e| !e.is_null()) {
5408 return None;
5409 }
5410 let commit = v.pointer("/data/repository/pullRequest/commits/nodes/0/commit")?;
5411 let oid = commit.get("oid")?.as_str().filter(|o| !o.is_empty())?;
5412 let contexts = commit.pointer("/statusCheckRollup/contexts");
5413 let Some(contexts) = contexts.filter(|c| !c.is_null()) else {
5414 return Some((oid.to_owned(), Vec::new()));
5416 };
5417 if contexts.pointer("/pageInfo/hasNextPage")?.as_bool()? {
5418 return None;
5419 }
5420 let nodes = contexts.get("nodes")?.as_array()?;
5421 let rollup = nodes
5422 .iter()
5423 .map(|n| serde_json::from_value::<GhCheck>(n.clone()))
5424 .collect::<Result<Vec<_>, _>>()
5425 .ok()?;
5426 Some((oid.to_owned(), rollup))
5427}
5428
5429async fn last_commit_node(repo: &Path, number: u64) -> Option<String> {
5432 let out = gh(
5433 repo,
5434 &[
5435 "api".to_owned(),
5436 "graphql".to_owned(),
5437 "-F".to_owned(),
5438 "owner={owner}".to_owned(),
5439 "-F".to_owned(),
5440 "repo={repo}".to_owned(),
5441 "-F".to_owned(),
5442 format!("number={number}"),
5443 "-f".to_owned(),
5444 "query=query($owner:String!,$repo:String!,$number:Int!){repository(owner:$owner,\
5445 name:$repo){pullRequest(number:$number){commits(last:1){nodes{commit{oid \
5446 statusCheckRollup{contexts(first:100){pageInfo{hasNextPage} nodes{\
5447 ... on CheckRun{name status conclusion detailsUrl \
5448 isRequired(pullRequestNumber:$number)} \
5449 ... on StatusContext{context state targetUrl \
5450 isRequired(pullRequestNumber:$number)}}}}}}}}}}"
5451 .to_owned(),
5452 ],
5453 )
5454 .await
5455 .ok()?;
5456 out.0.then_some(out.1)
5457}
5458
5459#[doc(hidden)]
5461#[derive(Debug, PartialEq)]
5462pub enum Fixed {
5463 Committed {
5465 head: String,
5467 },
5468 Declined,
5470 Failed(String),
5472}
5473
5474#[doc(hidden)]
5480pub async fn fix_round(
5481 state: &mut RunState,
5482 pr: &PrState,
5483 round: usize,
5484 budget: usize,
5485 reason: &str,
5486 logs: &str,
5487) -> Result<Fixed> {
5488 let winner = state
5489 .winner()
5490 .cloned()
5491 .context("landing needs a winning candidate; none is recorded on this run")?;
5492 let roles = state
5493 .config
5494 .resolve_roles()
5495 .context("resolve the roster for the fix round")?;
5496 let attempts = crate::fixer::attempts(state, &roles, &winner);
5500 let ids: Vec<String> = attempts.iter().map(|(s, _)| s.id.clone()).collect();
5501
5502 let prompt = fix_prompt(state, pr, round, budget, reason, logs);
5503 let mut artifacts = agent::artifacts_dir(&state.dir());
5504 if let Some(request) = state
5505 .merge_repairs
5506 .last()
5507 .filter(|r| r.phase == crate::run::MergeRepairPhase::Fixing)
5508 {
5509 artifacts = artifacts.join(format!("merge-repair-{}", request.question));
5510 }
5511 let prompt = if state.config.cache_dir().is_some() {
5512 format!("{prompt}\n\n{}", prompt::build_cache_note("fix", true))
5513 } else {
5514 prompt
5515 };
5516 let before = git::rev_parse(&winner.worktree, "HEAD").await?;
5520 let mut last = None;
5524 for (i, (spec, seat_key)) in attempts.into_iter().enumerate() {
5525 if owner_requested_stop(state)? {
5526 return Ok(Fixed::Declined);
5527 }
5528 let mut seat = seat_of(state, &seat_key, &spec.id);
5529 let stem = if i == 0 {
5530 format!("land-{round}")
5531 } else {
5532 format!("land-{round}-{}", spec.id)
5533 };
5534 let out = agent::invoke(
5535 &spec,
5536 &mut seat,
5537 &Invocation {
5538 coordination: state.config.coordination.as_ref(),
5539 fetched_base: state.fetched_base.as_ref(),
5540 cwd: &winner.worktree,
5541 prompt: &prompt,
5542 timeout: Duration::from_secs(state.config.graph.timeout_fix),
5543 allow_write: true,
5544 sessions: state.config.graph.sessions,
5545 artifacts: &artifacts,
5546 stem: &stem,
5547 run: &state.id,
5548 node: "land",
5549 cache_dir: state.config.cache_dir().as_deref(),
5550 attachments: &[],
5551 writable: &[],
5552 },
5553 )
5554 .await;
5555 state.seats.insert(seat.key.clone(), seat);
5556 if let Some(next) = ids.get(i + 1)
5557 && agent::chain_advances(&out)
5558 {
5559 let (class, why) = crate::fixer::failure_of(&out);
5560 crate::graph::record_handover(state, "land", &seat_key, &spec.id, next, &class, &why);
5561 continue;
5562 }
5563 last = Some(out);
5564 break;
5565 }
5566 let out = last.expect("the fixer chain always has an entry");
5567
5568 match out {
5569 Ok(o) if o.quota_exhausted() => {
5570 return Ok(Fixed::Failed(
5571 "rate limited (quota); the fixer could not run".to_owned(),
5572 ));
5573 }
5574 Ok(o) if !o.usable() => {
5575 return Ok(Fixed::Failed(format!(
5576 "the fixer produced nothing usable ({})",
5577 crate::notices::turn_status(o.exit_code, o.timed_out, o.quota_exhausted())
5578 )));
5579 }
5580 Ok(_) => {}
5581 Err(e) if e.is::<crate::repo_lock::ResourceBlocked>() => return Err(e),
5582 Err(e) => return Ok(Fixed::Failed(format!("{e:#}"))),
5583 }
5584
5585 if owner_requested_stop(state)? {
5586 return Ok(Fixed::Declined);
5587 }
5588
5589 let wait = crate::repo_lock::WaitPolicy::new(
5592 Duration::from_secs(state.config.graph.timeout_resource_wait),
5593 || false,
5594 );
5595 let coordination = crate::repo_lock::SeatLease::operation_with(
5596 &winner.worktree,
5597 state.config.coordination.as_ref(),
5598 &wait,
5599 )
5600 .await?;
5601 match git::rescue_commit(
5602 &winner.worktree,
5603 &format!("magi: land round {round} fixes (uncommitted work)"),
5604 )
5605 .await
5606 {
5607 Ok(r) => state.note_withheld("land", &r.withheld),
5608 Err(e)
5609 if state
5610 .merge_repairs
5611 .last()
5612 .is_some_and(|r| r.phase == crate::run::MergeRepairPhase::Fixing) =>
5613 {
5614 return Ok(Fixed::Failed(format!("saving repair commit failed: {e:#}")));
5615 }
5616 Err(_) => {}
5617 }
5618 let after = git::rev_parse(&winner.worktree, "HEAD").await?;
5619 drop(coordination);
5620 if after == before {
5621 return Ok(Fixed::Declined);
5622 }
5623
5624 if owner_requested_stop(state)? {
5625 return Ok(Fixed::Declined);
5626 }
5627 crate::pr_head::ensure_owner(state)?;
5628 let remote = state.config.merge.remote.clone();
5629 let public_head = state.pr_branch().unwrap_or(&winner.branch).to_owned();
5630 let push = if state.pr_head.is_some() {
5631 let expected = state
5632 .pr_pushed_head
5633 .as_deref()
5634 .context("missing public head lease")?;
5635 git::push_as(
5636 &winner.worktree,
5637 &remote,
5638 &winner.branch,
5639 &public_head,
5640 expected,
5641 )
5642 .await?
5643 } else {
5644 git::push(&winner.worktree, &remote, &winner.branch).await?
5645 };
5646 if !push.ok() {
5647 return Ok(Fixed::Failed(format!(
5648 "pushing {} to {remote} failed: {}",
5649 public_head, push.stderr
5650 )));
5651 }
5652 state.event(
5653 "land",
5654 format!("round {round}: pushed a fix to {public_head}"),
5655 );
5656 state.pr_pushed_head = Some(after.clone());
5657 state.save()?;
5658 Ok(Fixed::Committed { head: after })
5659}
5660
5661pub(crate) fn seat_of(state: &mut RunState, key: &str, agent: &str) -> SeatState {
5663 crate::fixer::seat_for(state, key, agent)
5664}
5665
5666pub(crate) async fn repair_preflight(state: &RunState, url: &str, head: &str) -> Result<PrState> {
5669 let seen = observe(&state.repo, url).await?;
5670 let winner = state.winner().context("no winning branch to repair")?;
5671 if seen.pr.state != PrLifecycle::Open || seen.head != head {
5672 anyhow::bail!(
5673 "PR is closed or its head changed; review the current head before requesting repair again"
5674 );
5675 }
5676 if git::rev_parse(&winner.worktree, "HEAD").await? != head
5677 || !git::is_clean(&winner.worktree).await?
5678 {
5679 anyhow::bail!(
5680 "repair worktree is missing, dirty or at a different head; restore the reviewed branch and resume this run"
5681 );
5682 }
5683 let view = gh(
5686 &state.repo,
5687 &[
5688 "pr".into(),
5689 "view".into(),
5690 url.into(),
5691 "--json".into(),
5692 "autoMergeRequest,headRefOid,state,headRefName,baseRefName,isCrossRepository".into(),
5693 ],
5694 )
5695 .await?;
5696 if !view.0 {
5697 bail!("cannot check auto-merge: {}", view.1);
5698 }
5699 let live: serde_json::Value = serde_json::from_str(&view.1)?;
5700 let public = state.pr_branch().unwrap_or(&winner.branch);
5701 if live["state"] != "OPEN"
5702 || live["headRefOid"] != head
5703 || live["headRefName"] != public
5704 || live["baseRefName"] != state.base_branch
5705 || live["isCrossRepository"] != false
5706 {
5707 bail!("PR changed during repair preflight; review its current head explicitly");
5708 }
5709 let auto_merge = live
5710 .get("autoMergeRequest")
5711 .context("cannot read the PR auto-merge reservation; repair held")?;
5712 if !auto_merge.is_null() {
5713 let out = gh(&state.repo, &disable_automerge_argv(seen.pr.number)).await?;
5714 if !out.0 {
5715 bail!("cannot disable auto-merge; repair held: {}", out.1);
5716 }
5717 }
5718 Ok(seen.pr)
5719}
5720
5721fn fix_prompt(
5723 state: &RunState,
5724 pr: &PrState,
5725 round: usize,
5726 budget: usize,
5727 reason: &str,
5728 logs: &str,
5729) -> String {
5730 let mut s = format!(
5731 "Your patch is open as a pull request and it is not landing. Land round \
5732 {round} of {budget}.\n\n\
5733 Pull request: {}\n\n\
5734 What is holding it: {reason}\n\n\
5735 # The task\n\n{}\n",
5736 pr.url, state.instruction
5737 );
5738
5739 if pr.failing.is_empty() {
5740 s.push_str("\n# Failing checks\n\n(none)\n");
5741 } else {
5742 let _ = write!(s, "\n# Failing checks\n\n- {}\n", pr.failing.join("\n- "));
5743 if logs.trim().is_empty() {
5744 s.push_str(
5745 "\nNo log could be read; investigate the failure with necessary focused checks.\n",
5746 );
5747 } else {
5748 let _ = write!(s, "\n## Failing log tails\n\n{logs}\n");
5749 }
5750 }
5751
5752 if pr.review_comments.is_empty() {
5753 s.push_str("\n# Review comments\n\n(none)\n");
5754 } else {
5755 s.push_str("\n# Review comments\n");
5756 for c in &pr.review_comments {
5757 let where_ = match (&c.path, c.line) {
5758 (Some(p), Some(l)) => format!(" ({p}:{l})"),
5759 (Some(p), None) => format!(" ({p})"),
5760 _ => String::new(),
5761 };
5762 let _ = write!(s, "\n## {}{where_}\n\n{}\n", c.author, c.body.trim());
5763 }
5764 }
5765
5766 s.push_str(
5767 "\n# Rules\n\n\
5768 1. Fix the cause, never the symptom. Do not delete, skip, or weaken a \
5769 failing test; do not silence a lint with an allow attribute; do not \
5770 stretch a timeout to hide a race. If the check is right, the code is \
5771 wrong.\n\
5772 2. Change nothing the checks and the comments did not raise. A \
5773 drive-by refactor turns a one-line fix into a pull request that \
5774 needs reviewing again.\n\
5775 3. If a comment is wrong, say so with a checkable argument and change \
5776 nothing for it. A declined comment with a reason is a correct \
5777 outcome; a change made to appease a reviewer is not.\n\
5778 4. Commit in this worktree. magi pushes to the pull request's branch \
5779 for you; do not push, merge, or close anything yourself.\n\
5780 5. Never name yourself, your vendor, or your model, anywhere.\n\n\
5781 # Output\n\n\
5782 Say what you changed and why, and what you declined and why.",
5783 );
5784
5785 let language = &state.config.graph.language;
5786 if !(language.trim().is_empty() || language.eq_ignore_ascii_case("en")) {
5787 let _ = write!(s, "\n\nWrite all prose in {language}.");
5788 }
5789 s.push_str(&crate::prompt::github_rule(
5791 language,
5792 &state.config.graph.github_language,
5793 ));
5794 if let Some(overlay) = state.config.prompts.overlay("fix") {
5795 let _ = write!(s, "\n\n{overlay}");
5796 }
5797 s.push('\n');
5798 s.push_str(crate::prompt::child_run_ownership());
5799 s
5800}
5801
5802async fn failing_logs(repo: &Path, failing: &[(String, String)]) -> String {
5805 let mut out = String::new();
5806 for (name, url) in failing.iter().take(MAX_LOGS) {
5807 let args = match (job_of(url), run_of(url)) {
5808 (Some(job), _) => vec![
5809 "run".to_owned(),
5810 "view".to_owned(),
5811 "--log-failed".to_owned(),
5812 "--job".to_owned(),
5813 job,
5814 ],
5815 (None, Some(run)) => vec![
5816 "run".to_owned(),
5817 "view".to_owned(),
5818 run,
5819 "--log-failed".to_owned(),
5820 ],
5821 (None, None) => continue,
5823 };
5824 let (ok, body) = match gh(repo, &args).await {
5825 Ok(v) => v,
5826 Err(e) => (false, format!("{e:#}")),
5827 };
5828 if !ok && body.trim().is_empty() {
5829 continue;
5830 }
5831 let _ = write!(out, "### {name}\n\n```\n{}\n```\n\n", tail(&body, LOG_TAIL));
5832 }
5833 out
5834}
5835
5836fn job_of(details_url: &str) -> Option<String> {
5839 let after = details_url.split("/job/").nth(1)?;
5840 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
5841 (!id.is_empty()).then_some(id)
5842}
5843
5844pub(crate) fn run_of(details_url: &str) -> Option<String> {
5846 let after = details_url.split("/actions/runs/").nth(1)?;
5847 let id: String = after.chars().take_while(char::is_ascii_digit).collect();
5848 (!id.is_empty()).then_some(id)
5849}
5850
5851fn stop_comment(run_id: &str, why: &str) -> String {
5855 format!(
5856 "{MARKER}\nmagi stopped landing this pull request: {why}\n\n\
5857 The branch is untouched and the run is `{run_id}`. Nothing was merged."
5858 )
5859}
5860
5861async fn stop(state: &mut RunState, repo: &Path, pr: &PrState, why: &str) -> Result<()> {
5866 let body = stop_comment(&state.id, why);
5867 let (_, mut body) = crate::github_text::prepare(state, "", &body);
5868 if !body.contains(MARKER) {
5869 body = format!("{MARKER}\n{body}");
5870 }
5871 let posted = gh(
5872 repo,
5873 &[
5874 "pr".to_owned(),
5875 "comment".to_owned(),
5876 pr.number.to_string(),
5877 "--body".to_owned(),
5878 body,
5879 ],
5880 )
5881 .await;
5882 match posted {
5883 Ok((true, _)) => {}
5884 Ok((false, out)) => tracing::warn!("could not comment on {}: {out}", pr.url),
5885 Err(e) => tracing::warn!("could not comment on {}: {e:#}", pr.url),
5886 }
5887 state.status = RunStatus::Blocked;
5888 state.merge = Some(MergeOutcome {
5889 mode: MergeMode::Pr,
5890 ok: false,
5891 detail: why.to_owned(),
5892 empty: false,
5893 });
5894 state.event("land", format!("stopped: {why}"));
5895 state.save()?;
5896 Ok(())
5897}
5898
5899pub(crate) async fn gh(cwd: &Path, args: &[String]) -> Result<(bool, String)> {
5915 let out = tokio::process::Command::new("gh")
5916 .args(args)
5917 .current_dir(cwd)
5918 .env_remove("GH_REPO")
5919 .quiet()
5920 .stdin(std::process::Stdio::null())
5921 .output()
5922 .await
5923 .with_context(|| format!("spawn gh {}", args.join(" ")))?;
5924 let mut body = String::from_utf8_lossy(&out.stdout).into_owned();
5925 let err = String::from_utf8_lossy(&out.stderr);
5926 if body.trim().is_empty() {
5927 body = err.into_owned();
5928 } else if !err.trim().is_empty() {
5929 body.push_str(&err);
5930 }
5931 Ok((out.status.success(), body.trim().to_owned()))
5932}
5933
5934#[derive(Debug, Clone, Copy, PartialEq, Eq)]
5936pub(crate) enum Verdict {
5937 Pass,
5938 Fail,
5939 Pending,
5940 Unknown,
5941}
5942
5943impl Verdict {
5944 pub(crate) fn label(self) -> &'static str {
5946 match self {
5947 Self::Pass => "passed",
5948 Self::Fail => "failed",
5949 Self::Pending => "pending",
5950 Self::Unknown => "unknown",
5951 }
5952 }
5953}
5954
5955#[derive(Debug, Deserialize)]
5956#[serde(rename_all = "camelCase")]
5957struct GhPr {
5958 #[serde(default)]
5959 url: String,
5960 #[serde(default)]
5961 number: u64,
5962 #[serde(default)]
5963 state: String,
5964 #[serde(default)]
5965 title: String,
5966 #[serde(default)]
5967 status_check_rollup: Vec<GhCheck>,
5968 #[serde(default)]
5975 merge_state_status: String,
5976 #[serde(default)]
5980 head_ref_oid: String,
5981 #[serde(default)]
5982 base_ref_name: String,
5983 #[serde(default)]
5984 reviews: Vec<GhReview>,
5985 #[serde(default)]
5986 comments: Vec<GhComment>,
5987}
5988
5989#[derive(Debug, Deserialize)]
5994#[serde(rename_all = "camelCase")]
5995struct GhCheck {
5996 #[serde(default)]
5997 name: Option<String>,
5998 #[serde(default)]
5999 context: Option<String>,
6000 #[serde(default)]
6001 status: Option<String>,
6002 #[serde(default)]
6003 conclusion: Option<String>,
6004 #[serde(default)]
6005 state: Option<String>,
6006 #[serde(default)]
6007 details_url: Option<String>,
6008 #[serde(default)]
6009 target_url: Option<String>,
6010 #[serde(default)]
6013 is_required: Option<bool>,
6014}
6015
6016impl GhCheck {
6017 fn label(&self) -> String {
6019 self.name
6020 .clone()
6021 .or_else(|| self.context.clone())
6022 .unwrap_or_else(|| "(unnamed check)".to_owned())
6023 }
6024
6025 fn url(&self) -> Option<&str> {
6027 self.details_url
6028 .as_deref()
6029 .or(self.target_url.as_deref())
6030 .filter(|u| !u.is_empty())
6031 }
6032
6033 fn verdict(&self) -> Verdict {
6041 if let Some(status) = self.status.as_deref() {
6042 if !status.eq_ignore_ascii_case("COMPLETED") {
6043 return Verdict::Pending;
6044 }
6045 }
6046 let outcome = self
6047 .conclusion
6048 .as_deref()
6049 .or(self.state.as_deref())
6050 .unwrap_or("");
6051 match outcome.to_ascii_uppercase().as_str() {
6052 "SUCCESS" | "SKIPPED" | "NEUTRAL" => Verdict::Pass,
6053 "FAILURE" | "ERROR" | "TIMED_OUT" | "CANCELLED" | "STARTUP_FAILURE"
6054 | "ACTION_REQUIRED" => Verdict::Fail,
6055 "PENDING" | "EXPECTED" | "QUEUED" | "IN_PROGRESS" | "WAITING" | "REQUESTED" => {
6056 Verdict::Pending
6057 }
6058 _ => Verdict::Unknown,
6059 }
6060 }
6061}
6062
6063#[derive(Debug, Deserialize)]
6064struct GhAuthor {
6065 #[serde(default)]
6066 login: String,
6067}
6068
6069#[derive(Debug, Deserialize)]
6070struct GhReview {
6071 #[serde(default)]
6072 author: GhAuthor,
6073 #[serde(default)]
6074 body: String,
6075}
6076
6077#[derive(Debug, Deserialize)]
6078struct GhComment {
6079 #[serde(default)]
6080 author: GhAuthor,
6081 #[serde(default)]
6082 body: String,
6083}
6084
6085#[derive(Debug, Deserialize)]
6086struct GhUser {
6087 #[serde(default)]
6088 login: String,
6089}
6090
6091#[derive(Debug, Deserialize)]
6092struct GhInline {
6093 #[serde(default)]
6094 user: GhUser,
6095 #[serde(default)]
6096 path: Option<String>,
6097 #[serde(default)]
6098 line: Option<u64>,
6099 #[serde(default)]
6100 body: String,
6101}
6102
6103impl Default for GhAuthor {
6104 fn default() -> Self {
6105 Self {
6106 login: "(unknown)".to_owned(),
6107 }
6108 }
6109}
6110
6111impl Default for GhUser {
6112 fn default() -> Self {
6113 Self {
6114 login: "(unknown)".to_owned(),
6115 }
6116 }
6117}
6118
6119#[cfg(test)]
6120pub(crate) mod tests {
6121 use super::*;
6122 use crate::run::{Candidate, ReviewRecord, ReviewRound, Tally};
6123
6124 fn head_json(head: &str, base: &str, state: &str, cross: bool) -> String {
6125 format!(
6126 r#"{{"headRefName":"{head}","headRefOid":"aaa","baseRefName":"{base}","state":"{state}","isCrossRepository":{cross}}}"#
6127 )
6128 }
6129
6130 #[test]
6131 fn a_pull_request_is_closed_only_when_its_head_is_exactly_the_runs_branch() {
6132 let ok = head_json("magi/27b2/A", "main", "OPEN", false);
6133 assert_eq!(
6134 closable(&ok, "magi/27b2/A", "main", &["aaa".to_owned()]),
6135 Ok(())
6136 );
6137 for (json, why) in [
6138 (head_json("magi/27b2/B", "main", "OPEN", false), "head"),
6139 (head_json("magi/27b2/A-2", "main", "OPEN", false), "head"),
6140 (head_json("magi/27b2/A", "main", "OPEN", true), "fork"),
6141 (head_json("magi/27b2/A", "dev", "OPEN", false), "targets"),
6142 (head_json("magi/27b2/A", "main", "MERGED", false), "already"),
6143 (head_json("magi/27b2/A", "main", "CLOSED", false), "already"),
6144 ] {
6145 let err = closable(&json, "magi/27b2/A", "main", &["aaa".to_owned()])
6146 .unwrap_err()
6147 .why;
6148 assert!(err.contains(why), "{json}: {err}");
6149 }
6150 let moved = head_json("magi/27b2/A", "main", "OPEN", false);
6152 let err = closable(&moved, "magi/27b2/A", "main", &["bbb".to_owned()]).unwrap_err();
6153 assert!(err.retry && err.why.contains("not a commit"), "{err:?}");
6154 assert!(
6155 !closable(
6156 &head_json("x", "main", "OPEN", false),
6157 "magi/27b2/A",
6158 "main",
6159 &[]
6160 )
6161 .unwrap_err()
6162 .retry
6163 );
6164 assert!(is_forge_url("https://github.com/o/r.git"));
6165 assert!(is_forge_url("git@github.com:o/r.git"));
6166 assert!(!is_forge_url("/tmp/origin.git"));
6167 assert!(!is_forge_url("C:\\work\\origin.git"));
6168 assert!(!is_forge_url("file:///tmp/origin.git"));
6169 assert!(forge_unavailable(
6170 "gh pr list failed: none of the git remotes configured for this repository point to a known GitHub host."
6171 ));
6172 assert!(!forge_unavailable(
6173 "gh pr list failed: error connecting to api.github.com"
6174 ));
6175 assert!(closable("not json", "magi/27b2/A", "main", &[]).is_err());
6176 assert!(
6178 closable(
6179 r#"{"headRefName":"b","headRefOid":"aaa","baseRefName":"main","state":"OPEN"}"#,
6180 "b",
6181 "main",
6182 &["aaa".to_owned()]
6183 )
6184 .is_err()
6185 );
6186 }
6187
6188 #[test]
6189 fn the_close_comment_names_the_commit_on_the_base() {
6190 let e = crate::already::Evidence {
6191 proof: crate::already::Proof::PatchId,
6192 tip: "1234567890".to_owned(),
6193 commits: vec!["0e368de0000".to_owned()],
6194 };
6195 let c = superseded_comment("main", &e);
6196 assert!(c.contains("0e368de") && c.contains("`main`"), "{c}");
6197 }
6198
6199 const GREEN_OPEN: &str = r####"{
6201 "url": "https://github.com/yukimemi/magi/pull/10",
6202 "number": 10,
6203 "state": "OPEN",
6204 "mergeStateStatus": "CLEAN",
6205 "statusCheckRollup": [
6206 {
6207 "__typename": "CheckRun",
6208 "conclusion": "SKIPPED",
6209 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278334/job/99378963755",
6210 "name": "review",
6211 "status": "COMPLETED",
6212 "workflowName": "claude-review"
6213 },
6214 {
6215 "__typename": "CheckRun",
6216 "conclusion": "SUCCESS",
6217 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963144",
6218 "name": "check (ubuntu-latest)",
6219 "status": "COMPLETED",
6220 "workflowName": "CI"
6221 },
6222 {
6223 "__typename": "CheckRun",
6224 "conclusion": "SUCCESS",
6225 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33356278338/job/99378963095",
6226 "name": "rustfmt",
6227 "status": "COMPLETED",
6228 "workflowName": "CI"
6229 },
6230 {
6231 "__typename": "StatusContext",
6232 "context": "CodeRabbit",
6233 "state": "SUCCESS",
6234 "targetUrl": ""
6235 }
6236 ],
6237 "reviews": [],
6238 "comments": [
6239 {
6240 "author": {
6241 "login": "coderabbitai"
6242 },
6243 "authorAssociation": "NONE",
6244 "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"
6245 }
6246 ]
6247}"####;
6248
6249 const RED_OPEN: &str = r####"{
6251 "url": "https://github.com/yukimemi/magi/pull/9",
6252 "number": 9,
6253 "state": "OPEN",
6254 "mergeStateStatus": "UNSTABLE",
6255 "statusCheckRollup": [
6256 {
6257 "__typename": "CheckRun",
6258 "conclusion": "SUCCESS",
6259 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
6260 "name": "check (ubuntu-latest)",
6261 "status": "COMPLETED",
6262 "workflowName": "CI"
6263 },
6264 {
6265 "__typename": "CheckRun",
6266 "conclusion": "SUCCESS",
6267 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
6268 "name": "rustfmt",
6269 "status": "COMPLETED",
6270 "workflowName": "CI"
6271 },
6272 {
6273 "__typename": "CheckRun",
6274 "conclusion": "FAILURE",
6275 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
6276 "name": "editorconfig",
6277 "status": "COMPLETED",
6278 "workflowName": "CI"
6279 },
6280 {
6281 "__typename": "StatusContext",
6282 "context": "CodeRabbit",
6283 "state": "SUCCESS",
6284 "targetUrl": ""
6285 }
6286 ],
6287 "reviews": [],
6288 "comments": [
6289 {
6290 "author": {
6291 "login": "coderabbitai"
6292 },
6293 "authorAssociation": "NONE",
6294 "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"
6295 }
6296 ]
6297}"####;
6298
6299 const PENDING_OPEN: &str = r####"{
6301 "url": "https://github.com/yukimemi/magi/pull/9",
6302 "number": 9,
6303 "state": "OPEN",
6304 "statusCheckRollup": [
6305 {
6306 "__typename": "CheckRun",
6307 "conclusion": "SUCCESS",
6308 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323744",
6309 "name": "check (ubuntu-latest)",
6310 "status": "COMPLETED",
6311 "workflowName": "CI"
6312 },
6313 {
6314 "__typename": "CheckRun",
6315 "conclusion": "SUCCESS",
6316 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323811",
6317 "name": "rustfmt",
6318 "status": "COMPLETED",
6319 "workflowName": "CI"
6320 },
6321 {
6322 "__typename": "CheckRun",
6323 "conclusion": null,
6324 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572",
6325 "name": "editorconfig",
6326 "status": "IN_PROGRESS",
6327 "workflowName": "CI"
6328 },
6329 {
6330 "__typename": "StatusContext",
6331 "context": "CodeRabbit",
6332 "state": "SUCCESS",
6333 "targetUrl": ""
6334 }
6335 ],
6336 "reviews": [],
6337 "comments": []
6338}"####;
6339
6340 const MERGED: &str = r####"{
6342 "url": "https://github.com/yukimemi/magi/pull/16",
6343 "number": 16,
6344 "state": "MERGED",
6345 "statusCheckRollup": [
6346 {
6347 "__typename": "CheckRun",
6348 "conclusion": "SUCCESS",
6349 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587933/job/100268878095",
6350 "name": "check (ubuntu-latest)",
6351 "status": "COMPLETED",
6352 "workflowName": "CI"
6353 },
6354 {
6355 "__typename": "CheckRun",
6356 "conclusion": "SUCCESS",
6357 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33636587918/job/100268876427",
6358 "name": "review",
6359 "status": "COMPLETED",
6360 "workflowName": "claude-review"
6361 }
6362 ],
6363 "reviews": [],
6364 "comments": []
6365}"####;
6366
6367 const REVIEWED_OPEN: &str = r####"{
6369 "url": "https://github.com/yukimemi/magi/pull/12",
6370 "number": 12,
6371 "state": "OPEN",
6372 "statusCheckRollup": [
6373 {
6374 "__typename": "CheckRun",
6375 "conclusion": "SUCCESS",
6376 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212506/job/100065355258",
6377 "name": "check (ubuntu-latest)",
6378 "status": "COMPLETED",
6379 "workflowName": "CI"
6380 },
6381 {
6382 "__typename": "CheckRun",
6383 "conclusion": "SUCCESS",
6384 "detailsUrl": "https://github.com/yukimemi/magi/actions/runs/33571212566/job/100065355810",
6385 "name": "review",
6386 "status": "COMPLETED",
6387 "workflowName": "claude-review"
6388 }
6389 ],
6390 "reviews": [
6391 {
6392 "author": {
6393 "login": "claude"
6394 },
6395 "state": "COMMENTED",
6396 "body": ""
6397 }
6398 ],
6399 "comments": [
6400 {
6401 "author": {
6402 "login": "coderabbitai"
6403 },
6404 "authorAssociation": "NONE",
6405 "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"
6406 },
6407 {
6408 "author": {
6409 "login": "claude"
6410 },
6411 "authorAssociation": "NONE",
6412 "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"
6413 }
6414 ]
6415}"####;
6416
6417 const INLINE: &str = r####"[
6419 {
6420 "user": {
6421 "login": "claude[bot]"
6422 },
6423 "path": "src/graph.rs",
6424 "line": 231,
6425 "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"
6426 }
6427]"####;
6428
6429 const CODERABBIT_TRIGGER: &str = r####"<!-- This is an auto-generated comment: summarize by coderabbit.ai -->
6431<!-- This is an auto-generated comment: skip review by coderabbit.ai -->
6432
6433> [!IMPORTANT]
6434> - [ ] <!-- {"checkboxId":"e9bb8d72-00e8-4f67-9cb2-caf3b22574fe"} --> 🔍 Trigger review
6435>
6436> This repository does not receive automatic reviews because it has fewer than 10 stars.
6437>
6438> <details>
6439> <summary>⚙️ Run configuration</summary>
6440>
6441> **Configuration used**: defaults
6442>
6443> **Review profile**: CHILL
6444>
6445> **Plan**: Team
6446>
6447> **Run ID**: `c1e2a68f-87fc-4b35-9ec4-e75c7854966a`
6448>
6449> </details>
6450
6451<!-- end of auto-generated comment: skip review by coderabbit.ai -->
6452
6453<!-- tips_start -->
6454
6455---
6456
6457Thanks 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.
6458
6459<details>
6460<summary>❤️ Share</summary>
6461
6462- [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"####;
6463
6464 const CLAUDE_CHECKLIST: &str = r####"**Claude finished @yukimemi's task in 4m 14s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33636587918)
6466
6467---
6468### Reviewing PR #16
6469
6470- [x] Read AGENTS.md conventions
6471- [x] Review `src/daemon.rs` changes
6472- [x] Review `src/main.rs` changes (new `doctor` reporting)
6473- [x] Review `src/web.rs` changes (reuse of unreadable-run count)
6474- [x] Check test coverage for new behavior
6475- [x] Run verification commands (blocked — see note)
6476- [x] Post findings"####;
6477
6478 const CLAUDE_FINDING: &str = r####"**Claude finished @yukimemi's task in 3m 52s** —— [View job](https://github.com/yukimemi/magi/actions/runs/33571212566)
6480
6481---
6482### Review: `magi review <branch>` — cheap-half-only graph
6483
6484Read 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.
6485
6486**Correctness**
6487
6488- 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"####;
6489
6490 fn pr(checks: Checks, failing: &[&str], comments: usize) -> PrState {
6491 PrState {
6492 url: "https://github.com/yukimemi/magi/pull/16".to_owned(),
6493 number: 16,
6494 state: PrLifecycle::Open,
6495 checks,
6496 blocking: if matches!(checks, Checks::Red) {
6500 Blocking::Yes
6501 } else {
6502 Blocking::No
6503 },
6504 failing: failing.iter().map(|s| (*s).to_owned()).collect(),
6505 review_comments: (0..comments)
6506 .map(|i| ReviewComment {
6507 author: "coderabbitai".to_owned(),
6508 path: Some("src/graph.rs".to_owned()),
6509 line: Some(231),
6510 body: format!("finding {i}"),
6511 })
6512 .collect(),
6513 }
6514 }
6515
6516 #[test]
6517 fn expected_ci_is_exactly_decide_and_absent_ci_never_waits_for_checks() {
6518 use CiExpectation::{Absent, Expected};
6519 for checks in [Checks::Pending, Checks::Unknown, Checks::Green, Checks::Red] {
6520 let p = pr(checks, &["x"], 0);
6521 for waited in [Duration::ZERO, CHECKS_GRACE] {
6522 assert_eq!(
6523 decide_with(&p, 0, 4, waited, Expected),
6524 decide(&p, 0, 4, waited)
6525 );
6526 }
6527 }
6528 for checks in [Checks::Pending, Checks::Unknown, Checks::Red] {
6530 let p = pr(checks, &["x"], 0);
6531 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Merge);
6532 assert_eq!(decide_with(&p, 4, 4, CHECKS_GRACE, Absent), Step::Merge);
6533 }
6534 for comments in [0, 1] {
6536 for round in [0, 4] {
6537 let absent = decide_with(
6538 &pr(Checks::Unknown, &[], comments),
6539 round,
6540 4,
6541 CHECKS_GRACE,
6542 Absent,
6543 );
6544 for checks in [Checks::Green, Checks::Red, Checks::Pending] {
6545 assert_eq!(
6546 decide_with(
6547 &pr(checks, &["third-party"], comments),
6548 round,
6549 4,
6550 Duration::ZERO,
6551 Absent
6552 ),
6553 absent
6554 );
6555 }
6556 if comments != 0 {
6557 assert!(matches!(absent, Step::Fix { .. } | Step::GiveUp { .. }));
6558 assert_eq!(matches!(absent, Step::GiveUp { .. }), round == 4);
6559 }
6560 }
6561 }
6562 let empty = pr(Checks::Unknown, &[], 0);
6563 for waited in [Duration::ZERO, CHECKS_GRACE + POLL] {
6564 assert_eq!(decide_with(&empty, 0, 4, waited, Absent), Step::Merge);
6565 }
6566 assert_eq!(
6567 decide_with(&empty, 0, 4, Duration::ZERO, Expected),
6568 Step::Wait
6569 );
6570 assert_eq!(
6571 decide_with(&empty, 0, 4, CHECKS_GRACE, Expected),
6572 Step::GiveUp { reason: "no check status is readable on the pull request after 3 minute(s); refusing to merge on a guess".to_owned() }
6573 );
6574 let mut p = pr(Checks::Unknown, &[], 0);
6576 p.blocking = Blocking::Conflict;
6577 assert_eq!(decide_with(&p, 0, 4, Duration::ZERO, Absent), Step::Rebase);
6578 p.state = PrLifecycle::Merged;
6580 assert_eq!(
6581 decide_with(&p, 0, 4, Duration::ZERO, Absent),
6582 Step::Done { merged: true }
6583 );
6584 }
6585
6586 #[test]
6587 fn a_green_pull_request_with_nothing_outstanding_parses_as_ready_to_merge() {
6588 let state = parse_pr(GREEN_OPEN).expect("green fixture parses");
6589 assert_eq!(state.number, 10);
6590 assert_eq!(state.state, PrLifecycle::Open);
6591 assert_eq!(state.checks, Checks::Green);
6592 assert!(state.failing.is_empty());
6593 assert!(
6594 state.review_comments.is_empty(),
6595 "the only comment is CodeRabbit's trigger notice: {:?}",
6596 state.review_comments
6597 );
6598 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Merge);
6599 }
6600
6601 #[test]
6602 fn a_failing_check_parses_as_red_and_is_named() {
6603 let state = parse_pr(RED_OPEN).expect("red fixture parses");
6604 assert_eq!(state.checks, Checks::Red);
6605 assert_eq!(state.failing, vec!["editorconfig".to_owned()]);
6606 let mut blocking = state.clone();
6613 blocking.blocking = Blocking::Yes;
6614 match decide(&blocking, 0, 4, Duration::ZERO) {
6615 Step::Fix { reason } => {
6616 assert!(reason.contains("editorconfig"), "reason: {reason}");
6617 assert!(reason.contains("failing"), "reason: {reason}");
6618 }
6619 other => panic!("expected a fix round, got {other:?}"),
6620 }
6621 }
6622
6623 #[test]
6624 fn a_check_still_running_parses_as_pending_and_is_waited_for() {
6625 let state = parse_pr(PENDING_OPEN).expect("pending fixture parses");
6626 assert_eq!(state.checks, Checks::Pending);
6627 assert_eq!(decide(&state, 0, 4, Duration::ZERO), Step::Wait);
6628 }
6629
6630 #[test]
6631 fn a_pull_request_merged_underneath_us_is_done_rather_than_a_failure() {
6632 let state = parse_pr(MERGED).expect("merged fixture parses");
6633 assert_eq!(state.state, PrLifecycle::Merged);
6634 assert_eq!(
6635 decide(&state, 0, 4, Duration::ZERO),
6636 Step::Done { merged: true }
6637 );
6638 }
6639
6640 #[test]
6641 fn a_review_that_found_something_is_outstanding_and_holds_the_merge() {
6642 let state = parse_pr(REVIEWED_OPEN).expect("reviewed fixture parses");
6643 assert_eq!(state.checks, Checks::Green);
6644 let authors: Vec<&str> = state
6645 .review_comments
6646 .iter()
6647 .map(|c| c.author.as_str())
6648 .collect();
6649 assert_eq!(
6650 authors,
6651 vec!["claude"],
6652 "CodeRabbit's walkthrough is machinery; Claude's review is a finding"
6653 );
6654 match decide(&state, 0, 4, Duration::ZERO) {
6655 Step::Fix { reason } => assert!(reason.contains("unresolved"), "reason: {reason}"),
6656 other => panic!("expected a fix round, got {other:?}"),
6657 }
6658 }
6659
6660 #[test]
6661 fn inline_review_comments_keep_their_file_and_line() {
6662 let comments = parse_inline_comments(INLINE).expect("inline fixture parses");
6663 assert_eq!(comments.len(), 1);
6664 assert_eq!(comments[0].author, "claude[bot]");
6665 assert_eq!(comments[0].path.as_deref(), Some("src/graph.rs"));
6666 assert_eq!(comments[0].line, Some(231));
6667 assert!(comments[0].body.contains("empty"), "{}", comments[0].body);
6668 }
6669
6670 #[test]
6671 fn a_status_only_bot_comment_does_not_trigger_a_fix_round() {
6672 assert!(
6673 is_noise(CODERABBIT_TRIGGER),
6674 "CodeRabbit's trigger notice declares itself not a review"
6675 );
6676 assert!(
6677 is_noise(CLAUDE_CHECKLIST),
6678 "a progress checklist asks for nothing"
6679 );
6680 assert!(
6681 !is_noise(CLAUDE_FINDING),
6682 "a review that names a bug is input, not noise"
6683 );
6684
6685 let mut clean = pr(Checks::Green, &[], 0);
6686 clean.review_comments.push(ReviewComment {
6687 author: "coderabbitai".to_owned(),
6688 path: None,
6689 line: None,
6690 body: CODERABBIT_TRIGGER.to_owned(),
6691 });
6692 clean.review_comments.retain(|c| !is_noise(&c.body));
6693 assert_eq!(decide(&clean, 0, 4, Duration::ZERO), Step::Merge);
6694
6695 let mut found = pr(Checks::Green, &[], 0);
6696 found.review_comments.push(ReviewComment {
6697 author: "claude".to_owned(),
6698 path: None,
6699 line: None,
6700 body: CLAUDE_FINDING.to_owned(),
6701 });
6702 found.review_comments.retain(|c| !is_noise(&c.body));
6703 assert!(matches!(
6704 decide(&found, 0, 4, Duration::ZERO),
6705 Step::Fix { .. }
6706 ));
6707 }
6708
6709 #[test]
6710 fn the_policy_table_holds_for_every_combination_that_matters() {
6711 let cases: Vec<(&str, PrState, usize, usize, Duration, Step)> = vec![
6712 (
6713 "pending checks are waited for, even on the last round",
6714 pr(Checks::Pending, &[], 0),
6715 4,
6716 4,
6717 Duration::ZERO,
6718 Step::Wait,
6719 ),
6720 (
6721 "red checks are fixed",
6722 pr(Checks::Red, &["editorconfig"], 0),
6723 0,
6724 4,
6725 Duration::ZERO,
6726 Step::Fix {
6727 reason: "1 check(s) failing: editorconfig".to_owned(),
6728 },
6729 ),
6730 (
6731 "green with comments is fixed, not merged",
6732 pr(Checks::Green, &[], 2),
6733 1,
6734 4,
6735 Duration::ZERO,
6736 Step::Fix {
6737 reason: "checks are green but 2 review comment(s) are unresolved: coderabbitai"
6738 .to_owned(),
6739 },
6740 ),
6741 (
6742 "green and clean merges",
6743 pr(Checks::Green, &[], 0),
6744 3,
6745 4,
6746 Duration::ZERO,
6747 Step::Merge,
6748 ),
6749 (
6750 "an unreadable rollup is waited on while the grace lasts",
6751 pr(Checks::Unknown, &[], 0),
6752 0,
6753 4,
6754 Duration::ZERO,
6755 Step::Wait,
6756 ),
6757 (
6758 "an unreadable rollup is never merged once the grace is spent",
6759 pr(Checks::Unknown, &[], 0),
6760 0,
6761 4,
6762 CHECKS_GRACE,
6763 Step::GiveUp {
6764 reason: "no check status is readable on the pull request after 3 minute(s); \
6765 refusing to merge on a guess"
6766 .to_owned(),
6767 },
6768 ),
6769 ];
6770 for (what, state, round, budget, waited, want) in cases {
6771 assert_eq!(decide(&state, round, budget, waited), want, "{what}");
6772 }
6773 }
6774
6775 #[test]
6776 fn the_forge_verdict_survives_the_round_trip_from_gh() {
6777 let green = parse_pr(GREEN_OPEN).expect("parse");
6781 assert_eq!(green.blocking, Blocking::No);
6782 let red = parse_pr(RED_OPEN).expect("parse");
6783 assert_eq!(
6784 red.blocking,
6785 Blocking::No,
6786 "`UNSTABLE` is mergeable: the red check is one nobody requires"
6787 );
6788 assert_eq!(red.checks, Checks::Red, "and it is still reported as red");
6789 let quiet =
6791 parse_pr(&GREEN_OPEN.replace("\"mergeStateStatus\": \"CLEAN\",", "")).expect("parse");
6792 assert_eq!(quiet.blocking, Blocking::Unsaid);
6793 }
6794
6795 #[test]
6796 fn a_red_check_nobody_requires_does_not_buy_a_fix_round() {
6797 let mut nonblocking = pr(Checks::Red, &["editorconfig", "coverage"], 0);
6803 nonblocking.blocking = Blocking::No;
6804 assert_eq!(
6805 decide(&nonblocking, 0, 4, Duration::ZERO),
6806 Step::Merge,
6807 "the forge says nothing is in the way, so nothing is"
6808 );
6809
6810 let mut blocking = pr(Checks::Red, &["test (ubuntu-latest)"], 0);
6812 blocking.blocking = Blocking::Yes;
6813 assert!(matches!(
6814 decide(&blocking, 0, 4, Duration::ZERO),
6815 Step::Fix { .. }
6816 ));
6817
6818 let mut commented = pr(Checks::Red, &["coverage"], 1);
6821 commented.blocking = Blocking::No;
6822 assert!(matches!(
6823 decide(&commented, 0, 4, Duration::ZERO),
6824 Step::Fix { .. }
6825 ));
6826
6827 let mut unsaid = pr(Checks::Red, &["coverage"], 0);
6829 unsaid.blocking = Blocking::Unsaid;
6830 assert_eq!(decide(&unsaid, 0, 4, Duration::ZERO), Step::Wait);
6831 assert!(matches!(
6832 decide(&unsaid, 0, 4, CHECKS_GRACE),
6833 Step::Fix { .. }
6834 ));
6835 }
6836
6837 #[test]
6838 fn a_red_merge_is_announced_with_every_failing_check_and_a_green_one_is_not() {
6839 let mut red = pr(Checks::Red, &["test (windows-latest)", "coverage"], 0);
6840 red.blocking = Blocking::No;
6841 assert_eq!(
6842 decide(&red, 0, 4, Duration::ZERO),
6843 Step::Merge,
6844 "announcing must not change the decision"
6845 );
6846 let said = red_merge_summary("yukimemi/magi", &red).expect("red merge is announced");
6847 assert!(said.contains("yukimemi/magi"), "{said}");
6848 assert!(said.contains("#16"), "{said}");
6849 assert!(
6850 said.contains("https://github.com/yukimemi/magi/pull/16"),
6851 "{said}"
6852 );
6853 assert!(
6854 said.contains("test (windows-latest)") && said.contains("coverage"),
6855 "{said}"
6856 );
6857
6858 let green = pr(Checks::Green, &["stale"], 0);
6860 assert_eq!(red_merge_summary("yukimemi/magi", &green), None);
6861 }
6862
6863 #[test]
6864 fn red_merge_notices_omit_empty_check_details() {
6865 for checks in [vec![], vec!["", " "]] {
6866 let red = pr(Checks::Red, &checks, 0);
6867 let summary = red_merge_summary("owner/repo", &red).unwrap();
6868 let notice = crate::notices::merged_red("run-1", &summary);
6869 assert_eq!(
6870 notice.message,
6871 format!("Merged owner/repo PR #16 with red checks ({})", red.url)
6872 );
6873 assert_eq!(notice.severity, crate::notices::Severity::Warn);
6874 }
6875 let red = pr(Checks::Red, &["", " test ", " "], 0);
6876 let summary = red_merge_summary("owner/repo", &red).unwrap();
6877 assert!(summary.contains("with red checks: test ("), "{summary}");
6878 }
6879
6880 #[test]
6881 fn the_repo_label_comes_from_the_pull_request_url() {
6882 let p = Path::new("/tmp/checkout");
6883 assert_eq!(
6884 repo_label(p, "https://github.com/yukimemi/magi/pull/16"),
6885 "yukimemi/magi"
6886 );
6887 assert_eq!(repo_label(p, "not a url"), "checkout");
6888 }
6889
6890 #[test]
6891 fn a_branch_the_base_moved_under_is_rebased_not_fixed() {
6892 let mut conflicted = pr(Checks::Green, &[], 0);
6897 conflicted.blocking = Blocking::Conflict;
6898 assert_eq!(decide(&conflicted, 0, 4, Duration::ZERO), Step::Rebase);
6899
6900 let mut red = pr(Checks::Red, &["test (ubuntu-latest)"], 2);
6904 red.blocking = Blocking::Conflict;
6905 assert_eq!(decide(&red, 4, 4, Duration::ZERO), Step::Rebase);
6906
6907 let mut merged = pr(Checks::Red, &[], 0);
6909 merged.blocking = Blocking::Conflict;
6910 merged.state = PrLifecycle::Merged;
6911 assert_eq!(
6912 decide(&merged, 0, 4, Duration::ZERO),
6913 Step::Done { merged: true }
6914 );
6915 }
6916
6917 #[test]
6918 fn the_forge_verdict_is_read_off_merge_state_status() {
6919 for ok in ["CLEAN", "UNSTABLE", "unstable", "HAS_HOOKS"] {
6922 assert_eq!(Blocking::of(ok), Blocking::No, "{ok}");
6923 assert!(!Blocking::of(ok).stops_a_merge(), "{ok}");
6924 }
6925 assert_eq!(Blocking::of("DIRTY"), Blocking::Conflict);
6926 assert_eq!(Blocking::of("BLOCKED"), Blocking::Yes);
6927 assert_eq!(Blocking::of("BEHIND"), Blocking::Yes);
6928 for quiet in ["", "UNKNOWN"] {
6931 assert_eq!(Blocking::of(quiet), Blocking::Unsaid);
6932 assert!(Blocking::of(quiet).stops_a_merge());
6933 }
6934 }
6935
6936 #[test]
6937 fn a_merge_command_that_failed_after_merging_is_still_a_merge() {
6938 let argv = merge_argv(28, "fix: retry uploads on transient network errors");
6939 let jj = "could not determine current branch: failed to run git: not on any branch";
6941
6942 let landed = merged_after_all(&argv, jj, Some(PrLifecycle::Merged))
6943 .expect("the forge says merged, so it merged");
6944 assert!(landed.ok);
6945 assert!(
6946 landed.detail.contains("but the pull request is merged"),
6947 "the record must not read as a clean success: {}",
6948 landed.detail
6949 );
6950 assert!(
6951 landed.detail.contains("not on any branch"),
6952 "and it must keep what the command actually said: {}",
6953 landed.detail
6954 );
6955
6956 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Open)).is_none());
6958 assert!(merged_after_all(&argv, jj, Some(PrLifecycle::Closed)).is_none());
6959 assert!(merged_after_all(&argv, jj, None).is_none());
6961 }
6962
6963 #[test]
6964 fn a_pull_request_closed_underneath_us_is_done_and_not_merged() {
6965 let mut state = pr(Checks::Red, &["editorconfig"], 3);
6966 state.state = PrLifecycle::Closed;
6967 assert_eq!(
6968 decide(&state, 0, 4, Duration::ZERO),
6969 Step::Done { merged: false },
6970 "a human closing the pull request ends the loop, whatever CI says"
6971 );
6972 }
6973
6974 #[test]
6975 fn the_last_round_gives_up_with_a_reason_naming_what_is_still_failing() {
6976 let red = decide(
6977 &pr(Checks::Red, &["editorconfig", "test (macos)"], 0),
6978 4,
6979 4,
6980 Duration::ZERO,
6981 );
6982 match red {
6983 Step::GiveUp { reason } => {
6984 assert!(reason.contains("editorconfig"), "reason: {reason}");
6985 assert!(reason.contains("test (macos)"), "reason: {reason}");
6986 assert!(reason.contains("4 fix round(s)"), "reason: {reason}");
6987 }
6988 other => panic!("expected a give-up, got {other:?}"),
6989 }
6990
6991 let commented = decide(&pr(Checks::Green, &[], 1), 2, 2, Duration::ZERO);
6992 match commented {
6993 Step::GiveUp { reason } => {
6994 assert!(reason.contains("unresolved"), "reason: {reason}");
6995 assert!(reason.contains("2 fix round(s)"), "reason: {reason}");
6996 }
6997 other => panic!("expected a give-up, got {other:?}"),
6998 }
6999 }
7000
7001 #[test]
7002 fn the_merge_command_squashes_deletes_the_branch_and_sets_its_own_subject() {
7003 let candidate_commit = "magi: candidate A (uncommitted work)";
7004 let subject = merge_subject(candidate_commit, "add retries to the uploader");
7005 let argv = merge_argv(16, &subject);
7006
7007 assert!(argv.contains(&"--squash".to_owned()));
7008 assert!(argv.contains(&"--delete-branch".to_owned()));
7009 assert!(argv.contains(&"--subject".to_owned()));
7010 assert_eq!(
7011 argv.last().map(String::as_str),
7012 Some("add retries to the uploader"),
7013 "the subject must not be the candidate commit message"
7014 );
7015 assert_ne!(subject, candidate_commit);
7016 }
7017
7018 #[test]
7019 fn a_real_pull_request_title_is_used_as_the_squash_subject_verbatim() {
7020 assert_eq!(
7021 merge_subject("feat: a queue, an unattended loop, and a phone UI", "task"),
7022 "feat: a queue, an unattended loop, and a phone UI"
7023 );
7024 assert_eq!(
7025 merge_subject("", "# port the retry logic\n\ndetails"),
7026 "port the retry logic",
7027 "an empty title falls back to the task's first line, heading marks stripped"
7028 );
7029 }
7030
7031 #[test]
7032 fn a_failing_checks_details_url_yields_the_job_to_read_logs_from() {
7033 let url = "https://github.com/yukimemi/magi/actions/runs/33587406996/job/100114323572";
7034 assert_eq!(job_of(url).as_deref(), Some("100114323572"));
7035 assert_eq!(run_of(url).as_deref(), Some("33587406996"));
7036 assert_eq!(job_of("https://coderabbit.ai/status"), None);
7037 assert_eq!(run_of(""), None);
7038 }
7039
7040 #[test]
7041 fn magis_own_stop_comment_is_never_read_back_as_a_finding() {
7042 let mut out = Vec::new();
7043 push_if_outstanding(
7044 &mut out,
7045 ReviewComment {
7046 author: "yukimemi".to_owned(),
7047 path: None,
7048 line: None,
7049 body: format!("{MARKER}\nmagi stopped landing this pull request: 1 check failing"),
7050 },
7051 );
7052 assert!(out.is_empty());
7053 }
7054
7055 fn run_state() -> RunState {
7059 let mut state = RunState::new(
7060 std::path::PathBuf::from("/repo/magi"),
7061 "main".to_owned(),
7062 "abcdef1234".to_owned(),
7063 "add retries to the uploader".to_owned(),
7064 crate::config::Config::default(),
7065 );
7066 static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
7071 let nanos = std::time::SystemTime::now()
7072 .duration_since(std::time::UNIX_EPOCH)
7073 .map_or(0, |d| d.subsec_nanos() % 1_000_000);
7074 state.id = format!(
7075 "20261004-{nanos:06}-{:04x}",
7076 NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
7077 );
7078 state
7079 }
7080
7081 fn green_pr() -> PrState {
7082 PrState {
7083 url: "https://github.com/yukimemi/magi/pull/42".to_owned(),
7084 number: 42,
7085 state: PrLifecycle::Open,
7086 checks: Checks::Green,
7087 blocking: Blocking::No,
7089 failing: Vec::new(),
7090 review_comments: vec![ReviewComment {
7091 author: "coderabbitai".to_owned(),
7092 path: Some("src/land.rs".to_owned()),
7093 line: Some(212),
7094 body: "this branch never checks the exit code".to_owned(),
7095 }],
7096 }
7097 }
7098
7099 #[test]
7100 fn land_fixer_defers_review_and_verification_without_a_cache() {
7101 let state = run_state();
7102 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7103 assert!(p.contains(crate::prompt::child_run_ownership()), "{p}");
7104 assert!(p.contains("Commit in this worktree"), "{p}");
7105 }
7106
7107 #[test]
7108 fn github_facing_land_text_is_english_whatever_the_language() {
7109 let mut state = run_state();
7110 state.config.graph.language = "ja".to_owned();
7111 let comment = stop_comment(&state.id, "checks are still red");
7112 assert!(crate::github_text::check("", &comment).is_empty());
7113 assert!(comment.is_ascii(), "{comment}");
7114 assert!(comment.starts_with(MARKER));
7115
7116 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7117 let ja_at = p.find("Write all prose in ja").unwrap();
7118 let rule_at = p.find(crate::prompt::GITHUB_ENGLISH_HEADING).unwrap();
7119 assert!(ja_at < rule_at, "{p}");
7120 assert!(p.contains("stays in Japanese"), "{p}");
7121
7122 state.config.graph.language = "en".to_owned();
7123 let p = fix_prompt(&state, &green_pr(), 1, 2, "red", "");
7124 assert!(p.contains(crate::prompt::GITHUB_ENGLISH_HEADING), "{p}");
7125 assert!(!p.contains("does not apply"), "{p}");
7126 }
7127
7128 const NUMSTAT: &str = "12\t3\tsrc/land.rs\n40\t1\tsrc/web.rs\n-\t-\tassets/logo.png";
7129
7130 fn panel() -> String {
7131 approval_panel(
7132 &run_state(),
7133 &green_pr(),
7134 NUMSTAT,
7135 "diff --git a/src/land.rs b/src/land.rs\n@@ -1,2 +1,2 @@\n-old line\n+new line\n context",
7136 &[
7137 "land: ask before merging".to_owned(),
7138 "land: colour the diff".to_owned(),
7139 ],
7140 "feat: merge approval from the phone",
7141 )
7142 }
7143
7144 #[test]
7145 fn the_approval_panel_carries_the_whole_case_for_the_merge() {
7146 let html = panel();
7147 for needle in [
7148 "42",
7149 "main",
7150 "src/land.rs",
7151 "src/web.rs",
7152 "assets/logo.png",
7153 "feat: merge approval from the phone",
7154 "land: ask before merging",
7155 "land: colour the diff",
7156 "coderabbitai",
7157 "this branch never checks the exit code",
7158 "green",
7159 ] {
7160 assert!(html.contains(needle), "the panel must state `{needle}`");
7161 }
7162 }
7163
7164 async fn landing_git_fixture() -> (tempfile::TempDir, RunState, String) {
7165 crate::run::pin_test_home();
7166 let tmp = tempfile::tempdir().unwrap();
7167 let repo = tmp.path().join("repo");
7168 let remote = tmp.path().join("remote.git");
7169 std::fs::create_dir(&repo).unwrap();
7170 git::git(tmp.path(), &["init", "--bare", remote.to_str().unwrap()])
7171 .await
7172 .unwrap();
7173 git::git(&repo, &["init", "-b", "main"]).await.unwrap();
7174 git::git(&repo, &["config", "user.name", "Test"])
7175 .await
7176 .unwrap();
7177 git::git(&repo, &["config", "user.email", "test@example.test"])
7178 .await
7179 .unwrap();
7180 std::fs::write(repo.join("base"), "base").unwrap();
7181 git::git(&repo, &["add", "."]).await.unwrap();
7182 git::git(&repo, &["commit", "-m", "base"]).await.unwrap();
7183 git::git(
7184 &repo,
7185 &["remote", "add", "origin", remote.to_str().unwrap()],
7186 )
7187 .await
7188 .unwrap();
7189 git::git(&repo, &["push", "origin", "main"]).await.unwrap();
7190 git::git(&repo, &["checkout", "-b", "winner"])
7191 .await
7192 .unwrap();
7193 std::fs::write(repo.join("change"), "change").unwrap();
7194 git::git(&repo, &["add", "."]).await.unwrap();
7195 git::git(&repo, &["commit", "-m", "change"]).await.unwrap();
7196 let head = git::rev_parse(&repo, "HEAD").await.unwrap();
7197 git::git(&repo, &["push", "origin", "HEAD:refs/heads/task-head"])
7198 .await
7199 .unwrap();
7200 let mut state = run_state();
7201 state.repo = repo.clone();
7202 state.base_commit = git::rev_parse(&repo, "origin/main").await.unwrap();
7203 state.config.graph.land = true;
7204 state.config.graph.land_approval = true;
7205 state.pr_head = Some("task-head".into());
7206 state.pr_pushed_head = Some(head.clone());
7207 state.candidates = vec![winning_candidate("change")];
7208 state.candidates[0].worktree = repo;
7209 state.candidates[0].branch = "winner".into();
7210 state.tally = Some(uncontested_tally());
7211 state.gate_ran = true;
7212 state.gate_head = Some(head.clone());
7213 state.land_sync_pending = true;
7214 state.save().unwrap();
7215 (tmp, state, head)
7216 }
7217
7218 async fn resume_observed_head(state: &mut RunState, head: &str) -> Result<String> {
7219 let forge = Scripted::new(vec![seen(head, Checks::Green, "CLEAN", false)], vec![]);
7220 resume_landing_head(state, head, &green_pr().url, &forge).await
7221 }
7222
7223 async fn advance_landing_base(state: &RunState) {
7224 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7225 std::fs::write(state.repo.join("advance"), "advance").unwrap();
7226 git::git(&state.repo, &["add", "."]).await.unwrap();
7227 git::git(&state.repo, &["commit", "-m", "advance base"])
7228 .await
7229 .unwrap();
7230 git::git(&state.repo, &["push", "origin", "main"])
7231 .await
7232 .unwrap();
7233 git::git(&state.repo, &["checkout", "winner"])
7234 .await
7235 .unwrap();
7236 }
7237
7238 #[tokio::test]
7239 async fn landing_resume_gates_rebased_sha_and_publishes_it_to_the_existing_head() {
7240 let (_tmp, mut state, old) = landing_git_fixture().await;
7241 advance_landing_base(&state).await;
7242 state.config.verify.gate = vec!["test -f advance".into()];
7243 let head = resume_observed_head(&mut state, &old).await.unwrap();
7244 assert_ne!(head, old);
7245 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7246 assert!(state.gate_allows_progress());
7247 assert_eq!(
7248 git::remote_head(&state.repo, "origin", "task-head")
7249 .await
7250 .unwrap(),
7251 Some(head.clone())
7252 );
7253 assert_eq!(state.pr_pushed_head, Some(head));
7254 assert!(!state.land_sync_pending);
7255 assert!(state.config.graph.land_approval);
7256 }
7257
7258 fn landing_gate_fixer(state: &mut RunState, script: &str) {
7259 state.config.disk.min_free_bytes = 0;
7260 state.config.graph.gate_fix_rounds = 1;
7261 state.config.agents = vec![crate::config::AgentSpec {
7262 id: "mock".into(),
7263 kind: crate::config::AgentKind::Command,
7264 model: None,
7265 command: vec!["sh".into(), "-c".into(), script.into()],
7266 extra_args: Vec::new(),
7267 env: Default::default(),
7268 prompt_delivery: None,
7269 max_turn_secs: None,
7270 }];
7271 state.candidates[0].agent = "mock".into();
7272 }
7273
7274 #[tokio::test]
7275 async fn landing_resume_revalidates_an_operator_published_winner_extension() {
7276 let (_tmp, mut state, old) = landing_git_fixture().await;
7277 std::fs::write(state.repo.join("change"), "operator update").unwrap();
7278 git::commit_all(&state.repo, "extend winner").await.unwrap();
7279 let updated = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7280 git::git(
7281 &state.repo,
7282 &["push", "origin", "HEAD:refs/heads/task-head"],
7283 )
7284 .await
7285 .unwrap();
7286 state.config.verify.gate = vec!["exit 1".into()];
7287 state.config.graph.gate_fix_rounds = 0;
7288 assert!(resume_observed_head(&mut state, &updated).await.is_err());
7289 assert_ne!(old, updated);
7290 assert_eq!(state.gate_head.as_ref(), Some(&updated));
7291 assert!(!state.gate_allows_progress());
7292 assert!(state.land_sync_pending);
7293 state.config.verify.gate = vec!["grep -q 'operator update' change".into()];
7294 let head = resume_observed_head(&mut state, &updated).await.unwrap();
7295 assert_eq!(head, updated);
7296 assert!(state.gate_allows_progress());
7297 assert!(!state.land_sync_pending);
7298 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7299 land_with(&mut state, &green_pr().url, &forge)
7300 .await
7301 .unwrap();
7302 assert!(state.parked);
7303 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7304 assert!(forge.argvs().is_empty());
7305 }
7306
7307 #[tokio::test]
7308 async fn landing_resume_refuses_remote_only_and_divergent_operator_updates() {
7309 for divergent in [false, true] {
7310 let (_tmp, mut state, old) = landing_git_fixture().await;
7311 if divergent {
7312 git::git(&state.repo, &["reset", "--hard", "origin/main"])
7313 .await
7314 .unwrap();
7315 }
7316 std::fs::write(state.repo.join("external"), "external").unwrap();
7317 git::commit_all(&state.repo, "external update")
7318 .await
7319 .unwrap();
7320 let external = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7321 git::git(
7322 &state.repo,
7323 &["push", "--force", "origin", "HEAD:refs/heads/task-head"],
7324 )
7325 .await
7326 .unwrap();
7327 if !divergent {
7328 git::git(&state.repo, &["reset", "--hard", &old])
7329 .await
7330 .unwrap();
7331 }
7332 let error = resume_observed_head(&mut state, &external)
7333 .await
7334 .unwrap_err();
7335 assert!(
7336 error
7337 .to_string()
7338 .contains("public head moved outside this run")
7339 );
7340 assert_eq!(state.pr_pushed_head.as_ref(), Some(&old));
7341 assert_eq!(
7342 git::remote_head(&state.repo, "origin", "task-head")
7343 .await
7344 .unwrap(),
7345 Some(external)
7346 );
7347 }
7348 }
7349
7350 #[tokio::test]
7351 async fn landing_resume_repairs_a_failed_rebased_gate_before_publication() {
7352 let (_tmp, mut state, old) = landing_git_fixture().await;
7353 advance_landing_base(&state).await;
7354 landing_gate_fixer(
7355 &mut state,
7356 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7357 );
7358 state.config.verify.gate =
7359 vec!["grep -q fixed change || { echo 'change needs repair'; exit 1; }".into()];
7360 state.config.verify.e2e = vec!["test -f advance".into()];
7361 state.config.graph.gate_fix_rounds = 0;
7364 assert!(resume_observed_head(&mut state, &old).await.is_err());
7365 assert_eq!(
7366 git::remote_head(&state.repo, "origin", "task-head")
7367 .await
7368 .unwrap(),
7369 Some(old.clone())
7370 );
7371 state.config.graph.gate_fix_rounds = 1;
7372 let head = resume_observed_head(&mut state, &old).await.unwrap();
7373 assert_eq!(state.gate_fixes.len(), 1);
7374 assert!(state.gate_fixes[0].committed);
7375 assert!(state.gate_allows_progress());
7376 assert_eq!(state.gate_head.as_ref(), Some(&head));
7377 assert_eq!(
7378 git::remote_head(&state.repo, "origin", "task-head")
7379 .await
7380 .unwrap(),
7381 Some(head.clone())
7382 );
7383 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7384 land_with(&mut state, &green_pr().url, &forge)
7385 .await
7386 .unwrap();
7387 assert!(state.parked);
7388 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7389 assert!(forge.argvs().is_empty());
7390 }
7391
7392 #[tokio::test]
7393 async fn landing_gate_repairs_stop_at_the_saved_budget_without_publishing() {
7394 let (_tmp, mut state, old) = landing_git_fixture().await;
7395 advance_landing_base(&state).await;
7396 landing_gate_fixer(
7397 &mut state,
7398 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7399 );
7400 state.config.verify.gate = vec!["echo still red; exit 1".into()];
7401 for _ in 0..2 {
7402 assert!(resume_observed_head(&mut state, &old).await.is_err());
7403 assert_eq!(state.gate_fixes.len(), 1);
7404 assert_eq!(
7405 git::remote_head(&state.repo, "origin", "task-head")
7406 .await
7407 .unwrap(),
7408 Some(old.clone())
7409 );
7410 }
7411 }
7412
7413 #[tokio::test]
7414 async fn landing_gate_repair_cannot_publish_failed_e2e_on_repeated_resumes() {
7415 let (_tmp, mut state, old) = landing_git_fixture().await;
7416 advance_landing_base(&state).await;
7417 landing_gate_fixer(
7418 &mut state,
7419 "cat >/dev/null; printf fixed > change; printf '{\"addressed\":[],\"rejected\":[],\"notes\":\"fixed\"}'",
7420 );
7421 state.config.verify.gate =
7422 vec!["grep -q fixed change || { echo 'change needs repair'; exit 1; }".into()];
7423 state.config.verify.e2e = vec!["grep -q '^change$' change".into()];
7425 for resume in 0..3 {
7426 assert!(resume_observed_head(&mut state, &old).await.is_err());
7427 state = RunState::load(&state.id).unwrap();
7428 let evidence = state.gate_repair_e2e.as_ref().unwrap();
7429 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
7430 assert_eq!(evidence.head, head);
7431 assert!(!evidence.passed);
7432 assert!(evidence.outcomes.iter().any(|o| !o.ok()));
7433 assert_eq!(state.gate_fixes.len(), 1);
7434 assert_eq!(
7435 git::remote_head(&state.repo, "origin", "task-head")
7436 .await
7437 .unwrap(),
7438 Some(old.clone())
7439 );
7440 if resume > 0 {
7441 assert!(
7442 state.gate_allows_progress(),
7443 "a green gate must not bypass red e2e"
7444 );
7445 }
7446 }
7447 state.config.verify.e2e = vec!["grep -q fixed change".into()];
7450 let head = resume_observed_head(&mut state, &old).await.unwrap();
7451 assert!(state.gate_repair_e2e.as_ref().unwrap().passed);
7452 assert_eq!(state.gate_repair_e2e.as_ref().unwrap().head, head);
7453 assert_eq!(state.gate_fixes.len(), 1);
7454 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7455 land_with(&mut state, &green_pr().url, &forge)
7456 .await
7457 .unwrap();
7458 assert!(state.parked);
7459 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7460 assert!(forge.argvs().is_empty());
7461 }
7462
7463 #[tokio::test]
7464 async fn landing_resumes_recheck_pending_deferred_and_stale_repair_e2e() {
7465 for phase in 0..3 {
7466 let (_tmp, mut state, old) = landing_git_fixture().await;
7467 advance_landing_base(&state).await;
7468 let head = resume_observed_head(&mut state, &old).await.unwrap();
7469 state.land_sync_pending = true;
7472 state.config.verify.e2e = vec!["echo e2e is red; exit 1".into()];
7473 state.gate_repair_e2e = Some(crate::run::GateRepairE2e {
7474 head: if phase == 2 {
7475 old.clone()
7476 } else {
7477 head.clone()
7478 },
7479 passed: phase == 2,
7480 outcomes: if phase == 1 {
7481 vec![crate::run::CommandOutcome {
7482 command: state.config.verify.e2e[0].clone(),
7483 code: None,
7484 output_tail: "verification resource unavailable".into(),
7485 duration_ms: 0,
7486 resource_blocked: true,
7487 }]
7488 } else {
7489 Vec::new()
7490 },
7491 });
7492 state.save().unwrap();
7493 for _ in 0..2 {
7494 state = RunState::load(&state.id).unwrap();
7495 assert!(resume_observed_head(&mut state, &head).await.is_err());
7496 let evidence = state.gate_repair_e2e.as_ref().unwrap();
7497 assert_eq!(evidence.head, head);
7498 assert!(!evidence.passed);
7499 assert!(!evidence.outcomes.is_empty());
7500 assert_eq!(
7501 git::remote_head(&state.repo, "origin", "task-head")
7502 .await
7503 .unwrap(),
7504 Some(head.clone())
7505 );
7506 assert!(state.land_sync_pending);
7507 }
7508 }
7509 }
7510
7511 async fn interrupt_landing_rebase(state: &mut RunState) {
7512 state.land_rebase_from = Some(git::rev_parse(&state.repo, "HEAD").await.unwrap());
7513 state.save().unwrap();
7514 let scratch = state.dir().join("rebase");
7515 assert_eq!(
7516 crate::rebase::rebase_with_fixer(state, &scratch, "winner", "origin/main")
7517 .await
7518 .unwrap(),
7519 crate::rebase::Rebased::Applied
7520 );
7521 assert!(!git::is_clean(&state.repo).await.unwrap());
7522 }
7523
7524 async fn landing_setup(state: &mut RunState) {
7525 git::git(
7526 &state.repo,
7527 &["config", "extensions.worktreeConfig", "true"],
7528 )
7529 .await
7530 .unwrap();
7531 state.config.worktree.setup =
7532 vec![toml::from_str("run = \"printf secret > .env\"").unwrap()];
7533 crate::worktree_setup::prepare(&state.config, &state.repo, &state.repo)
7534 .await
7535 .unwrap();
7536 state.config.verify.gate = vec!["test -f advance && test -f .env".into()];
7537 }
7538
7539 #[tokio::test]
7540 async fn landing_resume_restores_setup_after_both_fresh_and_interrupted_rebases() {
7541 for phase in 0..3 {
7542 let (_tmp, mut state, old) = landing_git_fixture().await;
7543 advance_landing_base(&state).await;
7544 landing_setup(&mut state).await;
7545 if phase > 0 {
7546 interrupt_landing_rebase(&mut state).await;
7547 if phase == 2 {
7548 git::sync_to_head(&state.repo).await.unwrap();
7550 assert!(!state.repo.join(".env").exists());
7551 }
7552 state = RunState::load(&state.id).unwrap();
7553 }
7554 let head = resume_observed_head(&mut state, &old).await.unwrap();
7555 assert_ne!(head, old);
7556 assert!(state.gate_allows_progress());
7557 assert!(state.land_rebase_from.is_none());
7558 assert_eq!(
7559 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7560 "secret"
7561 );
7562 assert!(git::is_clean(&state.repo).await.unwrap());
7563 assert!(
7564 !git::git(&state.repo, &["ls-tree", "--name-only", "HEAD"])
7565 .await
7566 .unwrap()
7567 .contains(".env")
7568 );
7569 }
7570 }
7571
7572 #[tokio::test]
7573 async fn landing_restoration_protects_ignored_files_outside_setup_products() {
7574 let (_tmp, mut state, _) = landing_git_fixture().await;
7575 advance_landing_base(&state).await;
7576 landing_setup(&mut state).await;
7577 interrupt_landing_rebase(&mut state).await;
7578 let locals = [
7581 "local notes",
7582 #[cfg(unix)]
7583 "local\nnotes",
7584 ];
7585 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7586 .await
7587 .unwrap();
7588 std::fs::write(state.repo.join(excludes), "local*\n").unwrap();
7589 for local in locals {
7590 std::fs::write(state.repo.join(local), "keep these notes").unwrap();
7591 assert!(
7592 git::git_raw(&state.repo, &["check-ignore", "--quiet", local])
7593 .await
7594 .unwrap()
7595 .ok()
7596 );
7597 }
7598 restore_landing_worktree(&mut state).await.unwrap();
7599 for local in locals {
7600 assert_eq!(
7601 std::fs::read_to_string(state.repo.join(local)).unwrap(),
7602 "keep these notes"
7603 );
7604 }
7605 assert_eq!(
7606 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7607 "secret"
7608 );
7609 assert!(git::is_clean(&state.repo).await.unwrap());
7610 assert!(state.land_rebase_from.is_none());
7611 }
7612
7613 #[tokio::test]
7614 async fn landing_restoration_rejects_ignored_paths_conflicting_with_the_new_tree() {
7615 for local in ["advance", "advance/notes", "new-directory"] {
7616 let (_tmp, mut state, _) = landing_git_fixture().await;
7617 advance_landing_base(&state).await;
7618 git::git(&state.repo, &["checkout", "main"]).await.unwrap();
7620 std::fs::create_dir(state.repo.join("new-directory")).unwrap();
7621 std::fs::write(state.repo.join("new-directory/tracked"), "new").unwrap();
7622 git::git(&state.repo, &["add", "."]).await.unwrap();
7623 git::git(&state.repo, &["commit", "-m", "add directory"])
7624 .await
7625 .unwrap();
7626 git::git(&state.repo, &["push", "origin", "main"])
7627 .await
7628 .unwrap();
7629 git::git(&state.repo, &["checkout", "winner"])
7630 .await
7631 .unwrap();
7632 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7633 .await
7634 .unwrap();
7635 std::fs::write(state.repo.join(excludes), "advance\nnew-directory\n").unwrap();
7636 let path = state.repo.join(local);
7637 std::fs::create_dir_all(path.parent().unwrap()).unwrap();
7638 std::fs::write(&path, "local notes").unwrap();
7639 interrupt_landing_rebase(&mut state).await;
7640 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7641 let checkpoint = state.land_rebase_from.clone();
7642 let error = restore_landing_worktree(&mut state).await.unwrap_err();
7643 assert!(
7644 error.to_string().contains("conflicting with HEAD"),
7645 "{error:#}"
7646 );
7647 assert_eq!(std::fs::read_to_string(&path).unwrap(), "local notes");
7648 assert_eq!(
7649 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7650 before
7651 );
7652 assert_eq!(state.land_rebase_from, checkpoint);
7653 }
7654 }
7655
7656 #[tokio::test]
7657 async fn landing_resume_preserves_ignored_gate_artifacts_without_setup() {
7658 for interrupted in [false, true] {
7659 let (_tmp, mut state, old) = landing_git_fixture().await;
7660 assert!(state.config.worktree.setup.is_empty());
7661 let excludes = git::git(&state.repo, &["rev-parse", "--git-path", "info/exclude"])
7663 .await
7664 .unwrap();
7665 std::fs::write(state.repo.join(excludes), "target/\n").unwrap();
7666 state.config.verify.gate =
7667 vec!["mkdir -p target && printf artifact > target/probe".into()];
7668 state.gate_ran = false;
7669 resume_observed_head(&mut state, &old).await.unwrap();
7670 assert_eq!(
7671 std::fs::read_to_string(state.repo.join("target/probe")).unwrap(),
7672 "artifact"
7673 );
7674 advance_landing_base(&state).await;
7675 if interrupted {
7676 interrupt_landing_rebase(&mut state).await;
7677 state = RunState::load(&state.id).unwrap();
7678 }
7679 state.config.verify.gate =
7680 vec!["test -f advance && test \"$(cat target/probe)\" = artifact".into()];
7681 let head = resume_observed_head(&mut state, &old).await.unwrap();
7682 assert_ne!(head, old);
7683 assert!(state.gate_allows_progress());
7684 assert_eq!(state.gate_head.as_deref(), Some(head.as_str()));
7685 assert_eq!(
7686 std::fs::read_to_string(state.repo.join("target/probe")).unwrap(),
7687 "artifact"
7688 );
7689 assert!(state.land_rebase_from.is_none());
7690 assert_eq!(
7691 git::remote_head(&state.repo, "origin", "task-head")
7692 .await
7693 .unwrap(),
7694 Some(head.clone())
7695 );
7696 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7697 land_with(&mut state, &green_pr().url, &forge)
7698 .await
7699 .unwrap();
7700 assert!(state.parked);
7701 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7702 assert!(forge.argvs().is_empty());
7703 }
7704 }
7705
7706 #[tokio::test]
7707 #[cfg(unix)]
7708 async fn landing_restoration_waits_for_external_coordination_before_changing_files() {
7709 use std::os::fd::AsRawFd as _;
7710
7711 for interrupted in [false, true] {
7712 let (_tmp, mut state, _) = landing_git_fixture().await;
7713 advance_landing_base(&state).await;
7714 landing_setup(&mut state).await;
7715 if interrupted {
7716 interrupt_landing_rebase(&mut state).await;
7717 }
7718 state.config.worktree.setup =
7719 vec![toml::from_str("run = \"printf restored > .env\"").unwrap()];
7720 let common = crate::repo_lock::common_dir(&state.repo)
7721 .await
7722 .unwrap()
7723 .unwrap();
7724 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
7725 state.config.coordination = crate::config::test_coordination();
7726 state.config.graph.timeout_resource_wait = 0;
7727 let external = std::fs::OpenOptions::new()
7728 .read(true)
7729 .write(true)
7730 .create(true)
7731 .truncate(false)
7732 .open(common.join("updater.lock"))
7733 .unwrap();
7734 let locked =
7736 unsafe { libc::flock(external.as_raw_fd(), libc::LOCK_EX | libc::LOCK_NB) };
7737 assert_eq!(locked, 0);
7738 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7739 let checkpoint = state.land_rebase_from.clone();
7740 let error = restore_landing_worktree(&mut state).await.unwrap_err();
7741 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
7742 assert_eq!(
7743 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7744 before
7745 );
7746 assert_eq!(state.land_rebase_from, checkpoint);
7747 assert_eq!(
7748 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7749 "secret"
7750 );
7751
7752 drop(external);
7753 state.config.graph.timeout_resource_wait = 2;
7754 restore_landing_worktree(&mut state).await.unwrap();
7755 assert!(git::is_clean(&state.repo).await.unwrap());
7756 assert!(state.land_rebase_from.is_none());
7757 assert_eq!(
7758 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7759 "restored"
7760 );
7761 }
7762 }
7763
7764 #[tokio::test]
7765 #[cfg(unix)]
7766 async fn landing_restoration_inherits_cancellation_while_waiting_for_a_local_seat() {
7767 use std::sync::atomic::{AtomicBool, Ordering};
7768
7769 let (_tmp, mut state, _) = landing_git_fixture().await;
7770 advance_landing_base(&state).await;
7771 landing_setup(&mut state).await;
7772 interrupt_landing_rebase(&mut state).await;
7773 let common = crate::repo_lock::common_dir(&state.repo)
7774 .await
7775 .unwrap()
7776 .unwrap();
7777 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
7778 state.config.coordination = crate::config::test_coordination();
7779 let holder = crate::repo_lock::SeatLease::for_checkout(
7780 &state.repo,
7781 true,
7782 state.config.coordination.as_ref(),
7783 )
7784 .await
7785 .unwrap();
7786 assert!(holder.is_some());
7787 let cancelled = Arc::new(AtomicBool::new(false));
7788 let signal = cancelled.clone();
7789 let wait = crate::repo_lock::WaitPolicy::new(Duration::from_secs(30), move || {
7790 signal.load(Ordering::SeqCst)
7791 });
7792 let before = git::git(&state.repo, &["diff", "HEAD"]).await.unwrap();
7793 let checkpoint = state.land_rebase_from.clone();
7794 let (result, ()) = tokio::join!(
7795 tokio::time::timeout(
7796 Duration::from_secs(2),
7797 wait.scope(restore_landing_worktree(&mut state)),
7798 ),
7799 async {
7800 tokio::time::sleep(Duration::from_millis(100)).await;
7801 cancelled.store(true, Ordering::SeqCst);
7802 }
7803 );
7804 let error = result
7805 .expect("cancellation must release the waiting driver")
7806 .unwrap_err();
7807 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
7808 assert_eq!(
7809 git::git(&state.repo, &["diff", "HEAD"]).await.unwrap(),
7810 before
7811 );
7812 assert_eq!(state.land_rebase_from, checkpoint);
7813 assert_eq!(
7814 std::fs::read_to_string(state.repo.join(".env")).unwrap(),
7815 "secret"
7816 );
7817 drop(holder);
7818 restore_landing_worktree(&mut state).await.unwrap();
7819 assert!(state.land_rebase_from.is_none());
7820 assert!(git::is_clean(&state.repo).await.unwrap());
7821 }
7822
7823 #[tokio::test]
7824 #[cfg(unix)]
7825 async fn landing_verification_inherits_cancellation_while_waiting_for_a_local_seat() {
7826 use std::sync::atomic::{AtomicBool, Ordering};
7827
7828 for e2e in [false, true] {
7829 let (_tmp, mut state, head) = landing_git_fixture().await;
7830 let common = crate::repo_lock::common_dir(&state.repo)
7831 .await
7832 .unwrap()
7833 .unwrap();
7834 std::fs::write(common.join("updater.contract"), "test-protocol-v1\n").unwrap();
7835 state.config.coordination = crate::config::test_coordination();
7836 if e2e {
7837 state.config.verify.e2e = vec!["true".into()];
7838 state.gate_repair_e2e = Some(crate::run::GateRepairE2e {
7839 head: head.clone(),
7840 passed: false,
7841 outcomes: Vec::new(),
7842 });
7843 } else {
7844 state.config.verify.gate = vec!["true".into()];
7845 state.gate_ran = false;
7846 }
7847 let holder = crate::repo_lock::SeatLease::for_checkout(
7848 &state.repo,
7849 true,
7850 state.config.coordination.as_ref(),
7851 )
7852 .await
7853 .unwrap();
7854 assert!(holder.is_some());
7855 let cancelled = Arc::new(AtomicBool::new(false));
7856 let signal = cancelled.clone();
7857 let wait = crate::repo_lock::WaitPolicy::new(Duration::from_secs(30), move || {
7858 signal.load(Ordering::SeqCst)
7859 });
7860 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7861 let url = green_pr().url;
7862 let (result, ()) = tokio::join!(
7863 tokio::time::timeout(
7864 Duration::from_secs(2),
7865 wait.scope(publish_landing_head(&mut state, &head, &url, &forge)),
7866 ),
7867 async {
7868 tokio::time::sleep(Duration::from_millis(100)).await;
7869 cancelled.store(true, Ordering::SeqCst);
7870 }
7871 );
7872 let error = result
7873 .expect("cancellation must release the verification waiter")
7874 .unwrap_err();
7875 assert!(error.is::<crate::repo_lock::ResourceBlocked>(), "{error:#}");
7876 assert!(forge.argvs().is_empty());
7877 assert_eq!(
7878 git::remote_head(&state.repo, "origin", "task-head")
7879 .await
7880 .unwrap(),
7881 Some(head.clone())
7882 );
7883 drop(holder);
7884 assert_eq!(
7886 publish_landing_head(&mut state, &head, &url, &forge)
7887 .await
7888 .unwrap(),
7889 head
7890 );
7891 }
7892 }
7893
7894 #[tokio::test]
7895 async fn landing_resume_preserves_user_edits_after_an_interrupted_rebase() {
7896 for staged in [false, true] {
7897 let (_tmp, mut state, old) = landing_git_fixture().await;
7898 advance_landing_base(&state).await;
7899 interrupt_landing_rebase(&mut state).await;
7900 std::fs::write(state.repo.join("change"), "user edit").unwrap();
7901 if staged {
7902 git::git(&state.repo, &["add", "change"]).await.unwrap();
7903 }
7904 assert!(resume_observed_head(&mut state, &old).await.is_err());
7905 assert_eq!(
7906 std::fs::read_to_string(state.repo.join("change")).unwrap(),
7907 "user edit"
7908 );
7909 assert_eq!(
7910 git::remote_head(&state.repo, "origin", "task-head")
7911 .await
7912 .unwrap(),
7913 Some(old)
7914 );
7915 }
7916 }
7917
7918 #[tokio::test]
7919 async fn landing_resume_returns_to_approval_wait_and_closed_pr_skips_sync() {
7920 let (_tmp, mut state, head) = landing_git_fixture().await;
7921 let forge = Scripted::new(vec![seen(&head, Checks::Green, "CLEAN", false)], vec![]);
7922 let id = state.id.clone();
7923 let pr = land_with(&mut state, &green_pr().url, &forge)
7924 .await
7925 .unwrap();
7926 assert_eq!(pr.state, PrLifecycle::Open);
7927 assert_eq!(state.id, id);
7928 assert!(state.parked);
7929 assert_eq!(state.status, RunStatus::Landing);
7930 assert_eq!(state.land_approval.as_ref().unwrap().head, head);
7931 assert!(forge.argvs().is_empty());
7932
7933 state.land_sync_pending = true;
7934 std::fs::write(state.repo.join("dirty"), "do not touch").unwrap();
7935 let mut closed = seen("foreign", Checks::Green, "CLEAN", false);
7936 closed.pr.state = PrLifecycle::Closed;
7937 let forge = Scripted::new(vec![closed], vec![]);
7938 assert_eq!(
7939 land_with(&mut state, &green_pr().url, &forge)
7940 .await
7941 .unwrap()
7942 .state,
7943 PrLifecycle::Closed
7944 );
7945 assert_eq!(
7946 std::fs::read_to_string(state.repo.join("dirty")).unwrap(),
7947 "do not touch"
7948 );
7949 assert!(forge.argvs().is_empty());
7950 }
7951
7952 #[tokio::test]
7953 async fn landing_resume_does_not_publish_a_failed_rebased_gate() {
7954 let (_tmp, mut state, old) = landing_git_fixture().await;
7955 advance_landing_base(&state).await;
7956 state.config.verify.gate = vec!["exit 1".into()];
7957 assert!(resume_observed_head(&mut state, &old).await.is_err());
7958 assert_ne!(state.gate_head.as_deref(), Some(old.as_str()));
7959 assert!(!state.gate_allows_progress());
7960 assert_eq!(
7961 git::remote_head(&state.repo, "origin", "task-head")
7962 .await
7963 .unwrap(),
7964 Some(old)
7965 );
7966 assert!(state.land_sync_pending);
7967 }
7968
7969 #[tokio::test]
7970 async fn landing_publication_recovers_a_push_before_save_and_refuses_a_lease_conflict() {
7971 let (_tmp, mut state, old) = landing_git_fixture().await;
7972 advance_landing_base(&state).await;
7973 let pushed = resume_observed_head(&mut state, &old).await.unwrap();
7974 state.pr_pushed_head = Some(old.clone());
7976 state.land_sync_pending = true;
7977 assert_eq!(
7978 resume_observed_head(&mut state, &pushed).await.unwrap(),
7979 pushed
7980 );
7981 git::git(
7984 &state.repo,
7985 &["push", "--force", "origin", "main:refs/heads/task-head"],
7986 )
7987 .await
7988 .unwrap();
7989 assert!(
7990 publish_landing_head(
7991 &mut state,
7992 &pushed,
7993 &green_pr().url,
7994 &Scripted::new(vec![seen(&pushed, Checks::Green, "CLEAN", false)], vec![])
7995 )
7996 .await
7997 .unwrap_err()
7998 .to_string()
7999 .contains("publishing gated")
8000 );
8001 assert!(
8002 resume_observed_head(&mut state, "foreign-head")
8003 .await
8004 .is_err()
8005 );
8006 }
8007 #[tokio::test]
8008 async fn landing_publication_refuses_a_pr_closed_during_gate() {
8009 let (_tmp, mut state, head) = landing_git_fixture().await;
8010 let mut closed = seen(&head, Checks::Green, "CLEAN", false);
8011 closed.pr.state = PrLifecycle::Closed;
8012 let forge = Scripted::new(vec![closed], vec![]);
8013 assert!(
8014 publish_landing_head(&mut state, &head, &green_pr().url, &forge)
8015 .await
8016 .unwrap_err()
8017 .to_string()
8018 .contains("PR closed or merged")
8019 );
8020 }
8021
8022 fn winning_candidate(summary: &str) -> Candidate {
8024 Candidate {
8025 index: 0,
8026 label: 'A',
8027 agent: "opus".to_owned(),
8028 branch: "magi/x/A".to_owned(),
8029 worktree: PathBuf::from("/wt/A"),
8030 summary: summary.to_owned(),
8031 stat: String::new(),
8032 files: 1,
8033 commits: 1,
8034 empty: false,
8035 failed: None,
8036 verified_noop: None,
8037 duration_ms: 0,
8038 folded: false,
8039 }
8040 }
8041
8042 fn uncontested_tally() -> Tally {
8043 Tally {
8044 first_choice: BTreeMap::from([('A', 1)]),
8045 borda: BTreeMap::new(),
8046 winner: 'A',
8047 rankings: 1,
8048 unanimous_initial: true,
8049 deliberated: false,
8050 changed_votes: 0,
8051 unanimous_final: true,
8052 tie_break: None,
8053 judges: 1,
8054 present: 1,
8055 quorum: 1,
8056 met_quorum: true,
8057 uncontested: None,
8058 }
8059 }
8060
8061 fn review_record(reviewer: usize, agent: &str, summary: &str) -> ReviewRecord {
8062 ReviewRecord {
8063 attempts: 0,
8064 reviewer,
8065 agent: agent.to_owned(),
8066 summary: summary.to_owned(),
8067 findings: Vec::new(),
8068 vote: None,
8069 failed: None,
8070 duration_ms: 0,
8071 }
8072 }
8073
8074 fn review_round(round: usize, reviews: Vec<ReviewRecord>) -> ReviewRound {
8075 let answered = reviews.len();
8076 ReviewRound {
8077 round,
8078 head: "abc1234".to_owned(),
8079 verified_head: None,
8080 verified_at: None,
8081 reviews,
8082 e2e: Vec::new(),
8083 verify_retried: false,
8084 e2e_deferred: false,
8085 e2e_defer_reason: None,
8086 fix: None,
8087 blocking: 0,
8088 answered,
8089 expected: answered,
8090 clean: true,
8091 progressed: false,
8092 vote_split: false,
8093 reconsideration: Vec::new(),
8094 verdict: None,
8095 }
8096 }
8097
8098 #[test]
8099 fn the_approval_panel_states_the_task_verbatim_in_either_language() {
8100 let en = panel();
8101 assert!(en.contains("Task"), "{en}");
8102 assert!(en.contains("add retries to the uploader"), "{en}");
8103
8104 let mut state = run_state();
8105 state.config.graph.language = "ja".to_owned();
8106 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8107 assert!(ja.contains("タスク"), "{ja}");
8108 assert!(
8109 ja.contains("add retries to the uploader"),
8110 "the task itself is not translated: {ja}"
8111 );
8112 }
8113
8114 #[test]
8115 fn the_approval_panel_omits_what_changed_and_review_verdict_with_no_data() {
8116 let html = panel();
8120 assert!(!html.contains("What changed"), "{html}");
8121 assert!(!html.contains("Review verdict"), "{html}");
8122 }
8123
8124 #[test]
8125 fn the_approval_panel_omits_what_changed_when_the_winners_summary_is_empty() {
8126 let mut state = run_state();
8127 state.candidates = vec![winning_candidate("")];
8128 state.tally = Some(uncontested_tally());
8129 let html = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8130 assert!(
8131 !html.contains("What changed"),
8132 "an empty summary must not render an empty box: {html}"
8133 );
8134 }
8135
8136 #[test]
8137 fn the_approval_panel_shows_the_winners_own_account_in_either_language() {
8138 let mut state = run_state();
8139 state.candidates = vec![winning_candidate(
8140 "Added a retry loop around the uploader PUT call.",
8141 )];
8142 state.tally = Some(uncontested_tally());
8143 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8144 assert!(en.contains("What changed"), "{en}");
8145 assert!(
8146 en.contains("Added a retry loop around the uploader PUT call."),
8147 "{en}"
8148 );
8149
8150 state.config.graph.language = "ja".to_owned();
8151 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8152 assert!(ja.contains("変更内容"), "{ja}");
8153 assert!(
8154 ja.contains("Added a retry loop around the uploader PUT call."),
8155 "{ja}"
8156 );
8157 }
8158
8159 #[test]
8160 fn the_approval_panel_shows_only_the_last_review_rounds_verdict() {
8161 let mut state = run_state();
8162 state.reviews = vec![
8163 review_round(
8164 1,
8165 vec![review_record(1, "alpha", "found a race, sent back")],
8166 ),
8167 review_round(2, vec![review_record(1, "alpha", "race is fixed, clean")]),
8168 ];
8169 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8170 assert!(en.contains("Review verdict"), "{en}");
8171 assert!(en.contains("race is fixed, clean"), "{en}");
8172 assert!(
8173 !en.contains("found a race, sent back"),
8174 "only the round that actually cleared the merge should show: {en}"
8175 );
8176
8177 state.config.graph.language = "ja".to_owned();
8178 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8179 assert!(ja.contains("レビューの結論"), "{ja}");
8180 assert!(ja.contains("レビュアー"), "{ja}");
8181 assert!(ja.contains("race is fixed, clean"), "{ja}");
8182 }
8183
8184 fn unanswered_review_record(reviewer: usize, agent: &str, reason: &str) -> ReviewRecord {
8190 ReviewRecord {
8191 attempts: 0,
8192 reviewer,
8193 agent: agent.to_owned(),
8194 summary: String::new(),
8195 findings: Vec::new(),
8196 vote: None,
8197 failed: Some(reason.to_owned()),
8198 duration_ms: 0,
8199 }
8200 }
8201
8202 #[test]
8203 fn the_approval_panel_never_shows_an_unanswered_seat_as_a_blank_verdict() {
8204 let mut state = run_state();
8205 state.reviews = vec![review_round(
8206 1,
8207 vec![
8208 review_record(1, "alpha", "clean, nothing to add"),
8209 unanswered_review_record(2, "beta", "timed out"),
8210 ],
8211 )];
8212 let en = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8213 assert!(en.contains("clean, nothing to add"), "{en}");
8214 assert!(
8215 en.contains("produced no answer: timed out"),
8216 "a seat that never answered must say so, not render a blank box: {en}"
8217 );
8218 assert!(
8219 !en.contains("<div style=\"white-space:pre-wrap;font-size:13px\"></div>"),
8220 "no reviewer box may be left empty: {en}"
8221 );
8222
8223 state.config.graph.language = "ja".to_owned();
8224 let ja = approval_panel(&state, &green_pr(), NUMSTAT, "", &[], "feat: x");
8225 assert!(ja.contains("回答なし: timed out"), "{ja}");
8226 }
8227
8228 #[test]
8229 fn the_approval_panel_contains_nothing_the_frames_policy_would_block() {
8230 let html = panel();
8231 assert!(!html.contains("<script"), "no script survives the csp");
8232 assert!(!html.contains("<form"), "form-action is 'none'");
8233 let pr = green_pr();
8234 assert_eq!(
8235 html.matches("http").count(),
8236 html.matches(pr.url.as_str()).count(),
8237 "the only http url in the panel is the pull request's own link"
8238 );
8239 assert!(
8240 html.contains("target=\"_blank\""),
8241 "the PR link must open in a new tab so it escapes the iframe"
8242 );
8243 assert!(
8244 html.contains("rel=\"noopener noreferrer\""),
8245 "external links opening in new tabs must carry noopener noreferrer"
8246 );
8247 }
8248
8249 #[test]
8250 fn added_and_removed_diff_lines_are_distinguishable_without_colour() {
8251 let html = panel();
8252 assert!(
8253 html.contains(">+</span>"),
8254 "an added line carries a `+` in the gutter, not only a background"
8255 );
8256 assert!(
8257 html.contains(">-</span>"),
8258 "a removed line carries a `-` in the gutter, not only a background"
8259 );
8260 assert!(
8261 html.contains(">new line</span>"),
8262 "the marker is moved to the gutter, so the body is printed once without it"
8263 );
8264 }
8265
8266 #[test]
8267 fn a_diff_past_the_threshold_is_cut_with_an_honest_count() {
8268 let total = DIFF_MAX_LINES + 100;
8269 let diff: String = (0..total).map(|i| format!("+line {i}\n")).collect();
8270 let html = approval_panel(
8271 &run_state(),
8272 &green_pr(),
8273 NUMSTAT,
8274 &diff,
8275 &[],
8276 "feat: something long",
8277 );
8278 assert!(
8279 html.contains(&format!("100 of {total} diff lines omitted")),
8280 "the note must say exactly how much was cut"
8281 );
8282 assert!(html.contains(&format!("line {}", DIFF_MAX_LINES - 1)));
8283 assert!(
8284 !html.contains(&format!("line {DIFF_MAX_LINES}")),
8285 "nothing past the threshold is rendered"
8286 );
8287 assert!(
8288 html.contains("/repo/magi"),
8289 "the note says where the rest is"
8290 );
8291 }
8292
8293 #[test]
8294 fn a_path_with_html_metacharacters_is_escaped_rather_than_rendered() {
8295 let html = approval_panel(
8296 &run_state(),
8297 &green_pr(),
8298 "1\t2\tsrc/<b>&\"x\"'.rs",
8299 "",
8300 &[],
8301 "subject",
8302 );
8303 assert!(html.contains("src/<b>&"x"'.rs"));
8304 assert!(
8305 !html.contains("<b>"),
8306 "an agent-influenced path must never become markup"
8307 );
8308 }
8309
8310 #[tokio::test]
8311 async fn the_merge_lock_serialises_one_repository_but_never_a_different_one() {
8312 let a = std::path::PathBuf::from("/repo/a");
8313 let b = std::path::PathBuf::from("/repo/b");
8314
8315 let held = repo_merge_lock(&a).lock_owned().await;
8316
8317 assert!(
8320 repo_merge_lock(&a).try_lock().is_err(),
8321 "a second merge into the same repository must not proceed concurrently"
8322 );
8323
8324 assert!(
8328 repo_merge_lock(&b).try_lock().is_ok(),
8329 "a different repository's merge lock must be independent"
8330 );
8331
8332 drop(held);
8333 assert!(
8334 repo_merge_lock(&a).try_lock().is_ok(),
8335 "the lock is released once the holder is done"
8336 );
8337 }
8338
8339 pub(crate) fn repair_state(major: bool, reject: bool) -> RunState {
8340 let mut state = landing_state();
8341 let mut rec = review_record(1, "alpha", "precise rejection reason");
8342 rec.vote = Some(if reject {
8343 crate::verdict::ReviewVote::Reject
8344 } else {
8345 crate::verdict::ReviewVote::Approve
8346 });
8347 if major {
8348 rec.findings = contested().findings;
8349 }
8350 let mut round = review_round(1, vec![rec]);
8351 round.clean = false;
8352 round.blocking = usize::from(major);
8353 state.reviews.push(round);
8354 state.config.graph.review_rounds = 1;
8355 state
8356 }
8357
8358 #[test]
8359 fn approval_policy_controls_are_independent_and_keep_all_reasons() {
8360 for every in [false, true] {
8361 for contested in [false, true] {
8362 for major in [false, true] {
8363 for reject in [false, true] {
8364 let mut state = repair_state(major, reject);
8365 state.config.graph.land_approval = every;
8366 state.config.graph.hold_contested_merge = contested;
8367 let reasons = approval_reasons(&state);
8368 assert_eq!(reasons.contains(&ApprovalReason::EveryMerge), every);
8369 assert_eq!(
8370 reasons.contains(&ApprovalReason::OpenBlockingFindings),
8371 contested && major
8372 );
8373 assert_eq!(
8374 reasons.contains(&ApprovalReason::FinalReject),
8375 contested && reject
8376 );
8377 assert_eq!(
8378 reasons.len(),
8379 usize::from(every)
8380 + usize::from(contested && major)
8381 + usize::from(contested && reject)
8382 );
8383 }
8384 }
8385 }
8386 }
8387 }
8388
8389 #[test]
8390 fn approval_policy_and_rendering_follow_reconsideration_in_both_directions() {
8391 use crate::verdict::ReviewVote::{Approve, Reject};
8392 for (initial_reject, final_vote) in [(true, Approve), (false, Reject)] {
8393 let mut state = repair_state(false, initial_reject);
8394 state.reviews[0]
8395 .reconsideration
8396 .push(crate::run::ReviewRevoteRecord {
8397 reviewer: 1,
8398 agent: "alpha".into(),
8399 vote: Some(final_vote),
8400 reason: "changed after reading the panel <evidence>".into(),
8401 failed: None,
8402 });
8403 assert_eq!(
8404 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8405 final_vote == Reject
8406 );
8407 for language in ["en", "ja"] {
8408 state.config.graph.language = language.into();
8409 let evidence = approval_evidence(&state);
8410 assert!(evidence.contains(&format!("→ {}", final_vote.label())));
8411 assert!(evidence.contains("changed after reading the panel <evidence>"));
8412 let html = approval_panel(&state, &green_pr(), "", "", &[], "subject");
8413 assert!(html.contains("changed after reading the panel <evidence>"));
8414 assert!(!html.contains("<evidence>"));
8415 }
8416 state.reviews[0].reconsideration[0].vote = None;
8417 state.reviews[0].reconsideration[0].failed = Some("timed out".into());
8418 assert_eq!(
8419 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8420 initial_reject
8421 );
8422 assert!(approval_evidence(&state).contains("timed out"));
8423 }
8424 }
8425
8426 #[tokio::test]
8427 async fn approval_merge_paths_apply_controls_to_major_and_reject_independently() {
8428 for every in [false, true] {
8429 for contested in [false, true] {
8430 for (major, reject) in [(false, false), (false, true), (true, false), (true, true)]
8431 {
8432 let mut state = repair_state(major, reject);
8433 state.config.graph.land_approval = every;
8434 state.config.graph.hold_contested_merge = contested;
8435 let forge = Scripted::new(
8436 vec![seen("abc", Checks::Green, "CLEAN", false)],
8437 vec![(true, "")],
8438 );
8439 land_with(&mut state, URL, &forge).await.unwrap();
8440 let expected = every || (contested && (major || reject));
8441 assert_eq!(state.land_approval.is_some(), expected);
8442 assert_eq!(forge.calls().contains(&"merge"), !expected);
8443 if expected {
8444 assert!(state.parked);
8445 }
8446 }
8447 }
8448 }
8449 }
8450
8451 #[tokio::test]
8452 async fn reviewed_branch_hold_is_read_before_landing_decision() {
8453 for (base, control) in [
8454 (false, "land_approval"),
8455 (true, "land_approval"),
8456 (false, "hold_contested_merge"),
8457 ] {
8458 let (_tmp, mut state, _) = landing_git_fixture().await;
8459 state.config.graph.land_approval = base;
8460 state.config.graph.hold_contested_merge = false;
8461 state.reviewed_commits = Some(Vec::new());
8462 if control == "hold_contested_merge" {
8463 state.reviews = repair_state(false, true).reviews;
8464 }
8465 std::fs::write(
8466 state.repo.join("magi.toml"),
8467 format!("[graph]\n{control} = {}\n", !base),
8468 )
8469 .unwrap();
8470 git::git(&state.repo, &["add", "magi.toml"]).await.unwrap();
8471 git::git(&state.repo, &["commit", "-m", "approval policy"])
8472 .await
8473 .unwrap();
8474 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8475 state.land_sync_pending = false;
8476 state.pr_pushed_head = Some(head.clone());
8477 state.gate_head = Some(head.clone());
8478 let forge = Scripted::new(
8479 vec![seen(&head, Checks::Green, "CLEAN", false)],
8480 vec![(true, "")],
8481 );
8482 land_with(&mut state, URL, &forge).await.unwrap();
8483 assert!(
8484 state.land_approval.is_some(),
8485 "base={base}, control={control}"
8486 );
8487 assert!(!forge.calls().contains(&"merge"));
8488 if !base {
8489 let question = ask::Questions::open()
8490 .get(&state.land_approval.as_ref().unwrap().question)
8491 .unwrap();
8492 assert!(question.detail.contains(&format!(
8493 "{control}=true from the reviewed branch's magi.toml"
8494 )));
8495 }
8496 }
8497 }
8498
8499 #[tokio::test]
8500 async fn reviewed_branch_hold_asks_and_survives_removal_and_resume() {
8501 let (_tmp, mut state, _) = landing_git_fixture().await;
8502 state.config.graph.land_approval = false;
8503 state.config.graph.hold_contested_merge = false;
8504 state.reviewed_commits = Some(Vec::new());
8505 std::fs::write(
8506 state.repo.join("magi.toml"),
8507 "[graph]\nland_approval = true\n[verify]\ngate = ['untrusted']\n",
8508 )
8509 .unwrap();
8510 git::git(&state.repo, &["add", "magi.toml"]).await.unwrap();
8511 git::git(&state.repo, &["commit", "-m", "require approval"])
8512 .await
8513 .unwrap();
8514 let head = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8515 let gate = state.config.verify.gate.clone();
8516 state.observe_branch_owner_holds(&head).await;
8517 assert_eq!(state.config.verify.gate, gate);
8518 assert_eq!(approval_reasons(&state), [ApprovalReason::EveryMerge]);
8519 git::git(&state.repo, &["rm", "magi.toml"]).await.unwrap();
8520 git::git(&state.repo, &["commit", "-m", "remove config"])
8521 .await
8522 .unwrap();
8523 let later = git::rev_parse(&state.repo, "HEAD").await.unwrap();
8524 state = serde_json::from_str(&serde_json::to_string(&state).unwrap()).unwrap();
8525 state.observe_branch_owner_holds(&later).await;
8526 assert_eq!(state.branch_owner_holds[0].head, head);
8527 state.land_sync_pending = false;
8528 state.pr_pushed_head = Some(later.clone());
8529 state.gate_head = Some(later.clone());
8530 let forge = Scripted::new(
8531 vec![seen(&later, Checks::Green, "CLEAN", false)],
8532 vec![(true, "")],
8533 );
8534 land_with(&mut state, URL, &forge).await.unwrap();
8535 assert!(!forge.calls().contains(&"merge"));
8536 let question = ask::Questions::open()
8537 .get(&state.land_approval.as_ref().unwrap().question)
8538 .unwrap();
8539 assert!(question.detail.contains("Approval required because:"));
8540 assert!(
8541 question
8542 .detail
8543 .contains("land_approval=true from the reviewed branch's magi.toml")
8544 );
8545 }
8546
8547 #[tokio::test]
8548 async fn approval_snapshot_exposes_minor_findings_and_survives_disabled_controls() {
8549 let mut state = repair_state(false, true);
8550 state.reviews[0].clean = true;
8551 let mut finding = contested().findings.remove(0);
8552 finding.severity = crate::verdict::Severity::Minor;
8553 state.reviews[0].reviews[0].findings.push(finding);
8554 assert!(state.open_findings().is_empty());
8555 let mut pr = green_pr();
8556 pr.review_comments.clear();
8557 for language in ["en", "ja"] {
8558 state.config.graph.language = language.into();
8559 let html = approval_panel(&state, &pr, "", "", &[], "subject");
8560 assert!(html.contains("[R3-1-1] minor"));
8561 assert!(html.contains(if language == "ja" {
8562 "内部指摘の解決を意味するものではありません"
8563 } else {
8564 "This does not mean internal findings are resolved"
8565 }));
8566 assert!(
8567 html.find(if language == "ja" {
8568 "承認が必要な理由:"
8569 } else {
8570 "Approval required because:"
8571 })
8572 .unwrap()
8573 < html.find("[R3-1-1]").unwrap()
8574 );
8575 }
8576 state.config.graph.language = "en".into();
8577 let observed = seen("abc", Checks::Green, "CLEAN", false);
8578 assert_eq!(
8579 approval_gate(&mut state, &observed.pr, "subject", None, "abc")
8580 .await
8581 .unwrap(),
8582 ApprovalGate::Pending
8583 );
8584 let id = state.land_approval.as_ref().unwrap().question.clone();
8585 let q = ask::Questions::open().get(&id).unwrap();
8586 assert!(q.detail.starts_with("Approval required because:"));
8587 assert!(q.detail.contains("final reviewer reject"));
8588 assert!(q.detail.contains("[R3-1-1] minor"));
8589 assert!(
8590 q.detail
8591 .contains("No adoption or resolution evidence recorded")
8592 );
8593 state.config.graph.land_approval = false;
8594 state.config.graph.hold_contested_merge = false;
8595 state.reviews.clear();
8596 assert_eq!(approval_reasons(&state), [ApprovalReason::ExistingDecision]);
8597 assert!(deputy_brief(&q, Some(&state)).contains("final reviewer reject"));
8598 assert!(deputy_brief(&q, None).contains("[R3-1-1] minor"));
8599 let forge = Scripted::new(vec![observed], vec![]);
8600 land_with(&mut state, URL, &forge).await.unwrap();
8601 assert!(!forge.calls().contains(&"merge"));
8602 assert_eq!(state.land_approval.as_ref().unwrap().question, id);
8603 assert_eq!(ask::Questions::open().get(&id).unwrap().detail, q.detail);
8604 }
8605
8606 #[tokio::test]
8607 async fn approval_evidence_keeps_all_findings_and_bounds_unicode_prose() {
8608 let mut state = repair_state(false, true);
8609 state.config.graph.land_approval = false;
8610 let long_reason = format!("{}REASON_TAIL", "拒否🦀".repeat(200));
8611 let long_detail = format!("{}DETAIL_TAIL", "詳細🦀".repeat(200));
8612 let long_title = format!("{}TITLE_TAIL", "題🦀".repeat(100));
8613 state.reviews[0].reviews[0].summary = long_reason.clone();
8614 for i in 1..=10 {
8615 let mut finding = contested().findings.remove(0);
8616 finding.id = format!("R1-1-{i}");
8617 finding.severity = if i == 9 {
8618 crate::verdict::Severity::Major
8619 } else {
8620 crate::verdict::Severity::Minor
8621 };
8622 finding.title = long_title.clone();
8623 finding.detail = long_detail.clone();
8624 state.reviews[0].reviews[0].findings.push(finding);
8625 }
8626 state.reviews[0].fix = Some(crate::run::FixRecord {
8627 agent: "fixer".into(),
8628 addressed: vec!["R1-1-9".into()],
8629 rejected: vec![crate::verdict::Rejection {
8630 id: "R1-1-10".into(),
8631 why: long_reason.clone(),
8632 }],
8633 notes: long_detail.clone(),
8634 committed: false,
8635 failed: None,
8636 duration_ms: 0,
8637 continuation: None,
8638 });
8639 assert_eq!(
8640 approval_reasons(&state),
8641 [
8642 ApprovalReason::OpenBlockingFindings,
8643 ApprovalReason::FinalReject
8644 ]
8645 );
8646 let excerpt = approval_excerpt(&long_reason, 300);
8647 assert_eq!(excerpt.chars().count(), 300);
8648 assert!(excerpt.ends_with('…'));
8649 let boundary = "拒".repeat(300);
8650 assert_eq!(approval_excerpt(&boundary, 300), boundary);
8651 for language in ["en", "ja"] {
8652 state.config.graph.language = language.into();
8653 for revote in [
8654 None,
8655 Some(crate::verdict::ReviewVote::Reject),
8656 Some(crate::verdict::ReviewVote::Approve),
8657 ] {
8658 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Reject);
8659 state.reviews[0].reconsideration.clear();
8660 if let Some(vote) = revote {
8661 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Approve);
8662 state.reviews[0]
8663 .reconsideration
8664 .push(crate::run::ReviewRevoteRecord {
8665 reviewer: 1,
8666 agent: "alpha".into(),
8667 vote: Some(vote),
8668 reason: long_reason.clone(),
8669 failed: None,
8670 });
8671 }
8672 let evidence = approval_evidence(&state);
8673 let final_vote = revote.unwrap_or(crate::verdict::ReviewVote::Reject);
8674 assert!(evidence.contains(&format!("#1 (alpha): {}", final_vote.label())));
8675 assert!(approval_reasons(&state).contains(&ApprovalReason::OpenBlockingFindings));
8676 assert_eq!(
8677 approval_reasons(&state).contains(&ApprovalReason::FinalReject),
8678 final_vote == crate::verdict::ReviewVote::Reject
8679 );
8680 assert!(evidence.contains(&excerpt));
8681 assert!(evidence.contains("[R1-1-8] minor"));
8682 assert!(evidence.contains("[R1-1-9] major"));
8683 assert!(evidence.contains("[R1-1-10] minor"));
8684 for tail in ["REASON_TAIL", "DETAIL_TAIL", "TITLE_TAIL"] {
8685 assert!(!evidence.contains(tail));
8686 }
8687 assert!(evidence.contains(if language == "ja" {
8688 "採用申告(解決未確認)"
8689 } else {
8690 "claimed addressed (resolution unconfirmed)"
8691 }));
8692 assert!(evidence.contains(if language == "ja" {
8693 "不採用理由"
8694 } else {
8695 "declined"
8696 }));
8697 let major_evidence = evidence
8698 .split("[R1-1-9] major")
8699 .nth(1)
8700 .unwrap()
8701 .split("[R1-1-10]")
8702 .next()
8703 .unwrap();
8704 assert!(major_evidence.contains(if language == "ja" {
8705 "採用申告(解決未確認)"
8706 } else {
8707 "claimed addressed (resolution unconfirmed)"
8708 }));
8709 let last_evidence = evidence.split("[R1-1-10] minor").nth(1).unwrap();
8710 assert!(last_evidence.contains(if language == "ja" {
8711 "不採用理由"
8712 } else {
8713 "declined"
8714 }));
8715 let html = approval_panel(&state, &green_pr(), "", "", &[], "subject");
8716 assert!(html.contains(&esc(&evidence)));
8717 assert_eq!(
8718 approval_gate(&mut state, &green_pr(), "subject", None, "abc")
8719 .await
8720 .unwrap(),
8721 ApprovalGate::Pending
8722 );
8723 let id = &state.land_approval.take().unwrap().question;
8724 let q = ask::Questions::open().get(id).unwrap();
8725 assert!(q.detail.starts_with(&evidence));
8726 }
8727 state.reviews[0].reviews[0].vote = Some(crate::verdict::ReviewVote::Reject);
8728 }
8729 }
8730
8731 #[test]
8732 fn merge_repair_choice_covers_major_only_and_reject_only_without_contested_and() {
8733 for (major, reject) in [(true, false), (false, true), (true, true)] {
8734 let state = repair_state(major, reject);
8735 assert!(repair_available(&state));
8736 assert_eq!(&approval_choices(&state)[..3], [APPROVE, HOLD, REPAIR]);
8737 }
8738 assert!(!repair_available(&repair_state(false, false)));
8739 let mut clean = repair_state(true, false);
8740 clean.reviews[0].clean = true;
8741 assert_eq!(&approval_choices(&clean)[..3], [APPROVE, HOLD, REPAIR]);
8742 assert_eq!(approval(Some(REPAIR)), Approval::Repair);
8743 }
8744
8745 #[tokio::test]
8746 async fn merge_repair_upgrades_legacy_questions_and_snapshots_exact_evidence_once() {
8747 let mut state = repair_state(true, false);
8748 let pr = green_pr();
8749 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8750 .await
8751 .unwrap();
8752 let store = ask::Questions::open();
8753 let id = state.land_approval.as_ref().unwrap().question.clone();
8754 store
8756 .update(&id, |q| {
8757 q.choices = vec![APPROVE.into(), HOLD.into()];
8758 Ok(())
8759 })
8760 .unwrap();
8761 let upgraded = store.get(&id).unwrap();
8762 assert_eq!(upgraded.choices, approval_choices(&state));
8763 assert!(!upgraded.actions.contains_key(HOLD));
8764 assert_eq!(store.get(&id).unwrap().choices, upgraded.choices);
8765 assert!(
8766 store
8767 .list()
8768 .iter()
8769 .any(|q| q.id == id && q.choices == upgraded.choices)
8770 );
8771 assert!(
8772 crate::prompt::chat_consult(&upgraded).contains("--reply 'fix findings and re-review'")
8773 );
8774 assert!(deputy_brief(&upgraded, Some(&state)).contains("never approves a merge"));
8775 store
8776 .update(&id, |q| q.answer(ask::Answer::Choice(REPAIR.into())))
8777 .unwrap();
8778 store
8781 .update(&id, |q| {
8782 q.actions.clear();
8783 Ok(())
8784 })
8785 .unwrap();
8786 assert_eq!(
8787 store.get(&id).unwrap().chosen_action(),
8788 Some(&ask::ChoiceAction::Resume {
8789 run: state.id.clone()
8790 })
8791 );
8792 let binding = state.land_approval.clone();
8793 assert_eq!(
8794 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8795 .await
8796 .unwrap(),
8797 ApprovalGate::Repair
8798 );
8799 assert!(state.land_approval.is_none());
8800 assert_eq!(state.merge_repairs.len(), 1);
8801 let request = &state.merge_repairs[0];
8802 assert_eq!(request.question, id);
8803 assert_eq!(request.head, "abc");
8804 assert_eq!(request.pr, pr.url);
8805 assert_eq!(
8806 request.reviews[0].reviews[0].summary,
8807 "precise rejection reason"
8808 );
8809 assert_eq!(request.reviews[0].reviews[0].findings[0].id, "R3-1-1");
8810 assert_eq!(
8811 request.reviews[0].reviews[0].findings[0].detail,
8812 state.reviews[0].reviews[0].findings[0].detail
8813 );
8814 state.land_approval = binding;
8816 assert_eq!(
8817 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8818 .await
8819 .unwrap(),
8820 ApprovalGate::Repair
8821 );
8822 assert_eq!(state.merge_repairs.len(), 1);
8823 state.land_approval = None;
8824 state.config.graph.land_approval = false;
8825 state.config.graph.hold_contested_merge = false;
8826 state.reviews.clear();
8827 assert_eq!(approval_reasons(&state), [ApprovalReason::AfterRepair]);
8828 assert_eq!(
8829 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8830 .await
8831 .unwrap(),
8832 ApprovalGate::Pending
8833 );
8834 let fresh_id = &state.land_approval.as_ref().unwrap().question;
8835 assert_ne!(fresh_id, &id);
8836 let fresh = store.get(fresh_id).unwrap();
8837 assert!(
8838 fresh
8839 .detail
8840 .contains("fresh owner approval after merge repair")
8841 );
8842 assert!(fresh.detail.contains("No review recorded"));
8843 assert!(!fresh.detail.contains("precise rejection reason"));
8844 }
8845
8846 #[tokio::test]
8847 async fn merge_repair_answer_never_merges_and_hold_never_requests_repair() {
8848 for choice in [REPAIR, HOLD] {
8849 let mut state = repair_state(false, true);
8850 let observed = seen("abc", Checks::Green, "CLEAN", false);
8851 approval_gate(&mut state, &observed.pr, "feat: x", None, "abc")
8852 .await
8853 .unwrap();
8854 let id = state.land_approval.as_ref().unwrap().question.clone();
8855 ask::Questions::open()
8856 .update(&id, |q| q.answer(ask::Answer::Choice(choice.into())))
8857 .unwrap();
8858 let forge = Scripted::new(vec![observed], vec![(true, "")]);
8859 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
8860 .await
8861 .unwrap();
8862 assert!(
8863 forge
8864 .argvs()
8865 .iter()
8866 .all(|a| a.iter().any(|s| s == "--disable-auto"))
8867 );
8868 assert!(!forge.calls().contains(&"fix"));
8869 assert_eq!(state.merge_repairs.len(), usize::from(choice == REPAIR));
8870 assert_ne!(state.status, RunStatus::Merged);
8871 }
8872 }
8873
8874 #[test]
8875 fn only_the_merge_choice_merges_and_silence_holds() {
8876 let table = [
8877 (None, Approval::Hold),
8878 (Some("merge"), Approval::Merge),
8879 (Some(" merge\n"), Approval::Merge),
8880 (Some("hold"), Approval::Hold),
8881 (Some(""), Approval::Hold),
8882 (Some("yes"), Approval::Hold),
8883 ];
8884 for (answer, want) in table {
8885 assert_eq!(
8886 approval(answer),
8887 want,
8888 "answer {answer:?} must resolve to {want:?}"
8889 );
8890 }
8891 }
8892
8893 #[tokio::test]
8894 async fn a_first_visit_to_the_merge_gate_files_a_question_and_returns_pending_at_once() {
8895 let mut state = landing_state();
8896 state.config.graph.land_approval = true;
8897 let pr = green_pr();
8898
8899 let gate = approval_gate(&mut state, &pr, "feat: x", None, "abc")
8900 .await
8901 .unwrap();
8902 assert_eq!(gate, ApprovalGate::Pending, "nobody has answered yet");
8903 assert!(
8904 !state.parked,
8905 "approval_gate itself never sets `parked`; only its caller does"
8906 );
8907
8908 let store = ask::Questions::open();
8909 let filed: Vec<_> = store
8910 .list()
8911 .into_iter()
8912 .filter(|q| q.run == state.id)
8913 .collect();
8914 assert_eq!(filed.len(), 1, "exactly one question is filed");
8915 assert_eq!(filed[0].node, APPROVAL_NODE);
8916 assert_eq!(filed[0].choices, approval_choices(&state));
8917 assert!(filed[0].status.open());
8918
8919 let again = approval_gate(&mut state, &pr, "feat: x", None, "abc")
8923 .await
8924 .unwrap();
8925 assert_eq!(again, ApprovalGate::Pending);
8926 let still_one = store
8927 .list()
8928 .into_iter()
8929 .filter(|q| q.run == state.id)
8930 .count();
8931 assert_eq!(
8932 still_one, 1,
8933 "asking twice must not double-file the question"
8934 );
8935 }
8936
8937 #[tokio::test]
8938 async fn approving_the_existing_question_is_read_back_as_approved() {
8939 crate::run::pin_test_home();
8940 let mut state = run_state();
8941 state.config.graph.land_approval = true;
8942 let pr = green_pr();
8943 assert_eq!(
8944 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8945 .await
8946 .unwrap(),
8947 ApprovalGate::Pending
8948 );
8949
8950 let store = ask::Questions::open();
8951 let mut q = store
8952 .list()
8953 .into_iter()
8954 .find(|q| q.run == state.id)
8955 .expect("filed above");
8956 let talks = crate::talk::Talks::open();
8957 let cfg = crate::config::Config {
8958 agents: vec![crate::config::AgentSpec {
8959 id: "mock".into(),
8960 kind: crate::config::AgentKind::Command,
8961 model: None,
8962 command: vec!["true".into()],
8963 extra_args: Vec::new(),
8964 env: Default::default(),
8965 prompt_delivery: None,
8966 max_turn_secs: None,
8967 }],
8968 ..crate::config::Config::default()
8969 };
8970 let mut talk = crate::talk::begin(&talks, &cfg, state.repo.clone(), Some("mock")).unwrap();
8971 crate::consult::begin(&store, &talks, &q, &talk).unwrap();
8972 crate::talk::drain(&mut talk, &talks).unwrap();
8973 assert_eq!(
8974 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8975 .await
8976 .unwrap(),
8977 ApprovalGate::Pending,
8978 "consultation cannot approve or hold the merge"
8979 );
8980 q = store.get(&q.id).unwrap();
8981 assert!(q.answer.is_none());
8982 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
8984 store.put(&mut q).unwrap();
8985
8986 assert_eq!(
8987 approval_gate(&mut state, &pr, "feat: x", None, "abc")
8988 .await
8989 .unwrap(),
8990 ApprovalGate::Approved
8991 );
8992 }
8993
8994 #[tokio::test]
8995 async fn legacy_hold_actions_are_removed_on_get_and_list_before_answering() {
8996 crate::run::pin_test_home();
8997 let store = ask::Questions::open();
8998 for via_list in [false, true] {
8999 let mut state = repair_state(false, true);
9000 let pr = green_pr();
9001 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9002 .await
9003 .unwrap();
9004 let id = state.land_approval.as_ref().unwrap().question.clone();
9005 store
9006 .update(&id, |q| {
9007 q.actions.insert(
9008 HOLD.to_owned(),
9009 ask::ChoiceAction::Resume {
9010 run: state.id.clone(),
9011 },
9012 );
9013 Ok(())
9014 })
9015 .unwrap();
9016 let q = if via_list {
9017 store.list().into_iter().find(|q| q.id == id).unwrap()
9018 } else {
9019 store.get(&id).unwrap()
9020 };
9021 assert!(!q.actions.contains_key(HOLD));
9022 store
9023 .update(&id, |q| {
9024 assert!(!q.actions.contains_key(HOLD));
9026 assert!(!upgrade_repair_choice(q, &state));
9027 q.answer(ask::Answer::Choice(HOLD.to_owned()))
9028 })
9029 .unwrap();
9030 assert!(store.get(&id).unwrap().chosen_action().is_none());
9031 assert_eq!(
9032 approval_gate(&mut state, &pr, "feat: x", None, "abc")
9033 .await
9034 .unwrap(),
9035 ApprovalGate::Held
9036 );
9037 }
9038 }
9039
9040 #[tokio::test]
9041 async fn explicit_hold_stays_held_but_expired_approval_is_reasked() {
9042 crate::run::pin_test_home();
9043 let store = ask::Questions::open();
9044
9045 let mut held_state = run_state();
9046 held_state.config.graph.land_approval = true;
9047 let pr = green_pr();
9048 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
9049 .await
9050 .unwrap();
9051 let mut q = store
9052 .list()
9053 .into_iter()
9054 .find(|q| q.run == held_state.id)
9055 .expect("filed above");
9056 q.answer(ask::Answer::Choice(HOLD.to_owned())).unwrap();
9057 store.put(&mut q).unwrap();
9058 assert_eq!(
9059 approval_gate(&mut held_state, &pr, "feat: x", None, "abc")
9060 .await
9061 .unwrap(),
9062 ApprovalGate::Held
9063 );
9064
9065 let mut abandoned_state = run_state();
9066 abandoned_state.config.graph.land_approval = true;
9067 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
9068 .await
9069 .unwrap();
9070 let mut q = store
9071 .list()
9072 .into_iter()
9073 .find(|q| q.run == abandoned_state.id)
9074 .expect("filed above");
9075 q.abandon("no answer within the timeout");
9076 store.put(&mut q).unwrap();
9077 assert_eq!(
9078 approval_gate(&mut abandoned_state, &pr, "feat: x", None, "abc")
9079 .await
9080 .unwrap(),
9081 ApprovalGate::Pending,
9082 "an expired approval must ask again without merging"
9083 );
9084 assert_eq!(
9085 store.get(&q.id).unwrap().status,
9086 ask::QuestionStatus::Abandoned
9087 );
9088 assert_ne!(
9089 abandoned_state.land_approval.as_ref().unwrap().question,
9090 q.id
9091 );
9092 }
9093
9094 fn contested() -> ContestedHandoff {
9095 let finding = |id: &str, n: u32| crate::verdict::Finding {
9096 id: id.to_owned(),
9097 severity: crate::verdict::Severity::Major,
9098 file: Some("src/a.rs".to_owned()),
9099 line: Some(n),
9100 title: format!("problem {id}"),
9101 detail: String::new(),
9102 };
9103 ContestedHandoff {
9104 findings: (1..=7).map(|n| finding(&format!("R3-1-{n}"), n)).collect(),
9105 rejecters: vec![(1, "alpha".to_owned())],
9106 }
9107 }
9108
9109 #[test]
9110 fn the_contested_record_is_asked_about_unless_the_switch_is_off() {
9111 let mut state = run_state();
9112 assert!(contested_to_ask(&state).is_none(), "nothing recorded");
9113 state.contested_handoff = Some(contested());
9114 assert!(contested_to_ask(&state).is_some());
9115 state.config.graph.hold_contested_merge = false;
9116 assert!(
9117 contested_to_ask(&state).is_none(),
9118 "the switch restores today"
9119 );
9120 }
9121
9122 #[test]
9123 fn the_deputy_brief_carries_the_pr_the_findings_and_names_what_is_missing() {
9124 let q = ask::Question::new(
9125 "run-1".to_owned(),
9126 APPROVAL_NODE.to_owned(),
9127 "land".to_owned(),
9128 "Merge?".to_owned(),
9129 String::new(),
9130 vec![APPROVE.to_owned(), HOLD.to_owned()],
9131 );
9132 let none = deputy_brief(&q, None);
9133 assert!(none.contains("could not be read"), "{none}");
9134 assert!(none.contains("Silence is a hold"), "{none}");
9135
9136 let mut state = run_state();
9137 state.pr = Some(crate::run::PrRecord {
9138 url: "https://example.test/pull/7".to_owned(),
9139 number: 7,
9140 state: "open".to_owned(),
9141 checks: "green".to_owned(),
9142 round: 0,
9143 rounds: 3,
9144 red_at_merge: Vec::new(),
9145 });
9146 state.contested_handoff = Some(contested());
9147 let b = deputy_brief(&q, Some(&state));
9148 assert!(b.contains("https://example.test/pull/7"), "{b}");
9149 assert!(b.contains("not recorded in this legacy question"), "{b}");
9150 assert!(!b.contains("This question was filed although"));
9151 state.contested_handoff = None;
9152 assert!(deputy_brief(&q, Some(&state)).contains("not recorded in this legacy question"));
9153 }
9154
9155 #[test]
9156 fn the_contested_question_names_the_pr_the_findings_and_the_rejecter() {
9157 for lang in ["en", "ja"] {
9158 let mut cfg = crate::config::Config::default();
9159 cfg.graph.language = lang.to_owned();
9160 let w = words(&cfg.graph.language);
9161 let text = w.approval_detail(
9162 "https://github.com/yukimemi/magi/pull/42",
9163 "main",
9164 "feat: x",
9165 Some(&contested()),
9166 );
9167 assert!(text.contains("pull/42"), "{text}");
9168 assert!(
9169 text.contains("R3-1-1 major src/a.rs:1: problem R3-1-1"),
9170 "{text}"
9171 );
9172 assert!(text.contains("R3-1-5"), "{text}");
9173 assert!(!text.contains("R3-1-6"), "the list is capped: {text}");
9174 assert!(text.contains("2"), "the rest are counted: {text}");
9175 assert!(text.contains("#1 (alpha)"), "{text}");
9176 }
9177 let plain = words("en").approval_detail("u", "main", "s", None);
9178 assert!(!plain.contains("reject"), "{plain}");
9179 }
9180
9181 #[tokio::test]
9182 async fn a_contested_question_is_filed_once_and_a_resume_finds_the_same_one() {
9183 crate::run::pin_test_home();
9184 let mut state = run_state();
9185 state.config.graph.land_approval = false;
9186 state.contested_handoff = Some(contested());
9187 let pr = green_pr();
9188 let c = contested_to_ask(&state);
9189 assert_eq!(
9190 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9191 .await
9192 .unwrap(),
9193 ApprovalGate::Pending,
9194 "silence is a hold"
9195 );
9196 let store = ask::Questions::open();
9197 let filed: Vec<_> = store
9198 .list()
9199 .into_iter()
9200 .filter(|q| q.run == state.id)
9201 .collect();
9202 assert_eq!(filed.len(), 1);
9203 assert!(filed[0].detail.contains("R3-1-1"), "{}", filed[0].detail);
9204
9205 assert_eq!(
9206 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9207 .await
9208 .unwrap(),
9209 ApprovalGate::Pending
9210 );
9211 let mut q = store
9212 .list()
9213 .into_iter()
9214 .find(|q| q.run == state.id)
9215 .unwrap();
9216 assert_eq!(q.id, filed[0].id, "the same question after a resume");
9217 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
9218 store.put(&mut q).unwrap();
9219 assert_eq!(
9220 approval_gate(&mut state, &pr, "feat: x", c.as_ref(), "abc")
9221 .await
9222 .unwrap(),
9223 ApprovalGate::Approved
9224 );
9225 }
9226
9227 #[test]
9228 fn the_diffstat_table_is_ordered_by_churn_with_binaries_last() {
9229 let rows = parse_numstat(NUMSTAT);
9230 assert_eq!(
9231 rows.iter().map(|r| r.path.as_str()).collect::<Vec<_>>(),
9232 ["src/web.rs", "src/land.rs", "assets/logo.png"]
9233 );
9234 assert_eq!(rows[2].added, None, "a binary file has no line counts");
9235 }
9236 #[test]
9237 fn the_approval_speaks_the_language_the_repository_is_configured_for() {
9238 let mut state = run_state();
9242 state.config.graph.language = "ja".to_owned();
9243 let pr = green_pr();
9244 let commits = ["c1".to_owned()];
9245
9246 let ja = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
9247 assert!(ja.contains("lang=\"ja\""), "the document must declare it");
9248 assert!(ja.contains("squash されるコミット"), "{ja}");
9249 assert!(ja.contains("レビューコメント"), "{ja}");
9250 assert!(ja.contains("差分"), "{ja}");
9251 assert!(
9252 !ja.contains("Commits being squashed"),
9253 "no English left over"
9254 );
9255
9256 let w = words("ja");
9257 assert!(w.approval_summary(17, "feat: x").contains("マージ"));
9258 assert!(
9259 w.approval_detail("http://x/1", "main", "feat: x", None)
9260 .contains("パネル")
9261 );
9262
9263 assert!(ja.contains("src/a.rs"), "the diffstat is not prose");
9265 assert!(ja.contains("feat: x"), "nor is the merge subject");
9266
9267 state.config.graph.language = "en".to_owned();
9270 let en = approval_panel(&state, &pr, "3\t1\tsrc/a.rs", "+ x", &commits, "feat: x");
9271 assert!(en.contains("Commits being squashed"), "{en}");
9272 assert_eq!(words("Klingon").html_lang, "en");
9273 }
9274
9275 #[test]
9279 fn pick_open_pr_classifies_by_count_and_base() {
9280 let one = r#"[{"number":58,"url":"https://x/pull/58","title":"t","baseRefName":"main"}]"#;
9281 assert_eq!(
9282 pick_open_pr(one, "main").unwrap(),
9283 OpenPr::One {
9284 url: "https://x/pull/58".into(),
9285 title: "t".into()
9286 }
9287 );
9288 assert_eq!(pick_open_pr("[]", "main").unwrap(), OpenPr::None);
9289 assert_eq!(pick_open_pr(one, "dev").unwrap(), OpenPr::None);
9290 let two = r#"[{"number":1,"url":"u1","title":"","baseRefName":"main"},
9291 {"number":2,"url":"u2","title":"","baseRefName":"main"}]"#;
9292 assert_eq!(
9293 pick_open_pr(two, "main").unwrap(),
9294 OpenPr::Many(vec!["u1".into(), "u2".into()])
9295 );
9296 let fork = r#"[{"url":"f","baseRefName":"main","isCrossRepository":true}]"#;
9298 assert_eq!(pick_open_pr(fork, "main").unwrap(), OpenPr::None);
9299 assert!(pick_open_pr("not json", "main").is_err());
9300 assert!(pick_open_pr(r#"[{"url":"u","title":"t"}]"#, "main").is_err());
9302 assert!(pick_open_pr(r#"[{"title":"t","baseRefName":"main"}]"#, "main").is_err());
9303 }
9304
9305 #[test]
9306 fn pick_merged_pr_picks_the_unique_match() {
9307 let json = r#"[
9308 {"url": "https://github.com/o/r/pull/42", "number": 42,
9309 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"}
9310 ]"#;
9311 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9312 let found = pick_merged_pr(json, "main", created_at)
9313 .expect("valid json")
9314 .expect("one unambiguous match");
9315 assert_eq!(found.url, "https://github.com/o/r/pull/42");
9316 assert_eq!(found.number, 42);
9317 }
9318
9319 #[test]
9323 fn pick_merged_pr_refuses_when_more_than_one_candidate_survives() {
9324 let json = r#"[
9325 {"url": "https://github.com/o/r/pull/42", "number": 42,
9326 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "main"},
9327 {"url": "https://github.com/o/r/pull/43", "number": 43,
9328 "mergedAt": "2026-09-21T10:00:00Z", "baseRefName": "main"}
9329 ]"#;
9330 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9331 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9332 }
9333
9334 #[test]
9338 fn pick_merged_pr_ignores_a_different_base_branch() {
9339 let json = r#"[
9340 {"url": "https://github.com/o/r/pull/42", "number": 42,
9341 "mergedAt": "2026-09-20T10:00:00Z", "baseRefName": "release"}
9342 ]"#;
9343 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9344 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9345 }
9346
9347 #[test]
9350 fn pick_merged_pr_ignores_a_merge_that_predates_the_run() {
9351 let json = r#"[
9352 {"url": "https://github.com/o/r/pull/42", "number": 42,
9353 "mergedAt": "2026-09-18T10:00:00Z", "baseRefName": "main"}
9354 ]"#;
9355 let created_at: Timestamp = "2026-09-19T00:00:00Z".parse().unwrap();
9356 assert_eq!(pick_merged_pr(json, "main", created_at).unwrap(), None);
9357 }
9358
9359 #[test]
9360 fn slug_of_pr_url_reads_host_owner_and_repo() {
9361 assert_eq!(
9362 slug_of_pr_url("https://github.com/yukimemi/shun/pull/272").as_deref(),
9363 Some("github.com/yukimemi/shun")
9364 );
9365 }
9366
9367 #[test]
9368 fn slug_of_pr_url_refuses_a_url_with_no_pull_segment() {
9369 assert_eq!(slug_of_pr_url("https://github.com/yukimemi/shun"), None);
9370 assert_eq!(slug_of_pr_url("not a url at all"), None);
9371 assert_eq!(slug_of_pr_url("https://github.com"), None);
9372 }
9373
9374 #[test]
9375 fn slug_of_repo_url_reads_host_owner_and_repo() {
9376 assert_eq!(
9377 slug_of_repo_url("https://github.com/yukimemi/magi").as_deref(),
9378 Some("github.com/yukimemi/magi")
9379 );
9380 assert_eq!(slug_of_repo_url("https://github.com"), None);
9381 }
9382
9383 #[test]
9384 fn ensure_same_repo_accepts_a_matching_slug_regardless_of_case() {
9385 ensure_same_repo("github.com/yukimemi/magi", "GitHub.Com/YukiMemi/Magi")
9386 .expect("same repo, different case");
9387 }
9388
9389 #[test]
9394 fn ensure_same_repo_refuses_a_different_repo() {
9395 let err =
9396 ensure_same_repo("github.com/yukimemi/magi", "github.com/yukimemi/shun").unwrap_err();
9397 let msg = format!("{err:#}");
9398 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
9399 assert!(msg.contains("github.com/yukimemi/shun"), "{msg}");
9400 }
9401
9402 #[test]
9407 fn ensure_same_repo_refuses_the_same_slug_on_a_different_host() {
9408 let err = ensure_same_repo(
9409 "github.com/yukimemi/magi",
9410 "github.example.com/yukimemi/magi",
9411 )
9412 .unwrap_err();
9413 let msg = format!("{err:#}");
9414 assert!(msg.contains("github.com/yukimemi/magi"), "{msg}");
9415 assert!(msg.contains("github.example.com/yukimemi/magi"), "{msg}");
9416 }
9417
9418 #[tokio::test]
9423 async fn find_external_merge_returns_none_without_a_winner() {
9424 let state = RunState::new(
9425 PathBuf::from("/no/such/repo"),
9426 "main".to_owned(),
9427 "0000000000000000000000000000000000000000".to_owned(),
9428 "irrelevant".to_owned(),
9429 crate::config::Config::default(),
9430 );
9431 assert_eq!(find_external_merge(&state).await.unwrap(), None);
9432 }
9433
9434 fn pr_run(home: &Path, id: &str, repo: &str, status: RunStatus, url: &str, state: &str) {
9435 let mut run = RunState::new(
9436 PathBuf::from(repo),
9437 "main".to_owned(),
9438 "abcdef1234".to_owned(),
9439 "x".to_owned(),
9440 crate::config::Config::default(),
9441 );
9442 run.id = id.to_owned();
9443 run.status = status;
9444 run.driver_exited = true;
9445 run.pr = Some(crate::run::PrRecord {
9446 number: url.rsplit('/').next().unwrap().parse().unwrap(),
9447 url: url.to_owned(),
9448 state: state.to_owned(),
9449 checks: "red".to_owned(),
9450 round: 0,
9451 rounds: 2,
9452 red_at_merge: Vec::new(),
9453 });
9454 run.save_under(home).unwrap();
9455 }
9456
9457 fn recorded(home: &Path, id: &str) -> String {
9458 let body = std::fs::read_to_string(home.join("runs").join(id).join("run.json")).unwrap();
9459 serde_json::from_str::<RunState>(&body)
9460 .unwrap()
9461 .pr
9462 .unwrap()
9463 .state
9464 }
9465
9466 const PR: &str = "https://github.com/o/r/pull/7";
9467
9468 #[test]
9469 fn write_through_updates_predecessors_and_siblings_only() {
9470 let tmp = tempfile::tempdir().unwrap();
9471 let h = tmp.path();
9472 pr_run(
9473 h,
9474 "20261004-100000-aaaa",
9475 "/repo/r",
9476 RunStatus::Superseded,
9477 PR,
9478 "open",
9479 );
9480 pr_run(
9481 h,
9482 "20261004-100100-bbbb",
9483 "/repo/r",
9484 RunStatus::Blocked,
9485 PR,
9486 "open",
9487 );
9488 pr_run(
9490 h,
9491 "20261004-100200-cccc",
9492 "/repo/r",
9493 RunStatus::Landing,
9494 PR,
9495 "open",
9496 );
9497 pr_run(
9499 h,
9500 "20261004-100300-dddd",
9501 "/repo/other",
9502 RunStatus::Blocked,
9503 "https://github.com/o/other/pull/7",
9504 "open",
9505 );
9506 pr_run(
9508 h,
9509 "20261004-100400-eeee",
9510 "/repo/r",
9511 RunStatus::Blocked,
9512 "https://github.com/o/r/pull/8",
9513 "open",
9514 );
9515 pr_run(
9516 h,
9517 "20261004-100500-ffff",
9518 "/repo/r",
9519 RunStatus::Merged,
9520 PR,
9521 "open",
9522 );
9523 let source = RunState::load_under("20261004-100500-ffff", h).unwrap();
9524
9525 assert_eq!(
9526 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
9527 2
9528 );
9529 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
9530 assert_eq!(recorded(h, "20261004-100100-bbbb"), "merged");
9531 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
9532 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
9533 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
9534 assert_eq!(recorded(h, "20261004-100500-ffff"), "open");
9536 assert_eq!(
9538 write_pr_state_through_in(h, &source, PrLifecycle::Merged),
9539 0
9540 );
9541 let hit = RunState::load_under("20261004-100000-aaaa", h).unwrap();
9542 assert!(hit.events.iter().any(|e| e.message.contains("merged")));
9543 }
9544
9545 #[test]
9546 fn lifecycle_updates_preserve_live_and_unknown_terminal_drivers() {
9547 let home = tempfile::tempdir().unwrap();
9548 let live_id = "20261004-100000-aaaa";
9549 let unknown_id = "20261004-100100-bbbb";
9550 for id in [live_id, unknown_id] {
9551 pr_run(home.path(), id, "repo", RunStatus::Ready, PR, "open");
9552 let mut s = RunState::load_under(id, home.path()).unwrap();
9553 s.driver_exited = false;
9554 s.driver_claimed = None;
9556 if id == live_id {
9557 s.driver_pid = Some(std::process::id());
9558 s.driver_started_at = crate::proc::process_started_at(std::process::id());
9559 }
9560 s.save_under(home.path()).unwrap();
9561 if id == unknown_id {
9562 assert_eq!(
9563 s.liveness_under(home.path(), false),
9564 crate::run::Liveness::Unknown
9565 );
9566 }
9567 }
9568 let known = BTreeMap::from([(PR.to_owned(), PrLifecycle::Merged)]);
9569 assert_eq!(apply_pr_states(home.path(), &known), 0);
9570 for id in [live_id, unknown_id] {
9571 assert_eq!(recorded(home.path(), id), "open");
9572 }
9573 }
9574
9575 #[test]
9576 fn repair_rewrites_merged_and_closed_and_leaves_open_and_unknown() {
9577 let tmp = tempfile::tempdir().unwrap();
9578 let h = tmp.path();
9579 let url = |n: u32| format!("https://github.com/o/r/pull/{n}");
9580 pr_run(
9581 h,
9582 "20261004-100000-aaaa",
9583 "/repo/r",
9584 RunStatus::Superseded,
9585 &url(1),
9586 "open",
9587 );
9588 pr_run(
9589 h,
9590 "20261004-100100-bbbb",
9591 "/repo/r",
9592 RunStatus::Blocked,
9593 &url(2),
9594 "open",
9595 );
9596 pr_run(
9597 h,
9598 "20261004-100200-cccc",
9599 "/repo/r",
9600 RunStatus::Ready,
9601 &url(3),
9602 "open",
9603 );
9604 pr_run(
9605 h,
9606 "20261004-100300-dddd",
9607 "/repo/r",
9608 RunStatus::Ready,
9609 &url(4),
9610 "open",
9611 );
9612 pr_run(
9613 h,
9614 "20261004-100400-eeee",
9615 "/repo/r",
9616 RunStatus::Implementing,
9617 &url(1),
9618 "open",
9619 );
9620 assert_eq!(stale_open_prs(h).len(), 4);
9621
9622 let mut known = BTreeMap::new();
9623 known.insert(url(1), PrLifecycle::Merged);
9624 known.insert(url(2), PrLifecycle::Closed);
9625 known.insert(url(3), PrLifecycle::Open);
9626 assert_eq!(apply_pr_states(h, &known), 2);
9628 assert_eq!(recorded(h, "20261004-100000-aaaa"), "merged");
9629 assert_eq!(recorded(h, "20261004-100100-bbbb"), "closed");
9630 assert_eq!(recorded(h, "20261004-100200-cccc"), "open");
9631 assert_eq!(recorded(h, "20261004-100300-dddd"), "open");
9632 assert_eq!(recorded(h, "20261004-100400-eeee"), "open");
9633 assert_eq!(apply_pr_states(h, &known), 0);
9634 }
9635
9636 use std::collections::VecDeque;
9639 use std::sync::Mutex;
9640
9641 struct Scripted {
9644 evidence: Mutex<Option<CiEvidence>>,
9645 views: Mutex<VecDeque<Seen>>,
9646 merges: Mutex<VecDeque<(bool, String)>>,
9647 fix: Mutex<Option<Fixed>>,
9648 log: Mutex<Vec<&'static str>>,
9649 argvs: Mutex<Vec<Vec<String>>>,
9650 required: Mutex<Option<BTreeSet<String>>>,
9651 merged: Mutex<bool>,
9654 queued: Mutex<bool>,
9655 unreadable_after_merge: Mutex<bool>,
9657 reruns: Mutex<Vec<String>>,
9659 rerun_fails: Mutex<bool>,
9660 clock: Mutex<i64>,
9662 }
9663
9664 impl Scripted {
9665 fn new(views: Vec<Seen>, merges: Vec<(bool, &str)>) -> Self {
9666 Self {
9667 evidence: Mutex::new(None),
9668 views: Mutex::new(views.into()),
9669 merges: Mutex::new(
9670 merges
9671 .into_iter()
9672 .map(|(ok, m)| (ok, m.to_owned()))
9673 .collect(),
9674 ),
9675 fix: Mutex::new(None),
9676 log: Mutex::new(Vec::new()),
9677 argvs: Mutex::new(Vec::new()),
9678 required: Mutex::new(None),
9679 merged: Mutex::new(false),
9680 queued: Mutex::new(false),
9681 unreadable_after_merge: Mutex::new(false),
9682 reruns: Mutex::new(Vec::new()),
9683 rerun_fails: Mutex::new(false),
9684 clock: Mutex::new(1_000),
9685 }
9686 }
9687 fn argvs(&self) -> Vec<Vec<String>> {
9688 self.argvs.lock().unwrap().clone()
9689 }
9690 fn calls(&self) -> Vec<&'static str> {
9691 self.log.lock().unwrap().clone()
9692 }
9693 }
9694
9695 impl Forge for Scripted {
9696 async fn attribution(&self, _state: &RunState, _seen: &Seen) -> Option<CiEvidence> {
9697 self.evidence.lock().unwrap().clone()
9698 }
9699 async fn view(&self, _repo: &Path, _url: &str) -> Result<Seen> {
9700 self.log.lock().unwrap().push("view");
9701 if *self.unreadable_after_merge.lock().unwrap()
9702 && !self.argvs.lock().unwrap().is_empty()
9703 {
9704 anyhow::bail!("forge unreachable");
9705 }
9706 let mut v = self.views.lock().unwrap();
9707 let mut seen = if v.len() > 1 {
9708 v.pop_front().unwrap()
9709 } else {
9710 v[0].clone()
9711 };
9712 if *self.merged.lock().unwrap() {
9713 seen.pr.state = PrLifecycle::Merged;
9714 }
9715 Ok(seen)
9716 }
9717 async fn merge(&self, _repo: &Path, argv: &[String]) -> Result<(bool, String)> {
9718 self.log.lock().unwrap().push("merge");
9719 self.argvs.lock().unwrap().push(argv.to_vec());
9720 let out = self
9721 .merges
9722 .lock()
9723 .unwrap()
9724 .pop_front()
9725 .expect("unscripted merge");
9726 if out.0 && !*self.queued.lock().unwrap() && !argv.iter().any(|a| a == "--disable-auto")
9727 {
9728 *self.merged.lock().unwrap() = true;
9729 }
9730 Ok(out)
9731 }
9732 async fn poll(&self) {
9733 self.log.lock().unwrap().push("poll");
9734 *self.clock.lock().unwrap() += POLL.as_secs() as i64;
9735 }
9736 async fn rerun(&self, _repo: &Path, run: &str) -> Result<()> {
9737 self.log.lock().unwrap().push("rerun");
9738 self.reruns.lock().unwrap().push(run.to_owned());
9739 if *self.rerun_fails.lock().unwrap() {
9740 anyhow::bail!("gh run rerun: no");
9741 }
9742 Ok(())
9743 }
9744 fn now(&self) -> i64 {
9745 *self.clock.lock().unwrap()
9746 }
9747 async fn required_contexts(&self, _repo: &Path, _base: &str) -> Option<BTreeSet<String>> {
9748 self.required.lock().unwrap().clone()
9749 }
9750 async fn fix(
9751 &self,
9752 _state: &mut RunState,
9753 _pr: &PrState,
9754 _round: usize,
9755 _budget: usize,
9756 _reason: &str,
9757 _logs: &str,
9758 ) -> Result<Fixed> {
9759 self.log.lock().unwrap().push("fix");
9760 Ok(self.fix.lock().unwrap().take().expect("unscripted fix"))
9761 }
9762 }
9763
9764 const REFUSED: &str =
9765 "X Pull request #42 is not mergeable: the base branch policy prohibits the merge.";
9766
9767 fn seen(head: &str, checks: Checks, merge_state: &str, comments: bool) -> Seen {
9768 let mut pr = green_pr();
9769 pr.checks = checks;
9770 pr.blocking = Blocking::of(merge_state);
9771 if !comments {
9772 pr.review_comments.clear();
9773 }
9774 Seen {
9775 pr,
9776 title: "feat: x".to_owned(),
9777 failing_urls: Vec::new(),
9778 head: head.to_owned(),
9779 rollup_head: head.to_owned(),
9780 merge_state: merge_state.to_owned(),
9781 contexts: Vec::new(),
9782 base: "main".to_owned(),
9783 }
9784 }
9785
9786 fn landing_state() -> RunState {
9787 crate::run::pin_test_home();
9788 let mut state = run_state();
9789 state.config.graph.land_approval = false;
9790 state
9791 }
9792
9793 #[test]
9794 fn a_pushed_head_is_awaited_case_insensitively_and_an_unreadable_one_is_not_a_match() {
9795 assert!(!awaiting_new_head(None, "aaa"));
9796 assert!(!awaiting_new_head(Some("abc123"), "ABC123"));
9797 assert!(awaiting_new_head(Some("abc123"), "def456"));
9798 assert!(awaiting_new_head(Some("abc123"), ""));
9799 }
9800
9801 #[test]
9802 fn a_refusal_is_judged_by_the_pull_requests_state_not_by_its_wording() {
9803 let open = |c, m: &str| seen("a", c, m, false);
9804 let table = [
9805 (None, false, Refused::Pending),
9806 (
9807 Some(open(Checks::Pending, "BLOCKED")),
9808 false,
9809 Refused::Pending,
9810 ),
9811 (
9812 Some(open(Checks::Unknown, "BLOCKED")),
9813 false,
9814 Refused::Pending,
9815 ),
9816 (
9817 Some(open(Checks::Green, "UNKNOWN")),
9818 false,
9819 Refused::Pending,
9820 ),
9821 (Some(open(Checks::Green, "")), false, Refused::Pending),
9822 (
9823 Some(open(Checks::Green, "BLOCKED")),
9824 false,
9825 Refused::Recheck,
9826 ),
9827 (Some(open(Checks::Green, "BLOCKED")), true, Refused::Final),
9828 ];
9829 for (after, rechecked, want) in table {
9830 assert_eq!(
9831 classify_refusal(after.as_ref(), rechecked, "a", CiExpectation::Expected),
9832 want
9833 );
9834 }
9835 let mut closed = open(Checks::Green, "CLEAN");
9836 closed.pr.state = PrLifecycle::Closed;
9837 assert_eq!(
9838 classify_refusal(Some(&closed), false, "a", CiExpectation::Expected),
9839 Refused::Final
9840 );
9841 }
9842
9843 #[tokio::test]
9844 async fn a_normal_landing_merges_on_the_first_look() {
9845 let mut state = landing_state();
9846 let forge = Scripted::new(
9847 vec![seen("a", Checks::Green, "CLEAN", false)],
9848 vec![(true, "")],
9849 );
9850 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9851 .await
9852 .unwrap();
9853 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
9855 assert_eq!(state.status, RunStatus::Merged);
9856 }
9857
9858 #[tokio::test]
9859 async fn a_successful_merge_command_that_only_queued_is_not_a_merge() {
9860 let mut state = landing_state();
9861 let forge = Scripted::new(
9862 vec![seen("a", Checks::Green, "CLEAN", false)],
9863 std::iter::repeat_n((true, ""), 100).collect(),
9864 );
9865 *forge.queued.lock().unwrap() = true;
9866 let task = async {
9867 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9868 .await
9869 .unwrap();
9870 };
9871 task.await;
9874 assert_ne!(state.status, RunStatus::Merged);
9875 }
9876
9877 #[tokio::test]
9878 async fn an_unreadable_forge_after_a_merge_command_is_not_a_confirmation() {
9879 let mut state = landing_state();
9880 let forge = Scripted::new(
9881 vec![seen("a", Checks::Green, "CLEAN", false)],
9882 std::iter::repeat_n((true, ""), 100).collect(),
9883 );
9884 *forge.unreadable_after_merge.lock().unwrap() = true;
9885 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9886 .await
9887 .ok();
9888 assert_ne!(state.status, RunStatus::Merged);
9889 }
9890
9891 #[tokio::test]
9892 async fn a_task_public_head_is_awaited_on_land_entry() {
9893 let mut state = landing_state();
9894 state.pr_head = Some("magi/task-abcd-1234".into());
9895 state.pr_pushed_head = Some("new".into());
9896 let forge = Scripted::new(
9897 vec![
9898 seen("old", Checks::Green, "CLEAN", false),
9899 seen("new", Checks::Green, "CLEAN", false),
9900 ],
9901 vec![(true, "")],
9902 );
9903 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9904 .await
9905 .unwrap();
9906 assert_eq!(
9907 forge.calls(),
9908 ["view", "poll", "view", "view", "merge", "view"]
9909 );
9910 assert_eq!(state.status, RunStatus::Merged);
9911 }
9912
9913 #[tokio::test]
9914 async fn a_superseded_public_head_owner_cannot_reenter_land() {
9915 let mut state = landing_state();
9916 state.pr_taken_over_by = Some("next".into());
9917 let forge = Scripted::new(vec![seen("a", Checks::Green, "CLEAN", false)], vec![]);
9918 assert!(
9919 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9920 .await
9921 .is_err()
9922 );
9923 assert!(forge.calls().is_empty());
9924 }
9925
9926 #[tokio::test]
9927 async fn after_a_pushed_fix_no_merge_is_tried_until_the_head_matches() {
9928 let mut state = landing_state();
9929 let forge = Scripted::new(
9930 vec![
9931 seen("old", Checks::Green, "CLEAN", true),
9932 seen("old", Checks::Green, "CLEAN", true),
9934 seen("new", Checks::Pending, "BLOCKED", true),
9935 seen("new", Checks::Green, "CLEAN", true),
9936 ],
9937 vec![(true, "")],
9938 );
9939 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
9940 head: "NEW".to_owned(),
9941 });
9942 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9943 .await
9944 .unwrap();
9945 assert_eq!(
9946 forge.calls(),
9947 [
9948 "view", "fix", "poll", "view", "poll", "view", "poll", "view", "view", "merge",
9949 "view"
9950 ]
9951 );
9952 assert_eq!(state.status, RunStatus::Merged);
9953 }
9954
9955 #[tokio::test]
9956 async fn a_head_that_never_arrives_stops_naming_both_commits() {
9957 let mut state = landing_state();
9958 let forge = Scripted::new(
9959 vec![
9960 seen("old", Checks::Green, "CLEAN", true),
9961 seen("someone-elses", Checks::Green, "CLEAN", true),
9962 ],
9963 vec![],
9964 );
9965 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
9966 head: "mine".to_owned(),
9967 });
9968 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9969 .await
9970 .unwrap();
9971 assert!(!forge.calls().contains(&"merge"));
9972 let why = state.merge.as_ref().unwrap().detail.clone();
9973 assert!(
9974 why.contains("mine") && why.contains("someone-elses"),
9975 "{why}"
9976 );
9977 assert_eq!(state.status, RunStatus::Blocked);
9978 }
9979
9980 #[tokio::test]
9981 async fn a_policy_refusal_while_checks_run_waits_and_then_merges() {
9982 let mut state = landing_state();
9983 let forge = Scripted::new(
9984 vec![
9985 seen("a", Checks::Green, "CLEAN", false),
9986 seen("a", Checks::Green, "CLEAN", false),
9987 seen("a", Checks::Pending, "BLOCKED", false),
9988 seen("a", Checks::Pending, "BLOCKED", false),
9989 seen("a", Checks::Green, "CLEAN", false),
9990 ],
9991 vec![(false, REFUSED), (true, "")],
9992 );
9993 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
9994 .await
9995 .unwrap();
9996 assert_eq!(
9997 forge.calls(),
9998 [
9999 "view", "view", "merge", "view", "poll", "view", "poll", "view", "view", "merge",
10000 "view"
10001 ]
10002 );
10003 assert_eq!(state.status, RunStatus::Merged);
10004 }
10005
10006 #[tokio::test]
10007 async fn a_refusal_that_outlives_settled_checks_stops_with_the_merge_state() {
10008 let mut state = landing_state();
10009 let forge = Scripted::new(
10010 vec![
10011 seen("a", Checks::Green, "CLEAN", false),
10012 seen("a", Checks::Green, "BLOCKED", false),
10013 ],
10014 vec![(false, REFUSED), (false, REFUSED)],
10015 );
10016 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10017 .await
10018 .unwrap();
10019 assert_eq!(forge.calls().iter().filter(|c| **c == "merge").count(), 2);
10021 let why = state.merge.as_ref().unwrap().detail.clone();
10022 assert!(
10023 why.contains("policy prohibits") && why.contains("BLOCKED") && why.contains("refused"),
10024 "{why}"
10025 );
10026 assert_eq!(state.status, RunStatus::Blocked);
10027 }
10028
10029 #[test]
10030 fn a_decision_is_bound_to_a_head_only_when_every_signal_agrees() {
10031 assert_eq!(bound_head("abc", "abc", None), Some("abc"));
10032 assert_eq!(bound_head("abc", "ABC", Some("abc")), Some("abc"));
10033 assert_eq!(bound_head("old", "old", Some("new")), None);
10035 assert_eq!(bound_head("new", "old", Some("new")), None);
10037 assert_eq!(bound_head("new", "old", None), None);
10038 assert_eq!(bound_head("", "", None), None);
10040 assert_eq!(bound_head("", "", Some("new")), None);
10041 assert_eq!(bound_head("abc", "", None), None);
10042 }
10043
10044 fn view_json(head: &str) -> String {
10045 format!(
10046 r#"{{"url":"https://github.com/o/r/pull/42","number":42,"state":"OPEN",
10047 "title":"t","headRefOid":"{head}","mergeStateStatus":"CLEAN",
10048 "reviews":[],"comments":[]}}"#
10049 )
10050 }
10051
10052 fn node_json(oid: &str, check: &str, has_next: bool) -> String {
10053 format!(
10054 r#"{{"data":{{"repository":{{"pullRequest":{{"commits":{{"nodes":[{{"commit":
10055 {{"oid":"{oid}","statusCheckRollup":{{"contexts":{{"pageInfo":{{"hasNextPage":{has_next}}},
10056 "nodes":[{{"__typename":"CheckRun","name":"ci","status":"COMPLETED",
10057 "conclusion":"{check}","detailsUrl":"https://example.test/1"}}]}}}}}}}}]}}}}}}}}}}"#
10058 )
10059 }
10060
10061 #[test]
10062 fn rollup_is_bound_to_the_commit_in_the_same_node() {
10063 let s = seen_from(&view_json("new"), Some(&node_json("old", "FAILURE", false))).unwrap();
10066 assert_eq!(s.rollup_head, "old");
10067 assert_eq!(s.pr.checks, Checks::Red);
10068 assert_eq!(bound_head(&s.head, &s.rollup_head, Some("new")), None);
10069 assert_eq!(s.failing_urls.len(), 1);
10070 }
10071
10072 #[test]
10073 fn checks_come_from_the_node_not_the_view() {
10074 let view = view_json("new").replace(
10075 r#""reviews""#,
10076 r#""statusCheckRollup":[{"name":"ci","status":"COMPLETED","conclusion":"FAILURE"}],"reviews""#,
10077 );
10078 let s = seen_from(&view, Some(&node_json("new", "SUCCESS", false))).unwrap();
10079 assert_eq!(s.pr.checks, Checks::Green);
10080 assert!(s.pr.failing.is_empty());
10081 assert_eq!(
10082 bound_head(&s.head, &s.rollup_head, Some("new")),
10083 Some("new")
10084 );
10085 }
10086
10087 #[test]
10088 fn an_unreadable_or_paged_node_leaves_the_head_unbound() {
10089 for node in [
10090 None,
10091 Some("not json".to_owned()),
10092 Some(r#"{"errors":[{"message":"x"}]}"#.to_owned()),
10093 Some(node_json("new", "SUCCESS", true)),
10094 ] {
10095 let s = seen_from(&view_json("new"), node.as_deref()).unwrap();
10096 assert!(s.rollup_head.is_empty());
10097 assert_eq!(s.pr.checks, Checks::Unknown);
10098 assert_eq!(bound_head(&s.head, &s.rollup_head, None), None);
10099 }
10100 }
10101
10102 #[test]
10103 fn the_merge_command_is_pinned_to_the_observed_head() {
10104 let argv = merge_argv_at(7, "feat: x", "deadbeef");
10105 let at = argv
10106 .iter()
10107 .position(|a| a == "--match-head-commit")
10108 .unwrap();
10109 assert_eq!(argv[at + 1], "deadbeef");
10110 }
10111
10112 #[tokio::test]
10113 async fn stale_checks_after_a_fix_push_never_reach_a_merge() {
10114 let mut state = landing_state();
10115 let mut stale = seen("new", Checks::Red, "CLEAN", false);
10118 stale.rollup_head = "old".to_owned();
10119 let forge = Scripted::new(
10120 vec![seen("old", Checks::Green, "CLEAN", true), stale],
10121 vec![],
10122 );
10123 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10124 head: "new".to_owned(),
10125 });
10126 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10127 .await
10128 .unwrap();
10129 assert!(!forge.calls().contains(&"merge"));
10130 assert_eq!(state.status, RunStatus::Blocked);
10131 let why = state.merge.as_ref().unwrap().detail.clone();
10132 assert!(why.contains("new") && why.contains("old"), "{why}");
10133 }
10134
10135 #[test]
10136 fn a_refusal_read_against_another_commits_checks_is_pending() {
10137 let mut after = seen("a", Checks::Green, "BLOCKED", false);
10138 after.rollup_head = "old".to_owned();
10139 assert_eq!(
10140 classify_refusal(Some(&after), true, "a", CiExpectation::Expected),
10141 Refused::Pending
10142 );
10143 }
10144
10145 #[tokio::test]
10146 async fn absent_ci_empty_rollup_reaches_approval_then_merges_on_the_approved_head() {
10147 let mut state = landing_state();
10148 state.config.merge.ci = crate::config::MergeCi::None;
10149 state.config.graph.land_approval = true;
10150 let forge = Scripted::new(
10151 vec![seen("a", Checks::Unknown, "CLEAN", false)],
10152 vec![(true, "")],
10153 );
10154 land_with(&mut state, URL, &forge).await.unwrap();
10155 assert!(state.parked);
10156 assert_eq!(forge.calls(), ["view"]);
10157 let store = ask::Questions::open();
10158 let mut q = store
10159 .get(&state.land_approval.as_ref().unwrap().question)
10160 .unwrap();
10161 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
10162 store.put(&mut q).unwrap();
10163
10164 land_with(&mut state, URL, &forge).await.unwrap();
10165 assert_eq!(forge.calls(), ["view", "view", "view", "merge", "view"]);
10166 assert_eq!(state.status, RunStatus::Merged);
10167 assert_eq!(
10168 value_of(&forge.argvs()[0], "--match-head-commit"),
10169 Some("a")
10170 );
10171 }
10172
10173 #[tokio::test]
10174 async fn absent_ci_ignores_failed_workflow_runs_without_rerunning_them() {
10175 let mut state = landing_state();
10176 state.config.merge.ci = crate::config::MergeCi::None;
10177 let forge = Scripted::new(vec![red("a", Some("7"))], vec![(true, "")]);
10178 land_with(&mut state, URL, &forge).await.unwrap();
10179 assert!(forge.reruns.lock().unwrap().is_empty());
10180 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10181 assert_eq!(state.status, RunStatus::Merged);
10182 }
10183
10184 #[test]
10185 fn absent_ci_still_requires_a_readable_matching_head_and_resolved_comments() {
10186 let shown = BTreeSet::new();
10187 let guard = |s: Option<&Seen>| {
10188 direct_merge_is_safe(s, "a", &shown, 0, 4, Duration::ZERO, CiExpectation::Absent)
10189 };
10190 let mut fresh = seen("a", Checks::Unknown, "CLEAN", false);
10191 assert!(guard(Some(&fresh)));
10192 assert!(!guard(None));
10193 fresh.rollup_head = "old".to_owned();
10194 assert!(!guard(Some(&fresh)));
10195 fresh.rollup_head = "a".to_owned();
10196 fresh.head = "b".to_owned();
10197 assert!(!guard(Some(&fresh)));
10198 assert!(!guard(Some(&seen("a", Checks::Unknown, "CLEAN", true))));
10199 assert!(!guard(Some(&seen("a", Checks::Unknown, "DIRTY", false))));
10200 }
10201
10202 #[test]
10203 fn absent_ci_refusal_does_not_wait_for_third_party_checks() {
10204 for checks in [Checks::Unknown, Checks::Pending, Checks::Red, Checks::Green] {
10205 let after = seen("a", checks, "BLOCKED", false);
10206 assert_eq!(
10207 classify_refusal(Some(&after), false, "a", CiExpectation::Absent),
10208 Refused::Recheck
10209 );
10210 assert_eq!(
10211 classify_refusal(Some(&after), true, "a", CiExpectation::Absent),
10212 Refused::Final
10213 );
10214 }
10215 }
10216
10217 #[tokio::test]
10218 async fn a_matching_head_with_red_non_required_checks_still_merges() {
10219 let mut state = landing_state();
10220 let forge = Scripted::new(
10221 vec![seen("a", Checks::Red, "CLEAN", false)],
10222 vec![(true, "")],
10223 );
10224 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10225 .await
10226 .unwrap();
10227 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10228 assert_eq!(state.status, RunStatus::Merged);
10229 }
10230
10231 #[tokio::test]
10232 async fn a_merge_refused_because_the_head_moved_looks_again_instead_of_failing() {
10233 let mut state = landing_state();
10234 let forge = Scripted::new(
10235 vec![
10236 seen("a", Checks::Green, "CLEAN", false),
10237 seen("a", Checks::Green, "CLEAN", false),
10238 seen("b", Checks::Green, "BLOCKED", false),
10240 seen("b", Checks::Green, "CLEAN", false),
10241 ],
10242 vec![(false, REFUSED), (true, "")],
10243 );
10244 land_with(&mut state, "https://github.com/o/r/pull/42", &forge)
10245 .await
10246 .unwrap();
10247 assert_eq!(
10248 forge.calls(),
10249 [
10250 "view", "view", "merge", "view", "poll", "view", "view", "merge", "view"
10251 ]
10252 );
10253 assert_eq!(state.status, RunStatus::Merged);
10254 }
10255
10256 fn merged_view(head: &str) -> Seen {
10257 let mut m = seen(head, Checks::Green, "CLEAN", false);
10258 m.pr.state = PrLifecycle::Merged;
10259 m
10260 }
10261
10262 fn has(argv: &[String], flag: &str) -> bool {
10263 argv.iter().any(|a| a == flag)
10264 }
10265
10266 fn value_of<'a>(argv: &'a [String], flag: &str) -> Option<&'a str> {
10267 let at = argv.iter().position(|a| a == flag)?;
10268 argv.get(at + 1).map(String::as_str)
10269 }
10270
10271 const URL: &str = "https://github.com/o/r/pull/42";
10272
10273 #[tokio::test]
10274 async fn the_merge_step_merges_directly_on_the_observed_head_and_never_arms() {
10275 let mut state = landing_state();
10276 let forge = Scripted::new(
10277 vec![
10278 seen("abc", Checks::Green, "CLEAN", false),
10279 seen("abc", Checks::Green, "CLEAN", false),
10280 ],
10281 vec![(true, "")],
10282 );
10283 land_with(&mut state, URL, &forge).await.unwrap();
10284 assert_eq!(forge.calls(), ["view", "view", "merge", "view"]);
10285 let argv = &forge.argvs()[0];
10286 assert!(has(argv, "--squash") && has(argv, "--subject"));
10287 assert!(!has(argv, "--auto") && !has(argv, "--admin"));
10288 assert_eq!(value_of(argv, "--match-head-commit"), Some("abc"));
10289 assert_eq!(state.status, RunStatus::Merged);
10290 assert!(state.land_armed_head.is_none());
10291 }
10292
10293 #[tokio::test]
10294 async fn a_resume_disables_an_arm_left_by_an_older_build_before_merging() {
10295 let mut state = landing_state();
10296 state.land_armed_head = Some("a".to_owned());
10297 let forge = Scripted::new(
10298 vec![seen("a", Checks::Green, "CLEAN", false)],
10299 vec![(true, ""), (true, "")],
10300 );
10301 land_with(&mut state, URL, &forge).await.unwrap();
10302 let argvs = forge.argvs();
10303 assert!(has(&argvs[0], "--disable-auto"));
10304 assert!(!has(&argvs[1], "--auto"));
10305 assert_eq!(value_of(&argvs[1], "--match-head-commit"), Some("a"));
10306 assert_eq!(state.status, RunStatus::Merged);
10307 assert!(state.land_armed_head.is_none());
10308 }
10309
10310 #[tokio::test]
10311 async fn an_approval_never_carries_over_to_a_new_head() {
10312 crate::run::pin_test_home();
10313 let mut state = run_state();
10314 state.config.graph.land_approval = true;
10315 let pr = green_pr();
10316 let store = ask::Questions::open();
10317
10318 approval_gate(&mut state, &pr, "feat: x", None, "aaa")
10319 .await
10320 .unwrap();
10321 let mut q = store
10322 .list()
10323 .into_iter()
10324 .find(|q| q.run == state.id)
10325 .unwrap();
10326 q.answer(ask::Answer::Choice(APPROVE.to_owned())).unwrap();
10327 store.put(&mut q).unwrap();
10328 assert_eq!(
10329 approval_gate(&mut state, &pr, "feat: x", None, "AAA")
10330 .await
10331 .unwrap(),
10332 ApprovalGate::Approved,
10333 "the same head keeps its approval"
10334 );
10335
10336 assert_eq!(
10338 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
10339 .await
10340 .unwrap(),
10341 ApprovalGate::Pending
10342 );
10343 let all: Vec<_> = store
10344 .list()
10345 .into_iter()
10346 .filter(|q| q.run == state.id)
10347 .collect();
10348 assert_eq!(all.len(), 2);
10349
10350 state.land_approval = None;
10352 assert_eq!(
10353 approval_gate(&mut state, &pr, "feat: x", None, "bbb")
10354 .await
10355 .unwrap(),
10356 ApprovalGate::Pending
10357 );
10358 let open = store
10359 .list()
10360 .into_iter()
10361 .filter(|q| q.run == state.id && q.status.open())
10362 .count();
10363 assert_eq!(open, 1, "the superseded question was retired");
10364 }
10365
10366 #[tokio::test]
10367 async fn the_merge_is_bound_to_the_head_it_was_decided_on() {
10368 let mut state = landing_state();
10369 let forge = Scripted::new(
10370 vec![
10371 seen("a", Checks::Green, "CLEAN", false),
10372 seen("b", Checks::Green, "CLEAN", false),
10374 ],
10375 vec![(true, "")],
10376 );
10377 land_with(&mut state, URL, &forge).await.unwrap();
10378 let argvs = forge.argvs();
10379 assert_eq!(argvs.len(), 1, "no merge was tried on the moved head");
10380 assert!(!has(&argvs[0], "--auto"));
10381 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("b"));
10382 assert_eq!(state.status, RunStatus::Merged);
10383 }
10384
10385 fn passing(label: &str) -> CheckInfo {
10386 CheckInfo {
10387 label: label.to_owned(),
10388 verdict: Verdict::Pass,
10389 required: Some(false),
10390 run: None,
10391 }
10392 }
10393
10394 fn failing(label: &str, run: Option<&str>) -> (String, Option<String>) {
10395 (label.to_owned(), run.map(str::to_owned))
10396 }
10397
10398 fn reran(head: &str, runs: &[(&str, i64)]) -> LandReruns {
10399 LandReruns {
10400 head: head.to_owned(),
10401 runs: runs.iter().map(|(r, at)| ((*r).to_owned(), *at)).collect(),
10402 }
10403 }
10404
10405 #[test]
10406 fn a_failed_run_is_rerun_once_then_waited_on_then_left_to_the_fixer() {
10407 let f = [failing("test (macos)", Some("7"))];
10408 assert_eq!(
10409 rerun_step(&f, None, "h", 100),
10410 RerunStep::Rerun(vec!["7".to_owned()])
10411 );
10412 let rec = reran("h", &[("7", 100)]);
10413 let grace = crate::release_watch::RERUN_GRACE;
10414 assert_eq!(
10415 rerun_step(&f, Some(&rec), "h", 100 + grace - 1),
10416 RerunStep::Grace
10417 );
10418 assert_eq!(rerun_step(&f, Some(&rec), "h", 100 + grace), RerunStep::Fix);
10419 }
10420
10421 #[test]
10422 fn a_failure_without_a_run_id_goes_to_the_fixer() {
10423 let f = [failing("a", Some("7")), failing("ci/external", None)];
10424 assert_eq!(rerun_step(&f, None, "h", 0), RerunStep::Fix);
10425 assert_eq!(rerun_step(&[], None, "h", 0), RerunStep::Fix);
10426 }
10427
10428 #[test]
10429 fn a_moved_head_forgets_the_reruns() {
10430 let f = [failing("a", Some("7"))];
10431 let rec = reran("old", &[("7", 100)]);
10432 assert_eq!(
10433 rerun_step(&f, Some(&rec), "new", 101),
10434 RerunStep::Rerun(vec!["7".to_owned()])
10435 );
10436 }
10437
10438 #[test]
10439 fn only_unrerun_runs_are_rerun_and_duplicates_collapse() {
10440 let f = [
10441 failing("a", Some("7")),
10442 failing("b", Some("7")),
10443 failing("c", Some("8")),
10444 ];
10445 assert_eq!(
10446 rerun_step(&f, None, "h", 0),
10447 RerunStep::Rerun(vec!["7".to_owned(), "8".to_owned()])
10448 );
10449 let rec = reran("h", &[("7", 0)]);
10450 assert_eq!(
10451 rerun_step(&f, Some(&rec), "h", 1),
10452 RerunStep::Rerun(vec!["8".to_owned()])
10453 );
10454 }
10455
10456 #[test]
10457 fn only_blocking_failures_are_candidates_for_a_rerun() {
10458 let check = |label: &str, verdict, required, run: &str| CheckInfo {
10459 label: label.to_owned(),
10460 verdict,
10461 required,
10462 run: Some(run.to_owned()),
10463 };
10464 let got = rerunnable(&[
10465 check("passed", Verdict::Pass, Some(true), "1"),
10466 check("optional", Verdict::Fail, Some(false), "2"),
10467 check("required", Verdict::Fail, Some(true), "3"),
10468 check("unknown", Verdict::Fail, None, "4"),
10469 ]);
10470 let labels: Vec<_> = got.iter().map(|(l, _)| l.as_str()).collect();
10471 assert_eq!(labels, ["required", "unknown"]);
10472 }
10473
10474 fn unrelated_ci_fixture() -> CiEvidence {
10475 let failure = CiFailure {
10476 path: "tests/web_render.rs".into(),
10477 start_line: 42,
10478 end_line: 42,
10479 title: "question_identity_disclosure_copy_and_live_updates".into(),
10480 message: "assertion failed".into(),
10481 };
10482 CiEvidence {
10483 head: "a".into(),
10484 base: "base-sha".into(),
10485 changed: vec![
10486 "AGENTS.md".into(),
10487 "src/talk.rs".into(),
10488 "tests/consult_investigation.rs".into(),
10489 ],
10490 checks: vec![CiCheckEvidence {
10491 label: "coverage".into(),
10492 head_check: 70,
10493 base_check: 60,
10494 app: 1,
10495 run: "7".into(),
10496 base_run: "6".into(),
10497 head_failures: vec![failure.clone()],
10498 base_failures: vec![failure],
10499 rerun_exhausted: true,
10500 }],
10501 }
10502 }
10503
10504 #[test]
10505 fn unrelated_ci_requires_complete_structural_evidence_for_every_failure() {
10506 let good = unrelated_ci_fixture();
10507 let red = vec!["coverage".into()];
10508 assert!(good.unrelated("a", &red));
10509 assert!(!good.unrelated("another-head", &red));
10510 assert!(!good.unrelated("a", &["coverage".into(), "test".into()]));
10511 assert!(!good.unrelated("a", &[]));
10512 for mutation in 0..8 {
10513 let mut bad = good.clone();
10514 match mutation {
10515 0 => bad.checks[0].rerun_exhausted = false,
10516 1 => bad.checks[0].base_failures.clear(),
10517 2 => bad.checks[0].head_failures.clear(),
10518 3 => bad.changed.push("tests/web_render.rs".into()),
10519 4 => bad.changed.push(".github/workflows/ci.yml".into()),
10520 5 => bad.checks[0].base_failures[0].message = "different failure".into(),
10521 6 => bad.checks.push(bad.checks[0].clone()),
10522 _ => bad.base.clear(),
10523 }
10524 assert!(!bad.unrelated("a", &red), "mutation {mutation}");
10525 }
10526 }
10527
10528 #[test]
10529 fn red_unknown_merge_state_waits_before_repair_but_never_implies_merge() {
10530 let pr = seen("a", Checks::Red, "UNKNOWN", false).pr;
10531 assert_eq!(decide(&pr, 0, 2, Duration::ZERO), Step::Wait);
10532 assert!(matches!(decide(&pr, 0, 2, CHECKS_GRACE), Step::Fix { .. }));
10533 assert!(matches!(
10534 decide(&pr, 2, 2, CHECKS_GRACE),
10535 Step::GiveUp { .. }
10536 ));
10537 let optional = CheckInfo {
10538 label: "coverage".into(),
10539 verdict: Verdict::Fail,
10540 required: Some(false),
10541 run: Some("7".into()),
10542 };
10543 assert!(rerunnable_with(std::slice::from_ref(&optional), false).is_empty());
10544 assert_eq!(
10545 rerunnable_with(&[optional], true),
10546 vec![("coverage".into(), Some("7".into()))]
10547 );
10548 }
10549
10550 #[tokio::test]
10551 async fn unrelated_ci_after_a_comment_round_does_not_charge_a_no_commit_stop() {
10552 let mut state = landing_state();
10553 let mut red = coverage_unknown();
10554 red.pr = seen("a", Checks::Red, "BLOCKED", true).pr;
10555 red.pr.failing = vec!["coverage".into()];
10556 let forge = Scripted::new(vec![red], vec![]);
10557 *forge.evidence.lock().unwrap() = Some(unrelated_ci_fixture());
10558 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10559 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10560 assert!(forge.calls().contains(&"fix"));
10561 assert!(state.land_unrelated.is_some());
10562 assert!(state.parked);
10563 assert!(
10564 !state
10565 .events
10566 .iter()
10567 .any(|e| e.message.contains("fixer produced no commit"))
10568 );
10569 }
10570
10571 fn coverage_unknown() -> Seen {
10572 let mut s = red("a", Some("7"));
10573 s.pr.blocking = Blocking::Unsaid;
10574 s.merge_state = "UNKNOWN".into();
10575 s.pr.failing = vec!["coverage".into()];
10576 s.contexts[0].label = "coverage".into();
10577 s.contexts[0].required = Some(false);
10578 s
10579 }
10580
10581 #[tokio::test]
10582 async fn run_196c_unknown_then_unstable_does_not_spend_a_fix_round() {
10583 let mut state = landing_state();
10584 let unknown = coverage_unknown();
10585 let mut unstable = unknown.clone();
10586 unstable.pr.blocking = Blocking::of("UNSTABLE");
10587 unstable.merge_state = "UNSTABLE".into();
10588 let forge = Scripted::new(vec![unknown, unstable], vec![(true, "")]);
10589 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10590 assert!(!forge.calls().contains(&"fix"));
10591 assert!(!forge.calls().contains(&"rerun"));
10592 assert_eq!(state.status, RunStatus::Merged);
10593 assert_eq!(state.pr.unwrap().round, 0);
10594 }
10595
10596 #[tokio::test]
10597 async fn run_196c_persistent_unknown_reruns_optional_once_then_parks_with_evidence() {
10598 let mut state = landing_state();
10599 let forge = Scripted::new(vec![coverage_unknown()], vec![]);
10600 *forge.evidence.lock().unwrap() = Some(unrelated_ci_fixture());
10601 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10602 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10603 assert!(!forge.calls().contains(&"fix"));
10604 assert!(state.parked);
10605 assert_eq!(state.status, RunStatus::Landing);
10606 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10607 let hold = state.land_unrelated.as_ref().unwrap();
10608 let q = ask::Questions::open().get(&hold.question).unwrap();
10609 assert!(
10610 q.actions
10611 .values()
10612 .any(|a| matches!(a, ask::ChoiceAction::Resume { .. }))
10613 );
10614 assert!(
10615 state
10616 .events
10617 .iter()
10618 .any(|e| e.message.contains("[ci-unrelated]") && e.message.contains("base-sha"))
10619 );
10620 let first = state.land_unsaid.clone();
10621 state.parked = false;
10623 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10624 assert_eq!(state.land_unsaid, first);
10625 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10626 }
10627
10628 fn red(head: &str, run: Option<&str>) -> Seen {
10629 let mut s = seen(head, Checks::Red, "BLOCKED", false);
10630 s.pr.failing = vec!["test (macos)".to_owned()];
10631 s.contexts = vec![CheckInfo {
10632 label: "test (macos)".to_owned(),
10633 verdict: Verdict::Fail,
10634 required: Some(true),
10635 run: run.map(str::to_owned),
10636 }];
10637 s
10638 }
10639
10640 const RERUN_PR: &str = "https://github.com/o/r/pull/42";
10641
10642 #[tokio::test]
10643 async fn a_flaky_red_check_is_rerun_without_a_fix_round_and_then_merges() {
10644 let mut state = landing_state();
10645 let forge = Scripted::new(
10646 vec![
10647 red("a", Some("7")),
10648 seen("a", Checks::Pending, "BLOCKED", false),
10649 seen("a", Checks::Green, "CLEAN", false),
10650 ],
10651 vec![(true, "")],
10652 );
10653 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10654 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10655 assert!(!forge.calls().contains(&"fix"));
10656 assert_eq!(state.status, RunStatus::Merged);
10657 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10658 let argvs = forge.argvs();
10659 assert_eq!(value_of(&argvs[0], "--match-head-commit"), Some("a"));
10660 assert!(
10661 state
10662 .events
10663 .iter()
10664 .any(|e| e.message.contains("test (macos)") && e.message.contains("run 7"))
10665 );
10666 }
10667
10668 #[tokio::test]
10669 async fn still_red_after_the_grace_goes_to_the_fixer_and_a_run_is_not_rerun_twice() {
10670 let mut state = landing_state();
10671 let forge = Scripted::new(
10672 vec![
10673 red("a", Some("7")),
10674 seen("a", Checks::Green, "CLEAN", false),
10675 ],
10676 vec![(true, "")],
10677 );
10678 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10679 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10681 assert_eq!(forge.reruns.lock().unwrap().len(), 1);
10682 let calls = forge.calls();
10683 let rerun_at = calls.iter().position(|c| *c == "rerun").unwrap();
10684 let fix_at = calls.iter().position(|c| *c == "fix");
10685 assert!(fix_at.is_none_or(|f| f > rerun_at));
10686 }
10687
10688 #[tokio::test]
10689 async fn a_failed_run_is_rerun_while_another_run_is_still_pending() {
10690 let mut state = landing_state();
10691 let mut v = red("a", Some("7"));
10692 v.pr.checks = Checks::Pending;
10693 v.contexts.push(CheckInfo {
10694 label: "slow".to_owned(),
10695 verdict: Verdict::Pending,
10696 required: Some(true),
10697 run: Some("8".to_owned()),
10698 });
10699 let forge = Scripted::new(
10700 vec![v, seen("a", Checks::Green, "CLEAN", false)],
10701 vec![(true, "")],
10702 );
10703 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10704 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10705 assert_eq!(state.status, RunStatus::Merged);
10706 }
10707
10708 #[test]
10709 fn a_run_with_a_job_still_going_is_not_rerun_yet() {
10710 let mut v = red("a", Some("7"));
10711 v.contexts.push(CheckInfo {
10712 label: "same run, still going".to_owned(),
10713 verdict: Verdict::Pending,
10714 required: Some(true),
10715 run: Some("7".to_owned()),
10716 });
10717 assert!(rerunnable(&v.contexts).is_empty());
10718 }
10719
10720 #[tokio::test]
10721 async fn the_rerun_is_made_even_when_the_fix_budget_is_spent() {
10722 let mut state = landing_state();
10723 state.config.graph.land_rounds = 0;
10724 let forge = Scripted::new(
10725 vec![
10726 red("a", Some("7")),
10727 seen("a", Checks::Green, "CLEAN", false),
10728 ],
10729 vec![(true, "")],
10730 );
10731 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10732 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10733 assert_eq!(state.status, RunStatus::Merged);
10734 assert!(!forge.calls().contains(&"fix"));
10735 assert_eq!(state.pr.as_ref().unwrap().round, 0);
10736 }
10737
10738 #[tokio::test]
10739 async fn the_last_fix_rounds_new_head_gets_its_rerun() {
10740 let mut state = landing_state();
10741 state.config.graph.land_rounds = 1;
10742 let forge = Scripted::new(
10743 vec![
10744 seen("a", Checks::Green, "CLEAN", true),
10745 red("b", Some("7")),
10746 seen("b", Checks::Green, "CLEAN", false),
10747 ],
10748 vec![(true, "")],
10749 );
10750 *forge.fix.lock().unwrap() = Some(Fixed::Committed {
10751 head: "b".to_owned(),
10752 });
10753 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10754 assert_eq!(*forge.reruns.lock().unwrap(), ["7"]);
10755 assert_eq!(forge.calls().iter().filter(|c| **c == "fix").count(), 1);
10756 assert_eq!(state.pr.as_ref().unwrap().round, 1);
10757 assert_eq!(state.status, RunStatus::Merged);
10758 assert_eq!(state.land_reruns.as_ref().unwrap().head, "b");
10759 assert_eq!(
10760 value_of(&forge.argvs()[0], "--match-head-commit"),
10761 Some("b")
10762 );
10763 }
10764
10765 #[tokio::test]
10766 async fn a_failed_rerun_call_falls_through_to_the_fix_in_the_same_lap() {
10767 let mut state = landing_state();
10768 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
10769 *forge.rerun_fails.lock().unwrap() = true;
10770 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10771 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10772 assert_eq!(forge.reruns.lock().unwrap().len(), 1, "never retried");
10773 assert_eq!(
10774 forge.calls().iter().filter(|c| **c == "fix").count(),
10775 1,
10776 "{:?}",
10777 forge.calls()
10778 );
10779 }
10780
10781 #[tokio::test]
10782 async fn a_saved_rerun_record_stops_a_restart_from_rerunning() {
10783 let mut state = landing_state();
10784 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
10785 state.land_reruns = Some(reran("a", &[("7", *forge.clock.lock().unwrap())]));
10787 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10788 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10789 assert!(forge.reruns.lock().unwrap().is_empty());
10790 }
10791
10792 #[tokio::test]
10793 async fn the_switch_off_and_a_missing_run_id_go_straight_to_the_fixer() {
10794 let mut state = landing_state();
10795 state.config.graph.rerun_flaky_checks = false;
10796 let forge = Scripted::new(vec![red("a", Some("7"))], vec![]);
10797 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10798 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10799 assert!(forge.reruns.lock().unwrap().is_empty());
10800 assert!(forge.calls().contains(&"fix"));
10801
10802 let mut state = landing_state();
10803 let forge = Scripted::new(vec![red("a", None)], vec![]);
10804 *forge.fix.lock().unwrap() = Some(Fixed::Declined);
10805 land_with(&mut state, RERUN_PR, &forge).await.unwrap();
10806 assert!(forge.reruns.lock().unwrap().is_empty());
10807 assert!(forge.calls().contains(&"fix"));
10808 }
10809
10810 fn names(xs: &[&str]) -> BTreeSet<String> {
10811 xs.iter().map(|x| (*x).to_owned()).collect()
10812 }
10813
10814 #[test]
10815 fn a_required_check_the_rollup_never_listed_is_named() {
10816 let req = names(&["build"]);
10817 let why = waiting_on("BLOCKED", &[passing("review")], Some(&req));
10818 assert!(why.contains("never reported: build"), "{why}");
10819 assert!(!why.contains("probably waiting for a review"), "{why}");
10820 }
10821
10822 #[test]
10823 fn an_unreadable_required_list_is_not_read_as_a_review_wait() {
10824 let why = waiting_on("BLOCKED", &[passing("review")], None);
10825 assert!(why.contains("could not be read"), "{why}");
10826 assert!(!why.contains("probably waiting for a review"), "{why}");
10827 }
10828
10829 #[test]
10830 fn all_required_reported_keeps_the_review_guess() {
10831 let req = names(&["build"]);
10832 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
10833 assert!(why.contains("probably waiting for a review"), "{why}");
10834 assert!(!why.contains("never reported"), "{why}");
10835 }
10836
10837 #[test]
10838 fn required_names_match_the_rollup_ignoring_case_only() {
10839 let req = names(&["Build"]);
10840 let why = waiting_on("BLOCKED", &[passing("build")], Some(&req));
10841 assert!(!why.contains("never reported"), "{why}");
10842 }
10843
10844 #[test]
10845 fn required_contexts_are_read_from_protection_and_rulesets() {
10846 let classic = r#"{"contexts":["build"],"checks":[{"context":"lint","app_id":1}]}"#;
10847 assert_eq!(
10848 parse_classic_required(classic),
10849 Some(names(&["build", "lint"]))
10850 );
10851 let rules = r#"[{"type":"pull_request","parameters":{}},
10852 {"type":"required_status_checks","parameters":{"required_status_checks":[{"context":"test"}]}}]"#;
10853 assert_eq!(parse_ruleset_required(rules), Some(names(&["test"])));
10854 assert_eq!(parse_ruleset_required("nope"), None);
10855 assert_eq!(encode_path_segment("release/1.x"), "release%2F1.x");
10856 }
10857
10858 #[test]
10859 fn the_direct_merge_guard_needs_the_approved_head_bound_to_its_checks() {
10860 let shown = BTreeSet::new();
10861 let ok = seen("a", Checks::Green, "CLEAN", false);
10862 let guard = |s: Option<&Seen>| {
10863 direct_merge_is_safe(
10864 s,
10865 "A",
10866 &shown,
10867 0,
10868 4,
10869 Duration::ZERO,
10870 CiExpectation::Expected,
10871 )
10872 };
10873 assert!(guard(Some(&ok)));
10874 assert!(!guard(None));
10875 assert!(!guard(Some(&seen("b", Checks::Green, "CLEAN", false))));
10876 let mut stale = ok.clone();
10877 stale.rollup_head = "old".to_owned();
10878 assert!(!guard(Some(&stale)));
10879 assert!(!guard(Some(&seen("a", Checks::Pending, "BLOCKED", false))));
10880 assert!(!guard(Some(&merged_view("a"))));
10881 }
10882
10883 #[test]
10884 fn the_rollup_node_carries_whether_each_check_is_required() {
10885 let node = node_json("new", "SUCCESS", false)
10886 .replace(r#""name":"ci","#, r#""name":"ci","isRequired":true,"#);
10887 let s = seen_from(&view_json("new"), Some(&node)).unwrap();
10888 assert_eq!(s.contexts.len(), 1);
10889 assert_eq!(s.contexts[0].required, Some(true));
10890 let s = seen_from(&view_json("new"), Some(&node_json("new", "SUCCESS", false))).unwrap();
10891 assert_eq!(s.contexts[0].required, None);
10892 }
10893
10894 #[tokio::test]
10895 async fn a_resume_that_cannot_disable_a_recorded_arm_stops_and_keeps_the_record() {
10896 let mut state = landing_state();
10897 state.land_armed_head = Some("a".to_owned());
10898 let forge = Scripted::new(
10899 vec![seen("a", Checks::Green, "CLEAN", true)],
10900 vec![(false, "disable exploded")],
10901 );
10902 land_with(&mut state, URL, &forge).await.unwrap();
10903 assert!(!forge.calls().contains(&"fix"));
10904 assert_eq!(state.status, RunStatus::Blocked);
10905 assert_eq!(state.land_armed_head.as_deref(), Some("a"));
10906 let why = state.merge.as_ref().unwrap().detail.clone();
10907 assert!(why.contains("disable exploded"), "{why}");
10908 }
10909}