1use std::collections::{BTreeMap, BTreeSet};
20use std::path::{Path, PathBuf};
21use std::sync::atomic::{AtomicBool, Ordering};
22use std::sync::{Arc, Mutex};
23use std::time::{Duration, Instant};
24
25use anyhow::{Context as _, Result, bail};
26use jiff::Timestamp;
27use tokio::sync::Semaphore;
28
29use crate::advise;
30use crate::agent::{self, AgentOutput, Invocation, SeatState};
31use crate::ask;
32use crate::blind;
33use crate::bump;
34use crate::config::{
35 AgentSpec, Config, IncompleteReviewPolicy, LeakPolicy, MergeMode, MergeStyle, Prompts,
36 ResolvedRoles,
37};
38use crate::git;
39use crate::land;
40use crate::proc::Quiet as _;
41use crate::prompt::{
42 self, CandidateView, Lens, ReviewPatch, ReviewReconsiderCtx, ReviewSeatReport, Turn,
43};
44use crate::queue;
45use crate::refs;
46use crate::run::{
47 BaseSync, Candidate, CommandOutcome, ContinuationOutcome, ContinuationRecord,
48 DeliberationRound, DeliberationTurn, E2eStatus, FailClass, FixRecord, GateFixRecord, Handover,
49 JobRecord, JobStatus, Judgement, MergeOutcome, OperatorFixFinding, OperatorFixOutcome,
50 OperatorFixRequest, Origin, QuotaLoss, ReviewRecord, ReviewRevoteRecord, ReviewRound, RunState,
51 RunStatus, SeatHistory, Tally, VoteRecord, tail, write_artifact,
52};
53use crate::verdict::{
54 self, FinalVote, Finding, FixReport, Position, Proposal, Ranking, Review, ReviewRevote,
55 ReviewVote, Severity,
56};
57
58const OUTPUT_TAIL: usize = 8_000;
60
61const EVENT_OUTPUT_TAIL: usize = 2_000;
64
65const LEASE_RELEASE_POLL: Duration = Duration::from_secs(1);
68
69const LEASE_RELEASE_MAX_WAIT: Duration = Duration::from_secs(30);
86
87pub(crate) const STAGNANT_LIMIT: usize = 2;
101
102const BASE_SYNC_ROUNDS: usize = 4;
115
116const MAX_FIX_CONTINUATIONS: usize = 2;
132
133#[derive(Clone)]
139struct SeatJob {
140 spec: AgentSpec,
141 seat: SeatState,
142 cwd: PathBuf,
143 prompt: String,
144 timeout: Duration,
145 allow_write: bool,
146 sessions: bool,
147 artifacts: PathBuf,
148 stem: String,
149 handover: Option<String>,
154}
155
156enum AgentOutcome {
168 Ok(AgentOutput),
170 Quota(AgentOutput),
172 Dropped(AgentOutput),
175 Failed(String),
177}
178
179#[derive(Debug, Clone, Default)]
206pub struct Pause(Arc<AtomicBool>, Arc<Mutex<Option<String>>>);
207
208impl Pause {
209 #[must_use]
211 pub fn new() -> Self {
212 Self::default()
213 }
214
215 pub fn park(&self) {
217 self.0.store(true, Ordering::SeqCst);
218 }
219
220 pub fn park_because(&self, reason: impl Into<String>) {
226 let mut reason_guard = self
227 .1
228 .lock()
229 .unwrap_or_else(std::sync::PoisonError::into_inner);
230 if reason_guard.is_none() {
231 *reason_guard = Some(reason.into());
232 }
233 drop(reason_guard);
234 self.park();
235 }
236
237 #[must_use]
239 pub fn parked(&self) -> bool {
240 self.0.load(Ordering::SeqCst)
241 }
242
243 #[must_use]
245 pub fn reason(&self) -> Option<String> {
246 self.1
247 .lock()
248 .unwrap_or_else(std::sync::PoisonError::into_inner)
249 .clone()
250 }
251}
252
253pub struct Runner {
255 pub state: RunState,
257 roles: ResolvedRoles,
258 sem: Arc<Semaphore>,
259 pause: Pause,
263 interrupt: Pause,
269}
270
271async fn review_base(
276 repo: &Path,
277 remote: &str,
278 base_branch: &str,
279 base_commit: &str,
280 branch: &str,
281) -> String {
282 review_base_checked(repo, remote, base_branch, base_commit, branch)
283 .await
284 .0
285}
286
287async fn review_base_checked(
292 repo: &Path,
293 remote: &str,
294 base_branch: &str,
295 base_commit: &str,
296 branch: &str,
297) -> (String, bool) {
298 let tracking = format!("{remote}/{base_branch}");
299 let fresh = matches!(git::fetch(repo, remote, base_branch).await, Ok(o) if o.ok());
300 if git::rev_exists(repo, &tracking).await
301 && let Ok(mb) = git::merge_base(repo, &tracking, branch).await
302 && !mb.is_empty()
303 {
304 return (mb, fresh);
305 }
306 let mb = git::merge_base(repo, base_commit, branch)
307 .await
308 .ok()
309 .filter(|mb| !mb.is_empty())
310 .unwrap_or_else(|| base_commit.to_owned());
311 (mb, false)
312}
313
314pub(crate) async fn refresh_reviewed_commits(state: &mut RunState, branch: &str) {
318 if !is_review_run(state) {
319 return;
320 }
321 let base = review_base(
322 &state.repo,
323 &state.config.merge.remote,
324 &state.base_branch,
325 &state.base_commit,
326 branch,
327 )
328 .await;
329 if let Ok(subjects) = git::subjects(&state.repo, &base, branch).await
330 && !subjects.is_empty()
331 && state.reviewed_commits.as_ref() != Some(&subjects)
332 {
333 state.reviewed_commits = Some(subjects);
334 state.save().ok();
335 }
336}
337
338async fn leaked_subjects(state: &RunState, branch: &str) -> Option<Vec<String>> {
342 let (base, trusted) = review_base_checked(
343 &state.repo,
344 &state.config.merge.remote,
345 &state.base_branch,
346 &state.base_commit,
347 branch,
348 )
349 .await;
350 if !trusted {
351 return None;
352 }
353 git::subjects(&state.repo, &state.base_commit, &base)
354 .await
355 .ok()
356}
357
358fn should_retitle(current: &str, computed: &str, leaked: &[String]) -> bool {
362 let is_leak = |t: &str| leaked.iter().any(|l| l.trim() == t.trim());
363 if is_leak(computed) {
364 return false;
365 }
366 let cur = current.trim();
367 cur.is_empty()
368 || cur.starts_with(REVIEW_PROMPT_OPENING)
369 || cur.starts_with("chore: land candidate")
370 || cur.starts_with("magi: candidate")
371 || is_leak(cur)
372}
373
374async fn sync_review_branch(repo: &Path, branch: &str, remote: &str, base: &str) -> Result<()> {
403 let tracking = format!("{remote}/{branch}");
404 let fetched = git::fetch(repo, remote, branch).await;
405 let fresh = matches!(&fetched, Ok(o) if o.ok()) && git::rev_exists(repo, &tracking).await;
406 let local_exists = git::branch_exists(repo, branch).await?;
407 if !fresh {
408 if !local_exists {
409 bail!("no branch `{branch}` in {} or on {remote}", repo.display());
410 }
411 tracing::warn!(
412 "could not read {tracking}; reviewing the local `{branch}`, which may be stale"
413 );
414 return Ok(());
415 }
416 let remote_sha = git::rev_parse(repo, &tracking).await?;
417 if !local_exists {
418 git::git(repo, &["branch", branch, &tracking]).await?;
419 return Ok(());
420 }
421 let local_sha = git::rev_parse(repo, &format!("refs/heads/{branch}")).await?;
422 if local_sha == remote_sha || git::is_ancestor(repo, &remote_sha, &local_sha).await {
423 return Ok(());
424 }
425 if !git::is_ancestor(repo, &local_sha, &remote_sha).await {
426 match crate::reconcile::reconcile(repo, remote, branch, &local_sha, &remote_sha, base)
432 .await?
433 {
434 crate::reconcile::Reconciliation::Pushed => {
435 tracing::warn!(
436 "local `{branch}` ({}) is {tracking} ({}) rebased; pushed it over",
437 short(&local_sha),
438 short(&remote_sha)
439 );
440 return Ok(());
441 }
442 crate::reconcile::Reconciliation::Placeholder => {}
443 crate::reconcile::Reconciliation::Genuine(d) => return Err((*d).into()),
444 }
445 }
446 let out = git::git_raw(repo, &["branch", "-f", branch, &tracking]).await?;
447 if !out.ok() {
448 bail!(
449 "local `{branch}` ({}) is stale against {tracking} ({}) but git will not move it: {}",
450 short(&local_sha),
451 short(&remote_sha),
452 out.stderr
453 );
454 }
455 tracing::warn!(
456 "local `{branch}` was stale: fast-forwarded {} -> {}",
457 short(&local_sha),
458 short(&remote_sha)
459 );
460 Ok(())
461}
462
463async fn resolve_base(repo: &Path, base_branch: &str, remote: &str) -> Result<String> {
464 let tracking = format!("{remote}/{base_branch}");
465 let fetched = git::fetch(repo, remote, base_branch).await;
466 if let Ok(out) = &fetched
467 && out.ok()
468 && git::rev_exists(repo, &tracking).await
469 {
470 return git::rev_parse(repo, &tracking).await;
471 }
472 let why = match &fetched {
473 Ok(out) if !out.ok() => out.stderr.lines().next().unwrap_or("").to_owned(),
474 Ok(_) => format!("{remote} has no {base_branch}"),
475 Err(e) => e.to_string(),
476 };
477 tracing::warn!(
478 "could not read {tracking} ({why}); branching off the local \
479 {base_branch} instead, which may be behind"
480 );
481 git::rev_parse(repo, base_branch).await.with_context(|| {
482 format!(
483 "cannot resolve `{base_branch}`; set [merge] base in magi.toml to a \
484 branch that exists"
485 )
486 })
487}
488
489struct FixClaim {
506 path: PathBuf,
507}
508
509impl FixClaim {
510 fn acquire(dir: &Path) -> Result<Self> {
511 std::fs::create_dir_all(dir).with_context(|| format!("create {}", dir.display()))?;
512 let path = dir.join("fix.lock");
513 match Self::create(&path) {
514 Ok(claim) => Ok(claim),
515 Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => {
516 if Self::reclaim_if_dead(&path) {
517 Self::create(&path).with_context(|| format!("lock {}", path.display()))
518 } else {
519 bail!(
520 "another `magi fix` is already running for this run ({} exists)",
521 path.display()
522 )
523 }
524 }
525 Err(e) => Err(e).with_context(|| format!("lock {}", path.display())),
526 }
527 }
528
529 fn create(path: &Path) -> std::io::Result<Self> {
530 let mut f = std::fs::OpenOptions::new()
531 .write(true)
532 .create_new(true)
533 .open(path)?;
534 use std::io::Write as _;
535 writeln!(f, "{}", std::process::id())?;
537 Ok(Self {
538 path: path.to_owned(),
539 })
540 }
541
542 fn reclaim_if_dead(path: &Path) -> bool {
546 let dead = std::fs::read_to_string(path)
547 .ok()
548 .and_then(|body| body.trim().parse::<u32>().ok())
549 .is_some_and(|pid| !crate::proc::pid_alive(pid));
550 dead && std::fs::remove_file(path).is_ok()
551 }
552}
553
554impl Drop for FixClaim {
555 fn drop(&mut self) {
556 let _ = std::fs::remove_file(&self.path);
557 }
558}
559
560impl Runner {
561 pub async fn start(
563 repo: &Path,
564 instruction: String,
565 config: Config,
566 origin: Origin,
567 ) -> Result<Self> {
568 Self::start_naming(repo, instruction, "", config, origin).await
569 }
570
571 pub async fn start_naming(
575 repo: &Path,
576 instruction: String,
577 also_scan: &str,
578 config: Config,
579 origin: Origin,
580 ) -> Result<Self> {
581 let repo = git::toplevel(repo).await?;
582 let missing = agent::missing_programs(&config.agents);
583 if !missing.is_empty() {
584 bail!(
585 "these agent programs are not on PATH: {}. Fix the roster in \
586 magi.toml or install them.",
587 missing.join(", ")
588 );
589 }
590 let base_branch = match config.merge.base.clone() {
591 Some(b) => b,
592 None => git::current_branch(&repo)
593 .await?
594 .context("HEAD is detached; set [merge] base in magi.toml")?,
595 };
596 let base_commit = resolve_base(&repo, &base_branch, &config.merge.remote).await?;
597 if !git::is_clean(&repo).await? {
601 tracing::warn!(
602 "{} has uncommitted changes; they are not part of this run, \
603 which branches off {base_branch} ({})",
604 repo.display(),
605 &base_commit[..base_commit.len().min(8)]
606 );
607 }
608 let roles = config.resolve_roles()?;
609 let max_parallel = config.graph.max_parallel.max(1);
610 let seeds = refs::resolve(
613 &repo,
614 &base_commit,
615 &config.merge.remote,
616 &format!("{also_scan}\n{instruction}"),
617 )
618 .await;
619 refs::plan(&repo, &seeds).await?;
620 let mut state = RunState::new(repo, base_branch, base_commit, instruction, config);
621 state.origin = Some(origin);
625 for seed in &seeds {
626 state.event(
627 "seed",
628 refs::describe(std::slice::from_ref(seed)).unwrap_or_default(),
629 );
630 }
631 state.seeds = seeds;
632 state.event("start", format!("run {} created", state.id));
633 state.save()?;
634 Ok(Self {
635 state,
636 roles,
637 sem: Arc::new(Semaphore::new(max_parallel)),
638 pause: Pause::new(),
639 interrupt: Pause::new(),
640 })
641 }
642
643 pub async fn review(repo: &Path, branch: &str, config: Config, origin: Origin) -> Result<Self> {
657 Self::review_taking_over(repo, branch, config, None, origin).await
658 }
659
660 pub async fn review_taking_over(
667 repo: &Path,
668 branch: &str,
669 config: Config,
670 takeover: Option<crate::handover::Takeover>,
671 origin: Origin,
672 ) -> Result<Self> {
673 let repo = git::toplevel(repo).await?;
674 let missing = agent::missing_programs(&config.agents);
675 if !missing.is_empty() {
676 bail!(
677 "these agent programs are not on PATH: {}. Fix the roster in \
678 magi.toml or install them.",
679 missing.join(", ")
680 );
681 }
682 let base_branch = match config.merge.base.clone() {
683 Some(b) => b,
684 None => git::current_branch(&repo)
685 .await?
686 .context("HEAD is detached; set [merge] base in magi.toml")?,
687 };
688 if base_branch == branch {
689 bail!("`{branch}` is the base branch; there is nothing to review against");
690 }
691 let base_commit = resolve_base(&repo, &base_branch, &config.merge.remote).await?;
692
693 let roles = config.resolve_roles()?;
694 let max_parallel = config.graph.max_parallel.max(1);
695 let mut state = RunState::new(
696 repo.clone(),
697 base_branch,
698 base_commit.clone(),
699 String::new(),
700 config,
701 );
702 state.origin = Some(origin);
703
704 let takeover = takeover.unwrap_or_else(|| crate::handover::Takeover {
711 earlier: Vec::new(),
712 home: crate::run::home(),
713 choice: None,
714 });
715 let released = crate::handover::release(&repo, branch, &state.id, &takeover).await?;
716 if let Some(released) = &released {
717 state.event(
718 "release",
719 format!(
720 "took `{branch}` over from run {}: its worktree was released: {}",
721 crate::run::short_of(&released.old_id),
722 released.audit
723 ),
724 );
725 }
726 if let Some(choice) = takeover.choice.as_ref()
730 && let Err(e) =
731 crate::reconcile::apply_choice(&repo, &state.config.merge.remote, branch, choice)
732 .await
733 {
734 if let Some(released) = &released {
735 released.restore(&repo, branch).await;
736 }
737 return Err(e.context("applying the owner's answer about the diverged branch"));
738 }
739 let opened =
740 Self::open_review(&repo, branch, state, roles, max_parallel, base_commit).await;
741 if opened.is_err()
742 && let Some(released) = &released
743 {
744 released.restore(&repo, branch).await;
745 }
746 opened
747 }
748
749 async fn open_review(
752 repo: &Path,
753 branch: &str,
754 mut state: RunState,
755 roles: ResolvedRoles,
756 max_parallel: usize,
757 base_commit: String,
758 ) -> Result<Self> {
759 sync_review_branch(repo, branch, &state.config.merge.remote, &base_commit).await?;
760 let start = review_base(
763 repo,
764 &state.config.merge.remote,
765 &state.base_branch,
766 &base_commit,
767 branch,
768 )
769 .await;
770 let log = git::log_oneline(repo, &start, branch)
771 .await
772 .unwrap_or_default();
773 let instruction = format!(
774 "Review the work already on branch `{branch}`. There is no task \
775 statement: what the change claims to do is whatever its commits \
776 say.\n\n{}",
777 if log.trim().is_empty() {
778 "(no commit messages)"
779 } else {
780 log.trim()
781 }
782 );
783 state.instruction = instruction;
784 state.reviewed_commits = Some(
785 git::subjects(repo, &start, branch)
786 .await
787 .unwrap_or_default(),
788 );
789
790 let worktree = state.worktree_root().join("under-review");
793 if let Some(parent) = worktree.parent() {
794 tokio::fs::create_dir_all(parent).await.ok();
795 }
796 let path = worktree.to_string_lossy().to_string();
797 git::git(repo, &["worktree", "add", &path, branch])
798 .await
799 .with_context(|| {
800 format!("checking out `{branch}` at {path} (is it checked out elsewhere?)")
801 })?;
802
803 let commits = git::commits_ahead(&worktree, &base_commit, "HEAD")
804 .await
805 .unwrap_or(0);
806 if commits == 0 {
807 git::worktree_remove(repo, &worktree).await.ok();
808 bail!("`{branch}` has no commits beyond {}", short(&base_commit));
809 }
810 let files = git::changed_files(&worktree, &base_commit, "HEAD")
811 .await
812 .map(|f| f.len())
813 .unwrap_or(0);
814 if files == 0
815 && let (Ok(head_tree), Ok(base_tree)) = (
816 git::tree_of(&worktree, "HEAD").await,
817 git::tree_of(&worktree, &base_commit).await,
818 )
819 && head_tree == base_tree
820 {
821 let head = git::rev_parse(&worktree, "HEAD").await.unwrap_or_default();
822 git::worktree_remove(repo, &worktree).await.ok();
823 bail!(
824 "`{branch}` at {} has a tree identical to base {}; this usually means \
825 the branch ref is stale (check `git rev-parse refs/heads/{branch}` \
826 against `{}/{branch}`) rather than an empty change",
827 short(&head),
828 short(&base_commit),
829 state.config.merge.remote
830 );
831 }
832 let stat = git::diff_stat(&worktree, &base_commit, "HEAD")
833 .await
834 .unwrap_or_default();
835
836 state.candidates.push(Candidate {
837 index: 0,
838 label: 'A',
839 agent: EXISTING_BRANCH.to_owned(),
842 branch: branch.to_owned(),
843 worktree,
844 summary: String::new(),
845 stat,
846 files,
847 commits,
848 empty: false,
849 failed: None,
850 verified_noop: None,
851 duration_ms: 0,
852 folded: false,
853 });
854 state.tally = Some(Tally {
855 first_choice: BTreeMap::from([('A', 0)]),
856 borda: BTreeMap::new(),
857 winner: 'A',
858 rankings: 0,
859 unanimous_initial: false,
860 deliberated: false,
861 changed_votes: 0,
862 unanimous_final: false,
863 tie_break: None,
864 judges: 0,
868 present: 0,
869 quorum: 0,
870 met_quorum: true,
871 uncontested: Some("review-only run: nothing competed".to_owned()),
872 });
873 state.status = RunStatus::Reviewing;
874 state.event(
875 "start",
876 format!(
877 "review-only run {} on `{branch}` ({files} files, {commits} commits)",
878 state.id
879 ),
880 );
881 state.save()?;
882 Ok(Self {
883 state,
884 roles,
885 sem: Arc::new(Semaphore::new(max_parallel)),
886 pause: Pause::new(),
887 interrupt: Pause::new(),
888 })
889 }
890
891 pub fn resume(id: &str) -> Result<Self> {
893 let state = RunState::load(id)?;
894 if let Some(to) = &state.released_to {
895 bail!(
896 "run {} cannot be resumed: its worktree was released to run {}",
897 state.short(),
898 crate::run::short_of(to)
899 );
900 }
901 let roles = state.config.resolve_roles()?;
902 let max_parallel = state.config.graph.max_parallel.max(1);
903 Ok(Self {
904 state,
905 roles,
906 sem: Arc::new(Semaphore::new(max_parallel)),
907 pause: Pause::new(),
908 interrupt: Pause::new(),
909 })
910 }
911
912 pub async fn execute(&mut self) -> Result<()> {
919 let result = self.execute_graph().await;
920 self.mark_driver_exited();
921 let ended = if result.is_err() {
922 Some(crate::notices::run_stopped(&self.state.id, &self.state))
923 } else {
924 crate::notices::run_ended(&self.state)
925 };
926 if let Some(notice) = ended {
927 crate::notices::raise(notice);
928 }
929 result
930 }
931
932 fn mark_driver_exited(&mut self) {
941 self.state.driver_exited = true;
942 let pid = std::process::id();
943 let Ok(mut disk) = RunState::load(&self.state.id) else {
944 return;
945 };
946 if disk.released_to.is_some() || disk.driver_pid != Some(pid) || disk.driver_exited {
947 return;
948 }
949 disk.driver_exited = true;
950 if let Err(e) = disk.save() {
951 tracing::warn!("could not record that run {} stopped: {e:#}", self.state.id);
952 }
953 }
954
955 async fn execute_graph(&mut self) -> Result<()> {
956 self.state.parked = false;
961 self.state.clear_active();
968 if let Ok(disk) = RunState::load(&self.state.id)
986 && let Some(to) = &disk.released_to
987 {
988 bail!(
989 "run {} cannot continue: its worktree was released to run {}",
990 self.state.short(),
991 crate::run::short_of(to)
992 );
993 }
994 let pid = std::process::id();
995 self.state.driver_pid = Some(pid);
996 self.state.driver_started_at = crate::proc::process_started_at(pid);
997 self.state.driver_exited = false;
998 self.state.save()?;
999 if self.state.status == RunStatus::Stalled {
1012 if self.recover_stall().await? {
1013 self.finish_after_tally().await?;
1014 } else {
1015 self.state.save()?;
1017 }
1018 return Ok(());
1019 }
1020 if self.state.status == RunStatus::Landing {
1030 self.run_land().await?;
1031 self.settle_questions();
1036 return Ok(());
1037 }
1038 self.prep().await?;
1039 if self.park_here()? {
1040 return Ok(());
1041 }
1042 self.advise().await?;
1043 if self.park_here()? {
1044 return Ok(());
1045 }
1046 self.implement().await?;
1047 if self.park_here()? {
1048 return Ok(());
1049 }
1050 if self.state.status == RunStatus::VerifiedNoop {
1054 return Ok(());
1055 }
1056 self.judge().await?;
1057 if self.park_here()? {
1058 return Ok(());
1059 }
1060 self.deliberate().await?;
1061 if self.park_here()? {
1062 return Ok(());
1063 }
1064 self.vote().await?;
1065 if self.park_here()? {
1066 return Ok(());
1067 }
1068 self.tally()?;
1069 if self.state.status == RunStatus::Stalled {
1074 self.state.save()?;
1078 return Ok(());
1079 }
1080 self.finish_after_tally().await?;
1081 Ok(())
1082 }
1083
1084 fn park_here(&mut self) -> Result<bool> {
1091 if !self.pause.parked() && !self.interrupt.parked() {
1096 return Ok(false);
1097 }
1098 let why = match self.interrupt.reason().or_else(|| self.pause.reason()) {
1099 Some(reason) => format!(
1100 "parked after `{}` ({reason}) — resume to carry on from here",
1101 self.state.status.as_str()
1102 ),
1103 None => format!(
1104 "parked after `{}` — resume to carry on from here",
1105 self.state.status.as_str()
1106 ),
1107 };
1108 self.state.event("park", why);
1109 self.state.parked = true;
1110 self.state.save()?;
1111 Ok(true)
1112 }
1113
1114 pub fn on_pause(&mut self, pause: Pause) {
1116 self.pause = pause;
1117 }
1118
1119 pub fn watch_interrupt(&mut self, pause: Pause) {
1125 self.interrupt = pause;
1126 }
1127
1128 fn settle_questions(&mut self) {
1148 if let Err(e) = ask::Questions::open().settle_run(&self.state.id, self.state.status) {
1149 tracing::warn!("abandon questions for {}: {e:#}", self.state.id);
1150 }
1151 }
1152
1153 async fn finish_after_tally(&mut self) -> Result<()> {
1156 self.fold_losers().await?;
1157 self.sync_to_base().await?;
1162 if self.state.status == RunStatus::AlreadyInBase {
1163 return Ok(());
1164 }
1165 self.review_loop().await?;
1166 self.sync_to_base().await?;
1167 if self.state.status == RunStatus::AlreadyInBase {
1168 return Ok(());
1169 }
1170 self.gate().await?;
1171 self.merge().await?;
1172 self.state.save()?;
1173 Ok(())
1174 }
1175
1176 async fn prep(&mut self) -> Result<()> {
1179 if !self.state.candidates.is_empty() {
1180 return Ok(());
1181 }
1182 self.state.status = RunStatus::Prep;
1183 let repo = self.state.repo.clone();
1184 let base = self.state.base_commit.clone();
1185 let plan = refs::plan(&repo, &self.state.seeds).await?;
1186 let start = plan.start.clone().unwrap_or_else(|| base.clone());
1187 let root = self.state.worktree_root();
1188 let labels = blind::assign_labels(self.roles.implementers.len(), self.state.seed);
1189
1190 let hooks_dir = self.state.dir().join("hooks");
1193 if self.state.config.blind.commit_msg_hook {
1194 std::fs::create_dir_all(&hooks_dir)
1195 .with_context(|| format!("create {}", hooks_dir.display()))?;
1196 let script = blind::commit_msg_hook(&self.state.config.blind.strip_lines);
1197 let path = hooks_dir.join("commit-msg");
1198 std::fs::write(&path, script).with_context(|| format!("write {}", path.display()))?;
1199 make_executable(&path)?;
1200 git::acquire_worktree_config(&repo).await?;
1208 self.state.enabled_worktree_config = true;
1209 }
1210
1211 for (index, (spec, label)) in self
1212 .roles
1213 .implementers
1214 .clone()
1215 .into_iter()
1216 .zip(labels)
1217 .enumerate()
1218 {
1219 let branch = self.state.branch_for(label);
1220 let worktree = root.join(format!("cand-{label}"));
1221 git::worktree_add_branch(&repo, &worktree, &branch, &start).await?;
1222 if self.state.config.blind.commit_msg_hook {
1223 git::set_worktree_hooks_path(&worktree, &hooks_dir).await?;
1224 }
1225 git::local_exclude(&worktree, "/.magi/").await?;
1226 for pick in &plan.picks {
1227 if let Err(e) = git::cherry_pick(&worktree, pick).await {
1228 self.state.status = RunStatus::Blocked;
1229 self.state
1230 .event("prep", format!("cannot apply referenced commit: {e}"));
1231 self.state.save()?;
1232 return Err(e);
1233 }
1234 }
1235 self.state.candidates.push(Candidate {
1236 index,
1237 label,
1238 agent: spec.id.clone(),
1239 branch,
1240 worktree,
1241 summary: String::new(),
1242 stat: String::new(),
1243 files: 0,
1244 commits: 0,
1245 empty: false,
1246 failed: None,
1247 verified_noop: None,
1248 duration_ms: 0,
1249 folded: false,
1250 });
1251 }
1252
1253 for j in 1..=self.roles.judges.len() {
1254 let wt = root.join(format!("judge-{j}"));
1255 if !wt.exists() {
1256 git::worktree_add_detached(&repo, &wt, &base).await?;
1257 }
1258 }
1259
1260 if self.state.config.graph.advise {
1268 for k in 1..=self.state.config.graph.advisors {
1269 let wt = root.join(format!("advisor-{k}"));
1270 if !wt.exists() {
1271 git::worktree_add_detached(&repo, &wt, &base).await?;
1272 }
1273 }
1274 }
1275
1276 let authors: Vec<&str> = self
1281 .roles
1282 .implementers
1283 .iter()
1284 .map(|a| a.id.as_str())
1285 .collect();
1286 let overlap: Vec<String> = self
1287 .roles
1288 .judges
1289 .iter()
1290 .enumerate()
1291 .filter(|(_, j)| authors.contains(&j.id.as_str()))
1292 .map(|(i, j)| format!("judge {} = {}", i + 1, j.id))
1293 .collect();
1294 if !overlap.is_empty() {
1295 let note = format!(
1296 "{} also authored a candidate; blind, but the panel is less \
1297 independent than {} distinct agents would be",
1298 overlap.join(", "),
1299 self.roles.judges.len()
1300 );
1301 self.state.event("prep", note);
1302 }
1303
1304 self.state.event(
1305 "prep",
1306 format!(
1307 "{} candidates, {} judges, base {} ({})",
1308 self.state.candidates.len(),
1309 self.roles.judges.len(),
1310 &self.state.base_commit[..7.min(self.state.base_commit.len())],
1311 self.state.base_branch
1312 ),
1313 );
1314 self.state.status = RunStatus::Implementing;
1315 self.state.save()?;
1316 Ok(())
1317 }
1318
1319 async fn advise(&mut self) -> Result<()> {
1352 let implement_untouched = self
1353 .state
1354 .candidates
1355 .iter()
1356 .all(|c| c.commits == 0 && c.failed.is_none() && !c.empty);
1357 if !self.state.config.graph.advise || self.state.advise_attempted {
1358 return Ok(());
1359 }
1360 if !implement_untouched {
1361 self.state.event(
1362 "advise",
1363 "skipping the design-deliberation stage: at least one \
1364 candidate already shows implementation progress, so this \
1365 run is past the point the stage exists to run before"
1366 .to_owned(),
1367 );
1368 self.state.advise_attempted = true;
1369 self.state.save()?;
1370 return Ok(());
1371 }
1372 let run_id = self.state.id.clone();
1373 let prompts = self.state.config.prompts.clone();
1374 let instruction = self.state.instruction.clone();
1375 let language = self.state.config.graph.language.clone();
1376 let root = self.state.worktree_root();
1377 let n = self.state.config.graph.advisors;
1378 let where_recorded = self.state.dir().join("run.json");
1379
1380 let seats = match self.state.config.advisors() {
1381 Ok(seats) if !seats.is_empty() => seats,
1382 Ok(_) => {
1383 self.state.event(
1384 "advise",
1385 format!(
1386 "[graph] advisors is 0; skipping the design-deliberation \
1387 stage and continuing without a synthesis brief (see {})",
1388 where_recorded.display()
1389 ),
1390 );
1391 self.state.advise_attempted = true;
1392 self.state.save()?;
1393 return Ok(());
1394 }
1395 Err(e) => {
1396 self.state.event(
1397 "advise",
1398 format!(
1399 "could not resolve advisor seats ({e:#}); continuing \
1400 without a design-deliberation brief (see {})",
1401 where_recorded.display()
1402 ),
1403 );
1404 self.state.advise_attempted = true;
1405 self.state.save()?;
1406 return Ok(());
1407 }
1408 };
1409
1410 let timeout = Duration::from_secs(self.state.config.graph.timeout_judge.max(1));
1411 let artifacts = agent::artifacts_dir(&self.state.dir());
1412 let worktrees: Vec<PathBuf> = (1..=n).map(|k| root.join(format!("advisor-{k}"))).collect();
1413
1414 let mut jobs = Vec::new();
1415 for (i, spec) in seats.iter().cloned().enumerate() {
1416 let seat_key = format!("advisor-{}", i + 1);
1417 let seat = self.seat(&seat_key, &spec.id);
1418 jobs.push(SeatJob {
1419 prompt: prompt::advisor(&instruction, i + 1, seats.len(), &language),
1420 spec,
1421 seat,
1422 cwd: worktrees[i % worktrees.len()].clone(),
1423 timeout,
1424 allow_write: false,
1425 sessions: false,
1426 artifacts: artifacts.clone(),
1427 stem: seat_key,
1428 handover: None,
1429 });
1430 }
1431
1432 self.state.event(
1433 "advise",
1434 format!(
1435 "{} advisor seat(s) sketching a design in parallel",
1436 jobs.len()
1437 ),
1438 );
1439 let mut quota_losses = Vec::new();
1440 let cache = self.state.config.cache_dir();
1441 let ctx = WaveCtx {
1442 carry_seats: false,
1443 run: &run_id,
1444 node: "advise",
1445 prompts: &prompts,
1446 cache: cache.as_deref(),
1447 round: None,
1448 };
1449 let advisor_roster = self.state.config.advisor_roster().unwrap_or_default();
1450 let results = ask_json_wave::<Proposal>(
1451 jobs,
1452 Arc::clone(&self.sem),
1453 self.state.config.graph.retries,
1454 &advisor_roster,
1455 &ctx,
1456 &mut quota_losses,
1457 &mut self.state,
1458 &|p: &Proposal| p.validate(),
1459 )
1460 .await;
1461 self.state.quota.extend(quota_losses);
1462
1463 let mut records = Vec::with_capacity(results.len());
1464 for (i, (seat, res, _attempts)) in results.into_iter().enumerate() {
1465 let agent_id = seat.agent.clone();
1466 self.state.seats.insert(seat.key.clone(), seat);
1467 match res {
1468 Ok((proposal, out)) => {
1469 self.state
1470 .event("advise", format!("advisor-{} proposed a design", i + 1));
1471 records.push(advise::AdvisorRecord::proposed(
1472 i + 1,
1473 agent_id,
1474 proposal,
1475 out.duration_ms,
1476 ));
1477 }
1478 Err(e) => {
1479 self.state.event(
1480 "advise",
1481 format!("advisor-{} produced no usable proposal: {e:#}", i + 1),
1482 );
1483 records.push(advise::AdvisorRecord::failed(
1484 i + 1,
1485 agent_id,
1486 e.to_string(),
1487 ));
1488 }
1489 }
1490 }
1491
1492 let mut advice = advise::Advice {
1493 records,
1494 synthesis: None,
1495 };
1496 if advice.proposals().is_empty() {
1497 self.state.event(
1498 "advise",
1499 "no advisor produced a usable proposal; continuing without a \
1500 synthesis brief"
1501 .to_owned(),
1502 );
1503 } else {
1504 match self
1505 .synthesize_brief(
1506 &advice,
1507 &instruction,
1508 &language,
1509 &worktrees[0],
1510 &artifacts,
1511 &run_id,
1512 &prompts,
1513 cache.as_deref(),
1514 )
1515 .await
1516 {
1517 Ok(Some(text)) => {
1518 self.state.event(
1519 "advise",
1520 "synthesized a design brief for the implementer".to_owned(),
1521 );
1522 advice.synthesis = Some(text);
1523 }
1524 Ok(None) => {
1525 self.state.event(
1526 "advise",
1527 "the synthesis seat produced nothing usable; continuing \
1528 without a design brief"
1529 .to_owned(),
1530 );
1531 }
1532 Err(e) => {
1533 self.state.event(
1534 "advise",
1535 format!("could not synthesize a design brief: {e:#}"),
1536 );
1537 }
1538 }
1539 }
1540 advise::apply_reflection(&mut advice);
1541
1542 self.state.advice = Some(advice);
1543 self.state.advise_attempted = true;
1544 self.state.save()?;
1545 Ok(())
1546 }
1547
1548 #[allow(clippy::too_many_arguments)]
1560 async fn synthesize_brief(
1561 &mut self,
1562 advice: &advise::Advice,
1563 instruction: &str,
1564 language: &str,
1565 cwd: &Path,
1566 artifacts: &Path,
1567 run_id: &str,
1568 prompts: &Prompts,
1569 cache: Option<&Path>,
1570 ) -> Result<Option<String>> {
1571 let chain = agent::pick_chain(
1572 &self.state.config.agents,
1573 self.state.config.roles.synthesizer.as_ref(),
1574 &agent::installed,
1575 "synthesizer",
1576 )?;
1577 let proposals = advice.proposals();
1578 let mut prompt = prompt::with_overlay(
1579 prompt::synthesize_brief(instruction, &proposals, language),
1580 prompts.overlay("advise"),
1581 );
1582 if cache.is_some() {
1583 prompt.push('\n');
1588 prompt.push_str(&prompt::build_cache_note("advise", false));
1589 }
1590 let timeout = Duration::from_secs(self.state.config.graph.timeout_judge.max(1));
1591 let mut last = None;
1596 for (n, spec) in chain.iter().enumerate() {
1597 if n > 0 {
1598 self.state
1599 .event("advise", format!("synthesis falling back to {}", spec.id));
1600 }
1601 let mut seat = self.seat("advise-synthesis", &spec.id);
1602 let outcome = agent::invoke(
1603 spec,
1604 &mut seat,
1605 &Invocation {
1606 cwd,
1607 prompt: &prompt,
1608 timeout,
1609 allow_write: false,
1610 sessions: false,
1611 artifacts,
1612 stem: &if n == 0 {
1613 "advise-synthesis".to_owned()
1614 } else {
1615 format!("advise-synthesis-{}", spec.id)
1616 },
1617 run: run_id,
1618 node: "advise",
1619 cache_dir: None,
1620 attachments: &[],
1621 writable: &[],
1622 },
1623 )
1624 .await;
1625 if outcome.is_ok() {
1626 self.state.seats.insert(seat.key.clone(), seat);
1627 }
1628 let advance = agent::chain_advances(&outcome);
1629 last = Some(outcome);
1630 if !advance {
1631 break;
1632 }
1633 }
1634 let out = last.expect("a chain holds at least one agent")?;
1637 if !out.usable() {
1638 return Ok(None);
1639 }
1640 let text =
1641 verdict::section(&out.text, "synthesis").unwrap_or_else(|| out.text.trim().to_owned());
1642 Ok((!text.trim().is_empty()).then_some(text))
1643 }
1644
1645 async fn implement(&mut self) -> Result<()> {
1648 let run_id = self.state.id.clone();
1653 let prompts = self.state.config.prompts.clone();
1654 let todo: Vec<usize> = self
1655 .state
1656 .candidates
1657 .iter()
1658 .enumerate()
1659 .filter(|(_, c)| c.commits == 0 && c.failed.is_none() && !c.empty)
1660 .map(|(i, _)| i)
1661 .collect();
1662 if todo.is_empty() {
1663 return self.after_implement();
1664 }
1665 self.state.status = RunStatus::Implementing;
1666
1667 let language = self.state.config.graph.language.clone();
1668 let timeout = Duration::from_secs(self.state.config.graph.timeout_implement);
1669 let sessions = self.state.config.graph.sessions;
1670 let artifacts = agent::artifacts_dir(&self.state.dir());
1671 let brief = self
1675 .state
1676 .advice
1677 .as_ref()
1678 .and_then(|a| a.synthesis.as_deref())
1679 .map(str::to_owned);
1680 let attachments = self.state.attachments.clone();
1681
1682 let mut jobs = Vec::new();
1683 for &i in &todo {
1684 let (index, label, worktree) = {
1685 let c = &self.state.candidates[i];
1686 (c.index, c.label, c.worktree.clone())
1687 };
1688 let spec = self.roles.implementers[index].clone();
1689 let seat_key = format!("impl-{label}");
1690 let seat = self.seat(&seat_key, &spec.id);
1691 let instruction = seeded_instruction(&self.state);
1692 jobs.push(SeatJob {
1693 spec,
1694 seat,
1695 prompt: prompt::implement(
1696 &instruction,
1697 &worktree.to_string_lossy(),
1698 &language,
1699 brief.as_deref(),
1700 &attachments,
1701 ),
1702 cwd: worktree,
1703 timeout,
1704 allow_write: true,
1705 sessions,
1706 artifacts: artifacts.clone(),
1707 stem: format!("impl-{label}"),
1708 handover: None,
1709 });
1710 }
1711
1712 self.state.event(
1713 "implement",
1714 format!("{} candidates in parallel", jobs.len()),
1715 );
1716 let mut sent = jobs.clone();
1722 let cache = self.state.config.cache_dir();
1723 let ctx = WaveCtx {
1724 carry_seats: false,
1725 run: &run_id,
1726 node: "implement",
1727 prompts: &prompts,
1728 cache: cache.as_deref(),
1729 round: None,
1730 };
1731 let mut results = wave(jobs, Arc::clone(&self.sem), &ctx, &mut self.state, 0).await;
1732 self.resume_undelivered(&mut results, &sent, &prompts, &run_id)
1733 .await;
1734 self.resume_seat_handovers(&mut results, &mut sent, &prompts, &run_id)
1735 .await;
1736 self.resume_unconfirmed_commands(&mut results, &sent, &prompts, &run_id)
1737 .await;
1738
1739 for (&i, (_wi, seat, out)) in todo.iter().zip(results) {
1740 let seat_key = seat.key.clone();
1741 let agent = seat.agent.clone();
1750 let exhausted_the_fallback_chain = FailClass::of(&out).is_some();
1751 self.state.seats.insert(seat.key.clone(), seat);
1752 let label = self.state.candidates[i].label;
1753 let worktree = self.state.candidates[i].worktree.clone();
1754 let base = self.state.base_commit.clone();
1755
1756 let (summary, duration, failed, verified_claim) = match out {
1757 AgentOutcome::Ok(o) => {
1758 let text = verdict::section(&o.text, "summary").unwrap_or(o.text.clone());
1759 let failed = (!o.usable()).then(|| {
1760 if o.timed_out {
1761 "agent timed out".to_owned()
1762 } else {
1763 format!("agent exited with {:?}", o.exit_code)
1764 }
1765 });
1766 let verified_claim = verified_noop_claim(failed.is_none(), &o.commands, &text);
1767 (text, o.duration_ms, failed, verified_claim)
1768 }
1769 AgentOutcome::Dropped(o) => {
1775 let why = o
1776 .dropped
1777 .as_ref()
1778 .map(|d| d.why.as_str())
1779 .unwrap_or("the CLI ended the stream without delivering its answer");
1780 (
1781 String::new(),
1782 o.duration_ms,
1783 Some(format!("the CLI dropped the stream ({why})")),
1784 None,
1785 )
1786 }
1787 AgentOutcome::Quota(o) => {
1788 self.state.quota.push(QuotaLoss {
1789 seat: seat_key,
1790 node: "implement".to_owned(),
1791 at: Timestamp::now(),
1792 reset: o.quota.as_ref().and_then(|q| q.reset.clone()),
1793 });
1794 (
1795 String::new(),
1796 o.duration_ms,
1797 Some("rate limited (quota); produced no change".to_owned()),
1798 None,
1799 )
1800 }
1801 AgentOutcome::Failed(e) => (String::new(), 0, Some(e), None),
1802 };
1803
1804 let rescued = match git::rescue_commit(
1807 &worktree,
1808 &format!("magi: candidate {label} (uncommitted work)"),
1809 )
1810 .await
1811 {
1812 Ok(r) => {
1813 self.state.note_withheld("implement", &r.withheld);
1814 r.committed
1815 }
1816 Err(_) => false,
1817 };
1818 let commits = git::commits_ahead(&worktree, &base, "HEAD")
1819 .await
1820 .unwrap_or(0);
1821 let patch = git::diff(&worktree, &base, "HEAD")
1822 .await
1823 .unwrap_or_default();
1824 let stat = git::diff_stat(&worktree, &base, "HEAD")
1825 .await
1826 .unwrap_or_default();
1827 let files = git::changed_files(&worktree, &base, "HEAD")
1828 .await
1829 .map(|f| f.len())
1830 .unwrap_or(0);
1831 write_artifact(&self.state, &format!("cand-{label}.patch"), &patch)?;
1832
1833 let c = &mut self.state.candidates[i];
1834 if !exhausted_the_fallback_chain {
1835 c.agent = agent;
1836 }
1837 c.summary = blind::sanitize_prose(&summary, &self.state.config.blind);
1838 c.stat = stat;
1839 c.files = files;
1840 c.commits = commits;
1841 c.duration_ms = duration;
1842 c.empty = commits == 0 || patch.trim().is_empty();
1843 c.failed = match failed {
1846 Some(_) if c.empty => failed,
1847 _ => None,
1848 };
1849 c.verified_noop = if c.empty { verified_claim } else { None };
1854 let note = match (&c.failed, c.empty, &c.verified_noop, rescued) {
1855 (Some(e), _, _, _) => format!("candidate {label}: {e}"),
1856 (None, true, Some(_), _) => {
1857 format!("candidate {label}: no change produced (agent-verified no-op)")
1858 }
1859 (None, true, None, _) => format!("candidate {label}: no change produced"),
1860 (None, false, _, true) => {
1861 format!(
1862 "candidate {label}: {files} files, {commits} commits (rescued an uncommitted tree)"
1863 )
1864 }
1865 (None, false, _, false) => {
1866 format!("candidate {label}: {files} files, {commits} commits")
1867 }
1868 };
1869 self.state.event("implement", note);
1870 self.state.save()?;
1871 }
1872
1873 self.after_implement()
1874 }
1875
1876 async fn resume_undelivered(
1904 &mut self,
1905 results: &mut [(usize, SeatState, AgentOutcome)],
1906 sent: &[SeatJob],
1907 prompts: &Prompts,
1908 run_id: &str,
1909 ) {
1910 for (wi, seat, out) in results.iter_mut() {
1911 let Some(dropped) = (match &*out {
1912 AgentOutcome::Dropped(o) => o.dropped.clone(),
1913 _ => None,
1914 }) else {
1915 continue;
1916 };
1917 let Some(job) = sent.get(*wi) else { continue };
1918 if !git::is_clean(&job.cwd).await.unwrap_or(true) {
1920 self.state.event(
1921 "implement",
1922 format!(
1923 "{}: the CLI dropped the stream after {} output tokens ({}), but the \
1924 work is in the tree",
1925 seat.key, dropped.output_tokens, dropped.why
1926 ),
1927 );
1928 continue;
1929 }
1930 if !has_context(&job.spec, seat, job.sessions) {
1938 self.state.event(
1939 "implement",
1940 format!(
1941 "{}: the CLI dropped the stream after {} output tokens ({}), but there \
1942 is no session left to resume",
1943 seat.key, dropped.output_tokens, dropped.why
1944 ),
1945 );
1946 continue;
1947 }
1948 self.state.event(
1949 "implement",
1950 format!(
1951 "{}: the CLI dropped the stream after {} output tokens ({}); resuming the \
1952 conversation",
1953 seat.key, dropped.output_tokens, dropped.why
1954 ),
1955 );
1956 let mut retry = job.clone();
1957 retry.seat = seat.clone();
1958 retry.prompt = prompt::resume_after_drop(&dropped.why);
1959 retry.timeout = retry_budget(job.timeout, true);
1960 retry.stem = format!("{}-resume", job.stem);
1961 let cache = self.state.config.cache_dir();
1962 let ctx = WaveCtx {
1963 carry_seats: false,
1964 run: run_id,
1965 node: "implement",
1966 prompts,
1967 cache: cache.as_deref(),
1968 round: None,
1969 };
1970 let (resumed_seat, resumed) =
1971 run_one(retry, Arc::clone(&self.sem), &ctx, &mut self.state, 1).await;
1972 *seat = resumed_seat;
1973 *out = resumed;
1974 }
1975 }
1976
1977 async fn resume_seat_handovers(
2042 &mut self,
2043 results: &mut [(usize, SeatState, AgentOutcome)],
2044 sent: &mut [SeatJob],
2045 prompts: &Prompts,
2046 run_id: &str,
2047 ) {
2048 let instruction = seeded_instruction(&self.state);
2049 let language = self.state.config.graph.language.clone();
2050 let brief = self
2051 .state
2052 .advice
2053 .as_ref()
2054 .and_then(|a| a.synthesis.as_deref())
2055 .map(str::to_owned);
2056 let attachments = self.state.attachments.clone();
2057 for (wi, seat, out) in results.iter_mut() {
2058 let Some(job) = sent.get_mut(*wi) else {
2059 continue;
2060 };
2061 let start = self
2066 .roles
2067 .implementer_roster
2068 .iter()
2069 .position(|s| s.id == job.spec.id)
2070 .unwrap_or(0);
2071 let mut tried: BTreeSet<String> = BTreeSet::from([job.spec.id.clone()]);
2072 let mut fallback_attempt = 0usize;
2073 let mut prev: Option<FailClass> = None;
2074 while let Some(cur) = FailClass::of(&*out) {
2075 if !should_hand_over(prev.as_ref(), &cur) {
2076 break;
2077 }
2078 let Some(next) =
2079 next_untried_in_roster(&self.roles.implementer_roster, start, &tried).cloned()
2080 else {
2081 break;
2082 };
2083 tried.insert(next.id.clone());
2084 fallback_attempt += 1;
2085
2086 if let Ok(r) = git::rescue_commit(
2087 &job.cwd,
2088 &format!(
2089 "magi: candidate {} (uncommitted work before {} fallback)",
2090 seat.key,
2091 if cur == FailClass::Quota {
2092 "quota"
2093 } else {
2094 "handover"
2095 }
2096 ),
2097 )
2098 .await
2099 {
2100 self.state.note_withheld("implement", &r.withheld);
2101 }
2102
2103 record_handover(
2104 &mut self.state,
2105 "implement",
2106 &seat.key,
2107 &seat.agent,
2108 &next.id,
2109 &cur,
2110 &fail_reason(&*out),
2111 );
2112 prev = Some(cur.clone());
2113
2114 let new_seat = handover_seat(&seat.key, &next.id, self.state.next_seat_seed());
2115 self.state.seats.insert(seat.key.clone(), new_seat.clone());
2116 job.spec = next.clone();
2124 let mut retry = job.clone();
2125 retry.seat = new_seat;
2126 retry.prompt = prompt::implement(
2127 &instruction,
2128 &job.cwd.to_string_lossy(),
2129 &language,
2130 brief.as_deref(),
2131 &attachments,
2132 );
2133 retry.stem = format!("{}-{}-{}", job.stem, cur.stem_word(), next.id);
2134 let cache = self.state.config.cache_dir();
2135 let ctx = WaveCtx {
2136 carry_seats: false,
2137 run: run_id,
2138 node: "implement",
2139 prompts,
2140 cache: cache.as_deref(),
2141 round: None,
2142 };
2143 let (fallback_seat, fallback_out) = run_one(
2144 retry,
2145 Arc::clone(&self.sem),
2146 &ctx,
2147 &mut self.state,
2148 fallback_attempt,
2149 )
2150 .await;
2151 *seat = fallback_seat;
2152 *out = fallback_out;
2153 }
2154 }
2155 }
2156
2157 async fn resume_unconfirmed_commands(
2181 &mut self,
2182 results: &mut [(usize, SeatState, AgentOutcome)],
2183 sent: &[SeatJob],
2184 prompts: &Prompts,
2185 run_id: &str,
2186 ) {
2187 for (wi, seat, out) in results.iter_mut() {
2188 let AgentOutcome::Ok(o) = &*out else {
2189 continue;
2190 };
2191 if !has_unconfirmed_command(&o.commands) {
2192 continue;
2193 }
2194 let Some(job) = sent.get(*wi) else { continue };
2195 if !has_context(&job.spec, seat, job.sessions) {
2196 self.state.event(
2197 "implement",
2198 format!(
2199 "{}: the reply named a command whose own CLI never confirmed the exit \
2200 status of, but there is no session left to resume",
2201 seat.key
2202 ),
2203 );
2204 continue;
2205 }
2206 self.state.event(
2207 "implement",
2208 format!(
2209 "{}: the reply named a command whose own CLI never confirmed the exit \
2210 status of; resuming the conversation",
2211 seat.key
2212 ),
2213 );
2214 let mut retry = job.clone();
2215 retry.seat = seat.clone();
2216 retry.prompt = prompt::resume_incomplete(
2217 "a command in your last reply had no confirmed exit status",
2218 );
2219 retry.timeout = retry_budget(job.timeout, true);
2220 retry.stem = format!("{}-confirm", job.stem);
2221 let cache = self.state.config.cache_dir();
2222 let ctx = WaveCtx {
2223 carry_seats: false,
2224 run: run_id,
2225 node: "implement",
2226 prompts,
2227 cache: cache.as_deref(),
2228 round: None,
2229 };
2230 let (resumed_seat, resumed) =
2231 run_one(retry, Arc::clone(&self.sem), &ctx, &mut self.state, 1).await;
2232 *seat = resumed_seat;
2233 *out = resumed;
2234 }
2235 }
2236
2237 async fn continue_fix_report(
2258 &mut self,
2259 mut seat: SeatState,
2260 parse_err: String,
2261 job: &SeatJob,
2262 prompts: &Prompts,
2263 run_id: &str,
2264 round: usize,
2265 ) -> (
2266 SeatState,
2267 Option<FixReport>,
2268 Option<String>,
2269 ContinuationRecord,
2270 ) {
2271 let mut last_err = parse_err;
2272 let mut cumulative_wait_ms = 0u64;
2273 let mut attempts = 0usize;
2274 loop {
2275 if !has_context(&job.spec, &seat, job.sessions) {
2276 self.state.event(
2277 "fix",
2278 format!(
2279 "round {round}: fixer's reply had no adoption report ({last_err}); no \
2280 session left to resume into"
2281 ),
2282 );
2283 let outcome = if attempts == 0 {
2284 ContinuationOutcome::NoSession
2285 } else {
2286 ContinuationOutcome::Exhausted
2287 };
2288 return (
2289 seat,
2290 None,
2291 Some(format!("unparsable fix report: {last_err}")),
2292 ContinuationRecord {
2293 attempts,
2294 cumulative_wait_ms,
2295 outcome,
2296 },
2297 );
2298 }
2299 if attempts >= MAX_FIX_CONTINUATIONS {
2300 self.state.event(
2301 "fix",
2302 format!(
2303 "round {round}: fixer's reply still had no adoption report after \
2304 {attempts} continuation(s) ({last_err}); giving up"
2305 ),
2306 );
2307 return (
2308 seat,
2309 None,
2310 Some(format!(
2311 "unparsable fix report after {attempts} continuation(s): {last_err}"
2312 )),
2313 ContinuationRecord {
2314 attempts,
2315 cumulative_wait_ms,
2316 outcome: ContinuationOutcome::Exhausted,
2317 },
2318 );
2319 }
2320 attempts += 1;
2321 self.state.event(
2322 "fix",
2323 format!(
2324 "round {round}: fixer's reply had no adoption report ({last_err}); resuming \
2325 the conversation (attempt {attempts}/{MAX_FIX_CONTINUATIONS})"
2326 ),
2327 );
2328 let mut retry = job.clone();
2329 retry.seat = seat.clone();
2330 retry.prompt = prompt::resume_incomplete(&last_err);
2331 retry.timeout = retry_budget(job.timeout, true);
2332 retry.stem = format!("{}-continue{attempts}", job.stem);
2333 let cache = self.state.config.cache_dir();
2334 let ctx = WaveCtx {
2335 carry_seats: false,
2336 run: run_id,
2337 node: "fix",
2338 prompts,
2339 cache: cache.as_deref(),
2340 round: Some(round),
2341 };
2342 let (resumed_seat, resumed_out) = run_one(
2343 retry,
2344 Arc::clone(&self.sem),
2345 &ctx,
2346 &mut self.state,
2347 attempts,
2348 )
2349 .await;
2350 seat = resumed_seat;
2351 match resumed_out {
2352 AgentOutcome::Ok(o) => {
2353 cumulative_wait_ms += o.duration_ms;
2354 match verdict::extract_json::<FixReport>(&o.text) {
2355 Ok(report) if !has_unconfirmed_command(&o.commands) => {
2356 self.state.event(
2357 "fix",
2358 format!(
2359 "round {round}: fixer's adoption report recovered after \
2360 {attempts} continuation(s)"
2361 ),
2362 );
2363 return (
2364 seat,
2365 Some(report),
2366 None,
2367 ContinuationRecord {
2368 attempts,
2369 cumulative_wait_ms,
2370 outcome: ContinuationOutcome::Resumed,
2371 },
2372 );
2373 }
2374 Ok(_) => {
2382 last_err = "the reply parsed, but it reported a command whose own CLI \
2383 never confirmed an exit status"
2384 .to_owned();
2385 }
2386 Err(e) => last_err = e.to_string(),
2387 }
2388 }
2389 AgentOutcome::Quota(o) => {
2390 cumulative_wait_ms += o.duration_ms;
2391 self.state.quota.push(QuotaLoss {
2392 seat: seat.key.clone(),
2393 node: "fix".to_owned(),
2394 at: Timestamp::now(),
2395 reset: o.quota.as_ref().and_then(|q| q.reset.clone()),
2396 });
2397 self.state.event(
2398 "fix",
2399 format!(
2400 "round {round}: continuation rate limited (quota); not retrying now"
2401 ),
2402 );
2403 return (
2404 seat,
2405 None,
2406 Some("rate limited (quota) while recovering the fix report".to_owned()),
2407 ContinuationRecord {
2408 attempts,
2409 cumulative_wait_ms,
2410 outcome: ContinuationOutcome::QuotaLost,
2411 },
2412 );
2413 }
2414 AgentOutcome::Dropped(o) => {
2415 cumulative_wait_ms += o.duration_ms;
2416 let why = o
2417 .dropped
2418 .as_ref()
2419 .map(|d| d.why.as_str())
2420 .unwrap_or("the CLI ended the stream without delivering its answer");
2421 last_err = format!("the CLI dropped the stream ({why})");
2422 }
2423 AgentOutcome::Failed(e) => last_err = e,
2424 }
2425 }
2426 }
2427
2428 fn after_implement(&mut self) -> Result<()> {
2429 if self.state.leaks.is_empty() {
2431 let cfg = self.state.config.blind.clone();
2432 let mut leaks = Vec::new();
2433 for c in &self.state.candidates {
2434 let Some(patch) =
2435 crate::run::read_artifact(&self.state, &format!("cand-{}.patch", c.label))
2436 else {
2437 continue;
2438 };
2439 leaks.extend(blind::scan(
2440 &format!("candidate {} patch", c.label),
2441 &patch,
2442 &cfg.vendor_tokens,
2443 ));
2444 }
2445 if !leaks.is_empty() {
2446 let summary = leaks
2447 .iter()
2448 .map(|l| format!("{}×{} in {}", l.token, l.count, l.site))
2449 .collect::<Vec<_>>()
2450 .join(", ");
2451 match cfg.on_leak {
2452 LeakPolicy::Fail => {
2453 self.state.status = RunStatus::Failed;
2454 self.state
2455 .event("blind", format!("vendor text in a patch: {summary}"));
2456 self.state.leaks = leaks;
2457 self.state.save()?;
2458 self.settle_questions();
2459 bail!(
2460 "blind.on_leak = \"fail\" and vendor text reached a \
2461 judged patch: {summary}"
2462 );
2463 }
2464 LeakPolicy::Redact => self.state.event(
2465 "blind",
2466 format!("redacting vendor text for judging: {summary}"),
2467 ),
2468 LeakPolicy::Warn => self.state.event(
2469 "blind",
2470 format!("vendor text present in a judged patch (shown as-is): {summary}"),
2471 ),
2472 }
2473 self.state.leaks = leaks;
2474 }
2475 }
2476
2477 if self.state.viable().is_empty() {
2478 if self.state.all_candidates_verified_noop() {
2479 self.state.status = RunStatus::VerifiedNoop;
2490 self.state.save()?;
2491 self.settle_questions();
2492 return Ok(());
2493 }
2494 self.state.status = RunStatus::Failed;
2495 self.state.save()?;
2496 self.settle_questions();
2497 bail!("no candidate produced a change; nothing to judge");
2498 }
2499 self.state.status = RunStatus::Judging;
2500 self.state.save()?;
2501 Ok(())
2502 }
2503
2504 async fn judge(&mut self) -> Result<()> {
2507 let run_id = self.state.id.clone();
2512 let prompts = self.state.config.prompts.clone();
2513 if !self.state.judgements.is_empty() || self.state.judge_skipped {
2514 return Ok(());
2515 }
2516 let viable: Vec<Candidate> = self.state.viable().into_iter().cloned().collect();
2517 if viable.len() == 1 {
2518 self.state.judge_skipped = true;
2525 self.state.event(
2526 "judge",
2527 format!(
2528 "only candidate {} produced a change; judging skipped",
2529 viable[0].label
2530 ),
2531 );
2532 self.state.save()?;
2533 return Ok(());
2534 }
2535 self.state.status = RunStatus::Judging;
2536
2537 let labels: Vec<char> = viable.iter().map(|c| c.label).collect();
2538 let language = self.state.config.graph.language.clone();
2539 let timeout = Duration::from_secs(self.state.config.graph.timeout_judge);
2540 let sessions = self.state.config.graph.sessions;
2541 let artifacts = agent::artifacts_dir(&self.state.dir());
2542 let root = self.state.worktree_root();
2543 let base_short = short(&self.state.base_commit);
2544
2545 let mut jobs = Vec::new();
2546 let mut orders = Vec::new();
2547 for (j, spec) in self.roles.judges.clone().into_iter().enumerate() {
2548 let order = blind::presentation_order(viable.len(), j, self.state.seed);
2549 let views: Vec<CandidateView> = order.iter().map(|&k| self.view(&viable[k])).collect();
2550 orders.push(order.iter().map(|&k| viable[k].index).collect::<Vec<_>>());
2551 let seat_key = format!("judge-{}", j + 1);
2552 let seat = self.seat(&seat_key, &spec.id);
2553 jobs.push(SeatJob {
2554 prompt: prompt::judge(
2555 &self.state.instruction,
2556 &views,
2557 self.roles.judges.len(),
2558 &base_short,
2559 &language,
2560 ),
2561 spec,
2562 seat,
2563 cwd: root.join(format!("judge-{}", j + 1)),
2564 timeout,
2565 allow_write: false,
2566 sessions,
2567 artifacts: artifacts.clone(),
2568 stem: format!("judge-{}", j + 1),
2569 handover: None,
2570 });
2571 }
2572
2573 self.state.event(
2574 "judge",
2575 format!(
2576 "{} judges ranking {} candidates blind",
2577 jobs.len(),
2578 viable.len()
2579 ),
2580 );
2581 let labels_for_check = labels.clone();
2582 let mut quota_losses = Vec::new();
2583 let cache = self.state.config.cache_dir();
2584 let ctx = WaveCtx {
2585 carry_seats: false,
2586 run: &run_id,
2587 node: "judge",
2588 prompts: &prompts,
2589 cache: cache.as_deref(),
2590 round: None,
2591 };
2592 let results = ask_json_wave::<Ranking>(
2593 jobs,
2594 Arc::clone(&self.sem),
2595 self.state.config.graph.retries,
2596 &self.roles.judge_roster,
2597 &ctx,
2598 &mut quota_losses,
2599 &mut self.state,
2600 &move |r: &Ranking| r.validate(&labels_for_check),
2601 )
2602 .await;
2603 self.state.quota.extend(quota_losses);
2604
2605 for (j, (seat, res, _attempts)) in results.into_iter().enumerate() {
2606 let agent_id = seat.agent.clone();
2607 self.state.seats.insert(seat.key.clone(), seat);
2608 let mut record = Judgement {
2609 judge: j + 1,
2610 seat: format!("judge-{}", j + 1),
2611 agent: agent_id,
2612 ranking: Vec::new(),
2613 reasons: BTreeMap::new(),
2614 confidence: None,
2615 order: orders[j].clone(),
2616 failed: None,
2617 duration_ms: 0,
2618 };
2619 match res {
2620 Ok((ranking, out)) => {
2621 record.ranking = ranking.normalized();
2622 record.reasons = ranking.reasons;
2623 record.confidence = ranking.confidence;
2624 record.duration_ms = out.duration_ms;
2625 self.state.event(
2626 "judge",
2627 format!(
2628 "judge {} ranked {}",
2629 j + 1,
2630 record.ranking.iter().collect::<String>()
2631 ),
2632 );
2633 }
2634 Err(e) => {
2635 record.failed = Some(e.to_string());
2636 self.state
2637 .event("judge", format!("judge {} produced no ranking: {e}", j + 1));
2638 }
2639 }
2640 self.state.judgements.push(record);
2641 self.state.save()?;
2642 }
2643 Ok(())
2644 }
2645
2646 async fn deliberate(&mut self) -> Result<()> {
2649 let run_id = self.state.id.clone();
2654 let prompts = self.state.config.prompts.clone();
2655 if !self.state.deliberation.is_empty() {
2656 return Ok(());
2657 }
2658 let tops: Vec<char> = self
2659 .state
2660 .judgements
2661 .iter()
2662 .filter_map(|j| j.ranking.first().copied())
2663 .collect();
2664 let rounds = self.state.config.graph.deliberate_rounds;
2665 if tops.len() < 2 || tops.iter().all(|t| *t == tops[0]) || rounds == 0 {
2666 if tops.len() >= 2 && tops.iter().all(|t| *t == tops[0]) {
2667 self.state.event(
2668 "deliberate",
2669 format!("judges agreed on {} outright; no deliberation", tops[0]),
2670 );
2671 }
2672 self.state.status = RunStatus::Voting;
2673 self.state.save()?;
2674 return Ok(());
2675 }
2676
2677 self.state.status = RunStatus::Deliberating;
2678 self.state.event(
2679 "deliberate",
2680 format!(
2681 "split: first choices were {} — opening {rounds} round(s)",
2682 tops.iter().collect::<String>()
2683 ),
2684 );
2685
2686 let viable: Vec<Candidate> = self.state.viable().into_iter().cloned().collect();
2687 let language = self.state.config.graph.language.clone();
2688 let timeout = Duration::from_secs(self.state.config.graph.timeout_judge);
2689 let sessions = self.state.config.graph.sessions;
2690 let artifacts = agent::artifacts_dir(&self.state.dir());
2691 let root = self.state.worktree_root();
2692 let base_short = short(&self.state.base_commit);
2693
2694 for round in 1..=rounds {
2698 let mut turns: Vec<DeliberationTurn> = Vec::new();
2699 for (j, spec) in self.roles.judges.clone().into_iter().enumerate() {
2700 if self.state.judgements[j].failed.is_some() {
2701 continue;
2702 }
2703 let seat_key = format!("judge-{}", j + 1);
2704 let spec = self.occupant(&seat_key, spec);
2705 let mut seat = self.seat(&seat_key, &spec.id);
2706 let transcript = self.transcript(&turns, j);
2707 let build = |context: Option<&str>| {
2708 prompt::deliberate(
2709 &self.state.instruction,
2710 context,
2711 &transcript,
2712 round,
2713 rounds,
2714 &language,
2715 )
2716 };
2717 let block = self.candidate_block(&viable, &base_short);
2718 let full = build(Some(&block));
2719 let text = if has_context(&spec, &seat, sessions) {
2720 build(None)
2721 } else {
2722 full.clone()
2723 };
2724 let job = SeatJob {
2725 spec,
2726 seat: seat.clone(),
2727 prompt: text,
2728 cwd: root.join(format!("judge-{}", j + 1)),
2729 timeout,
2730 allow_write: false,
2731 sessions,
2732 artifacts: artifacts.clone(),
2733 stem: format!("delib-{round}-judge-{}", j + 1),
2734 handover: Some(full),
2735 };
2736 let cache = self.state.config.cache_dir();
2737 let ctx = WaveCtx {
2738 carry_seats: false,
2739 run: &run_id,
2740 node: "deliberate",
2741 prompts: &prompts,
2742 cache: cache.as_deref(),
2743 round: None,
2744 };
2745 let mut losses = Vec::new();
2749 let mut results = ask_wave_with::<String>(
2750 vec![job],
2751 Arc::clone(&self.sem),
2752 0,
2753 &self.roles.judge_roster,
2754 &ctx,
2755 &mut losses,
2756 &mut self.state,
2757 &|text: &str| {
2758 Ok(verdict::section(text, "position").unwrap_or_else(|| text.to_owned()))
2759 },
2760 )
2761 .await;
2762 self.state.quota.extend(losses);
2763 let (updated, res, _) = results.pop().expect("one job in, one result out");
2764 seat = updated;
2765 let agent_id = seat.agent.clone();
2766 self.state.seats.insert(seat.key.clone(), seat);
2767 let body = match res {
2768 Ok((body, _)) => body,
2769 Err(e) => {
2772 self.state
2773 .event("deliberate", format!("judge {} skipped: {e}", j + 1));
2774 continue;
2775 }
2776 };
2777 let tentative = verdict::extract_json::<Position>(&body)
2778 .ok()
2779 .and_then(|p| p.tentative)
2780 .and_then(|s| s.trim().chars().next())
2781 .map(|c| c.to_ascii_uppercase());
2782 self.state.event(
2783 "deliberate",
2784 format!(
2785 "round {round}: judge {} now favours {}",
2786 j + 1,
2787 tentative.map_or("—".to_owned(), |c| c.to_string())
2788 ),
2789 );
2790 turns.push(DeliberationTurn {
2791 judge: j + 1,
2792 agent: agent_id,
2793 body: blind::sanitize_prose(&body, &self.state.config.blind),
2794 tentative,
2795 });
2796 }
2797 self.state
2798 .deliberation
2799 .push(DeliberationRound { round, turns });
2800 self.state.save()?;
2801 }
2802
2803 self.state.status = RunStatus::Voting;
2804 self.state.save()?;
2805 Ok(())
2806 }
2807
2808 async fn vote(&mut self) -> Result<()> {
2811 let run_id = self.state.id.clone();
2816 let prompts = self.state.config.prompts.clone();
2817 if !self.state.votes.is_empty() {
2818 return Ok(());
2819 }
2820 let viable: Vec<char> = self.state.viable().into_iter().map(|c| c.label).collect();
2821 if viable.len() == 1 {
2822 return Ok(());
2823 }
2824 self.state.status = RunStatus::Voting;
2825
2826 let language = self.state.config.graph.language.clone();
2827 let timeout = Duration::from_secs(self.state.config.graph.timeout_judge);
2828 let sessions = self.state.config.graph.sessions;
2829 let artifacts = agent::artifacts_dir(&self.state.dir());
2830 let root = self.state.worktree_root();
2831 let base_short = short(&self.state.base_commit);
2832 let candidates: Vec<Candidate> = self.state.viable().into_iter().cloned().collect();
2833
2834 let mut jobs = Vec::new();
2835 let mut seats_at = Vec::new();
2836 for (j, spec) in self.roles.judges.clone().into_iter().enumerate() {
2837 if self
2838 .state
2839 .judgements
2840 .get(j)
2841 .is_some_and(|r| r.failed.is_some())
2842 {
2843 continue;
2844 }
2845 let seat_key = format!("judge-{}", j + 1);
2846 let spec = self.occupant(&seat_key, spec);
2847 let seat = self.seat(&seat_key, &spec.id);
2848 let full = self.vote_prompt_full(j, &viable, &language, &candidates, &base_short);
2849 let text = if has_context(&spec, &seat, sessions) {
2850 prompt::final_vote(&viable, &language)
2851 } else {
2852 full.clone()
2853 };
2854 jobs.push(SeatJob {
2855 spec,
2856 seat,
2857 prompt: text,
2858 cwd: root.join(format!("judge-{}", j + 1)),
2859 timeout,
2860 allow_write: false,
2861 sessions,
2862 artifacts: artifacts.clone(),
2863 stem: format!("vote-judge-{}", j + 1),
2864 handover: Some(full),
2865 });
2866 seats_at.push(j);
2867 }
2868
2869 self.state.event(
2870 "vote",
2871 format!(
2872 "collecting {} final votes one by one, privately",
2873 jobs.len()
2874 ),
2875 );
2876 let allowed = viable.clone();
2877 let mut quota_losses = Vec::new();
2878 let cache = self.state.config.cache_dir();
2879 let ctx = WaveCtx {
2880 carry_seats: false,
2881 run: &run_id,
2882 node: "vote",
2883 prompts: &prompts,
2884 cache: cache.as_deref(),
2885 round: None,
2886 };
2887 let results = ask_json_wave::<FinalVote>(
2888 jobs,
2889 Arc::clone(&self.sem),
2890 self.state.config.graph.retries,
2891 &self.roles.judge_roster,
2892 &ctx,
2893 &mut quota_losses,
2894 &mut self.state,
2895 &move |v: &FinalVote| match v.label() {
2896 Some(c) if allowed.contains(&c) => Ok(()),
2897 other => bail!("vote {other:?} is not one of {allowed:?}"),
2898 },
2899 )
2900 .await;
2901 self.state.quota.extend(quota_losses);
2902
2903 for (&j, (seat, res, _attempts)) in seats_at.iter().zip(results) {
2904 let agent_id = seat.agent.clone();
2905 self.state.seats.insert(seat.key.clone(), seat);
2906 let initial = self
2907 .state
2908 .judgements
2909 .get(j)
2910 .and_then(|r| r.ranking.first().copied());
2911 let mut record = VoteRecord {
2912 judge: j + 1,
2913 agent: agent_id,
2914 vote: None,
2915 reason: String::new(),
2916 changed: false,
2917 };
2918 match res {
2919 Ok((v, _)) => {
2920 record.vote = v.label();
2921 record.reason = blind::sanitize_prose(&v.reason, &self.state.config.blind);
2922 record.changed = matches!((record.vote, initial), (Some(a), Some(b)) if a != b);
2923 self.state.event(
2924 "vote",
2925 format!(
2926 "judge {} voted {}{}",
2927 j + 1,
2928 record.vote.unwrap_or('?'),
2929 if record.changed { " (changed)" } else { "" }
2930 ),
2931 );
2932 }
2933 Err(e) => {
2934 self.state
2935 .event("vote", format!("judge {} cast no vote: {e}", j + 1));
2936 }
2937 }
2938 self.state.votes.push(record);
2939 self.state.save()?;
2940 }
2941 Ok(())
2942 }
2943
2944 fn tally(&mut self) -> Result<()> {
2947 if self.state.tally.is_some() {
2948 return Ok(());
2949 }
2950 let viable: Vec<char> = self.state.viable().into_iter().map(|c| c.label).collect();
2951 let tops: Vec<char> = self
2952 .state
2953 .judgements
2954 .iter()
2955 .filter_map(|j| j.ranking.first().copied())
2956 .collect();
2957 let unanimous_initial = tops.len() > 1 && tops.iter().all(|t| *t == tops[0]);
2958
2959 let mut first_choice: BTreeMap<char, usize> = viable.iter().map(|l| (*l, 0)).collect();
2962 let mut cast: Vec<char> = Vec::new();
2963 for (i, j) in self.state.judgements.iter().enumerate() {
2964 let vote = self
2965 .state
2966 .votes
2967 .iter()
2968 .find(|v| v.judge == i + 1)
2969 .and_then(|v| v.vote)
2970 .or_else(|| j.ranking.first().copied());
2971 if let Some(v) = vote {
2972 *first_choice.entry(v).or_insert(0) += 1;
2973 cast.push(v);
2974 }
2975 }
2976
2977 let mut borda: BTreeMap<char, usize> = viable.iter().map(|l| (*l, 0)).collect();
2978 for j in &self.state.judgements {
2979 let n = j.ranking.len();
2980 for (pos, label) in j.ranking.iter().enumerate() {
2981 *borda.entry(*label).or_insert(0) += n.saturating_sub(pos + 1);
2982 }
2983 }
2984
2985 let best = first_choice.values().copied().max().unwrap_or(0);
2986 let mut leaders: Vec<char> = first_choice
2987 .iter()
2988 .filter(|(_, v)| **v == best)
2989 .map(|(k, _)| *k)
2990 .collect();
2991 let mut tie_break = None;
2992 if leaders.len() > 1 {
2993 let top_borda = leaders.iter().map(|l| borda[l]).max().unwrap_or(0);
2994 let borda_leaders: Vec<char> = leaders
2995 .iter()
2996 .copied()
2997 .filter(|l| borda[l] == top_borda)
2998 .collect();
2999 tie_break = Some(if borda_leaders.len() == 1 {
3000 format!(
3001 "{} way tie on first-choice votes, broken by Borda points from the initial rankings",
3002 leaders.len()
3003 )
3004 } else {
3005 format!(
3006 "{} way tie on both first-choice votes and Borda points, broken by label order",
3007 leaders.len()
3008 )
3009 });
3010 leaders = borda_leaders;
3011 leaders.sort_unstable();
3012 }
3013 let winner = *leaders
3014 .first()
3015 .or(viable.first())
3016 .context("no candidate to declare a winner from")?;
3017
3018 let changed_votes = self.state.votes.iter().filter(|v| v.changed).count();
3019 let unanimous_final = !cast.is_empty() && cast.iter().all(|c| *c == cast[0]);
3020 let deliberated = !self.state.deliberation.is_empty();
3021
3022 let quota_seats: std::collections::BTreeSet<&str> =
3026 self.state.quota.iter().map(|q| q.seat.as_str()).collect();
3027 let mut present = 0usize;
3028 for (i, j) in self.state.judgements.iter().enumerate() {
3029 if quota_seats.contains(j.seat.as_str()) {
3030 continue;
3031 }
3032 let ranked = !j.ranking.is_empty() && j.failed.is_none();
3033 let voted = self
3034 .state
3035 .votes
3036 .iter()
3037 .any(|v| v.judge == i + 1 && v.vote.is_some());
3038 if ranked || voted {
3039 present += 1;
3040 }
3041 }
3042 let needs_quorum = viable.len() > 1;
3048 let judges_total = if needs_quorum {
3049 self.roles.judges.len()
3050 } else {
3051 0
3052 };
3053 let quorum = if needs_quorum {
3054 judges_total / 2 + 1
3055 } else {
3056 0
3057 };
3058 let met_quorum = !needs_quorum || present >= quorum;
3059 let uncontested = (!needs_quorum).then(|| {
3060 format!("only one candidate ({winner}) produced a usable change; no panel was asked")
3061 });
3062
3063 self.state.event(
3064 "tally",
3065 match &uncontested {
3066 Some(reason) => format!("winner {winner} — {reason}"),
3067 None => format!(
3068 "winner {winner} — votes {} | initial {} | {} changed | \
3069 {present}/{judges_total} judges{}",
3070 first_choice
3071 .iter()
3072 .map(|(k, v)| format!("{k}:{v}"))
3073 .collect::<Vec<_>>()
3074 .join(" "),
3075 if unanimous_initial {
3076 "unanimous"
3077 } else {
3078 "split"
3079 },
3080 changed_votes,
3081 if met_quorum {
3082 String::new()
3083 } else {
3084 format!(" — below quorum ({quorum} required)")
3085 },
3086 ),
3087 },
3088 );
3089 if !met_quorum {
3090 self.state.event(
3091 "stall",
3092 format!(
3093 "verdict rests on {present} of {judges_total} judges (quorum {quorum}); \
3094 the run stops here, resumable"
3095 ),
3096 );
3097 }
3098 self.state.tally = Some(Tally {
3099 first_choice,
3100 borda,
3101 winner,
3102 rankings: tops.len(),
3103 unanimous_initial,
3104 deliberated,
3105 changed_votes,
3106 unanimous_final,
3107 tie_break,
3108 judges: judges_total,
3109 present,
3110 quorum,
3111 met_quorum,
3112 uncontested,
3113 });
3114 self.state.status = if met_quorum {
3115 RunStatus::Reviewing
3116 } else {
3117 RunStatus::Stalled
3118 };
3119 self.state.save()?;
3120 Ok(())
3121 }
3122
3123 #[allow(clippy::too_many_lines)]
3144 async fn recover_stall(&mut self) -> Result<bool> {
3145 let run_id = self.state.id.clone();
3150 let prompts = self.state.config.prompts.clone();
3151 let quota_seats: BTreeSet<&str> =
3156 self.state.quota.iter().map(|q| q.seat.as_str()).collect();
3157 let absent: Vec<String> = self
3158 .state
3159 .judgements
3160 .iter()
3161 .filter(|j| quota_seats.contains(j.seat.as_str()) || j.failed.is_some())
3162 .map(|j| j.seat.clone())
3163 .collect();
3164 if absent.is_empty() {
3165 return Ok(false);
3166 }
3167 let viable: Vec<Candidate> = self.state.viable().into_iter().cloned().collect();
3168 if viable.len() <= 1 {
3169 return Ok(false);
3170 }
3171 let labels: Vec<char> = viable.iter().map(|c| c.label).collect();
3172 let language = self.state.config.graph.language.clone();
3173 let timeout = Duration::from_secs(self.state.config.graph.timeout_judge);
3174 let sessions = self.state.config.graph.sessions;
3175 let artifacts = agent::artifacts_dir(&self.state.dir());
3176 let root = self.state.worktree_root();
3177 let base_short = short(&self.state.base_commit);
3178 let candidates: Vec<Candidate> = viable.clone();
3179
3180 let mut positions: Vec<usize> = absent
3182 .iter()
3183 .filter_map(|k| self.state.judgements.iter().position(|r| &r.seat == k))
3184 .collect();
3185 if positions.is_empty() {
3186 return Ok(false);
3187 }
3188 positions.sort_unstable();
3189 positions.dedup();
3190
3191 let mut judge_jobs = Vec::new();
3193 for &j in &positions {
3194 let order = blind::presentation_order(viable.len(), j, self.state.seed);
3195 let views: Vec<CandidateView> = order.iter().map(|&k| self.view(&viable[k])).collect();
3196 let seat_key = format!("judge-{}", j + 1);
3197 let spec = self.occupant(&seat_key, self.roles.judges[j].clone());
3198 let seat = self.seat(&seat_key, &spec.id);
3199 judge_jobs.push(SeatJob {
3200 spec,
3201 seat,
3202 prompt: prompt::judge(
3203 &self.state.instruction,
3204 &views,
3205 self.roles.judges.len(),
3206 &base_short,
3207 &language,
3208 ),
3209 cwd: root.join(seat_key),
3210 timeout,
3211 allow_write: false,
3212 sessions,
3213 artifacts: artifacts.clone(),
3214 stem: format!("judge-{}-recover", j + 1),
3215 handover: None,
3216 });
3217 }
3218
3219 let labels_for_check = labels.clone();
3220 let mut judge_losses = Vec::new();
3221 let retries = self.state.config.graph.retries;
3222 let cache = self.state.config.cache_dir();
3223 let ctx = WaveCtx {
3224 carry_seats: false,
3225 run: &run_id,
3226 node: "judge",
3227 prompts: &prompts,
3228 cache: cache.as_deref(),
3229 round: None,
3230 };
3231 let results = ask_json_wave::<Ranking>(
3232 judge_jobs,
3233 Arc::clone(&self.sem),
3234 retries,
3235 &self.roles.judge_roster,
3236 &ctx,
3237 &mut judge_losses,
3238 &mut self.state,
3239 &move |r: &Ranking| r.validate(&labels_for_check),
3240 )
3241 .await;
3242
3243 let mut recovered: BTreeSet<usize> = BTreeSet::new();
3245 for (&j, (seat, res, _attempts)) in positions.iter().zip(results) {
3246 let agent_id = seat.agent.clone();
3247 self.state.seats.insert(seat.key.clone(), seat);
3248 let record = &mut self.state.judgements[j];
3249 match res {
3250 Ok((ranking, out)) => {
3251 record.agent = agent_id;
3252 record.ranking = ranking.normalized();
3253 record.reasons = ranking.reasons;
3254 record.confidence = ranking.confidence;
3255 record.failed = None;
3256 record.duration_ms = out.duration_ms;
3257 recovered.insert(j);
3258 self.state.event(
3259 "recover",
3260 format!("judge {} ranked again after the limit", j + 1),
3261 );
3262 }
3263 Err(e) => {
3264 self.state
3265 .event("recover", format!("judge {} still cannot rank: {e}", j + 1));
3266 }
3267 }
3268 }
3269
3270 let mut vote_jobs = Vec::new();
3272 let mut vote_pos: Vec<usize> = Vec::new();
3273 for &j in &recovered {
3274 let seat_key = format!("judge-{}", j + 1);
3275 let spec = self.occupant(&seat_key, self.roles.judges[j].clone());
3276 let seat = self.seat(&seat_key, &spec.id);
3277 let full = self.vote_prompt_full(j, &labels, &language, &candidates, &base_short);
3278 let text = if has_context(&spec, &seat, sessions) {
3279 prompt::final_vote(&labels, &language)
3280 } else {
3281 full.clone()
3282 };
3283 vote_jobs.push(SeatJob {
3284 spec,
3285 seat,
3286 prompt: text,
3287 cwd: root.join(seat_key),
3288 timeout,
3289 allow_write: false,
3290 sessions,
3291 artifacts: artifacts.clone(),
3292 stem: format!("vote-judge-{}-recover", j + 1),
3293 handover: Some(full),
3294 });
3295 vote_pos.push(j);
3296 }
3297 let allowed = labels.clone();
3298 let mut vote_losses = Vec::new();
3299 let vote_retries = self.state.config.graph.retries;
3300 let vote_cache = self.state.config.cache_dir();
3301 let ctx = WaveCtx {
3302 carry_seats: false,
3303 run: &run_id,
3304 node: "vote",
3305 prompts: &prompts,
3306 cache: vote_cache.as_deref(),
3307 round: None,
3308 };
3309 let votes = ask_json_wave::<FinalVote>(
3310 vote_jobs,
3311 Arc::clone(&self.sem),
3312 vote_retries,
3313 &self.roles.judge_roster,
3314 &ctx,
3315 &mut vote_losses,
3316 &mut self.state,
3317 &move |v: &FinalVote| match v.label() {
3318 Some(c) if allowed.contains(&c) => Ok(()),
3319 other => bail!("vote {other:?} is not one of {allowed:?}"),
3320 },
3321 )
3322 .await;
3323 for (&j, (seat, res, _attempts)) in vote_pos.iter().zip(votes) {
3324 let agent_id = seat.agent.clone();
3325 self.state.seats.insert(seat.key.clone(), seat);
3326 match res {
3327 Ok((v, _)) => {
3328 if let Some(rec) = self.state.votes.iter_mut().find(|r| r.judge == j + 1) {
3329 rec.vote = v.label();
3330 rec.reason = blind::sanitize_prose(&v.reason, &self.state.config.blind);
3331 } else {
3332 self.state.votes.push(VoteRecord {
3333 judge: j + 1,
3334 agent: agent_id,
3335 vote: v.label(),
3336 reason: blind::sanitize_prose(&v.reason, &self.state.config.blind),
3337 changed: false,
3338 });
3339 }
3340 self.state.event(
3341 "recover",
3342 format!("judge {} voted again after the limit", j + 1),
3343 );
3344 }
3345 Err(e) => {
3346 self.state
3347 .event("recover", format!("judge {} still cannot vote: {e}", j + 1));
3348 }
3349 }
3350 }
3351
3352 let recovered_keys: BTreeSet<String> = recovered
3356 .iter()
3357 .map(|&j| format!("judge-{}", j + 1))
3358 .collect();
3359 self.state
3360 .quota
3361 .retain(|q| !recovered_keys.contains(&q.seat));
3362 for loss in judge_losses.into_iter().chain(vote_losses) {
3366 if recovered_keys.contains(&loss.seat) {
3367 continue;
3368 }
3369 self.state.quota.retain(|q| q.seat != loss.seat);
3370 self.state.quota.push(loss);
3371 }
3372
3373 self.state.tally = None;
3375 self.tally()?;
3376 Ok(self
3377 .state
3378 .tally
3379 .as_ref()
3380 .map(|t| t.met_quorum)
3381 .unwrap_or(false))
3382 }
3383
3384 async fn fold_losers(&mut self) -> Result<()> {
3387 let Some(winner) = self.state.tally.as_ref().map(|t| t.winner) else {
3388 return Ok(());
3389 };
3390 let repo = self.state.repo.clone();
3391 let mut folded = Vec::new();
3392 for i in 0..self.state.candidates.len() {
3393 let c = &self.state.candidates[i];
3394 if c.label == winner || c.folded {
3395 continue;
3396 }
3397 let (wt, branch, label) = (c.worktree.clone(), c.branch.clone(), c.label);
3398 git::worktree_remove(&repo, &wt).await.ok();
3399 git::branch_delete(&repo, &branch).await.ok();
3400 self.state.candidates[i].folded = true;
3401 folded.push(label.to_string());
3402 }
3403 let root = self.state.worktree_root();
3405 for j in 1..=self.roles.judges.len() {
3406 let wt = root.join(format!("judge-{j}"));
3407 if wt.exists() {
3408 git::worktree_remove(&repo, &wt).await.ok();
3409 }
3410 }
3411 if self.state.config.graph.advise {
3414 for k in 1..=self.state.config.graph.advisors {
3415 let wt = root.join(format!("advisor-{k}"));
3416 if wt.exists() {
3417 git::worktree_remove(&repo, &wt).await.ok();
3418 }
3419 }
3420 }
3421 if !folded.is_empty() {
3422 self.state
3423 .event("fold", format!("folded candidates {}", folded.join(", ")));
3424 self.state.save()?;
3425 }
3426 Ok(())
3427 }
3428
3429 async fn sync_to_base(&mut self) -> Result<()> {
3469 if self.state.status == RunStatus::AlreadyInBase {
3470 return Ok(());
3471 }
3472 let conflicted = self
3473 .state
3474 .base_sync
3475 .as_ref()
3476 .is_some_and(|s| s.conflict.is_some());
3477 let Some(winner) = self.state.winner().cloned() else {
3478 return Ok(());
3479 };
3480
3481 let repo = self.state.repo.clone();
3482 let remote = self.state.config.merge.remote.clone();
3483 let base_branch = self.state.base_branch.clone();
3484 let tracking = format!("{remote}/{base_branch}");
3485
3486 git::fetch(&repo, &remote, &base_branch).await.ok();
3487 let Ok(tip) = git::rev_parse(&repo, &tracking).await else {
3491 return Ok(());
3492 };
3493
3494 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
3495 let behind = git::commits_ahead(&repo, &head, &tip).await.unwrap_or(0);
3496 let attempts = self.state.base_sync.as_ref().map_or(0, |s| s.attempts);
3497
3498 if (behind > 0 || conflicted || head == tip)
3507 && self
3508 .settle_already_in(&winner.branch, &tip, &head, attempts, behind)
3509 .await?
3510 {
3511 return Ok(());
3512 }
3513 if conflicted {
3514 return Ok(());
3515 }
3516
3517 if behind == 0 {
3518 if let Some(from) = self
3527 .state
3528 .rebase_fixes
3529 .iter()
3530 .rev()
3531 .find_map(|r| r.from.clone())
3532 && from != head
3533 && git::git_raw(&winner.worktree, &["diff", "--quiet", &from])
3534 .await
3535 .is_ok_and(|o| o.ok())
3536 {
3537 git::sync_to_head(&winner.worktree).await?;
3538 }
3539 let conflict = self.publish_resumed_rebase(&winner.branch, &head).await;
3545 if let Some(why) = &conflict {
3546 self.state.status = RunStatus::Blocked;
3547 self.state.event("land", why.clone());
3548 }
3549 self.state.base_sync = Some(BaseSync {
3550 tip,
3551 behind: 0,
3552 attempts,
3553 conflict,
3554 already_in: None,
3555 });
3556 self.state.save()?;
3557 return Ok(());
3558 }
3559
3560 if attempts >= BASE_SYNC_ROUNDS {
3561 let why = format!(
3562 "{base_branch} moved {behind} commit(s) ahead of {} after {BASE_SYNC_ROUNDS} \
3563 rebase(s); rebasing again would only race it",
3564 winner.branch
3565 );
3566 self.state.status = RunStatus::Blocked;
3567 self.state.base_sync = Some(BaseSync {
3568 tip,
3569 behind,
3570 attempts,
3571 conflict: Some(why.clone()),
3572 already_in: None,
3573 });
3574 self.state.event("land", why);
3575 self.state.save()?;
3576 return Ok(());
3577 }
3578
3579 self.state.event(
3580 "land",
3581 format!(
3582 "{base_branch} moved {behind} commit(s) ahead of {}; rebasing before verifying",
3583 winner.branch
3584 ),
3585 );
3586 self.state.save()?;
3587
3588 let branch_tracking = format!("{remote}/{}", winner.branch);
3594 let fetched_branch = git::fetch(&repo, &remote, &winner.branch).await;
3595 let remote_tip = if matches!(&fetched_branch, Ok(o) if o.ok()) {
3596 git::rev_parse(&repo, &branch_tracking).await.ok()
3597 } else {
3598 None
3599 };
3600 if let Some(theirs) = &remote_tip
3604 && !git::is_ancestor(&repo, theirs, &head).await
3605 && !crate::reconcile::origin_missing(&repo, &head, theirs)
3606 .await
3607 .is_ok_and(|missing| missing.is_empty())
3608 {
3609 let why = format!(
3610 "{branch_tracking} ({}) has commits {} does not contain; not rebasing over \
3611 them",
3612 short(theirs),
3613 winner.branch
3614 );
3615 self.state.status = RunStatus::Blocked;
3616 self.state.base_sync = Some(BaseSync {
3617 tip,
3618 behind,
3619 attempts,
3620 conflict: Some(why.clone()),
3621 already_in: None,
3622 });
3623 self.state.event("land", why);
3624 self.state.save()?;
3625 return Ok(());
3626 }
3627
3628 let scratch = self.state.dir().join("base-sync");
3629 let rebased = match crate::rebase::rebase_with_fixer(
3630 &mut self.state,
3631 &scratch,
3632 &winner.branch,
3633 &tracking,
3634 )
3635 .await
3636 {
3637 Ok(crate::rebase::Rebased::Applied) => Ok(None),
3638 Ok(crate::rebase::Rebased::Stopped(why)) => Ok(Some(why)),
3639 Err(e) => Err(e),
3640 };
3641 let attempts = attempts + 1;
3642 match rebased {
3643 Ok(None) => {
3644 git::sync_to_head(&winner.worktree).await?;
3648 refresh_reviewed_commits(&mut self.state, &winner.branch).await;
3649 let mut conflict = None;
3650 if let Some(pinned) = &remote_tip {
3651 let pushed = git::push_pinned(&repo, &remote, &winner.branch, pinned).await;
3652 match pushed {
3653 Ok(o) if o.ok() => self.state.event(
3654 "land",
3655 format!("pushed rebased {} to {remote}", winner.branch),
3656 ),
3657 Ok(o) => {
3658 conflict = Some(format!(
3659 "rebased {} locally but {remote} refused the push (it moved since {}; someone may have pushed): {}",
3660 winner.branch,
3661 short(pinned),
3662 o.stderr.chars().take(600).collect::<String>()
3663 ));
3664 }
3665 Err(e) => {
3666 conflict = Some(format!(
3667 "rebased {} locally but could not push it: {e:#}",
3668 winner.branch
3669 ));
3670 }
3671 }
3672 }
3673 if let Some(why) = &conflict {
3674 self.state.status = RunStatus::Blocked;
3675 self.state.event("land", why.clone());
3676 }
3677 self.state.base_sync = Some(BaseSync {
3678 tip: tip.clone(),
3679 behind: 0,
3680 attempts,
3681 conflict,
3682 already_in: None,
3683 });
3684 self.state
3685 .event("land", format!("rebased {} onto {tracking}", winner.branch));
3686 }
3687 Ok(Some(conflict)) => {
3688 let why = format!(
3689 "{} conflicts with {tracking} and did not rebase: {}",
3690 winner.branch,
3691 conflict.chars().take(600).collect::<String>()
3692 );
3693 self.state.status = RunStatus::Blocked;
3694 self.state.base_sync = Some(BaseSync {
3695 tip,
3696 behind,
3697 attempts,
3698 conflict: Some(why.clone()),
3699 already_in: None,
3700 });
3701 self.state.event("land", why);
3702 }
3703 Err(e) => {
3704 let why = format!("could not rebase {} onto {tracking}: {e:#}", winner.branch);
3705 self.state.status = RunStatus::Blocked;
3706 self.state.base_sync = Some(BaseSync {
3707 tip,
3708 behind,
3709 attempts,
3710 conflict: Some(why.clone()),
3711 already_in: None,
3712 });
3713 self.state.event("land", why);
3714 }
3715 }
3716 self.state.save()?;
3717 Ok(())
3718 }
3719
3720 async fn publish_resumed_rebase(&mut self, branch: &str, head: &str) -> Option<String> {
3726 let repo = self.state.repo.clone();
3727 let remote = self.state.config.merge.remote.clone();
3728 let fetched = git::fetch(&repo, &remote, branch).await;
3729 if !matches!(&fetched, Ok(o) if o.ok()) {
3730 return None;
3731 }
3732 let branch_tracking = format!("{remote}/{branch}");
3733 let theirs = git::rev_parse(&repo, &branch_tracking).await.ok()?;
3734 if theirs == head || git::is_ancestor(&repo, &theirs, head).await {
3735 return None;
3736 }
3737 if !crate::reconcile::origin_missing(&repo, head, &theirs)
3738 .await
3739 .is_ok_and(|missing| missing.is_empty())
3740 {
3741 return Some(format!(
3742 "{branch_tracking} ({}) has commits {branch} does not contain; not pushing over \
3743 them",
3744 short(&theirs)
3745 ));
3746 }
3747 match git::push_pinned(&repo, &remote, branch, &theirs).await {
3748 Ok(o) if o.ok() => {
3749 self.state
3750 .event("land", format!("pushed rebased {branch} to {remote}"));
3751 None
3752 }
3753 Ok(o) => Some(format!(
3754 "{branch} is rebased locally but {remote} refused the push (it moved since {}; \
3755 someone may have pushed): {}",
3756 short(&theirs),
3757 o.stderr.chars().take(600).collect::<String>()
3758 )),
3759 Err(e) => Some(format!(
3760 "{branch} is rebased locally but could not be pushed: {e:#}"
3761 )),
3762 }
3763 }
3764
3765 async fn settle_already_in(
3782 &mut self,
3783 branch: &str,
3784 tip: &str,
3785 head: &str,
3786 attempts: usize,
3787 behind: usize,
3788 ) -> Result<bool> {
3789 let repo = self.state.repo.clone();
3790 let remote = self.state.config.merge.remote.clone();
3791 let start = self.state.base_commit.clone();
3792 let evidence = match crate::already::classify(&repo, tip, head, Some(&start)).await {
3793 Ok(Some(e)) => e,
3794 Ok(None) => return Ok(false),
3795 Err(e) => {
3796 tracing::warn!("already-in-base check for {branch}: {e:#}");
3797 return Ok(false);
3798 }
3799 };
3800 let mut verified = vec![head.to_owned()];
3801 let fetched = git::fetch(&repo, &remote, branch).await;
3802 if matches!(&fetched, Ok(o) if o.ok())
3803 && let Ok(theirs) = git::rev_parse(&repo, &format!("{remote}/{branch}")).await
3804 && theirs != head
3805 {
3806 match crate::already::classify(&repo, tip, &theirs, Some(&start)).await {
3807 Ok(Some(_)) => verified.push(theirs),
3808 _ => return Ok(false),
3809 }
3810 }
3811 let base_branch = self.state.base_branch.clone();
3812 let message = format!(
3813 "{branch} is already in {remote}/{base_branch} as {} ({} match); nothing left to \
3814 land",
3815 evidence.names(),
3816 evidence.proof.as_str()
3817 );
3818 let closed =
3819 crate::land::close_superseded_pr(&mut self.state, branch, &evidence, &verified).await;
3820 match closed {
3821 Ok(Ok(url)) => self
3822 .state
3823 .event("land", format!("closed {url}: superseded on {base_branch}")),
3824 Ok(Err(why)) => self
3825 .state
3826 .event("land", format!("did not close a pull request: {why}")),
3827 Err(e) => {
3828 let why = format!(
3829 "{branch} is already in {remote}/{base_branch}, but its pull request could \
3830 not be closed ({e:#}); resume to retry"
3831 );
3832 self.state.status = RunStatus::Blocked;
3833 self.state.base_sync = Some(BaseSync {
3834 tip: tip.to_owned(),
3835 behind,
3836 attempts,
3837 conflict: Some(why.clone()),
3838 already_in: None,
3839 });
3840 self.state.event("land", why);
3841 self.state.save()?;
3842 return Ok(true);
3843 }
3844 }
3845 self.state.status = RunStatus::AlreadyInBase;
3846 self.state.base_sync = Some(BaseSync {
3847 tip: tip.to_owned(),
3848 behind,
3849 attempts,
3850 conflict: None,
3851 already_in: Some(evidence),
3852 });
3853 self.state.event("land", message);
3854 self.state.save()?;
3855 self.settle_questions();
3856 Ok(true)
3857 }
3858
3859 fn landing_base(&self) -> String {
3869 self.state
3870 .base_sync
3871 .as_ref()
3872 .map_or_else(|| self.state.base_commit.clone(), |s| s.tip.clone())
3873 }
3874
3875 pub async fn fix_selected(
3908 &mut self,
3909 ids: &[String],
3910 reason: &str,
3911 allow_stale: bool,
3912 ) -> Result<()> {
3913 let reason = reason.trim();
3914 if reason.is_empty() {
3915 bail!("a fix request needs a reason — that is the operator's own record of why");
3916 }
3917 if ids.is_empty() {
3918 bail!("no finding id given");
3919 }
3920 if !matches!(self.state.status, RunStatus::Ready | RunStatus::Blocked) {
3921 bail!(
3922 "run {} is `{}`; only a `ready` or `blocked` run — one whose review \
3923 has already concluded — can be given a targeted fix. A run still \
3924 in progress should simply be resumed; a `merged` run's branch has \
3925 already landed, so its answer is a fresh `magi review <branch>`, \
3926 not reopening this run's own record",
3927 self.state.id,
3928 self.state.status.as_str()
3929 );
3930 }
3931 let Some(winner) = self.state.winner().cloned() else {
3932 bail!("run {} has no winning candidate to fix", self.state.id);
3933 };
3934 if !git::branch_exists(&self.state.repo, &winner.branch).await? {
3935 bail!(
3936 "branch `{}` no longer exists; this run cannot be extended",
3937 winner.branch
3938 );
3939 }
3940 let home = crate::run::home();
3941 if crate::daemon::is_working_on(&home, &self.state.id, Timestamp::now()) {
3942 bail!(
3943 "run {} is currently being worked on by another magi process",
3944 self.state.id
3945 );
3946 }
3947 let _claim = FixClaim::acquire(&self.state.dir())?;
3953
3954 let mut seen = BTreeSet::new();
3958 let mut findings = Vec::new();
3959 let mut missing = Vec::new();
3960 for id in ids {
3961 if !seen.insert(id.clone()) {
3962 continue;
3963 }
3964 match self.state.finding(id) {
3965 Some((round, rec, f)) => findings.push(OperatorFixFinding {
3966 id: f.id.clone(),
3967 severity: f.severity,
3968 reviewer_vote: rec.vote,
3969 round: round.round,
3970 round_head: round.head.clone(),
3971 reviewer: rec.reviewer,
3972 agent: rec.agent.clone(),
3973 file: f.file.clone(),
3974 line: f.line,
3975 title: f.title.clone(),
3976 detail: f.detail.clone(),
3977 outcome: OperatorFixOutcome::Pending,
3978 }),
3979 None => missing.push(id.clone()),
3980 }
3981 }
3982 if !missing.is_empty() {
3983 bail!(
3984 "unknown finding id(s): {}; nothing was changed",
3985 missing.join(", ")
3986 );
3987 }
3988
3989 let head_at_request = git::rev_parse(&self.state.repo, &winner.branch).await?;
3990 let stale_details: Vec<(String, String)> = findings
3991 .iter()
3992 .filter(|f| f.round_head != head_at_request)
3993 .map(|f| (f.id.clone(), f.round_head.clone()))
3994 .collect();
3995 let stale = !stale_details.is_empty();
3996 if stale && !allow_stale {
3997 bail!(
3998 "the branch has moved since some finding(s) were raised — {} — now \
3999 at {}; pass --allow-stale to fix anyway, or re-run review first",
4000 stale_details
4001 .iter()
4002 .map(|(id, head)| format!("{id} (raised against {})", short(head)))
4003 .collect::<Vec<_>>()
4004 .join(", "),
4005 short(&head_at_request)
4006 );
4007 }
4008
4009 let request = OperatorFixRequest {
4010 requested_at: Timestamp::now(),
4011 reason: reason.to_owned(),
4012 findings,
4013 head_at_request: head_at_request.clone(),
4014 allow_stale,
4015 stale,
4016 fix: None,
4017 result_head: None,
4018 follow_up_review_run: None,
4019 };
4020 self.state.event(
4021 "fix",
4022 format!(
4023 "operator requested a targeted fix on {} finding(s) ({}): {reason}",
4024 request.findings.len(),
4025 request
4026 .findings
4027 .iter()
4028 .map(|f| f.id.as_str())
4029 .collect::<Vec<_>>()
4030 .join(", "),
4031 ),
4032 );
4033 self.state.operator_fixes.push(request);
4040 self.state.save()?;
4041 let request_index = self.state.operator_fixes.len() - 1;
4042
4043 if winner.worktree.exists() {
4052 let dirty = git::git(
4055 &winner.worktree,
4056 &["status", "--porcelain", "--untracked-files=all"],
4057 )
4058 .await?;
4059 let only_withheld = dirty.lines().all(|l| {
4060 l.strip_prefix("?? ")
4061 .is_some_and(|p| self.state.withheld.iter().any(|w| w.path == p))
4062 });
4063 if !only_withheld {
4064 bail!(
4065 "`{}` has uncommitted changes; refusing to touch it — commit or \
4066 discard them first",
4067 winner.worktree.display()
4068 );
4069 }
4070 git::worktree_remove(&self.state.repo, &winner.worktree)
4071 .await
4072 .ok();
4073 }
4074 let fix_worktree = self.state.worktree_root().join("operator-fix");
4075 let fix_worktree_s = fix_worktree.to_string_lossy().to_string();
4076 git::git(
4077 &self.state.repo,
4078 &["worktree", "add", &fix_worktree_s, winner.branch.as_str()],
4079 )
4080 .await
4081 .with_context(|| format!("checking out `{}` for the fix", winner.branch))?;
4082 if !git::is_clean(&fix_worktree).await? {
4083 git::worktree_remove(&self.state.repo, &fix_worktree)
4084 .await
4085 .ok();
4086 bail!(
4087 "`{}` has uncommitted changes; refusing to start a fix on a dirty tree",
4088 winner.branch
4089 );
4090 }
4091
4092 let run_id = self.state.id.clone();
4093 let prompts = self.state.config.prompts.clone();
4094 let language = self.state.config.graph.language.clone();
4095 let sessions = self.state.config.graph.sessions;
4096 let artifacts = agent::artifacts_dir(&self.state.dir());
4097 let (fix_spec, fix_seat_key) = match &self.roles.fixer {
4098 Some(f) if f.id != winner.agent => (f.clone(), "fix".to_owned()),
4099 _ => (
4100 self.state
4101 .config
4102 .agent(&winner.agent)
4103 .cloned()
4104 .unwrap_or_else(|_| self.roles.implementers[winner.index].clone()),
4105 format!("impl-{}", winner.label),
4106 ),
4107 };
4108 let seat = self.seat(&fix_seat_key, &fix_spec.id);
4109 let finding_list: Vec<Finding> = self.state.operator_fixes[request_index]
4110 .findings
4111 .iter()
4112 .map(|f| Finding {
4113 id: f.id.clone(),
4114 severity: f.severity,
4115 file: f.file.clone(),
4116 line: f.line,
4117 title: f.title.clone(),
4118 detail: f.detail.clone(),
4119 })
4120 .collect();
4121 let job = SeatJob {
4122 prompt: prompt::operator_fix(
4123 &self.state.instruction,
4124 &finding_list,
4125 reason,
4126 &stale_details,
4127 &head_at_request,
4128 &language,
4129 ),
4130 spec: fix_spec.clone(),
4131 seat,
4132 cwd: fix_worktree.clone(),
4133 timeout: Duration::from_secs(self.state.config.graph.timeout_fix),
4134 allow_write: true,
4135 sessions,
4136 artifacts: artifacts.clone(),
4137 stem: "operator-fix".to_owned(),
4138 handover: None,
4139 };
4140 let cache = self.state.config.cache_dir();
4141 let ctx = WaveCtx {
4142 carry_seats: false,
4143 run: &run_id,
4144 node: "fix",
4145 prompts: &prompts,
4146 cache: cache.as_deref(),
4147 round: None,
4148 };
4149 let (seat, out) =
4150 run_one(job.clone(), Arc::clone(&self.sem), &ctx, &mut self.state, 0).await;
4151 let agent_id = seat.agent.clone();
4152
4153 let mut fix = FixRecord {
4154 agent: agent_id,
4155 addressed: Vec::new(),
4156 rejected: Vec::new(),
4157 notes: String::new(),
4158 committed: false,
4159 failed: None,
4160 duration_ms: 0,
4161 continuation: None,
4162 };
4163 let mut final_seat = seat.clone();
4164 match out {
4165 AgentOutcome::Ok(o) => {
4166 fix.duration_ms = o.duration_ms;
4167 let parsed = verdict::extract_json::<FixReport>(&o.text);
4168 let incomplete_reason = match &parsed {
4169 Ok(_) if has_unconfirmed_command(&o.commands) => Some(
4170 "the reply parsed, but it reported a command whose own CLI \
4171 never confirmed an exit status"
4172 .to_owned(),
4173 ),
4174 Ok(_) => None,
4175 Err(e) => Some(e.to_string()),
4176 };
4177 match incomplete_reason {
4178 None => {
4179 let report = parsed.expect("checked Ok above");
4180 fix.addressed = report.addressed;
4181 fix.rejected = report.rejected;
4182 fix.notes = blind::sanitize_prose(&report.notes, &self.state.config.blind);
4183 }
4184 Some(reason) => {
4185 let (resumed_seat, resolved, failure, cont) = self
4186 .continue_fix_report(seat, reason, &job, &prompts, &run_id, 0)
4187 .await;
4188 fix.duration_ms += cont.cumulative_wait_ms;
4189 fix.continuation = Some(cont);
4190 final_seat = resumed_seat;
4191 match resolved {
4192 Some(report) => {
4193 fix.addressed = report.addressed;
4194 fix.rejected = report.rejected;
4195 fix.notes =
4196 blind::sanitize_prose(&report.notes, &self.state.config.blind);
4197 }
4198 None => fix.failed = failure,
4199 }
4200 }
4201 }
4202 }
4203 AgentOutcome::Dropped(o) => {
4204 fix.duration_ms = o.duration_ms;
4205 let why = o
4206 .dropped
4207 .as_ref()
4208 .map(|d| d.why.as_str())
4209 .unwrap_or("the CLI ended the stream without delivering its answer");
4210 fix.failed = Some(format!("the CLI dropped the stream ({why})"));
4211 }
4212 AgentOutcome::Quota(o) => {
4213 self.state.quota.push(QuotaLoss {
4214 seat: final_seat.key.clone(),
4215 node: "fix".to_owned(),
4216 at: Timestamp::now(),
4217 reset: o.quota.as_ref().and_then(|q| q.reset.clone()),
4218 });
4219 fix.failed = Some("rate limited (quota); fixer could not run".to_owned());
4220 }
4221 AgentOutcome::Failed(e) => fix.failed = Some(e),
4222 }
4223 if fix.continuation.is_none() {
4224 fix.continuation = Some(ContinuationRecord::not_needed());
4225 }
4226 self.state.seats.insert(final_seat.key.clone(), final_seat);
4227
4228 let rescue_message = format!(
4229 "magi: operator-selected fix ({}) (uncommitted work)",
4230 self.state.operator_fixes[request_index]
4231 .findings
4232 .iter()
4233 .map(|f| f.id.as_str())
4234 .collect::<Vec<_>>()
4235 .join(", ")
4236 );
4237 if let Ok(r) = git::rescue_commit(&fix_worktree, &rescue_message).await {
4238 self.state.note_withheld("fix", &r.withheld);
4239 }
4240 let after = git::rev_parse(&fix_worktree, "HEAD").await?;
4241 fix.committed = after != head_at_request;
4242 git::worktree_remove(&self.state.repo, &fix_worktree)
4243 .await
4244 .ok();
4245
4246 self.state.event(
4247 "fix",
4248 match &fix.failed {
4249 Some(reason) => format!(
4250 "operator fix: adoption report was lost ({reason}); {}",
4251 if fix.committed {
4252 "committed"
4253 } else {
4254 "NO new commit"
4255 }
4256 ),
4257 None => format!(
4258 "operator fix: {} addressed, {} rejected, {}",
4259 fix.addressed.len(),
4260 fix.rejected.len(),
4261 if fix.committed {
4262 "committed"
4263 } else {
4264 "NO new commit"
4265 }
4266 ),
4267 },
4268 );
4269
4270 for f in &mut self.state.operator_fixes[request_index].findings {
4277 f.outcome = if fix.failed.is_some() {
4278 OperatorFixOutcome::Unreported
4279 } else if fix.addressed.contains(&f.id) {
4280 OperatorFixOutcome::Addressed
4281 } else if let Some(r) = fix.rejected.iter().find(|r| r.id == f.id) {
4282 OperatorFixOutcome::Rejected { why: r.why.clone() }
4283 } else {
4284 OperatorFixOutcome::Unreported
4285 };
4286 }
4287
4288 let committed = fix.committed;
4289 if committed {
4290 self.state.operator_fixes[request_index].result_head = Some(after.clone());
4291 }
4292 self.state.operator_fixes[request_index].fix = Some(fix);
4293 self.state.save()?;
4296
4297 if committed {
4298 self.state.event(
4299 "fix",
4300 format!(
4301 "operator fix committed {}; opening a follow-up review-only run",
4302 short(&after)
4303 ),
4304 );
4305 let origin =
4308 Origin::operator().serving(self.state.origin.as_ref().and_then(|o| o.task.clone()));
4309 match Self::review(
4310 &self.state.repo,
4311 &winner.branch,
4312 self.state.config.clone(),
4313 origin,
4314 )
4315 .await
4316 {
4317 Ok(mut follow_up) => {
4318 follow_up.state.event(
4319 "start",
4320 format!(
4321 "requested by an operator fix on run {} for finding(s) {}",
4322 self.state.id,
4323 self.state.operator_fixes[request_index]
4324 .findings
4325 .iter()
4326 .map(|f| f.id.as_str())
4327 .collect::<Vec<_>>()
4328 .join(", "),
4329 ),
4330 );
4331 follow_up.state.save()?;
4332 let follow_up_id = follow_up.state.id.clone();
4333 if let Err(e) = follow_up.execute().await {
4334 self.state.event(
4335 "fix",
4336 format!(
4337 "follow-up review {follow_up_id} did not complete cleanly: {e:#}"
4338 ),
4339 );
4340 }
4341 self.state.operator_fixes[request_index].follow_up_review_run =
4342 Some(follow_up_id);
4343 }
4344 Err(e) => {
4345 self.state.event(
4346 "fix",
4347 format!("committed the fix but could not open a follow-up review: {e:#}"),
4348 );
4349 }
4350 }
4351 self.state.save()?;
4352 }
4353
4354 Ok(())
4355 }
4356
4357 fn fixer_spec(&self, winner: &Candidate) -> (AgentSpec, String) {
4364 match &self.roles.fixer {
4365 Some(f) if f.id != winner.agent => (f.clone(), "fix".to_owned()),
4366 _ => (
4367 self.state
4368 .config
4369 .agent(&winner.agent)
4370 .cloned()
4371 .unwrap_or_else(|_| self.roles.implementers[winner.index].clone()),
4372 format!("impl-{}", winner.label),
4373 ),
4374 }
4375 }
4376
4377 async fn review_loop(&mut self) -> Result<()> {
4378 if self
4383 .state
4384 .base_sync
4385 .as_ref()
4386 .is_some_and(|s| s.conflict.is_some())
4387 {
4388 return Ok(());
4389 }
4390 let run_id = self.state.id.clone();
4395 let prompts = self.state.config.prompts.clone();
4396 let Some(winner) = self.state.winner().cloned() else {
4397 return Ok(());
4398 };
4399 let max_rounds = self.state.config.graph.review_rounds;
4400 if let Some(status) = review_conclusion(&self.state.reviews, max_rounds) {
4410 if status == RunStatus::Gating {
4413 self.record_contested_handoff();
4414 }
4415 self.state.status = status;
4416 self.state.save()?;
4417 return Ok(());
4418 }
4419 self.state.status = RunStatus::Reviewing;
4420 if self
4430 .state
4431 .reviews
4432 .last()
4433 .is_some_and(|r| r.e2e_status() == E2eStatus::ResourceBlocked)
4434 {
4435 let shell = self.state.config.shell();
4436 return self
4437 .stop_reviewing(
4438 "the last round's own verification never resolved",
4439 &shell,
4440 &winner.worktree,
4441 )
4442 .await;
4443 }
4444
4445 let repo = self.state.repo.clone();
4446 let root = self.state.worktree_root();
4447 let language = self.state.config.graph.language.clone();
4448 let sessions = self.state.config.graph.sessions;
4449 let artifacts = agent::artifacts_dir(&self.state.dir());
4450 let base = self.landing_base();
4451 let base_short = short(&base);
4452 let reviewers = self.roles.reviewers.clone();
4453 let shell = self.state.config.shell();
4454
4455 for round in (self.state.reviews.len() + 1)..=max_rounds {
4456 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
4457 let patch = git::diff(&winner.worktree, &base, "HEAD").await?;
4458 let stat = git::diff_stat(&winner.worktree, &base, "HEAD").await?;
4459 let prev_verification = self
4468 .state
4469 .reviews
4470 .last()
4471 .and_then(|r| r.verification_summary(&head));
4472
4473 let mut jobs = Vec::new();
4477 for (r, spec) in reviewers.iter().cloned().enumerate() {
4478 let wt = root.join(format!("review-{}", r + 1));
4479 if wt.exists() {
4480 git::reset_detached(&wt, &head).await?;
4481 } else {
4482 git::worktree_add_detached(&repo, &wt, &head).await?;
4483 }
4484 let seat_key = format!("review-{}", r + 1);
4485 let spec = pick_start_spec(
4488 &self.roles.reviewer_roster,
4489 spec,
4490 self.state.seat_history.get(&seat_key),
4491 );
4492 let seat = self.seat(&seat_key, &spec.id);
4493 jobs.push(SeatJob {
4494 prompt: prompt::review(&prompt::ReviewCtx {
4495 instruction: &self.state.instruction,
4496 branch: &winner.branch,
4497 base_short: &base_short,
4498 stat: &stat,
4499 patch: &patch,
4500 verification: prev_verification.as_ref(),
4501 reviewers: reviewers.len(),
4502 round,
4503 rounds: max_rounds,
4504 competed: self.state.tally.as_ref().is_some_and(|t| t.rankings > 0),
4507 lens: Lens::for_seat(r),
4508 language: &language,
4509 }),
4510 spec,
4511 seat,
4512 cwd: wt,
4513 timeout: Duration::from_secs(self.state.config.graph.timeout_review),
4514 allow_write: false,
4515 sessions,
4516 artifacts: artifacts.clone(),
4517 stem: format!("review-{round}-{}", r + 1),
4518 handover: None,
4519 });
4520 }
4521
4522 self.state.event(
4523 "review",
4524 format!(
4525 "round {round}: {} reviewers on {}",
4526 jobs.len(),
4527 short(&head)
4528 ),
4529 );
4530 let mut quota_losses = Vec::new();
4531 let review_retries = self.state.config.graph.retries;
4532 let review_cache = self.state.config.cache_dir();
4533 let ctx = WaveCtx {
4534 carry_seats: true,
4535 run: &run_id,
4536 node: "review",
4537 prompts: &prompts,
4538 cache: review_cache.as_deref(),
4539 round: Some(round),
4540 };
4541 let results = ask_json_wave::<Review>(
4542 jobs,
4543 Arc::clone(&self.sem),
4544 review_retries,
4545 &self.roles.reviewer_roster,
4546 &ctx,
4547 &mut quota_losses,
4548 &mut self.state,
4549 &|_: &Review| Ok(()),
4550 )
4551 .await;
4552 let round_quota_missing = quota_losses.len();
4556 self.state.quota.extend(quota_losses);
4557
4558 let mut records = Vec::new();
4559 let mut all_findings = Vec::new();
4560 for (r, (seat, res, attempts)) in results.into_iter().enumerate() {
4561 let agent_id = seat.agent.clone();
4562 self.state.seats.insert(seat.key.clone(), seat);
4563 let mut record = ReviewRecord {
4564 reviewer: r + 1,
4565 agent: agent_id,
4566 summary: String::new(),
4567 findings: Vec::new(),
4568 vote: None,
4569 failed: None,
4570 duration_ms: 0,
4571 attempts,
4577 };
4578 match res {
4579 Ok((review, out)) => {
4580 record.summary =
4588 blind::sanitize_prose(&review.summary, &self.state.config.blind);
4589 record.vote = Some(review.vote);
4590 record.duration_ms = out.duration_ms;
4591 for (n, mut f) in review.findings.into_iter().enumerate() {
4592 f.id = format!("R{round}-{}-{}", r + 1, n + 1);
4595 f.title = blind::sanitize_prose(&f.title, &self.state.config.blind);
4596 f.detail = blind::sanitize_prose(&f.detail, &self.state.config.blind);
4597 f.file = f
4603 .file
4604 .map(|file| blind::sanitize_prose(&file, &self.state.config.blind));
4605 all_findings.push(f.clone());
4606 record.findings.push(f);
4607 }
4608 self.state.event(
4609 "review",
4610 format!(
4611 "round {round}: reviewer {} voted {} with {} finding(s)",
4612 r + 1,
4613 review.vote.label(),
4614 record.findings.len()
4615 ),
4616 );
4617 }
4618 Err(e) => {
4619 record.failed = Some(e.to_string());
4620 self.state.event(
4621 "review",
4622 format!("round {round}: reviewer {} produced nothing: {e}", r + 1),
4623 );
4624 }
4625 }
4626 records.push(record);
4627 }
4628
4629 let initial_votes: Vec<ReviewVote> = records.iter().filter_map(|r| r.vote).collect();
4636 let vote_split =
4637 initial_votes.len() > 1 && !initial_votes.iter().all(|v| *v == initial_votes[0]);
4638 let mut reconsideration: Vec<ReviewRevoteRecord> = Vec::new();
4639 if vote_split {
4640 self.state.event(
4641 "review",
4642 format!(
4643 "round {round}: votes split ({}) — one round of reconsideration",
4644 initial_votes
4645 .iter()
4646 .map(|v| v.label())
4647 .collect::<Vec<_>>()
4648 .join(", ")
4649 ),
4650 );
4651 let panel: Vec<ReviewSeatReport<'_>> = records
4654 .iter()
4655 .filter_map(|r| {
4656 r.vote.map(|vote| ReviewSeatReport {
4657 reviewer: r.reviewer,
4658 vote,
4659 summary: &r.summary,
4660 findings: &r.findings,
4661 })
4662 })
4663 .collect();
4664
4665 let mut jobs = Vec::new();
4666 let mut seats_at = Vec::new();
4667 for (r, spec) in reviewers.iter().cloned().enumerate() {
4668 if records[r].vote.is_none() {
4672 continue;
4673 }
4674 let wt = root.join(format!("review-{}", r + 1));
4675 let seat_key = format!("review-{}", r + 1);
4676 let spec = self.occupant(&seat_key, spec);
4677 let seat = self.seat(&seat_key, &spec.id);
4678 let build = |with_patch: bool| {
4686 prompt::review_reconsider(&ReviewReconsiderCtx {
4687 instruction: &self.state.instruction,
4688 reviewer: r + 1,
4689 lens: Lens::for_seat(r),
4690 panel: &panel,
4691 patch: with_patch.then_some(ReviewPatch {
4692 branch: &winner.branch,
4693 base_short: &base_short,
4694 stat: &stat,
4695 patch: &patch,
4696 }),
4697 round,
4698 rounds: max_rounds,
4699 language: &language,
4700 })
4701 };
4702 let full = build(true);
4703 let prompt = if has_context(&spec, &seat, sessions) {
4704 build(false)
4705 } else {
4706 full.clone()
4707 };
4708 jobs.push(SeatJob {
4709 prompt,
4710 spec,
4711 seat,
4712 cwd: wt,
4713 timeout: Duration::from_secs(self.state.config.graph.timeout_review),
4714 allow_write: false,
4715 sessions,
4716 artifacts: artifacts.clone(),
4717 stem: format!("review-{round}-reconsider-{}", r + 1),
4718 handover: Some(full),
4719 });
4720 seats_at.push(r);
4721 }
4722
4723 let mut recon_quota_losses = Vec::new();
4724 let recon_cache = self.state.config.cache_dir();
4725 let recon_ctx = WaveCtx {
4726 carry_seats: true,
4727 run: &run_id,
4728 node: "review",
4729 prompts: &prompts,
4730 cache: recon_cache.as_deref(),
4731 round: Some(round),
4732 };
4733 let recon_results = ask_json_wave::<ReviewRevote>(
4734 jobs,
4735 Arc::clone(&self.sem),
4736 review_retries,
4737 &self.roles.reviewer_roster,
4738 &recon_ctx,
4739 &mut recon_quota_losses,
4740 &mut self.state,
4741 &|_: &ReviewRevote| Ok(()),
4742 )
4743 .await;
4744 self.state.quota.extend(recon_quota_losses);
4745
4746 for (&r, (seat, res, _attempts)) in seats_at.iter().zip(recon_results) {
4747 let agent_id = seat.agent.clone();
4748 self.state.seats.insert(seat.key.clone(), seat);
4749 let mut rec = ReviewRevoteRecord {
4750 reviewer: r + 1,
4751 agent: agent_id,
4752 vote: None,
4753 reason: String::new(),
4754 failed: None,
4755 };
4756 match res {
4757 Ok((rv, _)) => {
4758 rec.vote = Some(rv.vote);
4759 rec.reason =
4760 blind::sanitize_prose(&rv.reason, &self.state.config.blind);
4761 self.state.event(
4762 "review",
4763 format!(
4764 "round {round}: reviewer {} revoted {}",
4765 r + 1,
4766 rv.vote.label()
4767 ),
4768 );
4769 }
4770 Err(e) => {
4771 rec.failed = Some(e.to_string());
4772 self.state.event(
4773 "review",
4774 format!("round {round}: reviewer {} did not revote: {e}", r + 1),
4775 );
4776 }
4777 }
4778 reconsideration.push(rec);
4779 }
4780 } else if initial_votes.len() > 1 {
4781 self.state.event(
4782 "review",
4783 format!(
4784 "round {round}: votes agreed ({}) — no reconsideration",
4785 initial_votes[0].label()
4786 ),
4787 );
4788 }
4789
4790 let blocking = all_findings.iter().filter(|f| f.severity.blocks()).count();
4791 let verify_timeout = Duration::from_secs(self.state.config.graph.verify_timeout());
4792 let defer_e2e =
4803 blocking > 0 && round < max_rounds && !self.state.config.graph.e2e_every_round;
4804 let (e2e, verify_retried, e2e_deferred, e2e_defer_reason) = if defer_e2e {
4805 let reason =
4806 format!("{blocking} blocking finding(s) already required a fix this round");
4807 self.state.event(
4808 "verify",
4809 format!(
4810 "round {round}: {reason} — e2e deferred to the fixer (reviewed head \
4811 {}); it will run once a round has none left",
4812 short(&head)
4813 ),
4814 );
4815 (Vec::new(), false, true, Some(reason))
4816 } else {
4817 let e2e_commands = self.state.config.verify.e2e.clone();
4818 let cache_dir = self.state.config.cache_dir();
4819 let context = format!("round {round}");
4820 let (e2e, verify_retried) = with_cache_lease(
4821 &mut self.state,
4822 cache_dir.as_deref(),
4823 "e2e",
4824 "e2e",
4825 &winner.worktree,
4826 &head,
4827 verify_timeout,
4828 &context,
4829 |state, budget| {
4830 let shell = shell.clone();
4831 let e2e_commands = e2e_commands.clone();
4832 let worktree = winner.worktree.clone();
4833 let context = context.clone();
4834 async move {
4835 run_e2e_with_retry(
4836 state,
4837 &shell,
4838 &e2e_commands,
4839 &worktree,
4840 budget,
4841 &context,
4842 )
4843 .await
4844 }
4845 },
4846 )
4847 .await;
4848 (e2e, verify_retried, false, None)
4849 };
4850
4851 let expected = records.len();
4852 let answered = records.iter().filter(|r| r.failed.is_none()).count();
4853 let incomplete = answered < expected;
4854 let e2e_ok = e2e.iter().all(CommandOutcome::ok);
4855 let policy = self.state.config.graph.incomplete_review;
4856 let clean = round_is_clean(
4857 blocking,
4858 e2e_ok,
4859 answered,
4860 expected,
4861 round_quota_missing,
4862 policy,
4863 );
4864
4865 let mut round_record = ReviewRound {
4866 round,
4867 head: head.clone(),
4868 verified_head: None,
4869 verified_at: None,
4870 reviews: records,
4871 e2e,
4872 verify_retried,
4873 e2e_deferred,
4874 e2e_defer_reason,
4875 fix: None,
4876 blocking,
4877 answered,
4878 expected,
4879 clean,
4880 progressed: false,
4881 vote_split,
4882 reconsideration,
4883 verdict: None,
4884 };
4885 round_record.verdict = ReviewVote::worst(
4889 round_record
4890 .final_votes()
4891 .into_iter()
4892 .map(|(_, _, vote)| vote),
4893 );
4894 if !matches!(
4905 round_record.e2e_status(),
4906 E2eStatus::Deferred | E2eStatus::NotConfigured
4907 ) {
4908 round_record.verified_head = Some(head.clone());
4909 round_record.verified_at = Some(Timestamp::now());
4910 }
4911 let this_round_verification = round_record.verification_summary(&head);
4912
4913 if incomplete {
4914 let missing: Vec<String> = round_record
4915 .reviews
4916 .iter()
4917 .filter(|r| r.failed.is_some())
4918 .map(|r| format!("review-{}", r.reviewer))
4919 .collect();
4920 self.state.event(
4921 "review",
4922 format!(
4923 "round {round}: {answered}/{expected} reviewer(s) answered ({} never answered)",
4924 missing.join(", ")
4925 ),
4926 );
4927 }
4928
4929 if clean {
4930 self.state.event(
4931 "review",
4932 if incomplete && policy == IncompleteReviewPolicy::Warn {
4933 format!(
4934 "round {round}: clean (warn policy, incomplete panel) — no \
4935 blocking findings from the seats that answered, verification green"
4936 )
4937 } else if incomplete {
4938 format!(
4939 "round {round}: clean ({} rate-limited reviewer(s) excluded from \
4940 quorum) — no blocking findings from the seats that answered, \
4941 verification green",
4942 expected - answered
4943 )
4944 } else {
4945 format!("round {round}: clean — no blocking findings, verification green")
4946 },
4947 );
4948 self.state.reviews.push(round_record);
4949 self.state.status = RunStatus::Gating;
4950 self.state.save()?;
4951 return Ok(());
4952 }
4953
4954 if incomplete && blocking == 0 && e2e_ok {
4962 self.state.reviews.push(round_record);
4963 self.state.save()?;
4964 if round == max_rounds {
4965 self.state.status = RunStatus::Blocked;
4966 self.state.event(
4967 "review",
4968 format!(
4969 "{} reviewer seat(s) never answered after {max_rounds} rounds; \
4970 refusing to call it clean",
4971 expected - answered
4972 ),
4973 );
4974 return Ok(());
4975 }
4976 continue;
4977 }
4978
4979 if blocking == 0 && round_record.e2e_status() == E2eStatus::ResourceBlocked {
4991 self.state.reviews.push(round_record);
4992 return self
4993 .stop_reviewing(
4994 "the round's own verification could not run",
4995 &shell,
4996 &winner.worktree,
4997 )
4998 .await;
4999 }
5000
5001 if round == max_rounds {
5002 self.state.reviews.push(round_record);
5003 return self
5004 .stop_reviewing(
5005 &format!(
5006 "{blocking} blocking finding(s) still open after {max_rounds} round(s)"
5007 ),
5008 &shell,
5009 &winner.worktree,
5010 )
5011 .await;
5012 }
5013
5014 let (fix_spec, fix_seat_key) = self.fixer_spec(&winner);
5017 let seat = self.seat(&fix_seat_key, &fix_spec.id);
5018 let blocking_findings: Vec<_> = all_findings
5019 .iter()
5020 .filter(|f| f.severity.blocks())
5021 .cloned()
5022 .collect();
5023 let job = SeatJob {
5024 prompt: prompt::fix(
5025 &self.state.instruction,
5026 &blocking_findings,
5027 this_round_verification.as_ref(),
5028 round,
5029 max_rounds,
5030 &language,
5031 ),
5032 spec: fix_spec.clone(),
5033 seat,
5034 cwd: winner.worktree.clone(),
5035 timeout: Duration::from_secs(self.state.config.graph.timeout_fix),
5036 allow_write: true,
5037 sessions,
5038 artifacts: artifacts.clone(),
5039 stem: format!("fix-{round}"),
5040 handover: None,
5041 };
5042 let before = git::rev_parse(&winner.worktree, "HEAD").await?;
5043 let cache = self.state.config.cache_dir();
5044 let ctx = WaveCtx {
5045 carry_seats: false,
5046 run: &run_id,
5047 node: "fix",
5048 prompts: &prompts,
5049 cache: cache.as_deref(),
5050 round: Some(round),
5051 };
5052 let (seat, out) =
5053 run_one(job.clone(), Arc::clone(&self.sem), &ctx, &mut self.state, 0).await;
5054 let agent_id = seat.agent.clone();
5055
5056 let mut fix = FixRecord {
5057 agent: agent_id,
5058 addressed: Vec::new(),
5059 rejected: Vec::new(),
5060 notes: String::new(),
5061 committed: false,
5062 failed: None,
5063 duration_ms: 0,
5064 continuation: None,
5065 };
5066 let mut continuation = ContinuationRecord::not_needed();
5067 let mut final_seat = seat.clone();
5068 match out {
5069 AgentOutcome::Ok(o) => {
5070 fix.duration_ms = o.duration_ms;
5071 let parsed = verdict::extract_json::<FixReport>(&o.text);
5072 let incomplete_reason = match &parsed {
5079 Ok(_) if has_unconfirmed_command(&o.commands) => Some(
5080 "the reply parsed, but it reported a command whose own CLI never \
5081 confirmed an exit status"
5082 .to_owned(),
5083 ),
5084 Ok(_) => None,
5085 Err(e) => Some(e.to_string()),
5086 };
5087 match incomplete_reason {
5088 None => {
5089 let report = parsed.expect("checked Ok above");
5090 fix.addressed = report.addressed;
5091 fix.rejected = report.rejected;
5092 fix.notes =
5093 blind::sanitize_prose(&report.notes, &self.state.config.blind);
5094 }
5095 Some(reason) => {
5096 let (resumed_seat, resolved, failure, cont) = self
5097 .continue_fix_report(seat, reason, &job, &prompts, &run_id, round)
5098 .await;
5099 fix.duration_ms += cont.cumulative_wait_ms;
5100 continuation = cont;
5101 final_seat = resumed_seat;
5102 match resolved {
5103 Some(report) => {
5104 fix.addressed = report.addressed;
5105 fix.rejected = report.rejected;
5106 fix.notes = blind::sanitize_prose(
5107 &report.notes,
5108 &self.state.config.blind,
5109 );
5110 }
5111 None => fix.failed = failure,
5112 }
5113 }
5114 }
5115 }
5116 AgentOutcome::Dropped(o) => {
5118 fix.duration_ms = o.duration_ms;
5119 let why = o
5120 .dropped
5121 .as_ref()
5122 .map(|d| d.why.as_str())
5123 .unwrap_or("the CLI ended the stream without delivering its answer");
5124 fix.failed = Some(format!("the CLI dropped the stream ({why})"));
5125 }
5126 AgentOutcome::Quota(o) => {
5127 self.state.quota.push(QuotaLoss {
5128 seat: final_seat.key.clone(),
5129 node: "fix".to_owned(),
5130 at: Timestamp::now(),
5131 reset: o.quota.as_ref().and_then(|q| q.reset.clone()),
5132 });
5133 fix.failed = Some("rate limited (quota); fixer could not run".to_owned());
5134 }
5135 AgentOutcome::Failed(e) => fix.failed = Some(e),
5136 }
5137 fix.continuation = Some(continuation);
5138 self.state.seats.insert(final_seat.key.clone(), final_seat);
5139 if let Ok(r) = git::rescue_commit(
5140 &winner.worktree,
5141 &format!("magi: review round {round} fixes (uncommitted work)"),
5142 )
5143 .await
5144 {
5145 self.state.note_withheld("fix", &r.withheld);
5146 }
5147 let after = git::rev_parse(&winner.worktree, "HEAD").await?;
5148 fix.committed = after != before;
5149 let diff_after = git::diff(&winner.worktree, &base, "HEAD").await?;
5157 let progressed = diff_after != patch;
5158 let commit_note = if fix.committed {
5159 "committed"
5160 } else {
5161 "NO new commit"
5162 };
5163 let tree_note = if progressed {
5164 "changed vs base"
5165 } else {
5166 "unchanged vs base"
5167 };
5168 self.state.event(
5169 "fix",
5170 match &fix.failed {
5171 Some(reason) => {
5177 format!(
5178 "round {round}: fixer's adoption report was lost ({reason}); \
5179 {commit_note}, tree {tree_note}"
5180 )
5181 }
5182 None => format!(
5183 "round {round}: {} addressed, {} rejected, {commit_note}, tree \
5184 {tree_note}{}",
5185 fix.addressed.len(),
5186 fix.rejected.len(),
5187 if continuation.outcome == ContinuationOutcome::Resumed {
5188 format!(
5189 " (adoption report recovered after {} continuation(s))",
5190 continuation.attempts
5191 )
5192 } else {
5193 String::new()
5194 },
5195 ),
5196 },
5197 );
5198 round_record.fix = Some(fix);
5199 round_record.progressed = progressed;
5200 self.state.reviews.push(round_record);
5201 self.state.save()?;
5202
5203 if matches!(
5216 continuation.outcome,
5217 ContinuationOutcome::Exhausted
5218 | ContinuationOutcome::QuotaLost
5219 | ContinuationOutcome::NoSession
5220 ) {
5221 return self
5222 .stop_reviewing(
5223 "the fixer's adoption report never came back, even after resuming its \
5224 own seat; refusing to start another round against the same worktree \
5225 while that is unresolved",
5226 &shell,
5227 &winner.worktree,
5228 )
5229 .await;
5230 }
5231
5232 let streak = self
5233 .state
5234 .reviews
5235 .iter()
5236 .rev()
5237 .take_while(|r| !r.progressed)
5238 .count();
5239 if streak >= STAGNANT_LIMIT {
5240 return self
5241 .stop_reviewing(
5242 &format!(
5243 "the tree has not moved against base for {streak} round(s) in a row"
5244 ),
5245 &shell,
5246 &winner.worktree,
5247 )
5248 .await;
5249 }
5250 }
5251 Ok(())
5252 }
5253
5254 fn record_contested_handoff(&mut self) {
5288 if self.state.contested_handoff.is_some() {
5289 return;
5290 }
5291 let Some(contested) = self
5292 .state
5293 .reviews
5294 .last()
5295 .and_then(ReviewRound::contested_handoff)
5296 else {
5297 return;
5298 };
5299 self.state.event(
5300 "review",
5301 format!(
5302 "{} blocking finding(s) open and {} reviewer(s) rejecting — the merge will \
5303 wait for the owner's approval",
5304 contested.findings.len(),
5305 contested.rejecters.len()
5306 ),
5307 );
5308 self.state.contested_handoff = Some(contested);
5309 }
5310
5311 async fn stop_reviewing(&mut self, why: &str, shell: &[String], worktree: &Path) -> Result<()> {
5312 let round_idx = self.state.reviews.len() - 1;
5313 let needs_catchup_run = matches!(
5321 self.state.reviews[round_idx].e2e_status(),
5322 E2eStatus::Deferred | E2eStatus::ResourceBlocked
5323 );
5324 if needs_catchup_run {
5325 let round = self.state.reviews[round_idx].round;
5326 let timeout = Duration::from_secs(self.state.config.graph.verify_timeout());
5327 let commands = self.state.config.verify.e2e.clone();
5328 let attempted_head = git::rev_parse(worktree, "HEAD").await?;
5329 let cache_dir = self.state.config.cache_dir();
5330 let context = format!(
5331 "round {round}: verification unresolved, catching up before the final decision"
5332 );
5333 let (outcomes, verify_retried) = with_cache_lease(
5334 &mut self.state,
5335 cache_dir.as_deref(),
5336 "e2e",
5337 "e2e",
5338 worktree,
5339 &attempted_head,
5340 timeout,
5341 &context,
5342 |state, budget| {
5343 let shell = shell.to_vec();
5344 let commands = commands.clone();
5345 let context = context.clone();
5346 async move {
5347 run_e2e_with_retry(state, &shell, &commands, worktree, budget, &context)
5348 .await
5349 }
5350 },
5351 )
5352 .await;
5353 let last = &mut self.state.reviews[round_idx];
5354 last.e2e = outcomes;
5355 last.verify_retried = verify_retried;
5356 last.verified_head = Some(attempted_head);
5363 last.verified_at = Some(Timestamp::now());
5364 if verify_inconclusive(&last.e2e) {
5365 self.state.save()?;
5372 return Ok(());
5373 }
5374 last.e2e_deferred = false;
5375 }
5376 let last = &self.state.reviews[round_idx];
5377 let open: usize = last.reviews.iter().map(|r| r.findings.len()).sum();
5378
5379 match last.e2e_status() {
5380 E2eStatus::Failed => {
5381 let red: Vec<String> = last
5382 .e2e
5383 .iter()
5384 .filter(|o| !o.ok())
5385 .map(|o| {
5386 format!(
5387 "`{}` -> {:?}\n{}",
5388 o.command,
5389 o.code,
5390 tail(&o.output_tail, EVENT_OUTPUT_TAIL)
5391 )
5392 })
5393 .collect();
5394 self.state
5395 .event("review", format!("{why}; e2e failed:\n{}", red.join("\n")));
5396 self.state.status = RunStatus::Blocked;
5397 }
5398 E2eStatus::ResourceBlocked => {
5403 self.state.event(
5404 "review",
5405 format!(
5406 "{why}; e2e could not run (shared build cache unavailable); not \
5407 deciding yet"
5408 ),
5409 );
5410 }
5411 E2eStatus::Passed | E2eStatus::Deferred | E2eStatus::NotConfigured => {
5412 self.state.event(
5413 "review",
5414 format!("{why}; e2e is green — handing off with {open} finding(s) still open"),
5415 );
5416 self.record_contested_handoff();
5417 self.state.status = RunStatus::Gating;
5418 }
5419 }
5420 self.state.save()?;
5421 Ok(())
5422 }
5423
5424 async fn gate(&mut self) -> Result<()> {
5427 if self.state.status == RunStatus::Failed
5439 || self
5440 .state
5441 .base_sync
5442 .as_ref()
5443 .is_some_and(|s| s.conflict.is_some())
5444 || review_conclusion(&self.state.reviews, self.state.config.graph.review_rounds)
5445 != Some(RunStatus::Gating)
5446 {
5447 return Ok(());
5448 }
5449 if self.state.gate_ran {
5450 if self.state.gate.iter().any(|outcome| !outcome.ok()) {
5461 self.state.status = RunStatus::Blocked;
5462 self.state.save()?;
5463 }
5464 return Ok(());
5465 }
5466 let Some(winner) = self.state.winner().cloned() else {
5467 return Ok(());
5468 };
5469 self.state.status = RunStatus::Gating;
5470 let mut outcomes = self.run_gate(&winner).await?;
5471 loop {
5472 if verify_inconclusive(&outcomes) {
5483 self.state.save()?;
5484 return Ok(());
5485 }
5486 if outcomes.iter().all(CommandOutcome::ok) {
5487 break;
5488 }
5489 match self.gate_fix_round(&winner, &outcomes).await? {
5490 GateFix::Retry => outcomes = self.run_gate(&winner).await?,
5491 GateFix::Stop => break,
5492 GateFix::Defer => {
5493 self.state.save()?;
5494 return Ok(());
5495 }
5496 }
5497 }
5498 let passed = outcomes.iter().all(CommandOutcome::ok);
5499 self.state.gate = outcomes;
5500 self.state.gate_ran = true;
5501 if !passed {
5502 self.state.status = RunStatus::Blocked;
5503 let spent = self.state.gate_fixes.len();
5504 self.state.event(
5505 "gate",
5506 if spent == 0 {
5507 "gate failed; not merging".to_owned()
5508 } else {
5509 format!("gate failed after {spent} gate-fix round(s); not merging")
5510 },
5511 );
5512 }
5513 self.state.save()?;
5514 Ok(())
5515 }
5516
5517 async fn run_pre_gate(&mut self, winner: &Candidate) {
5527 let commands = self.state.config.verify.pre_gate.clone();
5528 if commands.is_empty() {
5529 return;
5530 }
5531 let shell = self.state.config.shell();
5532 let timeout = Duration::from_secs(self.state.config.graph.verify_timeout());
5533 let (outcomes, _) = run_commands(
5534 &mut self.state,
5535 "pre_gate",
5536 "pre_gate",
5537 0,
5538 &shell,
5539 &commands,
5540 &winner.worktree,
5541 timeout,
5542 )
5543 .await;
5544 for o in &outcomes {
5545 if !o.ok() {
5546 tracing::warn!(
5547 "pre_gate `{}` failed ({:?}); the gate decides",
5548 o.command,
5549 o.code
5550 );
5551 }
5552 self.state.event(
5553 "pre_gate",
5554 format!(
5555 "`{}` -> {}",
5556 o.command,
5557 if o.ok() {
5558 "pass".to_owned()
5559 } else {
5560 format!(
5561 "FAIL ({:?})\n{}",
5562 o.code,
5563 tail(&o.output_tail, EVENT_OUTPUT_TAIL)
5564 )
5565 }
5566 ),
5567 );
5568 }
5569 self.state.pre_gate = outcomes;
5570 match git::commit_all(&winner.worktree, "magi: pre_gate (mechanical fixes)").await {
5571 Ok(true) => match git::rev_parse(&winner.worktree, "HEAD").await {
5572 Ok(head) => {
5573 self.state
5574 .event("pre_gate", format!("committed mechanical fixes ({head})"));
5575 self.state.pre_gate_commit = Some(head);
5576 }
5577 Err(e) => tracing::warn!("pre_gate committed but HEAD unreadable: {e:#}"),
5578 },
5579 Ok(false) => {}
5580 Err(e) => tracing::warn!("pre_gate could not commit its changes: {e:#}"),
5581 }
5582 if let Err(e) = self.state.save() {
5583 tracing::warn!("could not persist the pre_gate record: {e:#}");
5584 }
5585 }
5586
5587 async fn run_gate(&mut self, winner: &Candidate) -> Result<Vec<CommandOutcome>> {
5590 self.run_pre_gate(winner).await;
5591 let shell = self.state.config.shell();
5592 let gate_commands = self.state.config.verify.gate.clone();
5593 let outcomes = if gate_commands.is_empty() {
5602 Vec::new()
5603 } else {
5604 let timeout = Duration::from_secs(self.state.config.graph.verify_timeout());
5605 let cache_dir = self.state.config.cache_dir();
5606 let head = git::rev_parse(&winner.worktree, "HEAD").await?;
5607 let (outcomes, _) = with_cache_lease(
5608 &mut self.state,
5609 cache_dir.as_deref(),
5610 "gate",
5611 "gate",
5612 &winner.worktree,
5613 &head,
5614 timeout,
5615 "final gate",
5616 |state, budget| {
5617 let shell = shell.clone();
5618 let gate_commands = gate_commands.clone();
5619 let worktree = winner.worktree.clone();
5620 async move {
5621 let (outcomes, timed_out_pids) = run_commands(
5622 state,
5623 "gate",
5624 "gate",
5625 0,
5626 &shell,
5627 &gate_commands,
5628 &worktree,
5629 budget,
5630 )
5631 .await;
5632 (outcomes, false, timed_out_pids)
5633 }
5634 },
5635 )
5636 .await;
5637 outcomes
5638 };
5639 if outcomes.is_empty() {
5640 self.state.event(
5645 "gate",
5646 "no gate commands configured; nothing to check, passing",
5647 );
5648 }
5649 for o in &outcomes {
5650 self.state.event(
5651 "gate",
5652 format!(
5653 "`{}` -> {}",
5654 o.command,
5655 if o.ok() {
5656 "pass".to_owned()
5657 } else {
5658 format!(
5659 "FAIL ({:?})\n{}",
5660 o.code,
5661 tail(&o.output_tail, EVENT_OUTPUT_TAIL)
5662 )
5663 }
5664 ),
5665 );
5666 }
5667 Ok(outcomes)
5668 }
5669
5670 async fn gate_fix_round(
5683 &mut self,
5684 winner: &Candidate,
5685 outcomes: &[CommandOutcome],
5686 ) -> Result<GateFix> {
5687 let cap = self.state.config.graph.gate_fix_rounds;
5688 let spent = self.state.gate_fixes.len();
5689 if spent >= cap {
5690 if cap > 0 {
5691 self.state.event(
5692 "gate",
5693 format!("{spent} gate-fix round(s) spent and the gate still fails"),
5694 );
5695 }
5696 return Ok(GateFix::Stop);
5697 }
5698 if !gate_fixable(outcomes) {
5699 self.state.event(
5700 "gate",
5701 "gate failure is not an ordinary non-zero exit with output (timeout, missing \
5702 command or similar); not spending a fix round on it",
5703 );
5704 return Ok(GateFix::Stop);
5705 }
5706 let min_free = self.state.config.disk.min_free_bytes;
5707 if min_free > 0 {
5708 match crate::disk::free_bytes(&winner.worktree) {
5709 Ok(free) if crate::disk::enough_space(free, min_free) => {}
5710 Ok(free) => {
5711 self.state.event(
5712 "gate",
5713 format!(
5714 "only {free} bytes free ({min_free} required by `[disk] \
5715 min_free_bytes`); not spending a fix round on a failure the disk \
5716 may explain"
5717 ),
5718 );
5719 return Ok(GateFix::Stop);
5720 }
5721 Err(e) => {
5722 self.state.event(
5723 "gate",
5724 format!("free disk space could not be measured ({e:#}); no fix round"),
5725 );
5726 return Ok(GateFix::Stop);
5727 }
5728 }
5729 }
5730
5731 let attempt = spent + 1;
5732 let run_id = self.state.id.clone();
5733 let prompts = self.state.config.prompts.clone();
5734 let failed: Vec<CommandOutcome> = outcomes.iter().filter(|o| !o.ok()).cloned().collect();
5735 let base = self.landing_base();
5736 let (fix_spec, fix_seat_key) = self.fixer_spec(winner);
5737 let seat = self.seat(&fix_seat_key, &fix_spec.id);
5738 let job = SeatJob {
5739 prompt: prompt::gate_fix(
5740 &self.state.instruction,
5741 &failed,
5742 attempt,
5743 cap,
5744 &self.state.config.graph.language,
5745 ),
5746 spec: fix_spec,
5747 seat,
5748 cwd: winner.worktree.clone(),
5749 timeout: Duration::from_secs(self.state.config.graph.timeout_fix),
5750 allow_write: true,
5751 sessions: self.state.config.graph.sessions,
5752 artifacts: agent::artifacts_dir(&self.state.dir()),
5753 stem: format!("gate-fix-{attempt}"),
5754 handover: None,
5755 };
5756 self.state.event(
5757 "gate",
5758 format!("gate failed; gate-fix round {attempt} of {cap}"),
5759 );
5760 let before = git::rev_parse(&winner.worktree, "HEAD").await?;
5761 let patch = git::diff(&winner.worktree, &base, "HEAD").await?;
5762 let cache = self.state.config.cache_dir();
5763 let ctx = WaveCtx {
5764 carry_seats: false,
5765 run: &run_id,
5766 node: "gate-fix",
5767 prompts: &prompts,
5768 cache: cache.as_deref(),
5769 round: None,
5770 };
5771 let (seat, out) = run_one(job, Arc::clone(&self.sem), &ctx, &mut self.state, 0).await;
5772 let mut record = GateFixRecord {
5773 agent: seat.agent.clone(),
5774 failed,
5775 notes: String::new(),
5776 committed: false,
5777 error: None,
5778 };
5779 match out {
5780 AgentOutcome::Ok(o) => {
5781 if let Ok(report) = verdict::extract_json::<FixReport>(&o.text) {
5784 record.notes = blind::sanitize_prose(&report.notes, &self.state.config.blind);
5785 }
5786 }
5787 AgentOutcome::Dropped(_) => {
5788 record.error = Some("the CLI dropped the stream".to_owned());
5789 }
5790 AgentOutcome::Quota(o) => {
5791 self.state.quota.push(QuotaLoss {
5792 seat: seat.key.clone(),
5793 node: "gate-fix".to_owned(),
5794 at: Timestamp::now(),
5795 reset: o.quota.as_ref().and_then(|q| q.reset.clone()),
5796 });
5797 record.error = Some("rate limited (quota); fixer could not run".to_owned());
5798 }
5799 AgentOutcome::Failed(e) => record.error = Some(e),
5800 }
5801 self.state.seats.insert(seat.key.clone(), seat);
5802 if let Ok(r) = git::rescue_commit(
5803 &winner.worktree,
5804 &format!("magi: gate fix {attempt} (uncommitted work)"),
5805 )
5806 .await
5807 {
5808 self.state.note_withheld("gate-fix", &r.withheld);
5809 }
5810 let after = git::rev_parse(&winner.worktree, "HEAD").await?;
5811 record.committed = after != before;
5812 let changed = git::diff(&winner.worktree, &base, "HEAD").await? != patch;
5813 let note = record.error.clone();
5814 self.state.gate_fixes.push(record);
5815 self.state.save()?;
5816 if !changed {
5817 self.state.event(
5818 "gate",
5819 match note {
5820 Some(why) => format!("gate-fix round {attempt}: fixer failed ({why})"),
5821 None => format!("gate-fix round {attempt}: the tree did not change"),
5822 },
5823 );
5824 return Ok(GateFix::Stop);
5825 }
5826 self.state.event(
5827 "gate",
5828 format!("gate-fix round {attempt}: tree changed vs base; re-running verify.e2e"),
5829 );
5830
5831 let commands = self.state.config.verify.e2e.clone();
5832 if !commands.is_empty() {
5833 let shell = self.state.config.shell();
5834 let timeout = Duration::from_secs(self.state.config.graph.verify_timeout());
5835 let cache_dir = self.state.config.cache_dir();
5836 let context = format!("gate-fix round {attempt}");
5837 let (e2e, _) = with_cache_lease(
5838 &mut self.state,
5839 cache_dir.as_deref(),
5840 "e2e",
5841 "e2e",
5842 &winner.worktree,
5843 &after,
5844 timeout,
5845 &context,
5846 |state, budget| {
5847 let shell = shell.clone();
5848 let commands = commands.clone();
5849 let context = context.clone();
5850 let worktree = winner.worktree.clone();
5851 async move {
5852 run_e2e_with_retry(state, &shell, &commands, &worktree, budget, &context)
5853 .await
5854 }
5855 },
5856 )
5857 .await;
5858 if verify_inconclusive(&e2e) {
5859 return Ok(GateFix::Defer);
5860 }
5861 if e2e.iter().any(|o| !o.ok()) {
5862 self.state.event(
5863 "gate",
5864 format!("gate-fix round {attempt}: verify.e2e failed after the fix"),
5865 );
5866 return Ok(GateFix::Stop);
5867 }
5868 }
5869 Ok(GateFix::Retry)
5870 }
5871
5872 async fn merge(&mut self) -> Result<()> {
5875 if self
5890 .state
5891 .base_sync
5892 .as_ref()
5893 .is_some_and(|s| s.conflict.is_some())
5894 || review_conclusion(&self.state.reviews, self.state.config.graph.review_rounds)
5895 != Some(RunStatus::Gating)
5896 || !self.state.gate_status().ok()
5905 {
5906 return Ok(());
5907 }
5908 if self.state.merge.is_some() {
5917 return Ok(());
5918 }
5919 let Some(winner) = self.state.winner().cloned() else {
5920 return Ok(());
5921 };
5922 let repo = self.state.repo.clone();
5923 let base = self.state.base_branch.clone();
5924 let mode = self.state.config.merge.mode;
5925 let style = self.state.config.merge.style;
5926 let facts = if is_review_run(&self.state) {
5927 refresh_reviewed_commits(&mut self.state, &winner.branch).await;
5928 let start = review_base(
5929 &repo,
5930 &self.state.config.merge.remote,
5931 &base,
5932 &self.state.base_commit,
5933 &winner.branch,
5934 )
5935 .await;
5936 branch_facts(&repo, &start, &winner.branch).await
5937 } else {
5938 None
5939 };
5940 let leaked = if is_review_run(&self.state) {
5943 leaked_subjects(&self.state, &winner.branch).await
5944 } else {
5945 Some(Vec::new())
5946 };
5947 let pr = pr_message_with(&self.state, winner.label, facts.as_ref());
5948 let message = pr.commit_message();
5949
5950 let outcome = match mode {
5951 MergeMode::None => MergeOutcome {
5952 mode,
5953 ok: true,
5954 detail: manual_merge_command(style, &repo, &winner.branch, &message),
5955 empty: false,
5956 },
5957 MergeMode::Pr | MergeMode::Local
5958 if merge_is_empty(&repo, &self.state, &winner.branch, mode).await =>
5959 {
5960 MergeOutcome {
5961 mode,
5962 ok: false,
5963 detail: empty_candidate_detail(&self.state, &base),
5964 empty: true,
5965 }
5966 }
5967 MergeMode::Local => {
5968 let on = git::current_branch(&repo).await?;
5969 if on.as_deref() != Some(base.as_str()) {
5970 MergeOutcome {
5971 mode,
5972 ok: false,
5973 detail: format!(
5974 "{} has {} checked out, not the base branch {base}",
5975 repo.display(),
5976 on.unwrap_or_else(|| "a detached HEAD".to_owned())
5977 ),
5978 empty: false,
5979 }
5980 } else if !git::is_clean(&repo).await? {
5981 MergeOutcome {
5982 mode,
5983 ok: false,
5984 detail: format!("{} is dirty; refusing to merge", repo.display()),
5985 empty: false,
5986 }
5987 } else {
5988 let out = match style {
5989 MergeStyle::Merge => {
5990 git::merge_no_ff(&repo, &winner.branch, &message).await?
5991 }
5992 MergeStyle::Squash => {
5993 git::merge_squash(&repo, &winner.branch, &message).await?
5994 }
5995 MergeStyle::Rebase => git::merge_ff_only(&repo, &winner.branch).await?,
5996 };
5997 MergeOutcome {
5998 mode,
5999 ok: out.ok(),
6000 detail: if out.ok() { out.stdout } else { out.stderr },
6001 empty: false,
6002 }
6003 }
6004 }
6005 MergeMode::Pr => {
6006 let remote = self.state.config.merge.remote.clone();
6007 let pushed = git::push(&winner.worktree, &remote, &winner.branch).await?;
6008 if !pushed.ok() {
6009 MergeOutcome {
6010 mode,
6011 ok: false,
6012 detail: pushed.stderr,
6013 empty: false,
6014 }
6015 } else {
6016 let found = land::find_open_pr(&winner.worktree, &winner.branch, &base).await;
6022 let out = match pr_merge_plan(found) {
6023 PrPlan::Create => {
6024 gh_pr_create(
6025 &winner.worktree,
6026 &base,
6027 &winner.branch,
6028 &pr.title,
6029 &pr.body,
6030 )
6031 .await
6032 }
6033 PrPlan::Adopt { url, title } => {
6034 self.state
6035 .event("merge", format!("Pr: adopted open pull request {url}"));
6036 if title != pr.title
6037 && (!is_review_run(&self.state)
6038 || leaked
6039 .as_deref()
6040 .is_some_and(|l| should_retitle(&title, &pr.title, l)))
6041 && let Err(e) =
6042 land::set_pr_title(&winner.worktree, &url, &pr.title).await
6043 {
6044 tracing::warn!("could not refresh title of {url}: {e:#}");
6045 self.state
6046 .event("merge", format!("Pr: title refresh failed: {e:#}"));
6047 }
6048 Ok(url)
6049 }
6050 PrPlan::Stop(why) => Err(anyhow::anyhow!(why)),
6051 };
6052 match out {
6053 Ok(url) => MergeOutcome {
6054 mode,
6055 ok: true,
6056 detail: url,
6057 empty: false,
6058 },
6059 Err(e) => MergeOutcome {
6060 mode,
6061 ok: false,
6062 detail: e.to_string(),
6063 empty: false,
6064 },
6065 }
6066 }
6067 }
6068 };
6069
6070 self.state.status = match (mode, outcome.ok) {
6071 (MergeMode::None, _) => RunStatus::Ready,
6072 (_, true) => RunStatus::Merged,
6073 (_, false) => RunStatus::Blocked,
6074 };
6075 self.state.event(
6076 "merge",
6077 format!(
6078 "{:?}: {}",
6079 mode,
6080 outcome.detail.lines().next().unwrap_or("")
6081 ),
6082 );
6083 self.state.merge = Some(outcome);
6084 self.state.save()?;
6085
6086 if self.state.config.graph.land
6092 && mode == MergeMode::Pr
6093 && self.state.status == RunStatus::Merged
6094 {
6095 self.run_land().await?;
6096 }
6097 self.settle_questions();
6102 Ok(())
6103 }
6104
6105 async fn run_land(&mut self) -> Result<()> {
6116 let url = self
6117 .state
6118 .merge
6119 .as_ref()
6120 .map(|m| m.detail.clone())
6121 .unwrap_or_default();
6122 let url = url.lines().next().unwrap_or("").trim().to_owned();
6123 if !url.starts_with("http") {
6124 return Ok(());
6125 }
6126 match land::land(&mut self.state, &url).await {
6129 Ok(pr) if self.state.parked => {
6130 let _ = pr;
6134 }
6135 Ok(pr) => {
6136 self.state.status = match pr.state {
6137 land::PrLifecycle::Merged => RunStatus::Merged,
6138 _ => RunStatus::Blocked,
6139 };
6140 if bump::should_release_bump(self.state.status)
6147 && let Err(e) = bump::after_merge(&mut self.state, &pr.url).await
6148 {
6149 self.state
6155 .event("bump", format!("release bump skipped: {e:#}"));
6156 }
6157 if self.state.status == RunStatus::Merged {
6160 crate::followup::after_merge(&mut self.state, &pr.url).await;
6161 }
6162 self.state.save()?;
6163 }
6164 Err(e) => {
6165 self.state.status = RunStatus::Blocked;
6166 self.state.event("land", format!("gave up: {e}"));
6167 self.state.save()?;
6168 }
6169 }
6170 Ok(())
6171 }
6172
6173 fn seat(&mut self, key: &str, agent: &str) -> SeatState {
6177 if let Some(existing) = self.state.seats.get(key)
6178 && existing.agent == agent
6179 {
6180 return existing.clone();
6181 }
6182 let fresh = if self.state.seats.contains_key(key) {
6185 handover_seat(key, agent, self.state.next_seat_seed())
6186 } else {
6187 SeatState::new(key, agent, self.state.seed)
6188 };
6189 self.state.seats.insert(key.to_owned(), fresh.clone());
6190 fresh
6191 }
6192
6193 fn occupant(&self, key: &str, spec: AgentSpec) -> AgentSpec {
6199 match self.state.seats.get(key) {
6200 Some(s) if s.agent != spec.id => {
6201 self.state.config.agent(&s.agent).cloned().unwrap_or(spec)
6202 }
6203 _ => spec,
6204 }
6205 }
6206
6207 fn view(&self, c: &Candidate) -> CandidateView {
6209 let raw = crate::run::read_artifact(&self.state, &format!("cand-{}.patch", c.label))
6210 .unwrap_or_default();
6211 let (patch, _) = blind::sanitize_patch(
6212 &format!("candidate {} patch", c.label),
6213 &raw,
6214 &self.state.config.blind,
6215 );
6216 CandidateView {
6217 label: c.label,
6218 branch: c.branch.clone(),
6219 summary: c.summary.clone(),
6220 stat: c.stat.clone(),
6221 patch,
6222 }
6223 }
6224
6225 fn candidate_block(&self, candidates: &[Candidate], base_short: &str) -> String {
6227 let views: Vec<CandidateView> = candidates.iter().map(|c| self.view(c)).collect();
6228 prompt::judge(
6229 "(see above)",
6230 &views,
6231 self.roles.judges.len(),
6232 base_short,
6233 "en",
6234 )
6235 }
6236
6237 fn vote_prompt_full(
6243 &self,
6244 j: usize,
6245 labels: &[char],
6246 language: &str,
6247 candidates: &[Candidate],
6248 base_short: &str,
6249 ) -> String {
6250 let mut text = format!(
6251 "{}\n\n# The task the candidates were given\n\n{}\n\n# Candidates\n\n{}",
6252 prompt::final_vote(labels, language),
6253 self.state.instruction,
6254 self.candidate_block(candidates, base_short)
6255 );
6256 if let Some(own) = self
6257 .state
6258 .judgements
6259 .get(j)
6260 .filter(|r| !r.ranking.is_empty())
6261 {
6262 let reasons = own
6263 .reasons
6264 .iter()
6265 .map(|(k, v)| format!("- {k}: {v}"))
6266 .collect::<Vec<_>>()
6267 .join("\n");
6268 text.push_str(&format!(
6269 "\n\n# Your own earlier ranking\n\nYou ranked {}{}{reasons}\n",
6270 own.ranking.iter().collect::<String>(),
6271 if reasons.is_empty() {
6272 ""
6273 } else {
6274 ", because:\n"
6275 }
6276 ));
6277 }
6278 if !self.state.deliberation.is_empty() {
6279 text.push_str("\n# What was argued before this vote\n");
6280 for t in self.transcript(&[], j) {
6281 text.push_str(&format!(
6282 "\n## {}{}\n\n{}\n",
6283 t.who,
6284 if t.is_self { " (you)" } else { "" },
6285 t.body.trim()
6286 ));
6287 }
6288 }
6289 text
6290 }
6291
6292 fn transcript(&self, current: &[DeliberationTurn], self_idx: usize) -> Vec<Turn> {
6299 let mut turns = Vec::new();
6300 for j in &self.state.judgements {
6301 if j.ranking.is_empty() {
6302 continue;
6303 }
6304 let reasons = j
6305 .reasons
6306 .iter()
6307 .map(|(k, v)| format!("- {k}: {v}"))
6308 .collect::<Vec<_>>()
6309 .join("\n");
6310 turns.push(Turn {
6311 who: format!("Judge {} (opening ranking)", j.judge),
6312 is_self: j.judge == self_idx + 1,
6313 body: format!(
6314 "Ranked {}{}{reasons}",
6315 j.ranking.iter().collect::<String>(),
6316 if reasons.is_empty() {
6317 ""
6318 } else {
6319 ", because:\n"
6320 }
6321 ),
6322 });
6323 }
6324 for t in self
6325 .state
6326 .deliberation
6327 .iter()
6328 .flat_map(|r| r.turns.iter())
6329 .chain(current)
6330 {
6331 turns.push(Turn {
6332 who: format!("Judge {}", t.judge),
6333 is_self: t.judge == self_idx + 1,
6334 body: t.body.clone(),
6335 });
6336 }
6337 turns
6338 }
6339}
6340
6341fn has_context(spec: &AgentSpec, seat: &SeatState, sessions: bool) -> bool {
6343 agent::has_session(spec.kind, seat, sessions)
6344}
6345
6346fn next_untried_in_roster<'a>(
6367 roster: &'a [AgentSpec],
6368 start: usize,
6369 tried: &BTreeSet<String>,
6370) -> Option<&'a AgentSpec> {
6371 roster
6372 .get(start + 1..)?
6373 .iter()
6374 .find(|s| !tried.contains(&s.id))
6375}
6376
6377fn next_for_seat<'a>(
6387 roster: &'a [AgentSpec],
6388 start: usize,
6389 round_tried: &BTreeSet<String>,
6390 carried_failed: &BTreeSet<String>,
6391) -> Option<&'a AgentSpec> {
6392 roster
6393 .get(start + 1..)?
6394 .iter()
6395 .find(|s| !round_tried.contains(&s.id) && !carried_failed.contains(&s.id))
6396 .or_else(|| roster.iter().find(|s| !round_tried.contains(&s.id)))
6397}
6398
6399fn pick_start_spec(roster: &[AgentSpec], spec: AgentSpec, hist: Option<&SeatHistory>) -> AgentSpec {
6405 let Some(h) = hist.filter(|_| !roster.is_empty()) else {
6406 return spec;
6407 };
6408 let ok = |id: &str| !h.failed.contains(id);
6409 if let Some(last) = h.last_ok.as_deref()
6410 && ok(last)
6411 && let Some(s) = roster.iter().find(|s| s.id == last)
6412 {
6413 return s.clone();
6414 }
6415 if ok(&spec.id) {
6416 return spec;
6417 }
6418 let from = roster.iter().position(|s| s.id == spec.id).unwrap_or(0);
6419 roster
6420 .get(from + 1..)
6421 .into_iter()
6422 .flatten()
6423 .chain(roster.iter())
6424 .find(|s| ok(&s.id))
6425 .cloned()
6426 .unwrap_or(spec)
6427}
6428
6429fn handover_seat(key: &str, agent: &str, run_seed: u64) -> SeatState {
6433 SeatState::new(key, agent, run_seed ^ crate::rng::fnv1a(agent))
6434}
6435
6436const TIMED_OUT: &str = "timed out";
6439
6440impl FailClass {
6441 fn of(out: &AgentOutcome) -> Option<Self> {
6443 match out {
6444 AgentOutcome::Ok(_) => None,
6445 AgentOutcome::Quota(_) => Some(Self::Quota),
6446 AgentOutcome::Dropped(_) => Some(Self::Other("dropped".to_owned())),
6447 AgentOutcome::Failed(e) if e == TIMED_OUT => Some(Self::Timeout),
6448 AgentOutcome::Failed(e) => Some(Self::Other(failure_signature(e))),
6449 }
6450 }
6451
6452 fn stem_word(&self) -> &'static str {
6454 match self {
6455 Self::Quota => "quota",
6456 _ => "handover",
6457 }
6458 }
6459}
6460
6461fn failure_signature(msg: &str) -> String {
6465 let line = msg.lines().next().unwrap_or("").trim().to_lowercase();
6466 let mut out = Vec::new();
6467 for word in line.split_whitespace() {
6468 if word.contains('/') || word.contains('\\') {
6469 out.push("<path>".to_owned());
6470 continue;
6471 }
6472 let mut w = String::new();
6473 let mut in_digits = false;
6474 for c in word.chars() {
6475 if c.is_ascii_digit() {
6476 if !in_digits {
6477 w.push('#');
6478 }
6479 in_digits = true;
6480 } else {
6481 in_digits = false;
6482 w.push(c);
6483 }
6484 }
6485 out.push(w);
6486 }
6487 out.join(" ").chars().take(120).collect()
6488}
6489
6490fn should_hand_over(prev: Option<&FailClass>, cur: &FailClass) -> bool {
6497 match cur {
6498 FailClass::Quota | FailClass::Timeout => true,
6499 FailClass::Other(_) => prev != Some(cur),
6500 }
6501}
6502
6503fn fail_reason(out: &AgentOutcome) -> String {
6505 match out {
6506 AgentOutcome::Ok(_) => String::new(),
6507 AgentOutcome::Quota(_) => "rate limited (quota)".to_owned(),
6508 AgentOutcome::Dropped(o) => format!(
6509 "the CLI dropped the stream ({})",
6510 o.dropped
6511 .as_ref()
6512 .map(|d| d.why.as_str())
6513 .unwrap_or("it ended without delivering its answer")
6514 ),
6515 AgentOutcome::Failed(e) => e.lines().next().unwrap_or("").chars().take(160).collect(),
6516 }
6517}
6518
6519fn record_handover(
6522 state: &mut RunState,
6523 node: &str,
6524 seat: &str,
6525 from: &str,
6526 to: &str,
6527 class: &FailClass,
6528 reason: &str,
6529) {
6530 let message = if *class == FailClass::Quota {
6531 format!("{seat}: rate limited (quota) on {from}; retrying with {to}")
6532 } else {
6533 format!("{seat}: handed over {from} -> {to} ({reason})")
6534 };
6535 state.event(node, message);
6536 state.handovers.push(Handover {
6537 at: Timestamp::now(),
6538 node: node.to_owned(),
6539 seat: seat.to_owned(),
6540 from: from.to_owned(),
6541 to: to.to_owned(),
6542 reason: reason.to_owned(),
6543 });
6544}
6545
6546fn has_unconfirmed_command(commands: &[agent::CommandEvidence]) -> bool {
6560 commands.iter().any(|c| c.exit_code.is_none())
6561}
6562
6563fn verified_noop_claim(
6576 usable: bool,
6577 commands: &[agent::CommandEvidence],
6578 text: &str,
6579) -> Option<String> {
6580 (usable && !has_unconfirmed_command(commands))
6581 .then(|| verdict::verified_noop(text))
6582 .flatten()
6583}
6584
6585fn short(commit: &str) -> String {
6586 commit.chars().take(7).collect()
6587}
6588
6589fn make_executable(path: &Path) -> Result<()> {
6590 #[cfg(unix)]
6591 {
6592 use std::os::unix::fs::PermissionsExt as _;
6593 let mut perms = std::fs::metadata(path)?.permissions();
6594 perms.set_mode(0o755);
6595 std::fs::set_permissions(path, perms)?;
6596 }
6597 #[cfg(not(unix))]
6598 {
6599 let _ = path;
6600 }
6601 Ok(())
6602}
6603
6604struct WaveCtx<'a> {
6611 run: &'a str,
6614 node: &'a str,
6616 prompts: &'a Prompts,
6617 cache: Option<&'a Path>,
6619 round: Option<usize>,
6622 carry_seats: bool,
6626}
6627
6628async fn run_one(
6630 job: SeatJob,
6631 sem: Arc<Semaphore>,
6632 ctx: &WaveCtx<'_>,
6633 state: &mut RunState,
6634 attempt: usize,
6635) -> (SeatState, AgentOutcome) {
6636 let (_, seat, out) = wave(vec![job], sem, ctx, state, attempt)
6637 .await
6638 .pop()
6639 .expect("one job in, one result out");
6640 (seat, out)
6641}
6642
6643async fn wave(
6649 jobs: Vec<SeatJob>,
6650 sem: Arc<Semaphore>,
6651 ctx: &WaveCtx<'_>,
6652 state: &mut RunState,
6653 attempt: usize,
6654) -> Vec<(usize, SeatState, AgentOutcome)> {
6655 let WaveCtx {
6656 run,
6657 node,
6658 prompts,
6659 cache,
6660 round,
6661 carry_seats: _,
6662 } = *ctx;
6663 for job in &jobs {
6664 state.seat_started(node, &job.seat.key, job.timeout, attempt);
6665 }
6666 if let Err(e) = state.save() {
6667 tracing::warn!("could not persist in-progress seats: {e:#}");
6672 }
6673 let jobs_had_a_writer = jobs.iter().any(|j| j.allow_write);
6689 let wait_started = Instant::now();
6690 let cache_guard = if let Some(cache_dir) = cache {
6691 if jobs_had_a_writer {
6692 let owner = crate::cache::Owner::here(run, node, "*", Path::new("(wave)"), "");
6693 let budget = jobs
6694 .iter()
6695 .map(|j| j.timeout)
6696 .max()
6697 .unwrap_or(Duration::from_secs(60));
6698 acquire_cache_lease(state, cache_dir, &owner, budget, node)
6699 .await
6700 .ok()
6701 } else {
6702 None
6703 }
6704 } else {
6705 None
6706 };
6707 let waited_for_lease = wait_started.elapsed();
6714 let mut set = tokio::task::JoinSet::new();
6715 let overlay = prompts.overlay(node);
6716 for (i, mut job) in jobs.into_iter().enumerate() {
6717 job.timeout = job.timeout.saturating_sub(waited_for_lease);
6718 job.prompt = prompt::with_overlay(job.prompt, overlay.clone());
6719 if cache.is_some() {
6720 job.prompt.push('\n');
6721 job.prompt
6722 .push_str(&prompt::build_cache_note(node, job.allow_write));
6723 }
6724 let sem = Arc::clone(&sem);
6725 let run = run.to_owned();
6726 let node = node.to_owned();
6727 let attachments = if node == "implement" {
6730 state.attachments.clone()
6731 } else {
6732 Vec::new()
6733 };
6734 let cache = cache
6745 .filter(|_| job.allow_write && cache_guard.is_some())
6746 .map(Path::to_path_buf);
6747 set.spawn(async move {
6748 let _permit = sem.acquire().await;
6749 let mut seat = job.seat;
6750 let out = agent::invoke(
6751 &job.spec,
6752 &mut seat,
6753 &Invocation {
6754 cwd: &job.cwd,
6755 prompt: &job.prompt,
6756 timeout: job.timeout,
6757 allow_write: job.allow_write,
6758 sessions: job.sessions,
6759 artifacts: &job.artifacts,
6760 stem: &job.stem,
6761 run: &run,
6762 node: &node,
6763 cache_dir: cache.as_deref(),
6764 attachments: &attachments,
6765 writable: &[],
6766 },
6767 )
6768 .await;
6769 let out = match out {
6770 Ok(o) if o.usable() => AgentOutcome::Ok(o),
6771 Ok(o) if o.quota_exhausted() => AgentOutcome::Quota(o),
6772 Ok(o) if o.work_undelivered() => AgentOutcome::Dropped(o),
6780 Ok(o) if o.timed_out => AgentOutcome::Failed(TIMED_OUT.to_owned()),
6781 Ok(o) => AgentOutcome::Failed(format!(
6782 "exited with {:?} and no usable output",
6783 o.exit_code
6784 )),
6785 Err(e) => AgentOutcome::Failed(e.to_string()),
6786 };
6787 (i, seat, out)
6788 });
6789 }
6790 let mut collected: Vec<Option<(usize, SeatState, AgentOutcome)>> = Vec::new();
6791 while let Some(joined) = set.join_next().await {
6792 let (i, seat, out) = match joined {
6793 Ok(v) => v,
6794 Err(e) => {
6798 tracing::error!("agent task panicked: {e}");
6799 continue;
6800 }
6801 };
6802 state.seat_finished(&seat.key);
6803 record_jobs(state, node, round, &seat.key, &out);
6804 if let Err(e) = state.save() {
6805 tracing::warn!("could not persist a seat's completion: {e:#}");
6806 }
6807 if collected.len() <= i {
6808 collected.resize_with(i + 1, || None);
6809 }
6810 collected[i] = Some((i, seat, out));
6811 }
6812 if state
6818 .active
6819 .values()
6820 .any(|a| a.node == node && a.attempt == attempt)
6821 {
6822 state
6823 .active
6824 .retain(|_, a| !(a.node == node && a.attempt == attempt));
6825 if let Err(e) = state.save() {
6826 tracing::warn!("could not persist the end of a wave: {e:#}");
6827 }
6828 }
6829 if let Some(cache_dir) = cache
6836 && jobs_had_a_writer
6837 {
6838 crate::cache::invalidate_identity(&crate::run::home(), cache_dir);
6839 }
6840 if let Some(guard) = cache_guard {
6841 guard.release();
6842 }
6843 collected.into_iter().flatten().collect()
6844}
6845
6846fn record_jobs(
6857 state: &mut RunState,
6858 node: &str,
6859 round: Option<usize>,
6860 seat: &str,
6861 out: &AgentOutcome,
6862) {
6863 let commands: &[agent::CommandEvidence] = match out {
6864 AgentOutcome::Ok(o) | AgentOutcome::Quota(o) | AgentOutcome::Dropped(o) => &o.commands,
6865 AgentOutcome::Failed(_) => &[],
6866 };
6867 let checked_at = Timestamp::now();
6868 for c in commands {
6869 state.jobs.push(JobRecord {
6870 node: node.to_owned(),
6871 round,
6872 seat: seat.to_owned(),
6873 id: c.id.clone(),
6874 description: c.description.clone(),
6875 checked_at,
6876 status: match c.exit_code {
6877 Some(0) => JobStatus::Completed,
6878 Some(_) => JobStatus::Failed,
6879 None => JobStatus::Unknown,
6880 },
6881 exit_code: c.exit_code,
6882 result_summary: c.result_summary.clone(),
6883 source: c.source.clone(),
6884 });
6885 }
6886}
6887
6888fn round_is_clean(
6909 blocking: usize,
6910 e2e_ok: bool,
6911 answered: usize,
6912 expected: usize,
6913 quota_missing: usize,
6914 policy: IncompleteReviewPolicy,
6915) -> bool {
6916 if blocking != 0 || !e2e_ok {
6917 return false;
6918 }
6919 if answered == expected || policy == IncompleteReviewPolicy::Warn {
6920 return true;
6921 }
6922 answered > 0 && expected - answered <= quota_missing
6923}
6924
6925fn review_conclusion(reviews: &[ReviewRound], max_rounds: usize) -> Option<RunStatus> {
6949 if max_rounds == 0 || reviews.iter().any(|r| r.clean) {
6950 return Some(RunStatus::Gating);
6951 }
6952 let last = reviews.last()?;
6953 let stagnant = reviews.iter().rev().take_while(|r| !r.progressed).count() >= STAGNANT_LIMIT;
6954 if reviews.len() < max_rounds && !stagnant {
6955 return None;
6956 }
6957 if last.incomplete() && last.blocking == 0 {
6958 return Some(RunStatus::Blocked);
6959 }
6960 if last.e2e_status() == E2eStatus::ResourceBlocked {
6961 return None;
6962 }
6963 Some(if last.e2e.iter().all(CommandOutcome::ok) {
6964 RunStatus::Gating
6965 } else {
6966 RunStatus::Blocked
6967 })
6968}
6969
6970fn retry_budget(full: Duration, nudged: bool) -> Duration {
6985 if nudged {
6986 (full / 4).max(Duration::from_secs(120)).min(full)
6987 } else {
6988 full
6989 }
6990}
6991
6992#[allow(clippy::too_many_arguments)]
7021async fn ask_json_wave<T>(
7022 jobs: Vec<SeatJob>,
7023 sem: Arc<Semaphore>,
7024 retries: usize,
7025 roster: &[AgentSpec],
7026 ctx: &WaveCtx<'_>,
7027 losses: &mut Vec<QuotaLoss>,
7028 state: &mut RunState,
7029 validate: &(dyn Fn(&T) -> Result<()> + Send + Sync),
7030) -> Vec<(SeatState, Result<(T, AgentOutput)>, usize)>
7031where
7032 T: serde::de::DeserializeOwned + Send + 'static,
7033{
7034 ask_wave_with(
7035 jobs,
7036 sem,
7037 retries,
7038 roster,
7039 ctx,
7040 losses,
7041 state,
7042 &|text: &str| {
7043 let v = verdict::extract_json::<T>(text)?;
7044 validate(&v)?;
7045 Ok(v)
7046 },
7047 )
7048 .await
7049}
7050
7051#[allow(clippy::too_many_arguments)]
7060async fn ask_wave_with<T>(
7061 jobs: Vec<SeatJob>,
7062 sem: Arc<Semaphore>,
7063 retries: usize,
7064 roster: &[AgentSpec],
7065 ctx: &WaveCtx<'_>,
7066 losses: &mut Vec<QuotaLoss>,
7067 state: &mut RunState,
7068 parse: &(dyn Fn(&str) -> Result<T> + Send + Sync),
7069) -> Vec<(SeatState, Result<(T, AgentOutput)>, usize)>
7070where
7071 T: Send + 'static,
7072{
7073 let n = jobs.len();
7074 let originals: Vec<SeatJob> = jobs;
7075 let mut seats: Vec<SeatState> = originals.iter().map(|j| j.seat.clone()).collect();
7076 let mut done: Vec<Option<Result<(T, AgentOutput)>>> = (0..n).map(|_| None).collect();
7077 let mut nudges: Vec<usize> = vec![0; n];
7084 let mut specs: Vec<AgentSpec> = originals.iter().map(|j| j.spec.clone()).collect();
7088 let mut tried: Vec<BTreeSet<String>> = specs
7089 .iter()
7090 .map(|s| BTreeSet::from([s.id.clone()]))
7091 .collect();
7092 let starts: Vec<usize> = specs
7093 .iter()
7094 .map(|s| roster.iter().position(|r| r.id == s.id).unwrap_or(0))
7095 .collect();
7096 let carry = ctx.carry_seats && !roster.is_empty();
7097 let carried: Vec<BTreeSet<String>> = originals
7100 .iter()
7101 .map(|j| {
7102 state
7103 .seat_history
7104 .get(&j.seat.key)
7105 .filter(|_| carry)
7106 .map(|h| h.failed.clone())
7107 .unwrap_or_default()
7108 })
7109 .collect();
7110 let mut prev: Vec<Option<FailClass>> = originals
7111 .iter()
7112 .map(|j| {
7113 state
7114 .seat_history
7115 .get(&j.seat.key)
7116 .filter(|_| carry)
7117 .and_then(|h| h.last_fail.clone())
7118 })
7119 .collect();
7120 let next_agent = |i: usize, tried: &BTreeSet<String>| -> Option<AgentSpec> {
7121 if carry {
7122 next_for_seat(roster, starts[i], tried, &carried[i]).cloned()
7123 } else {
7124 next_untried_in_roster(roster, starts[i], tried).cloned()
7125 }
7126 };
7127 let mut fresh: Vec<Option<String>> = vec![None; n];
7128 let mut last_quota: Vec<Option<Option<String>>> = vec![None; n];
7129 let mut pending: Vec<usize> = (0..n).collect();
7130
7131 let max_rounds = (retries + 1) * roster.len().max(1) + 1;
7136 for round in 0..max_rounds {
7137 if pending.is_empty() {
7138 break;
7139 }
7140 let mut batch = Vec::with_capacity(pending.len());
7141 let mut renudged: Vec<&str> = Vec::new();
7142 for &i in &pending {
7143 let src = &originals[i];
7144 let full: &str = match &src.handover {
7149 Some(h) if specs[i].id != src.spec.id => h,
7150 _ => &src.prompt,
7151 };
7152 let (prompt, timeout, stem) = if let Some(word) = fresh[i].take() {
7155 (
7156 full.to_owned(),
7157 src.timeout,
7158 format!("{}-{word}-{}", src.stem, specs[i].id),
7159 )
7160 } else if nudges[i] == 0 {
7161 (full.to_owned(), src.timeout, src.stem.clone())
7162 } else {
7163 renudged.push(src.seat.key.as_str());
7164 let why = done[i]
7165 .as_ref()
7166 .and_then(|r| r.as_ref().err().map(ToString::to_string))
7167 .unwrap_or_else(|| "no parsable answer".to_owned());
7168 let nudge = prompt::nudge(&why);
7169 let nudged = has_context(&specs[i], &seats[i], src.sessions);
7170 let prompt = if nudged {
7171 nudge
7172 } else {
7173 format!("{full}\n\n---\n\n{nudge}")
7174 };
7175 (
7176 prompt,
7177 retry_budget(src.timeout, nudged),
7178 format!("{}-retry{}", src.stem, nudges[i]),
7179 )
7180 };
7181 batch.push(SeatJob {
7182 spec: specs[i].clone(),
7183 seat: seats[i].clone(),
7184 cwd: src.cwd.clone(),
7185 prompt,
7186 timeout,
7187 allow_write: src.allow_write,
7188 sessions: src.sessions,
7189 artifacts: src.artifacts.clone(),
7190 stem,
7191 handover: None,
7192 });
7193 }
7194
7195 if !renudged.is_empty() {
7196 state.event(
7197 ctx.node,
7198 format!("retry {round}: re-asking {}", renudged.join(", ")),
7199 );
7200 }
7201 let results = wave(batch, Arc::clone(&sem), ctx, state, round).await;
7202 let mut still = Vec::new();
7203 for (&i, (_wi, seat, out)) in pending.iter().zip(results) {
7204 seats[i] = seat;
7205 let class = FailClass::of(&out);
7206 let nudge_first = matches!(out, AgentOutcome::Dropped(_))
7209 && nudges[i] < retries
7210 && !roster.is_empty();
7211 if let Some(cur) = class.clone().filter(|_| !roster.is_empty() && !nudge_first) {
7212 let next = should_hand_over(prev[i].as_ref(), &cur)
7213 .then(|| next_agent(i, &tried[i]))
7214 .flatten();
7215 if carry {
7216 let h = state
7217 .seat_history
7218 .entry(originals[i].seat.key.clone())
7219 .or_default();
7220 h.failed.insert(specs[i].id.clone());
7221 h.last_fail = Some(cur.clone());
7222 if h.last_ok.as_deref() == Some(specs[i].id.as_str()) {
7223 h.last_ok = None;
7224 }
7225 if let Err(e) = state.save() {
7228 tracing::warn!("could not persist a seat's failure history: {e:#}");
7229 }
7230 }
7231 if let Some(next) = next {
7232 record_handover(
7233 state,
7234 ctx.node,
7235 &originals[i].seat.key,
7236 &specs[i].id,
7237 &next.id,
7238 &cur,
7239 &fail_reason(&out),
7240 );
7241 tried[i].insert(next.id.clone());
7242 prev[i] = Some(cur.clone());
7243 seats[i] =
7244 handover_seat(&originals[i].seat.key, &next.id, state.next_seat_seed());
7245 specs[i] = next;
7246 fresh[i] = Some(cur.stem_word().to_owned());
7247 nudges[i] = 0;
7248 done[i] = Some(Err(anyhow::anyhow!(
7249 "handed over after: {}",
7250 fail_reason(&out)
7251 )));
7252 still.push(i);
7253 continue;
7254 }
7255 }
7256 if carry
7257 && !nudge_first
7258 && let Some(cur) = class.clone()
7259 {
7260 let h = state
7262 .seat_history
7263 .entry(originals[i].seat.key.clone())
7264 .or_default();
7265 h.failed.insert(specs[i].id.clone());
7266 h.last_fail = Some(cur);
7267 }
7268 let parsed = match out {
7269 AgentOutcome::Ok(o) => parse(&o.text).map(|v| (v, o)),
7270 AgentOutcome::Quota(o) => {
7271 last_quota[i] = Some(o.quota.as_ref().and_then(|q| q.reset.clone()));
7272 Err(anyhow::anyhow!("rate limited (quota); not retrying now"))
7273 }
7274 AgentOutcome::Dropped(o) => {
7278 let why = o
7279 .dropped
7280 .as_ref()
7281 .map(|d| d.why.as_str())
7282 .unwrap_or("the CLI ended the stream without delivering its answer");
7283 Err(anyhow::anyhow!("the CLI dropped the stream ({why})"))
7284 }
7285 AgentOutcome::Failed(e) => Err(anyhow::anyhow!(e)),
7286 };
7287 let quota = class == Some(FailClass::Quota);
7288 let failed = parsed.is_err();
7289 done[i] = Some(parsed);
7290 if carry && !failed {
7291 let h = state
7292 .seat_history
7293 .entry(originals[i].seat.key.clone())
7294 .or_default();
7295 h.failed.remove(&specs[i].id);
7296 h.last_ok = Some(specs[i].id.clone());
7297 h.last_fail = None;
7298 }
7299 let agent_failure = class.is_some()
7307 && !nudge_first
7308 && !roster.is_empty()
7309 && next_agent(i, &tried[i]).is_some();
7310 if failed && !quota && !agent_failure && nudges[i] < retries {
7311 nudges[i] += 1;
7312 still.push(i);
7313 }
7314 }
7315 pending = still;
7316 }
7317
7318 for (i, q) in last_quota.into_iter().enumerate() {
7321 if let Some(reset) = q {
7322 losses.push(QuotaLoss {
7323 seat: originals[i].seat.key.clone(),
7324 node: ctx.node.to_owned(),
7325 at: Timestamp::now(),
7326 reset,
7327 });
7328 }
7329 }
7330
7331 seats
7332 .into_iter()
7333 .zip(done)
7334 .zip(nudges)
7335 .map(|((seat, res), attempts)| {
7336 (
7337 seat,
7338 res.unwrap_or_else(|| Err(anyhow::anyhow!("no attempt was made"))),
7339 attempts,
7340 )
7341 })
7342 .collect()
7343}
7344
7345async fn acquire_cache_lease(
7358 state: &mut RunState,
7359 cache_dir: &Path,
7360 owner: &crate::cache::Owner,
7361 budget: Duration,
7362 context: &str,
7363) -> Result<crate::cache::Guard> {
7364 let home = crate::run::home();
7365 let started = Instant::now();
7366 let busy = match crate::cache::try_acquire(&home, cache_dir, owner) {
7367 Ok(crate::cache::AcquireOutcome::Acquired(g)) => return Ok(g),
7368 Ok(crate::cache::AcquireOutcome::Busy(busy)) => busy,
7369 Err(e) => {
7370 state.event(
7371 "verify",
7372 format!("{context}: could not check the shared build cache: {e:#}"),
7373 );
7374 if let Err(e2) = state.save() {
7375 tracing::warn!("could not persist a cache-check failure: {e2:#}");
7376 }
7377 return Err(e);
7378 }
7379 };
7380 state.event(
7381 "verify",
7382 format!(
7383 "{context}: waiting for the shared build cache at {} ({})",
7384 cache_dir.display(),
7385 busy.describe()
7386 ),
7387 );
7388 if let Err(e) = state.save() {
7389 tracing::warn!("could not persist a cache wait: {e:#}");
7390 }
7391 let remaining = budget.saturating_sub(started.elapsed());
7392 match crate::cache::wait_for(&home, cache_dir, owner, remaining, Duration::from_secs(5)).await {
7393 Ok(g) => Ok(g),
7394 Err(e) => {
7395 state.event("verify", format!("{context}: {e:#}"));
7396 if let Err(e2) = state.save() {
7397 tracing::warn!("could not persist a cache wait timeout: {e2:#}");
7398 }
7399 Err(e)
7400 }
7401 }
7402}
7403
7404#[allow(clippy::too_many_arguments)]
7425async fn with_cache_lease<'s, F, Fut>(
7426 state: &'s mut RunState,
7427 cache_dir: Option<&Path>,
7428 node: &str,
7429 seat: &str,
7430 worktree: &Path,
7431 head: &str,
7432 budget: Duration,
7433 context: &str,
7434 body: F,
7435) -> (Vec<CommandOutcome>, bool)
7436where
7437 F: FnOnce(&'s mut RunState, Duration) -> Fut,
7438 Fut: std::future::Future<Output = (Vec<CommandOutcome>, bool, Vec<u32>)>,
7439{
7440 let Some(cache_dir) = cache_dir else {
7441 let (outcomes, retried, _timed_out_pids) = body(state, budget).await;
7442 return (outcomes, retried);
7443 };
7444 let home = crate::run::home();
7445 let owner = crate::cache::Owner::here(&state.id, node, seat, worktree, head);
7446 let started = Instant::now();
7447 let guard = match acquire_cache_lease(state, cache_dir, &owner, budget, context).await {
7448 Ok(g) => g,
7449 Err(e) => {
7450 return (
7451 vec![CommandOutcome {
7452 command: "(waiting for the shared build cache)".to_owned(),
7453 code: None,
7454 output_tail: e.to_string(),
7455 duration_ms: started.elapsed().as_millis() as u64,
7456 resource_blocked: true,
7457 }],
7458 false,
7459 );
7460 }
7461 };
7462 let identity = crate::cache::Identity::new(worktree, head);
7463 if let Err(e) = crate::cache::ensure_fresh(&home, cache_dir, &identity) {
7464 state.event(
7472 "verify",
7473 format!(
7474 "{context}: could not confirm the shared build cache matches {} at {}: {e:#}",
7475 worktree.display(),
7476 short(head)
7477 ),
7478 );
7479 guard.release();
7480 return (
7481 vec![CommandOutcome {
7482 command: "(confirming the shared build cache is fresh)".to_owned(),
7483 code: None,
7484 output_tail: e.to_string(),
7485 duration_ms: started.elapsed().as_millis() as u64,
7486 resource_blocked: true,
7487 }],
7488 false,
7489 );
7490 }
7491 let remaining = budget.saturating_sub(started.elapsed());
7492 let (outcomes, retried, timed_out_pids) = body(state, remaining).await;
7493 if !timed_out_pids.is_empty() {
7498 wait_for_timed_out_children_to_die(&timed_out_pids).await;
7499 }
7500 guard.release();
7501 (outcomes, retried)
7502}
7503
7504async fn wait_for_timed_out_children_to_die(pids: &[u32]) {
7516 wait_for_pids_with(
7517 pids,
7518 crate::proc::pid_alive,
7519 LEASE_RELEASE_POLL,
7520 LEASE_RELEASE_MAX_WAIT,
7521 )
7522 .await;
7523}
7524
7525async fn wait_for_pids_with<F: Fn(u32) -> bool>(
7531 pids: &[u32],
7532 alive: F,
7533 poll: Duration,
7534 max_wait: Duration,
7535) {
7536 let deadline = Instant::now() + max_wait;
7537 loop {
7538 if pids.iter().all(|&pid| !alive(pid)) {
7539 return;
7540 }
7541 if Instant::now() >= deadline {
7542 return;
7543 }
7544 tokio::time::sleep(poll).await;
7545 }
7546}
7547
7548fn verify_inconclusive(outcomes: &[CommandOutcome]) -> bool {
7555 outcomes.iter().any(|o| o.resource_blocked)
7556}
7557
7558enum GateFix {
7560 Retry,
7562 Stop,
7565 Defer,
7568}
7569
7570fn gate_fixable(outcomes: &[CommandOutcome]) -> bool {
7578 let mut red = outcomes.iter().filter(|o| !o.ok()).peekable();
7579 red.peek().is_some()
7580 && red.all(|o| {
7581 !o.resource_blocked
7582 && matches!(o.code, Some(c) if c != 0 && c != 126 && c != 127)
7583 && !o.output_tail.trim().is_empty()
7584 })
7585}
7586
7587fn e2e_outcome_label(o: &CommandOutcome) -> String {
7591 if o.ok() {
7592 return "pass".to_owned();
7593 }
7594 let reason = if o.build_failed() {
7595 format!("COULD NOT RUN ({:?}, build/link failure)", o.code)
7596 } else {
7597 format!("FAIL ({:?})", o.code)
7598 };
7599 format!("{reason}\n{}", tail(&o.output_tail, EVENT_OUTPUT_TAIL))
7600}
7601
7602async fn run_e2e_with_retry(
7610 state: &mut RunState,
7611 shell: &[String],
7612 commands: &[String],
7613 worktree: &Path,
7614 timeout: Duration,
7615 context: &str,
7616) -> (Vec<CommandOutcome>, bool, Vec<u32>) {
7617 let (mut e2e, mut timed_out_pids) = run_commands(
7618 state, "verify", "e2e", 0, shell, commands, worktree, timeout,
7619 )
7620 .await;
7621 for o in &e2e {
7622 state.event(
7623 "verify",
7624 format!("{context}: `{}` -> {}", o.command, e2e_outcome_label(o)),
7625 );
7626 }
7627 let verify_retried = e2e.iter().any(CommandOutcome::build_failed);
7631 if verify_retried {
7632 state.event(
7633 "verify",
7634 format!(
7635 "{context}: verify could not build/link, not a test result — retrying once \
7636 before concluding"
7637 ),
7638 );
7639 let retried = run_commands(
7640 state, "verify", "e2e", 1, shell, commands, worktree, timeout,
7641 )
7642 .await;
7643 e2e = retried.0;
7644 timed_out_pids.extend(retried.1);
7647 for o in &e2e {
7648 state.event(
7649 "verify",
7650 format!(
7651 "{context}: retry `{}` -> {}",
7652 o.command,
7653 e2e_outcome_label(o)
7654 ),
7655 );
7656 }
7657 }
7658 (e2e, verify_retried, timed_out_pids)
7659}
7660
7661#[allow(clippy::too_many_arguments)]
7677async fn run_commands(
7678 state: &mut RunState,
7679 node: &str,
7680 task: &str,
7681 attempt: usize,
7682 shell: &[String],
7683 commands: &[String],
7684 cwd: &Path,
7685 timeout: Duration,
7686) -> (Vec<CommandOutcome>, Vec<u32>) {
7687 if commands.is_empty() {
7688 return (Vec::new(), Vec::new());
7693 }
7694 let mut out = Vec::new();
7695 let mut timed_out_pids = Vec::new();
7696 let total = commands.len();
7697 for (idx, command) in commands.iter().enumerate() {
7698 state.task_command(task, node, attempt, command, idx + 1, total, timeout);
7699 if let Err(e) = state.save() {
7700 tracing::warn!("could not persist an in-progress {task} command: {e:#}");
7701 }
7702 let started = Instant::now();
7703 let mut cmd = tokio::process::Command::new(&shell[0]);
7704 cmd.quiet();
7705 cmd.args(&shell[1..])
7706 .arg(command)
7707 .current_dir(cwd)
7708 .stdin(std::process::Stdio::null())
7709 .stdout(std::process::Stdio::piped())
7710 .stderr(std::process::Stdio::piped())
7711 .kill_on_drop(true);
7712 let spawned = cmd.spawn();
7713 let (code, body) = match spawned {
7714 Ok(child) => {
7715 let pid = child.id();
7720 match tokio::time::timeout(timeout, child.wait_with_output()).await {
7721 Ok(Ok(o)) => {
7722 let mut body = String::from_utf8_lossy(&o.stdout).into_owned();
7723 body.push_str(&String::from_utf8_lossy(&o.stderr));
7724 (o.status.code(), body)
7725 }
7726 Ok(Err(e)) => (None, format!("failed to run: {e}")),
7727 Err(_) => {
7728 if let Some(pid) = pid {
7729 timed_out_pids.push(pid);
7730 }
7731 (None, format!("timed out after {}s", timeout.as_secs()))
7732 }
7733 }
7734 }
7735 Err(e) => (None, format!("failed to spawn `{}`: {e}", shell[0])),
7736 };
7737 out.push(CommandOutcome {
7738 command: command.clone(),
7739 code,
7740 output_tail: tail(&body, OUTPUT_TAIL),
7741 duration_ms: started.elapsed().as_millis() as u64,
7742 resource_blocked: false,
7743 });
7744 }
7745 state.task_finished(task);
7746 if let Err(e) = state.save() {
7747 tracing::warn!("could not persist the end of {task}: {e:#}");
7748 }
7749 (out, timed_out_pids)
7750}
7751
7752fn manual_merge_command(style: MergeStyle, repo: &Path, branch: &str, message: &str) -> String {
7764 let repo = repo.display();
7765 match style {
7766 MergeStyle::Merge => format!("git -C {repo} merge --no-ff {branch}"),
7767 MergeStyle::Squash => {
7768 let subject = message
7771 .lines()
7772 .next()
7773 .unwrap_or(branch)
7774 .replace(['\\', '"', '$', '`'], "");
7775 format!(
7776 "git -C {repo} merge --squash {branch} && git -C {repo} commit -m \"{subject}\""
7777 )
7778 }
7779 MergeStyle::Rebase => format!("git -C {repo} merge --ff-only {branch}"),
7780 }
7781}
7782
7783const PR_TITLE_MAX: usize = 240;
7794
7795fn english_title(text: &str, max: usize) -> Option<String> {
7806 let line = queue::first_line(text)?;
7807 let chars: Vec<char> = line.chars().collect();
7808 let (kept, mark) = if chars.len() <= max {
7809 (line.to_owned(), "")
7810 } else if let Some(end) = sentence_end(&chars, max) {
7811 (chars[..end].iter().collect::<String>(), "")
7812 } else {
7813 let room = max.saturating_sub(3);
7814 let cut = if chars[room].is_whitespace() {
7817 room
7818 } else {
7819 chars[..room]
7820 .iter()
7821 .rposition(|c| c.is_whitespace())
7822 .unwrap_or(room)
7823 };
7824 let head: String = chars[..cut].iter().collect();
7825 let head = head.trim_end_matches(|c: char| c.is_whitespace() || ",;:-".contains(c));
7826 (head.to_owned(), "...")
7827 };
7828 if kept.is_empty() || !kept.is_ascii() || !kept.chars().any(|c| c.is_ascii_alphabetic()) {
7829 return None;
7830 }
7831 Some(format!("{kept}{mark}"))
7832}
7833
7834fn sentence_end(chars: &[char], max: usize) -> Option<usize> {
7838 const MIN: usize = 20;
7839 for i in MIN..max.min(chars.len()) {
7840 if !matches!(chars[i], '.' | '!' | '?') {
7841 continue;
7842 }
7843 let Some(&next) = chars.get(i + 1) else {
7844 continue;
7845 };
7846 if !next.is_whitespace() {
7847 continue;
7848 }
7849 let after = chars[i + 1..].iter().find(|c| !c.is_whitespace());
7850 if after.is_some_and(|c| c.is_ascii_lowercase()) {
7851 continue;
7852 }
7853 let word: String = chars[..i]
7854 .iter()
7855 .rev()
7856 .take_while(|c| !c.is_whitespace())
7857 .collect::<Vec<_>>()
7858 .into_iter()
7859 .rev()
7860 .collect();
7861 let word = word.to_ascii_lowercase();
7862 if matches!(word.as_str(), "e.g" | "i.e" | "etc" | "vs" | "cf") {
7863 continue;
7864 }
7865 let end = chars[..i]
7866 .iter()
7867 .rposition(|c| !c.is_whitespace())
7868 .map_or(i, |p| p + 1);
7869 return Some(end);
7870 }
7871 None
7872}
7873
7874struct PrMessage {
7879 title: String,
7880 body: String,
7881}
7882
7883impl PrMessage {
7884 fn commit_message(&self) -> String {
7888 format!("{}\n\n{}", self.title, self.body)
7889 }
7890}
7891
7892fn title_marker(line: &str) -> Option<&str> {
7894 let line = line.trim();
7895 let head = line.get(..6)?;
7896 head.eq_ignore_ascii_case("title:")
7897 .then(|| line[6..].trim())
7898}
7899
7900fn summary_title(summary: &str) -> Option<String> {
7905 let first = summary.lines().find(|l| !l.trim().is_empty())?;
7906 let raw = title_marker(first)?;
7907 if raw.is_empty() {
7908 return None;
7909 }
7910 let title = queue::title_from(raw, PR_TITLE_MAX);
7911 let lower = title.to_ascii_lowercase();
7912 if lower.starts_with("magi:") || lower.contains("(uncommitted work)") {
7913 return None;
7914 }
7915 Some(title)
7916}
7917
7918const REVIEW_PROMPT_OPENING: &str = "Review the work already on branch";
7920
7921const EXISTING_BRANCH: &str = "(existing branch)";
7923
7924fn is_review_run(state: &RunState) -> bool {
7928 state.reviewed_commits.is_some() || state.candidates.iter().any(|c| c.agent == EXISTING_BRANCH)
7929}
7930
7931fn review_title(state: &RunState) -> Option<String> {
7936 english_subject(state.reviewed_commits.as_ref()?.first()?)
7937}
7938
7939fn english_subject(raw: &str) -> Option<String> {
7942 let raw = raw.trim();
7943 if raw.is_empty() || !raw.is_ascii() || !raw.chars().any(|c| c.is_ascii_alphabetic()) {
7944 return None;
7945 }
7946 let title = queue::title_from(raw, PR_TITLE_MAX);
7947 let lower = title.to_ascii_lowercase();
7948 if lower.starts_with("magi:") || lower.contains("(uncommitted work)") {
7949 return None;
7950 }
7951 Some(title)
7952}
7953
7954#[derive(Debug, Clone, PartialEq, Eq)]
7957struct BranchFacts {
7958 commits: Vec<(String, String)>,
7960 stat: String,
7962}
7963
7964const STAT_FILE_LINES: usize = 25;
7966const COMMITS_MAX_CHARS: usize = 20_000;
7968
7969async fn branch_facts(repo: &Path, base: &str, branch: &str) -> Option<BranchFacts> {
7972 let commits = git::commit_log(repo, base, branch).await.ok()?;
7973 if commits.is_empty() {
7974 return None;
7975 }
7976 let stat = git::diff_stat(repo, base, branch).await.unwrap_or_default();
7977 let lines: Vec<&str> = stat.lines().collect();
7978 let stat = if lines.len() > STAT_FILE_LINES + 1 {
7979 let omitted = lines.len() - 1 - STAT_FILE_LINES;
7980 let more = format!(" ... {omitted} more file(s)");
7981 let mut kept: Vec<&str> = lines[..STAT_FILE_LINES].to_vec();
7982 kept.push(&more);
7983 kept.push(lines[lines.len() - 1]);
7984 kept.join("\n")
7985 } else {
7986 lines.join("\n")
7987 };
7988 Some(BranchFacts { commits, stat })
7989}
7990
7991fn markdown_safe(text: &str) -> String {
7994 text.replace("</details>", "</details>")
7995 .replace("\x60\x60\x60", "~~~")
7996}
7997
7998fn neutral_title(state: &RunState, winner: char) -> String {
7999 format!(
8000 "chore: land candidate {} of run {}",
8001 winner.to_ascii_uppercase(),
8002 state.id
8003 )
8004}
8005
8006pub fn landing_title<'a>(state: &RunState, pr_title: &'a str) -> &'a str {
8012 if is_review_run(state) && pr_title.trim_start().starts_with(REVIEW_PROMPT_OPENING) {
8013 ""
8014 } else {
8015 pr_title
8016 }
8017}
8018
8019pub fn landing_subject_source(state: &RunState) -> String {
8023 if is_review_run(state) {
8024 let winner = state.candidates.first().map_or('A', |c| c.label);
8025 return review_title(state).unwrap_or_else(|| neutral_title(state, winner));
8026 }
8027 state.instruction.clone()
8028}
8029
8030fn summary_without_title(summary: &str) -> String {
8033 let mut lines = summary.trim().lines().peekable();
8034 if lines.peek().is_some_and(|l| title_marker(l).is_some()) {
8035 lines.next();
8036 }
8037 lines.collect::<Vec<_>>().join("\n").trim().to_owned()
8038}
8039
8040#[cfg(test)]
8054fn pr_message(state: &RunState, winner: char) -> PrMessage {
8055 pr_message_with(state, winner, None)
8056}
8057
8058fn pr_message_with(state: &RunState, winner: char, facts: Option<&BranchFacts>) -> PrMessage {
8061 let summary = state
8062 .candidates
8063 .iter()
8064 .find(|c| c.label == winner)
8065 .map(|c| c.summary.as_str())
8066 .unwrap_or_default();
8067 let review = is_review_run(state);
8070 let title = if review {
8071 facts
8072 .and_then(|f| english_subject(&f.commits.first()?.0))
8073 .or_else(|| review_title(state))
8074 .or_else(|| {
8075 state
8076 .candidates
8077 .iter()
8078 .find(|c| c.label == winner)
8079 .filter(|c| !c.branch.starts_with("magi/"))
8080 .and_then(|c| english_subject(&c.branch))
8081 })
8082 .unwrap_or_else(|| neutral_title(state, winner))
8083 } else {
8084 summary_title(summary).unwrap_or_else(|| {
8085 english_title(&state.instruction, PR_TITLE_MAX)
8086 .unwrap_or_else(|| neutral_title(state, winner))
8087 })
8088 };
8089
8090 let mut body = String::new();
8091 let what = summary_without_title(summary);
8092 if !what.is_empty() {
8093 body.push_str("## Summary\n\n");
8094 body.push_str(&what);
8095 body.push_str("\n\n");
8096 }
8097
8098 let notes: Vec<(usize, &str)> = state
8101 .reviews
8102 .iter()
8103 .filter_map(|r| {
8104 let n = r.fix.as_ref()?.notes.trim();
8105 (!n.is_empty()).then_some((r.round, n))
8106 })
8107 .collect();
8108 if !notes.is_empty() {
8109 body.push_str("## Review fixes\n\n");
8110 if let [(_, only)] = notes.as_slice() {
8111 body.push_str(only);
8112 body.push_str("\n\n");
8113 } else {
8114 for (round, n) in ¬es {
8115 body.push_str(&format!("### Round {round}\n\n{n}\n\n"));
8116 }
8117 }
8118 }
8119 let fix = state.reviews.iter().rev().find_map(|r| r.fix.as_ref());
8120
8121 let open = state.open_findings();
8122 if !open.is_empty() {
8123 body.push_str("## Open review findings\n\n");
8124 for f in &open {
8125 body.push_str(&format!("- `{}` [{:?}] {}\n", f.id, f.severity, f.title));
8126 }
8127 body.push('\n');
8128 }
8129
8130 if let Some(fix) = fix
8131 && !fix.rejected.is_empty()
8132 {
8133 body.push_str("## Declined by the fixer\n\n");
8134 for r in &fix.rejected {
8135 body.push_str(&format!("- `{}`: {}\n", r.id, r.why));
8136 }
8137 body.push('\n');
8138 }
8139
8140 if review {
8141 body.push_str("## Commits under review\n\n");
8143 if let Some(facts) = facts {
8144 let mut left = COMMITS_MAX_CHARS;
8145 for (i, (subject, text)) in facts.commits.iter().enumerate() {
8146 let mut entry = format!("- {}\n", markdown_safe(subject));
8147 for l in markdown_safe(text).lines() {
8148 entry.push_str(format!(" {l}\n").trim_end_matches(' '));
8149 }
8150 if left == 0 {
8151 body.push_str(&format!(
8152 "- ... {} more commit(s)\n",
8153 facts.commits.len() - i
8154 ));
8155 break;
8156 }
8157 if entry.len() > left {
8158 let mut end = left;
8161 while !entry.is_char_boundary(end) {
8162 end -= 1;
8163 }
8164 entry.truncate(end);
8165 entry.push_str("\n ... (truncated)\n");
8166 left = 0;
8167 } else {
8168 left -= entry.len();
8169 }
8170 body.push_str(&entry);
8171 }
8172 if !facts.stat.trim().is_empty() {
8173 body.push_str(&format!(
8174 "\n## Diff stat\n\n```\n{}\n```\n",
8175 markdown_safe(facts.stat.trim())
8176 ));
8177 }
8178 } else {
8179 match &state.reviewed_commits {
8180 Some(subjects) => {
8181 for s in subjects {
8182 body.push_str(&format!("- {}\n", s.trim()));
8183 }
8184 }
8185 None => {
8186 let rest = state.instruction.split_once("\n\n").map_or("", |(_, r)| r);
8189 body.push_str(rest.trim());
8190 body.push('\n');
8191 }
8192 }
8193 }
8194 } else {
8195 let task = state.instruction.trim();
8196 let task = if task.is_empty() {
8197 "(empty task)"
8198 } else {
8199 task
8200 };
8201 body.push_str(&format!(
8202 "<details>\n<summary>Original task</summary>\n\n{}\n\n</details>\n",
8203 task.replace("</details>", "</details>")
8204 ));
8205 }
8206
8207 body.push_str(&format!(
8208 "\n---\nmagi:run/{} magi:candidate-{}\n",
8209 state.id,
8210 winner.to_ascii_lowercase()
8211 ));
8212
8213 let id = crate::scrub::Identity::current();
8216 PrMessage {
8217 title: crate::scrub::scrub(&title, &id),
8218 body: crate::scrub::scrub(&body, &id),
8219 }
8220}
8221
8222fn seeded_instruction(state: &RunState) -> String {
8226 match refs::describe(&state.seeds) {
8227 Some(facts) => format!(
8228 "{}\n\n# Existing work the task refers to\n\n{facts}\n\n\
8229 Candidates start from the unmerged branch named above, when there \
8230 is one, and carry any unmerged commit named by sha as a \
8231 cherry-pick. Check that this is what the task meant before \
8232 building on it.",
8233 state.instruction
8234 ),
8235 None => state.instruction.clone(),
8236 }
8237}
8238
8239async fn merge_is_empty(repo: &Path, state: &RunState, branch: &str, mode: MergeMode) -> bool {
8243 let base = &state.base_branch;
8244 let mut against = base.clone();
8245 if mode == MergeMode::Pr {
8246 let remote = &state.config.merge.remote;
8247 let tracking = format!("{remote}/{base}");
8248 let fetched = git::fetch(repo, remote, base).await;
8249 if fetched.is_ok_and(|o| o.ok()) && git::rev_exists(repo, &tracking).await {
8250 against = tracking;
8251 }
8252 }
8253 matches!(git::commits_ahead(repo, &against, branch).await, Ok(0))
8254}
8255
8256fn empty_candidate_detail(state: &RunState, base: &str) -> String {
8259 let mut detail = format!(
8260 "empty candidate: the winning branch has 0 commits ahead of {base}, so there is \
8261 nothing to open a pull request for"
8262 );
8263 match refs::describe(&state.seeds) {
8264 Some(facts) => detail.push_str(&format!("\nReferences in the task:\n{facts}")),
8265 None => detail.push_str(
8266 "\nThe task names no existing branch or commit; if it means to land work \
8267 that lives elsewhere, name the branch (magi/<run>/<label>) or the sha.",
8268 ),
8269 }
8270 detail
8271}
8272
8273#[derive(Debug, PartialEq, Eq)]
8276enum PrPlan {
8277 Create,
8278 Adopt { url: String, title: String },
8279 Stop(String),
8280}
8281
8282fn pr_merge_plan(found: Result<land::OpenPr>) -> PrPlan {
8285 match found {
8286 Ok(land::OpenPr::None) => PrPlan::Create,
8287 Ok(land::OpenPr::One { url, title }) => PrPlan::Adopt { url, title },
8288 Ok(land::OpenPr::Many(urls)) => PrPlan::Stop(format!(
8289 "several open pull requests exist for this branch, not picking one: {}",
8290 urls.join(" ")
8291 )),
8292 Err(e) => PrPlan::Stop(format!("could not look up open pull requests: {e:#}")),
8293 }
8294}
8295
8296async fn gh_pr_create(
8298 cwd: &Path,
8299 base: &str,
8300 head: &str,
8301 title: &str,
8302 body: &str,
8303) -> Result<String> {
8304 let out = tokio::process::Command::new("gh")
8305 .args([
8306 "pr", "create", "--base", base, "--head", head, "--title", title, "--body", body,
8307 ])
8308 .current_dir(cwd)
8309 .quiet()
8310 .stdin(std::process::Stdio::null())
8311 .output()
8312 .await
8313 .context("spawn gh")?;
8314 if out.status.success() {
8315 Ok(String::from_utf8_lossy(&out.stdout).trim().to_owned())
8316 } else {
8317 bail!("{}", String::from_utf8_lossy(&out.stderr).trim().to_owned())
8318 }
8319}
8320
8321pub async fn fold_run(state: &mut RunState, drop_winner: bool, home: &Path) -> Result<Vec<String>> {
8330 let repo = state.repo.clone();
8331 let root = state.worktree_root();
8332 let winner = state.tally.as_ref().map(|t| t.winner);
8333 let mut removed = Vec::new();
8334
8335 for i in 0..state.candidates.len() {
8336 let c = state.candidates[i].clone();
8337 let is_winner = Some(c.label) == winner;
8338 if is_winner && !drop_winner {
8339 continue;
8340 }
8341 if c.worktree.exists() {
8342 git::worktree_remove(&repo, &c.worktree).await.ok();
8343 removed.push(c.worktree.to_string_lossy().into_owned());
8344 }
8345 let handed_over = state.released_branches.contains(&c.branch);
8348 if !handed_over && git::branch_exists(&repo, &c.branch).await.unwrap_or(false) {
8349 git::branch_delete(&repo, &c.branch).await.ok();
8350 removed.push(c.branch.clone());
8351 }
8352 state.candidates[i].folded = true;
8353 }
8354
8355 for name in std::fs::read_dir(&root).into_iter().flatten().flatten() {
8356 let path = name.path();
8357 let keep = !drop_winner
8358 && winner.is_some_and(|w| {
8359 path.file_name()
8360 .is_some_and(|n| n == format!("cand-{w}").as_str())
8361 });
8362 if keep {
8363 continue;
8364 }
8365 git::worktree_remove(&repo, &path).await.ok();
8366 removed.push(path.to_string_lossy().into_owned());
8367 }
8368
8369 remove_if_empty(&root);
8378
8379 if state.enabled_worktree_config && drop_winner {
8380 git::release_worktree_config(&repo).await.ok();
8384 state.enabled_worktree_config = false;
8385 }
8386 state.save_under(home)?;
8387 Ok(removed)
8388}
8389
8390fn remove_if_empty(dir: &Path) {
8401 if dir.is_dir() && std::fs::read_dir(dir).is_ok_and(|mut entries| entries.next().is_none()) {
8402 std::fs::remove_dir(dir).ok();
8403 }
8404}
8405
8406pub fn worst_open(state: &RunState) -> Option<Severity> {
8408 state
8409 .reviews
8410 .last()?
8411 .reviews
8412 .iter()
8413 .flat_map(|r| r.findings.iter())
8414 .map(|f| f.severity)
8415 .max()
8416}
8417
8418#[cfg(test)]
8419mod tests {
8420 #[test]
8421 fn should_retitle_only_replaces_magi_shaped_or_leaked_titles() {
8422 let leaked = vec!["chore(deps): update a crate".to_owned()];
8423 let own = "fix(daemon): apply a chosen action";
8424 assert!(should_retitle("", own, &leaked));
8425 assert!(should_retitle(
8426 &format!("{REVIEW_PROMPT_OPENING} `x`"),
8427 own,
8428 &leaked
8429 ));
8430 assert!(should_retitle(
8431 "chore: land candidate A of run 1",
8432 own,
8433 &leaked
8434 ));
8435 assert!(should_retitle(
8436 "magi: candidate A (uncommitted work)",
8437 own,
8438 &leaked
8439 ));
8440 assert!(should_retitle("chore(deps): update a crate", own, &leaked));
8441 assert!(!should_retitle("feat: renamed by hand", own, &leaked));
8442 assert!(!should_retitle("", "chore(deps): update a crate", &leaked));
8443 }
8444
8445 #[test]
8446 fn pr_merge_plan_creates_adopts_or_stops() {
8447 assert_eq!(pr_merge_plan(Ok(land::OpenPr::None)), PrPlan::Create);
8448 assert_eq!(
8449 pr_merge_plan(Ok(land::OpenPr::One {
8450 url: "u".into(),
8451 title: "t".into()
8452 })),
8453 PrPlan::Adopt {
8454 url: "u".into(),
8455 title: "t".into()
8456 }
8457 );
8458 let PrPlan::Stop(many) =
8459 pr_merge_plan(Ok(land::OpenPr::Many(vec!["a".into(), "b".into()])))
8460 else {
8461 panic!("many must stop");
8462 };
8463 assert!(many.contains('a') && many.contains('b'));
8464 let PrPlan::Stop(err) = pr_merge_plan(Err(anyhow::anyhow!("bad token"))) else {
8465 panic!("a failed lookup must stop");
8466 };
8467 assert!(err.contains("bad token"));
8468 }
8469
8470 use super::*;
8471 use crate::run::GateStatus;
8472 use std::collections::BTreeMap;
8473 use std::time::Duration;
8474
8475 fn conductor() -> AgentSpec {
8476 AgentSpec {
8477 id: "conductor".to_owned(),
8478 kind: crate::config::AgentKind::Command,
8479 model: None,
8480 command: vec!["true".to_owned()],
8481 extra_args: Vec::new(),
8482 env: BTreeMap::new(),
8483 prompt_delivery: None,
8484 }
8485 }
8486
8487 fn spec(id: &str) -> AgentSpec {
8488 AgentSpec {
8489 id: id.to_owned(),
8490 kind: crate::config::AgentKind::Command,
8491 model: None,
8492 command: vec!["true".to_owned()],
8493 extra_args: Vec::new(),
8494 env: BTreeMap::new(),
8495 prompt_delivery: None,
8496 }
8497 }
8498
8499 fn ids(xs: &[&str]) -> BTreeSet<String> {
8500 xs.iter().map(|s| (*s).to_owned()).collect()
8501 }
8502
8503 #[test]
8504 fn next_for_seat_prefers_an_agent_that_has_not_failed() {
8505 let roster = [spec("a"), spec("b"), spec("c")];
8506 let next = next_for_seat(&roster, 0, &ids(&["a"]), &ids(&["b"]));
8507 assert_eq!(next.map(|s| s.id.as_str()), Some("c"));
8508 }
8509
8510 #[test]
8511 fn next_for_seat_rescues_a_failed_agent_only_when_nothing_else_is_left() {
8512 let roster = [spec("a"), spec("b"), spec("c")];
8513 let failed = ids(&["a", "b", "c"]);
8514 let mut tried = ids(&["b"]);
8516 let first = next_for_seat(&roster, 1, &tried, &failed).expect("rescue");
8517 assert_eq!(first.id, "a");
8518 tried.insert(first.id.clone());
8519 let second = next_for_seat(&roster, 1, &tried, &failed).expect("rescue");
8520 assert_eq!(second.id, "c");
8521 tried.insert(second.id.clone());
8522 assert!(next_for_seat(&roster, 1, &tried, &failed).is_none());
8523 }
8524
8525 #[test]
8526 fn next_for_seat_ignores_failed_ids_no_longer_on_the_roster() {
8527 let roster = [spec("a"), spec("b")];
8528 let next = next_for_seat(&roster, 0, &ids(&["a"]), &ids(&["gone"]));
8529 assert_eq!(next.map(|s| s.id.as_str()), Some("b"));
8530 }
8531
8532 #[test]
8533 fn pick_start_spec_starts_on_the_last_answerer_when_still_eligible() {
8534 let roster = [spec("a"), spec("b"), spec("c")];
8535 let h = SeatHistory {
8536 failed: ids(&["a"]),
8537 last_ok: Some("b".to_owned()),
8538 last_fail: None,
8539 };
8540 assert_eq!(pick_start_spec(&roster, spec("a"), Some(&h)).id, "b");
8541 let gone = SeatHistory {
8543 last_ok: Some("zzz".to_owned()),
8544 ..h.clone()
8545 };
8546 assert_eq!(pick_start_spec(&roster, spec("a"), Some(&gone)).id, "b");
8547 let failed = SeatHistory {
8548 failed: ids(&["a", "b"]),
8549 last_ok: Some("b".to_owned()),
8550 last_fail: None,
8551 };
8552 assert_eq!(pick_start_spec(&roster, spec("a"), Some(&failed)).id, "c");
8553 }
8554
8555 #[test]
8556 fn handover_seat_mints_a_session_id_distinct_from_the_previous_agents() {
8557 let first = SeatState::new("review-1", "alpha", 7);
8558 let next = handover_seat("review-1", "gamma", 7);
8559 assert_ne!(first.claude_session, next.claude_session);
8560 }
8561
8562 #[test]
8563 fn re_handing_a_seat_to_the_same_agent_mints_a_new_session_id() {
8564 let mut state = state_with_summary("x", "y");
8565 let a = handover_seat("review-1", "beta", state.next_seat_seed());
8566 let b = handover_seat("review-1", "beta", state.next_seat_seed());
8567 assert_ne!(a.claude_session, b.claude_session);
8568 }
8569
8570 #[test]
8571 fn pick_start_spec_falls_back_to_the_spec_when_the_whole_roster_failed() {
8572 let roster = [spec("a"), spec("b")];
8573 let h = SeatHistory {
8574 failed: ids(&["a", "b"]),
8575 ..SeatHistory::default()
8576 };
8577 assert_eq!(pick_start_spec(&roster, spec("b"), Some(&h)).id, "b");
8578 assert_eq!(pick_start_spec(&roster, spec("b"), None).id, "b");
8579 assert_eq!(pick_start_spec(&[], spec("b"), Some(&h)).id, "b");
8580 }
8581
8582 #[test]
8589 fn failure_signature_ignores_numbers_and_paths() {
8590 assert_eq!(
8591 failure_signature("exited with Some(2) and no usable output"),
8592 failure_signature("exited with Some(137) and no usable output")
8593 );
8594 assert_eq!(
8595 failure_signature("cannot open /tmp/a/b.txt: denied\nsecond line"),
8596 failure_signature("cannot open /var/x.txt: denied")
8597 );
8598 assert_ne!(failure_signature("boom"), failure_signature("bang"));
8599 }
8600
8601 #[test]
8602 fn quota_and_timeout_always_hand_over_other_failures_stop_on_a_repeat() {
8603 let other = FailClass::Other("x".into());
8604 assert!(should_hand_over(None, &FailClass::Quota));
8605 assert!(should_hand_over(Some(&other), &FailClass::Quota));
8606 assert!(should_hand_over(
8607 Some(&FailClass::Timeout),
8608 &FailClass::Timeout
8609 ));
8610 assert!(should_hand_over(None, &other));
8611 assert!(!should_hand_over(Some(&other), &other));
8612 assert!(should_hand_over(
8613 Some(&other),
8614 &FailClass::Other("y".into())
8615 ));
8616 assert!(should_hand_over(Some(&FailClass::Timeout), &other));
8618 assert!(should_hand_over(Some(&FailClass::Quota), &other));
8619 }
8620
8621 #[test]
8622 fn a_handover_seat_never_reuses_the_previous_agents_session_id() {
8623 let a = SeatState::new("judge-1", "alpha", 7);
8624 let b = handover_seat("judge-1", "beta", 7);
8625 assert_ne!(a.claude_session, b.claude_session);
8626 assert_eq!(b.turns, 0);
8627 }
8628
8629 #[test]
8630 fn a_timeout_is_classified_apart_from_other_failures() {
8631 assert_eq!(
8632 FailClass::of(&AgentOutcome::Failed(TIMED_OUT.to_owned())),
8633 Some(FailClass::Timeout)
8634 );
8635 assert!(matches!(
8636 FailClass::of(&AgentOutcome::Failed("boom".to_owned())),
8637 Some(FailClass::Other(_))
8638 ));
8639 }
8640
8641 #[test]
8642 fn next_untried_in_roster_walks_forward_from_the_seats_own_position() {
8643 let roster = vec![spec("alpha"), spec("beta"), spec("gamma")];
8644 let tried = BTreeSet::from(["beta".to_owned()]);
8645 let next = next_untried_in_roster(&roster, 1, &tried);
8648 assert_eq!(next.map(|s| s.id.as_str()), Some("gamma"));
8649 }
8650
8651 #[test]
8652 fn next_untried_in_roster_does_not_wrap_back_past_its_own_start() {
8653 let roster = vec![spec("alpha"), spec("beta")];
8654 let tried = BTreeSet::from(["beta".to_owned()]);
8655 assert!(next_untried_in_roster(&roster, 1, &tried).is_none());
8659 }
8660
8661 #[test]
8662 fn next_untried_in_roster_stops_once_the_tail_is_exhausted_even_if_earlier_ids_are_untried() {
8663 let roster = vec![spec("alpha"), spec("beta"), spec("gamma")];
8664 let tried = BTreeSet::from(["beta".to_owned(), "gamma".to_owned()]);
8665 assert!(next_untried_in_roster(&roster, 1, &tried).is_none());
8669 }
8670
8671 #[test]
8672 fn next_untried_in_roster_skips_ids_already_tried_even_when_duplicated() {
8673 let roster = vec![spec("a"), spec("a"), spec("b")];
8674 let tried = BTreeSet::from(["a".to_owned()]);
8675 let next = next_untried_in_roster(&roster, 0, &tried);
8676 assert_eq!(next.map(|s| s.id.as_str()), Some("b"));
8677 }
8678
8679 #[test]
8680 fn next_untried_in_roster_returns_none_once_every_id_is_tried() {
8681 let roster = vec![spec("a"), spec("b")];
8682 let tried = BTreeSet::from(["a".to_owned(), "b".to_owned()]);
8683 assert!(next_untried_in_roster(&roster, 0, &tried).is_none());
8684 }
8685
8686 #[test]
8687 fn remove_if_empty_only_ever_takes_a_bare_directory() {
8688 let dir = tempfile::tempdir().unwrap();
8689 let bay = dir.path().join("ffff");
8690
8691 remove_if_empty(&bay);
8693 assert!(!bay.exists());
8694
8695 std::fs::create_dir_all(bay.join("cand-A")).unwrap();
8698 remove_if_empty(&bay);
8699 assert!(bay.exists(), "non-empty directory must survive");
8700
8701 std::fs::remove_dir(bay.join("cand-A")).unwrap();
8703 remove_if_empty(&bay);
8704 assert!(!bay.exists(), "an empty bay is a leftover, not a record");
8705 }
8706
8707 #[test]
8716 fn a_full_panel_that_found_nothing_is_clean() {
8717 assert!(round_is_clean(
8718 0,
8719 true,
8720 2,
8721 2,
8722 0,
8723 IncompleteReviewPolicy::Block
8724 ));
8725 }
8726
8727 #[test]
8728 fn a_missing_seat_is_never_clean_under_the_default_policy() {
8729 assert!(!round_is_clean(
8730 0,
8731 true,
8732 1,
8733 2,
8734 0,
8735 IncompleteReviewPolicy::Block
8736 ));
8737 }
8738
8739 #[test]
8740 fn warn_policy_still_refuses_a_missing_seat_with_open_findings() {
8741 assert!(!round_is_clean(
8742 1,
8743 true,
8744 1,
8745 2,
8746 0,
8747 IncompleteReviewPolicy::Warn
8748 ));
8749 }
8750
8751 #[test]
8752 fn warn_policy_gates_a_missing_seat_once_what_answered_is_clean() {
8753 assert!(round_is_clean(
8754 0,
8755 true,
8756 1,
8757 2,
8758 0,
8759 IncompleteReviewPolicy::Warn
8760 ));
8761 }
8762
8763 #[test]
8764 fn a_full_panel_with_an_open_finding_is_not_clean() {
8765 assert!(!round_is_clean(
8766 1,
8767 true,
8768 2,
8769 2,
8770 0,
8771 IncompleteReviewPolicy::Block
8772 ));
8773 }
8774
8775 #[test]
8776 fn a_full_panel_with_a_red_e2e_is_not_clean() {
8777 assert!(!round_is_clean(
8778 0,
8779 false,
8780 2,
8781 2,
8782 0,
8783 IncompleteReviewPolicy::Block
8784 ));
8785 }
8786
8787 #[test]
8794 fn a_seat_missing_only_to_its_own_quota_is_clean_under_the_default_policy() {
8795 assert!(round_is_clean(
8798 0,
8799 true,
8800 1,
8801 2,
8802 1,
8803 IncompleteReviewPolicy::Block
8804 ));
8805 }
8806
8807 #[test]
8808 fn a_seat_missing_for_a_reason_other_than_quota_still_waits() {
8809 assert!(!round_is_clean(
8812 0,
8813 true,
8814 1,
8815 2,
8816 0,
8817 IncompleteReviewPolicy::Block
8818 ));
8819 }
8820
8821 #[test]
8822 fn a_quota_loss_does_not_excuse_an_open_finding_or_a_red_e2e() {
8823 assert!(!round_is_clean(
8824 1,
8825 true,
8826 1,
8827 2,
8828 1,
8829 IncompleteReviewPolicy::Block
8830 ));
8831 assert!(!round_is_clean(
8832 0,
8833 false,
8834 1,
8835 2,
8836 1,
8837 IncompleteReviewPolicy::Block
8838 ));
8839 }
8840
8841 #[test]
8842 fn a_panel_lost_entirely_to_quota_still_waits_rather_than_deciding_on_nobody() {
8843 assert!(!round_is_clean(
8847 0,
8848 true,
8849 0,
8850 2,
8851 2,
8852 IncompleteReviewPolicy::Block
8853 ));
8854 }
8855
8856 fn outcome(code: Option<i32>, resource_blocked: bool) -> CommandOutcome {
8857 CommandOutcome {
8858 command: "test".to_owned(),
8859 code,
8860 output_tail: String::new(),
8861 duration_ms: 0,
8862 resource_blocked,
8863 }
8864 }
8865
8866 #[test]
8867 fn verify_is_inconclusive_only_when_a_resource_blocked_outcome_is_present() {
8868 assert!(!verify_inconclusive(&[outcome(Some(0), false)]));
8869 assert!(
8870 !verify_inconclusive(&[outcome(Some(1), false)]),
8871 "an ordinary failure is still evidence about the patch"
8872 );
8873 assert!(verify_inconclusive(&[outcome(None, true)]));
8874 assert!(
8875 verify_inconclusive(&[outcome(Some(0), false), outcome(None, true)]),
8876 "one inconclusive outcome taints the whole batch"
8877 );
8878 assert!(!verify_inconclusive(&[]));
8879 }
8880
8881 #[tokio::test]
8882 async fn timed_out_pid_waiting_returns_as_soon_as_every_pid_is_confirmed_dead() {
8883 let calls = std::sync::atomic::AtomicUsize::new(0);
8887 let started = Instant::now();
8888 wait_for_pids_with(
8889 &[123],
8890 |_| calls.fetch_add(1, std::sync::atomic::Ordering::SeqCst) < 2,
8891 Duration::from_millis(5),
8892 Duration::from_secs(5),
8893 )
8894 .await;
8895 assert!(
8896 calls.load(std::sync::atomic::Ordering::SeqCst) >= 3,
8897 "must keep checking rather than deciding on the first answer"
8898 );
8899 assert!(
8900 started.elapsed() < Duration::from_secs(1),
8901 "must return the moment it is confirmed dead, not wait out the ceiling"
8902 );
8903 }
8904
8905 #[tokio::test]
8906 async fn timed_out_pid_waiting_gives_up_at_its_ceiling_if_never_confirmed_dead() {
8907 let started = Instant::now();
8908 wait_for_pids_with(
8909 &[123],
8910 |_| true, Duration::from_millis(5),
8912 Duration::from_millis(30),
8913 )
8914 .await;
8915 let elapsed = started.elapsed();
8916 assert!(
8917 elapsed >= Duration::from_millis(30),
8918 "must not give up before its own ceiling: {elapsed:?}"
8919 );
8920 assert!(
8921 elapsed < Duration::from_secs(1),
8922 "must not wait past its own ceiling either: {elapsed:?}"
8923 );
8924 }
8925
8926 #[tokio::test]
8927 async fn timed_out_pid_waiting_is_a_no_op_when_nothing_was_still_running() {
8928 let started = Instant::now();
8929 wait_for_pids_with(
8930 &[],
8931 |_| true,
8932 Duration::from_secs(5),
8933 Duration::from_secs(5),
8934 )
8935 .await;
8936 assert!(
8937 started.elapsed() < Duration::from_millis(200),
8938 "an empty pid list has nothing to confirm"
8939 );
8940 }
8941
8942 fn review_round(
8948 clean: bool,
8949 blocking: usize,
8950 answered: usize,
8951 expected: usize,
8952 progressed: bool,
8953 e2e_ok: bool,
8954 ) -> ReviewRound {
8955 ReviewRound {
8956 round: 1,
8957 head: "h".to_owned(),
8958 verified_head: None,
8959 verified_at: None,
8960 reviews: Vec::new(),
8961 e2e: vec![CommandOutcome {
8962 command: "test".to_owned(),
8963 code: Some(if e2e_ok { 0 } else { 1 }),
8964 output_tail: String::new(),
8965 duration_ms: 0,
8966 resource_blocked: false,
8967 }],
8968 verify_retried: false,
8969 e2e_deferred: false,
8970 e2e_defer_reason: None,
8971 fix: None,
8972 blocking,
8973 answered,
8974 expected,
8975 clean,
8976 progressed,
8977 vote_split: false,
8978 reconsideration: Vec::new(),
8979 verdict: None,
8980 }
8981 }
8982
8983 #[test]
8984 fn review_conclusion_is_none_when_nothing_has_run() {
8985 assert_eq!(review_conclusion(&[], 3), None);
8986 }
8987
8988 #[test]
8989 fn review_conclusion_is_none_while_rounds_remain() {
8990 let rounds = vec![review_round(false, 1, 2, 2, true, true)];
8991 assert_eq!(review_conclusion(&rounds, 3), None);
8992 }
8993
8994 #[test]
8995 fn review_conclusion_is_gating_once_a_round_is_clean() {
8996 let rounds = vec![review_round(true, 0, 2, 2, false, true)];
8997 assert_eq!(review_conclusion(&rounds, 3), Some(RunStatus::Gating));
8998 }
8999
9000 #[test]
9001 fn review_conclusion_hands_off_when_the_budget_is_spent_and_e2e_is_green() {
9002 let rounds = vec![
9003 review_round(false, 1, 2, 2, true, true),
9004 review_round(false, 1, 2, 2, true, true),
9005 ];
9006 assert_eq!(review_conclusion(&rounds, 2), Some(RunStatus::Gating));
9007 }
9008
9009 #[test]
9010 fn review_conclusion_blocks_when_the_budget_is_spent_and_e2e_is_red() {
9011 let rounds = vec![
9012 review_round(false, 1, 2, 2, true, true),
9013 review_round(false, 1, 2, 2, true, false),
9014 ];
9015 assert_eq!(review_conclusion(&rounds, 2), Some(RunStatus::Blocked));
9016 }
9017
9018 #[test]
9019 fn review_conclusion_stays_none_when_the_budget_is_spent_but_the_last_round_could_not_run() {
9020 let mut blocked = review_round(false, 1, 2, 2, true, false);
9027 blocked.e2e[0].resource_blocked = true;
9028 let rounds = vec![review_round(false, 1, 2, 2, true, true), blocked];
9029 assert_eq!(review_conclusion(&rounds, 2), None);
9030 }
9031
9032 #[test]
9033 fn review_conclusion_blocks_an_incomplete_panel_that_raised_nothing_even_with_green_e2e() {
9034 let rounds = vec![review_round(false, 0, 1, 2, false, true)];
9036 assert_eq!(review_conclusion(&rounds, 1), Some(RunStatus::Blocked));
9037 }
9038
9039 #[test]
9040 fn review_conclusion_hands_off_when_the_tree_stagnates_before_the_budget_is_spent() {
9041 let rounds = vec![
9042 review_round(false, 1, 2, 2, false, true),
9043 review_round(false, 1, 2, 2, false, true),
9044 ];
9045 assert_eq!(review_conclusion(&rounds, 10), Some(RunStatus::Gating));
9046 }
9047
9048 fn secs(n: u64) -> Duration {
9049 Duration::from_secs(n)
9050 }
9051
9052 fn init_repo(dir: &Path) {
9055 let run = |args: &[&str]| {
9056 let out = std::process::Command::new("git")
9057 .args(args)
9058 .current_dir(dir)
9059 .quiet()
9060 .output()
9061 .expect("spawn git");
9062 assert!(
9063 out.status.success(),
9064 "git {args:?} failed: {}",
9065 String::from_utf8_lossy(&out.stderr)
9066 );
9067 };
9068 run(&["init", "-b", "main"]);
9069 run(&["config", "user.name", "magi test"]);
9070 run(&["config", "user.email", "magi@example.com"]);
9071 std::fs::write(dir.join("README.md"), "# fixture\n").unwrap();
9072 run(&["add", "-A"]);
9073 run(&["commit", "-m", "init"]);
9074 }
9075
9076 fn ask_test_home() {
9084 crate::run::pin_test_home();
9085 }
9086
9087 fn runner_at(status: RunStatus) -> Runner {
9090 let mut state = RunState::new(
9091 PathBuf::from("/nonexistent/repo"),
9092 "main".to_owned(),
9093 "deadbeef".to_owned(),
9094 "task".to_owned(),
9095 Config::default(),
9096 );
9097 state.status = status;
9098 Runner {
9099 state,
9100 roles: ResolvedRoles {
9101 implementers: Vec::new(),
9102 judges: Vec::new(),
9103 reviewers: Vec::new(),
9104 fixer: None,
9105 conductor: conductor(),
9106 implementer_roster: Vec::new(),
9107 judge_roster: Vec::new(),
9108 reviewer_roster: Vec::new(),
9109 },
9110 sem: Arc::new(Semaphore::new(1)),
9111 pause: Pause::new(),
9112 interrupt: Pause::new(),
9113 }
9114 }
9115
9116 #[test]
9120 fn park_here_folds_the_interrupt_reason_into_the_park_event() {
9121 crate::run::pin_test_home();
9122 let mut runner = runner_at(RunStatus::Implementing);
9123 let interrupt = Pause::new();
9124 runner.watch_interrupt(interrupt.clone());
9125
9126 interrupt.park_because("task a1b2 asked to run first");
9127
9128 assert!(runner.park_here().expect("park_here"));
9129 assert!(runner.state.parked);
9130 let last = runner.state.events.last().expect("a park event");
9131 assert_eq!(last.node, "park");
9132 assert!(
9133 last.message.contains("task a1b2 asked to run first"),
9134 "expected the interrupt reason in {:?}",
9135 last.message
9136 );
9137 }
9138
9139 #[test]
9147 fn the_stop_level_pause_and_a_runs_interrupt_pause_do_not_leak_into_each_other() {
9148 crate::run::pin_test_home();
9149 let mut runner = runner_at(RunStatus::Implementing);
9150 let shutdown = Pause::new();
9151 runner.on_pause(shutdown.clone());
9152 let interrupt = Pause::new();
9153 runner.watch_interrupt(interrupt.clone());
9154
9155 assert!(!runner.park_here().expect("park_here"));
9157 assert!(!runner.state.parked);
9158
9159 interrupt.park_because("test");
9161 assert!(!shutdown.parked());
9162 assert!(runner.park_here().expect("park_here"));
9163 }
9164
9165 #[tokio::test]
9179 async fn a_park_request_made_mid_node_only_takes_effect_at_the_next_boundary() {
9180 crate::run::pin_test_home();
9181 let mut runner = runner_at(RunStatus::Implementing);
9182 let interrupt = Pause::new();
9183 runner.watch_interrupt(interrupt.clone());
9184
9185 let (started_tx, started_rx) = tokio::sync::oneshot::channel::<()>();
9186 let (finish_tx, finish_rx) = tokio::sync::oneshot::channel::<()>();
9187
9188 let node = async move {
9192 started_tx.send(()).expect("send started");
9193 finish_rx.await.expect("recv finish");
9194 "node finished"
9195 };
9196
9197 let interrupter = async move {
9198 started_rx.await.expect("recv started");
9199 interrupt.park_because("higher-priority task waiting");
9201 tokio::task::yield_now().await;
9205 finish_tx.send(()).expect("send finish");
9206 };
9207
9208 let (node_result, ()) = tokio::join!(node, interrupter);
9209 assert_eq!(
9210 node_result, "node finished",
9211 "the in-flight call ran to completion"
9212 );
9213
9214 assert!(runner.park_here().expect("park_here"));
9217 assert!(runner.state.parked);
9218 }
9219
9220 #[test]
9226 fn a_run_parked_for_an_interrupt_resumes_with_nothing_lost() {
9227 crate::run::pin_test_home();
9228 let mut runner = runner_at(RunStatus::Judging);
9229 runner.state.config.agents = vec![conductor()];
9233 runner.state.candidates = vec![Candidate {
9234 index: 0,
9235 label: 'A',
9236 agent: "alpha".to_owned(),
9237 branch: "magi/x/A".to_owned(),
9238 worktree: PathBuf::from("/nonexistent/worktree"),
9239 summary: "did the thing".to_owned(),
9240 stat: "1 file changed".to_owned(),
9241 files: 1,
9242 commits: 1,
9243 empty: false,
9244 failed: None,
9245 verified_noop: None,
9246 duration_ms: 1234,
9247 folded: false,
9248 }];
9249 let run_id = runner.state.id.clone();
9250
9251 let interrupt = Pause::new();
9252 runner.watch_interrupt(interrupt.clone());
9253 interrupt.park_because("task c3d4 asked to run first");
9254 assert!(runner.park_here().expect("park_here"));
9255
9256 let resumed = Runner::resume(&run_id).expect("resume");
9257 assert_eq!(resumed.state.candidates.len(), 1);
9258 assert_eq!(resumed.state.candidates[0].summary, "did the thing");
9259 assert_eq!(resumed.state.candidates[0].branch, "magi/x/A");
9260 assert_eq!(resumed.state.status, runner.state.status);
9261 assert!(
9262 resumed.state.parked,
9263 "still parked until `execute` actually walks the graph again"
9264 );
9265 assert!(resumed.state.events.iter().any(|e| e.node == "park"));
9266 }
9267
9268 fn ask_open_question(store: &ask::Questions, run: &str) -> ask::Question {
9270 let mut q = ask::Question::new(
9271 run.to_owned(),
9272 "implement".to_owned(),
9273 "impl-A".to_owned(),
9274 "Which storage backend should the cache use?".to_owned(),
9275 String::new(),
9276 vec!["SQLite".to_owned(), "Redis".to_owned()],
9277 );
9278 store.put(&mut q).unwrap();
9279 q
9280 }
9281
9282 #[test]
9283 fn a_failed_runs_open_question_is_abandoned() {
9284 ask_test_home();
9285 let store = ask::Questions::open();
9286 let mut runner = runner_at(RunStatus::Failed);
9287 let run = runner.state.id.clone();
9288 let q = ask_open_question(&store, &run);
9289
9290 runner.settle_questions();
9291
9292 let back = store.get(&q.id).unwrap();
9293 assert!(
9294 !back.status.open(),
9295 "the seat that asked died with the run; nobody is left to read an answer"
9296 );
9297 assert!(
9298 back.detail.contains(&run) && back.detail.contains("failed"),
9299 "the reason names what the run became, not just that it is gone: {}",
9300 back.detail
9301 );
9302 }
9303
9304 #[test]
9305 fn a_merged_runs_open_question_is_abandoned_too() {
9306 ask_test_home();
9307 let store = ask::Questions::open();
9308 for status in [RunStatus::Merged, RunStatus::Ready] {
9311 let mut runner = runner_at(status);
9312 let run = runner.state.id.clone();
9313 let q = ask_open_question(&store, &run);
9314
9315 runner.settle_questions();
9316
9317 let back = store.get(&q.id).unwrap();
9318 assert!(
9319 !back.status.open(),
9320 "{status:?} run's question must not outlive the run"
9321 );
9322 }
9323 }
9324
9325 #[test]
9326 fn a_still_resumable_runs_open_question_is_left_alone() {
9327 ask_test_home();
9328 let store = ask::Questions::open();
9329 for status in [RunStatus::Blocked, RunStatus::Stalled] {
9335 let mut runner = runner_at(status);
9336 let run = runner.state.id.clone();
9337 let q = ask_open_question(&store, &run);
9338
9339 runner.settle_questions();
9340
9341 let back = store.get(&q.id).unwrap();
9342 assert!(
9343 back.status.open(),
9344 "{status:?} is still alive; the question must still be waiting"
9345 );
9346 }
9347 }
9348
9349 #[test]
9350 fn settle_questions_never_touches_an_already_answered_question() {
9351 ask_test_home();
9352 let store = ask::Questions::open();
9353 let mut runner = runner_at(RunStatus::Failed);
9354 let run = runner.state.id.clone();
9355 let mut q = ask_open_question(&store, &run);
9356 q.answer(crate::ask::Answer::Choice("SQLite".to_owned()))
9357 .unwrap();
9358 store.put(&mut q).unwrap();
9359
9360 runner.settle_questions();
9365 runner.settle_questions();
9366
9367 let back = store.get(&q.id).unwrap();
9368 assert_eq!(
9369 back.status,
9370 ask::QuestionStatus::Answered,
9371 "a real answer is a decision on record, never overwritten by a sweep"
9372 );
9373 }
9374
9375 #[tokio::test]
9386 async fn fold_run_keeps_only_the_winner_when_the_winner_is_not_dropped() {
9387 crate::run::pin_test_home();
9388 let tmp = tempfile::tempdir().expect("tempdir");
9389 let repo = tmp.path().join("repo");
9390 std::fs::create_dir_all(&repo).unwrap();
9391 init_repo(&repo);
9392
9393 let mut config = Config::default();
9394 config.graph.worktree_root = Some(tmp.path().join("wt"));
9395
9396 let mut state = RunState::new(
9397 repo.clone(),
9398 "main".to_owned(),
9399 "deadbeef".to_owned(),
9400 "task".to_owned(),
9401 config,
9402 );
9403 let root = state.worktree_root();
9404 let wt_a = root.join("cand-A");
9405 let wt_b = root.join("cand-B");
9406 git::worktree_add_branch(&repo, &wt_a, "magi/x/A", "main")
9407 .await
9408 .expect("worktree A");
9409 git::worktree_add_branch(&repo, &wt_b, "magi/x/B", "main")
9410 .await
9411 .expect("worktree B");
9412
9413 state.candidates = vec![
9414 Candidate {
9415 index: 0,
9416 label: 'A',
9417 agent: "alpha".to_owned(),
9418 branch: "magi/x/A".to_owned(),
9419 worktree: wt_a.clone(),
9420 summary: String::new(),
9421 stat: String::new(),
9422 files: 0,
9423 commits: 0,
9424 empty: false,
9425 failed: None,
9426 verified_noop: None,
9427 duration_ms: 0,
9428 folded: false,
9429 },
9430 Candidate {
9431 index: 1,
9432 label: 'B',
9433 agent: "beta".to_owned(),
9434 branch: "magi/x/B".to_owned(),
9435 worktree: wt_b.clone(),
9436 summary: String::new(),
9437 stat: String::new(),
9438 files: 0,
9439 commits: 0,
9440 empty: false,
9441 failed: None,
9442 verified_noop: None,
9443 duration_ms: 0,
9444 folded: false,
9445 },
9446 ];
9447 state.tally = Some(Tally {
9448 first_choice: BTreeMap::from([('A', 1)]),
9449 borda: BTreeMap::new(),
9450 winner: 'A',
9451 rankings: 1,
9452 unanimous_initial: true,
9453 deliberated: false,
9454 changed_votes: 0,
9455 unanimous_final: true,
9456 tie_break: None,
9457 judges: 1,
9458 present: 1,
9459 quorum: 1,
9460 met_quorum: true,
9461 uncontested: None,
9462 });
9463 state.status = RunStatus::Ready;
9464
9465 fold_run(&mut state, false, &crate::run::home())
9466 .await
9467 .expect("fold_run");
9468
9469 assert!(wt_a.exists(), "the unmerged winner's worktree survives");
9470 assert!(
9471 git::branch_exists(&repo, "magi/x/A").await.unwrap(),
9472 "the unmerged winner's branch survives"
9473 );
9474 assert!(
9475 !state.candidates[0].folded,
9476 "the winner is not marked folded"
9477 );
9478
9479 assert!(!wt_b.exists(), "the loser's worktree is removed");
9480 assert!(
9481 !git::branch_exists(&repo, "magi/x/B").await.unwrap(),
9482 "the loser's branch is removed"
9483 );
9484 assert!(state.candidates[1].folded, "the loser is marked folded");
9485 }
9486
9487 #[tokio::test]
9490 async fn fold_run_keeps_a_branch_that_was_handed_to_a_later_run() {
9491 let tmp = tempfile::tempdir().expect("tempdir");
9492 let repo = tmp.path().join("repo");
9493 std::fs::create_dir_all(&repo).unwrap();
9494 init_repo(&repo);
9495 let home = tmp.path().join("home");
9496
9497 let mut config = Config::default();
9498 config.graph.worktree_root = Some(tmp.path().join("wt"));
9499 let mut state = RunState::new(
9500 repo.clone(),
9501 "main".to_owned(),
9502 "deadbeef".to_owned(),
9503 "task".to_owned(),
9504 config,
9505 );
9506 git::git(&repo, &["branch", "magi/x/A", "main"])
9508 .await
9509 .expect("branch");
9510 state.candidates = vec![Candidate {
9511 index: 0,
9512 label: 'A',
9513 agent: "alpha".to_owned(),
9514 branch: "magi/x/A".to_owned(),
9515 worktree: state.worktree_root().join("cand-A"),
9516 summary: String::new(),
9517 stat: String::new(),
9518 files: 0,
9519 commits: 0,
9520 empty: false,
9521 failed: None,
9522 verified_noop: None,
9523 duration_ms: 0,
9524 folded: true,
9525 }];
9526 state.released_to = Some("20260901-000000-new1".to_owned());
9527 state.released_branches = vec!["magi/x/A".to_owned()];
9528
9529 fold_run(&mut state, true, &home).await.expect("fold_run");
9530
9531 assert!(
9532 git::branch_exists(&repo, "magi/x/A").await.unwrap(),
9533 "the handed-over branch survives a fold"
9534 );
9535 }
9536
9537 #[tokio::test]
9541 async fn an_empty_winner_is_detected_before_a_pull_request_is_attempted() {
9542 let tmp = tempfile::tempdir().expect("tempdir");
9543 let repo = tmp.path().join("repo");
9544 std::fs::create_dir_all(&repo).unwrap();
9545 init_repo(&repo);
9546 let run = |args: &[&str]| {
9547 let out = std::process::Command::new("git")
9548 .quiet()
9549 .args(args)
9550 .current_dir(&repo)
9551 .output()
9552 .expect("spawn git");
9553 assert!(out.status.success(), "git {args:?}");
9554 };
9555 run(&["branch", "magi/x/A"]);
9556 run(&["checkout", "-q", "-b", "magi/x/B"]);
9557 std::fs::write(repo.join("f.txt"), "x\n").unwrap();
9558 run(&["add", "-A"]);
9559 run(&["commit", "-q", "-m", "work"]);
9560 run(&["checkout", "-q", "main"]);
9561
9562 let mut state = RunState::new(
9563 repo.clone(),
9564 "main".to_owned(),
9565 "deadbeef".to_owned(),
9566 "task".to_owned(),
9567 Config::default(),
9568 );
9569 state.seeds = vec![refs::Seed {
9570 token: "magi/27b2/A".to_owned(),
9571 kind: refs::SeedKind::Unresolved,
9572 sha: String::new(),
9573 branch: true,
9574 detail: "no branch or commit named magi/27b2/A".to_owned(),
9575 }];
9576
9577 assert!(merge_is_empty(&repo, &state, "magi/x/A", MergeMode::Pr).await);
9578 assert!(merge_is_empty(&repo, &state, "magi/x/A", MergeMode::Local).await);
9579 assert!(!merge_is_empty(&repo, &state, "magi/x/B", MergeMode::Pr).await);
9580 let detail = empty_candidate_detail(&state, "main");
9581 assert!(detail.starts_with("empty candidate"), "{detail}");
9582 assert!(detail.contains("magi/27b2/A"), "{detail}");
9583 }
9584
9585 #[tokio::test]
9594 async fn merge_does_not_reattempt_once_a_run_has_concluded() {
9595 let tmp = tempfile::tempdir().expect("tempdir");
9596 let repo = tmp.path().join("repo");
9597 std::fs::create_dir_all(&repo).unwrap();
9598 init_repo(&repo);
9599
9600 let mut config = Config::default();
9601 config.merge.mode = MergeMode::Local;
9602
9603 let mut state = RunState::new(
9604 repo.clone(),
9605 "main".to_owned(),
9606 "deadbeef".to_owned(),
9607 "task".to_owned(),
9608 config,
9609 );
9610 state.candidates = vec![Candidate {
9611 index: 0,
9612 label: 'A',
9613 agent: "alpha".to_owned(),
9614 branch: "does-not-exist".to_owned(),
9615 worktree: repo.clone(),
9616 summary: String::new(),
9617 stat: String::new(),
9618 files: 0,
9619 commits: 0,
9620 empty: false,
9621 failed: None,
9622 verified_noop: None,
9623 duration_ms: 0,
9624 folded: false,
9625 }];
9626 state.tally = Some(Tally {
9627 first_choice: BTreeMap::from([('A', 1)]),
9628 borda: BTreeMap::new(),
9629 winner: 'A',
9630 rankings: 1,
9631 unanimous_initial: true,
9632 deliberated: false,
9633 changed_votes: 0,
9634 unanimous_final: true,
9635 tie_break: None,
9636 judges: 0,
9637 present: 0,
9638 quorum: 0,
9639 met_quorum: true,
9640 uncontested: Some("only candidate A produced a change".to_owned()),
9641 });
9642 state.reviews = vec![ReviewRound {
9643 round: 1,
9644 head: "deadbeef".to_owned(),
9645 verified_head: None,
9646 verified_at: None,
9647 reviews: Vec::new(),
9648 e2e: Vec::new(),
9649 fix: None,
9650 blocking: 0,
9651 answered: 0,
9652 expected: 0,
9653 clean: true,
9654 verify_retried: false,
9655 e2e_deferred: false,
9656 e2e_defer_reason: None,
9657 progressed: false,
9658 vote_split: false,
9659 reconsideration: Vec::new(),
9660 verdict: None,
9661 }];
9662 state.gate = vec![CommandOutcome {
9663 command: "test".to_owned(),
9664 code: Some(0),
9665 output_tail: String::new(),
9666 duration_ms: 0,
9667 resource_blocked: false,
9668 }];
9669 state.gate_ran = true;
9670 state.status = RunStatus::Ready;
9675 state.merge = Some(MergeOutcome {
9676 mode: MergeMode::Local,
9677 ok: false,
9678 detail: "already concluded".to_owned(),
9679 empty: false,
9680 });
9681
9682 let mut runner = Runner {
9683 state,
9684 roles: ResolvedRoles {
9685 implementers: Vec::new(),
9686 judges: Vec::new(),
9687 reviewers: Vec::new(),
9688 fixer: None,
9689 conductor: conductor(),
9690 implementer_roster: Vec::new(),
9691 judge_roster: Vec::new(),
9692 reviewer_roster: Vec::new(),
9693 },
9694 sem: Arc::new(Semaphore::new(1)),
9695 pause: Pause::new(),
9696 interrupt: Pause::new(),
9697 };
9698
9699 runner.merge().await.expect("merge");
9700
9701 assert_eq!(
9702 runner.state.status,
9703 RunStatus::Ready,
9704 "a concluded run's status must not change on reentry"
9705 );
9706 assert_eq!(
9707 runner.state.merge.as_ref().map(|m| m.detail.as_str()),
9708 Some("already concluded"),
9709 "merge must not run again once the node already recorded an outcome"
9710 );
9711 }
9712
9713 #[tokio::test]
9722 async fn merge_refuses_a_gate_that_has_not_actually_run() {
9723 let tmp = tempfile::tempdir().expect("tempdir");
9724 let repo = tmp.path().join("repo");
9725 std::fs::create_dir_all(&repo).unwrap();
9726 init_repo(&repo);
9727
9728 let mut config = Config::default();
9729 config.merge.mode = MergeMode::Local;
9730
9731 let mut state = RunState::new(
9732 repo.clone(),
9733 "main".to_owned(),
9734 "deadbeef".to_owned(),
9735 "task".to_owned(),
9736 config,
9737 );
9738 state.candidates = vec![Candidate {
9739 index: 0,
9740 label: 'A',
9741 agent: "alpha".to_owned(),
9742 branch: "does-not-exist".to_owned(),
9743 worktree: repo.clone(),
9744 summary: String::new(),
9745 stat: String::new(),
9746 files: 0,
9747 commits: 0,
9748 empty: false,
9749 failed: None,
9750 verified_noop: None,
9751 duration_ms: 0,
9752 folded: false,
9753 }];
9754 state.tally = Some(Tally {
9755 first_choice: BTreeMap::from([('A', 1)]),
9756 borda: BTreeMap::new(),
9757 winner: 'A',
9758 rankings: 1,
9759 unanimous_initial: true,
9760 deliberated: false,
9761 changed_votes: 0,
9762 unanimous_final: true,
9763 tie_break: None,
9764 judges: 0,
9765 present: 0,
9766 quorum: 0,
9767 met_quorum: true,
9768 uncontested: Some("only candidate A produced a change".to_owned()),
9769 });
9770 state.reviews = vec![ReviewRound {
9771 round: 1,
9772 head: "deadbeef".to_owned(),
9773 verified_head: None,
9774 verified_at: None,
9775 reviews: Vec::new(),
9776 e2e: Vec::new(),
9777 fix: None,
9778 blocking: 0,
9779 answered: 0,
9780 expected: 0,
9781 clean: true,
9782 verify_retried: false,
9783 e2e_deferred: false,
9784 e2e_defer_reason: None,
9785 progressed: false,
9786 vote_split: false,
9787 reconsideration: Vec::new(),
9788 verdict: None,
9789 }];
9790 state.gate = Vec::new();
9792 state.gate_ran = false;
9793 state.status = RunStatus::Gating;
9794
9795 let mut runner = Runner {
9796 state,
9797 roles: ResolvedRoles {
9798 implementers: Vec::new(),
9799 judges: Vec::new(),
9800 reviewers: Vec::new(),
9801 fixer: None,
9802 conductor: conductor(),
9803 implementer_roster: Vec::new(),
9804 judge_roster: Vec::new(),
9805 reviewer_roster: Vec::new(),
9806 },
9807 sem: Arc::new(Semaphore::new(1)),
9808 pause: Pause::new(),
9809 interrupt: Pause::new(),
9810 };
9811
9812 runner.merge().await.expect("merge");
9813
9814 assert!(
9815 runner.state.merge.is_none(),
9816 "an empty gate must never be read as a passing one: {:?}",
9817 runner.state.merge
9818 );
9819 }
9820
9821 #[tokio::test]
9828 async fn gate_and_merge_reach_ready_when_no_gate_commands_are_configured() {
9829 let tmp = tempfile::tempdir().expect("tempdir");
9830 let repo = tmp.path().join("repo");
9831 std::fs::create_dir_all(&repo).unwrap();
9832 init_repo(&repo);
9833
9834 let config = Config::default();
9836
9837 let mut state = RunState::new(
9838 repo.clone(),
9839 "main".to_owned(),
9840 "deadbeef".to_owned(),
9841 "task".to_owned(),
9842 config,
9843 );
9844 state.candidates = vec![Candidate {
9845 index: 0,
9846 label: 'A',
9847 agent: "alpha".to_owned(),
9848 branch: "does-not-exist".to_owned(),
9849 worktree: repo.clone(),
9850 summary: String::new(),
9851 stat: String::new(),
9852 files: 0,
9853 commits: 0,
9854 empty: false,
9855 failed: None,
9856 verified_noop: None,
9857 duration_ms: 0,
9858 folded: false,
9859 }];
9860 state.tally = Some(Tally {
9861 first_choice: BTreeMap::from([('A', 1)]),
9862 borda: BTreeMap::new(),
9863 winner: 'A',
9864 rankings: 1,
9865 unanimous_initial: true,
9866 deliberated: false,
9867 changed_votes: 0,
9868 unanimous_final: true,
9869 tie_break: None,
9870 judges: 0,
9871 present: 0,
9872 quorum: 0,
9873 met_quorum: true,
9874 uncontested: Some("only candidate A produced a change".to_owned()),
9875 });
9876 state.reviews = vec![ReviewRound {
9877 round: 1,
9878 head: "deadbeef".to_owned(),
9879 verified_head: None,
9880 verified_at: None,
9881 reviews: Vec::new(),
9882 e2e: Vec::new(),
9883 fix: None,
9884 blocking: 0,
9885 answered: 0,
9886 expected: 0,
9887 clean: true,
9888 verify_retried: false,
9889 e2e_deferred: false,
9890 e2e_defer_reason: None,
9891 progressed: false,
9892 vote_split: false,
9893 reconsideration: Vec::new(),
9894 verdict: None,
9895 }];
9896
9897 let mut runner = Runner {
9898 state,
9899 roles: ResolvedRoles {
9900 implementers: Vec::new(),
9901 judges: Vec::new(),
9902 reviewers: Vec::new(),
9903 fixer: None,
9904 conductor: conductor(),
9905 implementer_roster: Vec::new(),
9906 judge_roster: Vec::new(),
9907 reviewer_roster: Vec::new(),
9908 },
9909 sem: Arc::new(Semaphore::new(1)),
9910 pause: Pause::new(),
9911 interrupt: Pause::new(),
9912 };
9913
9914 runner.gate().await.expect("gate");
9915 assert!(
9916 runner.state.gate_ran,
9917 "zero configured commands is still a real attempt, not an unrun gate"
9918 );
9919 assert!(runner.state.gate.is_empty());
9920 assert_eq!(runner.state.gate_status(), GateStatus::PassedWithNoCommands);
9921 assert_ne!(
9922 runner.state.status,
9923 RunStatus::Blocked,
9924 "a gate with nothing to check must not read as failed"
9925 );
9926
9927 runner.merge().await.expect("merge");
9928 assert_eq!(
9929 runner.state.status,
9930 RunStatus::Ready,
9931 "a clean review-only run with no gate commands must reach Ready, not stay stuck in Gating"
9932 );
9933 }
9934
9935 #[tokio::test]
9946 async fn gate_never_asks_for_the_cache_lease_when_it_has_no_commands_to_run() {
9947 crate::run::pin_test_home();
9948 let home = crate::run::home();
9949
9950 let tmp = tempfile::tempdir().expect("tempdir");
9951 let repo = tmp.path().join("repo");
9952 std::fs::create_dir_all(&repo).unwrap();
9953 init_repo(&repo);
9954 let cache_dir = tmp.path().join("target");
9957
9958 let mut config = Config::default();
9959 config.verify.e2e = vec![format!("CARGO_TARGET_DIR='{}' true", cache_dir.display())];
9960 config.graph.timeout_verify = Some(2);
9963
9964 let other = crate::cache::Owner::here("other-run", "e2e", "e2e", &repo, "deadbeef");
9965 let _held = match crate::cache::try_acquire(&home, &cache_dir, &other)
9966 .expect("no io error acquiring directly")
9967 {
9968 crate::cache::AcquireOutcome::Acquired(g) => g,
9969 crate::cache::AcquireOutcome::Busy(b) => {
9970 panic!("expected the direct acquire to win the lease first: {b:?}")
9971 }
9972 };
9973
9974 let mut state = RunState::new(
9975 repo.clone(),
9976 "main".to_owned(),
9977 "deadbeef".to_owned(),
9978 "task".to_owned(),
9979 config,
9980 );
9981 state.candidates = vec![Candidate {
9982 index: 0,
9983 label: 'A',
9984 agent: "alpha".to_owned(),
9985 branch: "does-not-exist".to_owned(),
9986 worktree: repo.clone(),
9987 summary: String::new(),
9988 stat: String::new(),
9989 files: 0,
9990 commits: 0,
9991 empty: false,
9992 failed: None,
9993 verified_noop: None,
9994 duration_ms: 0,
9995 folded: false,
9996 }];
9997 state.tally = Some(Tally {
9998 first_choice: BTreeMap::from([('A', 1)]),
9999 borda: BTreeMap::new(),
10000 winner: 'A',
10001 rankings: 1,
10002 unanimous_initial: true,
10003 deliberated: false,
10004 changed_votes: 0,
10005 unanimous_final: true,
10006 tie_break: None,
10007 judges: 0,
10008 present: 0,
10009 quorum: 0,
10010 met_quorum: true,
10011 uncontested: Some("only candidate A produced a change".to_owned()),
10012 });
10013 state.reviews = vec![ReviewRound {
10014 round: 1,
10015 head: "deadbeef".to_owned(),
10016 verified_head: None,
10017 verified_at: None,
10018 reviews: Vec::new(),
10019 e2e: Vec::new(),
10020 fix: None,
10021 blocking: 0,
10022 answered: 0,
10023 expected: 0,
10024 clean: true,
10025 verify_retried: false,
10026 e2e_deferred: false,
10027 e2e_defer_reason: None,
10028 progressed: false,
10029 vote_split: false,
10030 reconsideration: Vec::new(),
10031 verdict: None,
10032 }];
10033
10034 let mut runner = Runner {
10035 state,
10036 roles: ResolvedRoles {
10037 implementers: Vec::new(),
10038 judges: Vec::new(),
10039 reviewers: Vec::new(),
10040 fixer: None,
10041 conductor: conductor(),
10042 implementer_roster: Vec::new(),
10043 judge_roster: Vec::new(),
10044 reviewer_roster: Vec::new(),
10045 },
10046 sem: Arc::new(Semaphore::new(1)),
10047 pause: Pause::new(),
10048 interrupt: Pause::new(),
10049 };
10050
10051 let started = std::time::Instant::now();
10052 runner.gate().await.expect("gate");
10053 assert!(
10054 started.elapsed() < Duration::from_secs(1),
10055 "a gate with nothing to run must never wait on a lease it never needed"
10056 );
10057 assert!(
10058 runner.state.gate_ran,
10059 "zero commands is still a real, immediate attempt"
10060 );
10061 assert!(runner.state.gate.is_empty());
10062 assert_ne!(
10063 runner.state.status,
10064 RunStatus::Blocked,
10065 "must not read as resource-blocked on a lease it never asked for"
10066 );
10067 }
10068
10069 #[tokio::test]
10079 async fn gate_records_a_running_task_entry_while_its_command_is_still_in_flight() {
10080 crate::run::pin_test_home();
10081
10082 let tmp = tempfile::tempdir().expect("tempdir");
10083 let repo = tmp.path().join("repo");
10084 std::fs::create_dir_all(&repo).unwrap();
10085 init_repo(&repo);
10086
10087 let mut config = Config::default();
10088 config.verify.gate = vec![
10089 "printf started > started.marker; i=0; while [ ! -f release.marker ] && \
10090 [ \"$i\" -lt 100 ]; do i=$((i+1)); sleep 0.05; done"
10091 .to_owned(),
10092 ];
10093
10094 let mut state = RunState::new(
10095 repo.clone(),
10096 "main".to_owned(),
10097 "deadbeef".to_owned(),
10098 "task".to_owned(),
10099 config,
10100 );
10101 let run_id = state.id.clone();
10102 state.candidates = vec![Candidate {
10103 index: 0,
10104 label: 'A',
10105 agent: "alpha".to_owned(),
10106 branch: "does-not-exist".to_owned(),
10107 worktree: repo.clone(),
10108 summary: String::new(),
10109 stat: String::new(),
10110 files: 0,
10111 commits: 0,
10112 empty: false,
10113 failed: None,
10114 verified_noop: None,
10115 duration_ms: 0,
10116 folded: false,
10117 }];
10118 state.tally = Some(Tally {
10119 first_choice: BTreeMap::from([('A', 1)]),
10120 borda: BTreeMap::new(),
10121 winner: 'A',
10122 rankings: 1,
10123 unanimous_initial: true,
10124 deliberated: false,
10125 changed_votes: 0,
10126 unanimous_final: true,
10127 tie_break: None,
10128 judges: 0,
10129 present: 0,
10130 quorum: 0,
10131 met_quorum: true,
10132 uncontested: Some("only candidate A produced a change".to_owned()),
10133 });
10134 state.reviews = vec![ReviewRound {
10135 round: 1,
10136 head: "deadbeef".to_owned(),
10137 verified_head: None,
10138 verified_at: None,
10139 reviews: Vec::new(),
10140 e2e: Vec::new(),
10141 fix: None,
10142 blocking: 0,
10143 answered: 0,
10144 expected: 0,
10145 clean: true,
10146 verify_retried: false,
10147 e2e_deferred: false,
10148 e2e_defer_reason: None,
10149 progressed: false,
10150 vote_split: false,
10151 reconsideration: Vec::new(),
10152 verdict: None,
10153 }];
10154
10155 let mut runner = Runner {
10156 state,
10157 roles: ResolvedRoles {
10158 implementers: Vec::new(),
10159 judges: Vec::new(),
10160 reviewers: Vec::new(),
10161 fixer: None,
10162 conductor: conductor(),
10163 implementer_roster: Vec::new(),
10164 judge_roster: Vec::new(),
10165 reviewer_roster: Vec::new(),
10166 },
10167 sem: Arc::new(Semaphore::new(1)),
10168 pause: Pause::new(),
10169 interrupt: Pause::new(),
10170 };
10171
10172 let started_marker = repo.join("started.marker");
10173 let release_marker = repo.join("release.marker");
10174 let poller = tokio::spawn(async move {
10175 for _ in 0..100 {
10180 if started_marker.exists()
10181 && let Ok(s) = crate::run::RunState::load(&run_id)
10182 && let Some(a) = s.active.get("gate")
10183 {
10184 std::fs::write(&release_marker, b"go").expect("release marker");
10185 return Some(a.clone());
10186 }
10187 tokio::time::sleep(Duration::from_millis(50)).await;
10188 }
10189 None
10190 });
10191
10192 runner.gate().await.expect("gate");
10193 let captured = poller.await.expect("poller task");
10194 let captured = captured.expect(
10195 "the poller never saw a `gate` task entry in run.json while the command was \
10196 still blocked on its own release marker",
10197 );
10198
10199 assert_eq!(captured.task.as_deref(), Some("gate"));
10200 assert_eq!(captured.node, "gate");
10201 assert_eq!(captured.index, Some(1));
10202 assert_eq!(captured.total, Some(1));
10203 assert!(
10204 captured
10205 .command
10206 .as_deref()
10207 .is_some_and(|c| c.contains("started.marker")),
10208 "{captured:?}"
10209 );
10210
10211 assert!(
10212 runner.state.active.is_empty(),
10213 "the entry must be cleared once the command actually finished: {:?}",
10214 runner.state.active
10215 );
10216 assert!(runner.state.gate_ran);
10217 assert!(runner.state.gate.iter().all(CommandOutcome::ok));
10218 }
10219
10220 #[tokio::test]
10223 async fn stop_reviewing_records_a_contested_hand_off_only_for_major_plus_reject() {
10224 use crate::verdict::{Finding, ReviewVote, Severity};
10225 crate::run::pin_test_home();
10226 let tmp = tempfile::tempdir().expect("tempdir");
10227 let repo = tmp.path().join("repo");
10228 std::fs::create_dir_all(&repo).unwrap();
10229 init_repo(&repo);
10230
10231 for (severity, vote, expect) in [
10232 (Severity::Major, ReviewVote::Reject, true),
10233 (Severity::Minor, ReviewVote::Reject, false),
10234 (Severity::Major, ReviewVote::Approve, false),
10235 ] {
10236 let mut round = review_round(false, 1, 1, 1, false, true);
10237 round.reviews = vec![ReviewRecord {
10238 reviewer: 1,
10239 agent: "alpha".to_owned(),
10240 summary: String::new(),
10241 findings: vec![Finding {
10242 id: "R1-1-1".to_owned(),
10243 severity,
10244 file: None,
10245 line: None,
10246 title: "t".to_owned(),
10247 detail: String::new(),
10248 }],
10249 vote: Some(vote),
10250 failed: None,
10251 duration_ms: 0,
10252 attempts: 0,
10253 }];
10254 let mut state = RunState::new(
10255 repo.clone(),
10256 "main".to_owned(),
10257 "deadbeef".to_owned(),
10258 "task".to_owned(),
10259 Config::default(),
10260 );
10261 state.reviews = vec![round];
10262 let mut runner = Runner {
10263 state,
10264 roles: ResolvedRoles {
10265 implementers: Vec::new(),
10266 judges: Vec::new(),
10267 reviewers: Vec::new(),
10268 fixer: None,
10269 conductor: conductor(),
10270 implementer_roster: Vec::new(),
10271 judge_roster: Vec::new(),
10272 reviewer_roster: Vec::new(),
10273 },
10274 sem: Arc::new(Semaphore::new(1)),
10275 pause: Pause::new(),
10276 interrupt: Pause::new(),
10277 };
10278 let shell = runner.state.config.shell();
10279 runner
10280 .stop_reviewing("round budget spent", &shell, &repo)
10281 .await
10282 .expect("stop_reviewing");
10283 assert_eq!(runner.state.status, RunStatus::Gating);
10284 assert_eq!(
10285 runner.state.contested_handoff.is_some(),
10286 expect,
10287 "{severity:?} + {vote:?}"
10288 );
10289 }
10290 }
10291
10292 #[tokio::test]
10305 async fn stop_reviewing_retries_a_resource_blocked_e2e_instead_of_reading_it_as_red() {
10306 crate::run::pin_test_home();
10307 let home = crate::run::home();
10308
10309 let tmp = tempfile::tempdir().expect("tempdir");
10310 let repo = tmp.path().join("repo");
10311 std::fs::create_dir_all(&repo).unwrap();
10312 init_repo(&repo);
10313 let head = crate::git::rev_parse(&repo, "HEAD")
10314 .await
10315 .expect("rev-parse");
10316 let cache_dir = tmp.path().join("target");
10319
10320 let mut config = Config::default();
10321 config.verify.e2e = vec![format!(
10322 "CARGO_TARGET_DIR='{}' test -f README.md",
10323 cache_dir.display()
10324 )];
10325 config.graph.review_rounds = 1;
10326 config.graph.timeout_verify = Some(2);
10329
10330 let other = crate::cache::Owner::here("other-run", "e2e", "e2e", &repo, "deadbeef");
10331 let held = match crate::cache::try_acquire(&home, &cache_dir, &other)
10332 .expect("no io error acquiring directly")
10333 {
10334 crate::cache::AcquireOutcome::Acquired(g) => g,
10335 crate::cache::AcquireOutcome::Busy(b) => {
10336 panic!("expected the direct acquire to win the lease first: {b:?}")
10337 }
10338 };
10339
10340 let mut state = RunState::new(
10341 repo.clone(),
10342 "main".to_owned(),
10343 head.clone(),
10344 "task".to_owned(),
10345 config,
10346 );
10347 state.candidates = vec![Candidate {
10348 index: 0,
10349 label: 'A',
10350 agent: "alpha".to_owned(),
10351 branch: "does-not-exist".to_owned(),
10352 worktree: repo.clone(),
10353 summary: String::new(),
10354 stat: String::new(),
10355 files: 0,
10356 commits: 0,
10357 empty: false,
10358 failed: None,
10359 verified_noop: None,
10360 duration_ms: 0,
10361 folded: false,
10362 }];
10363 state.tally = Some(Tally {
10364 first_choice: BTreeMap::from([('A', 1)]),
10365 borda: BTreeMap::new(),
10366 winner: 'A',
10367 rankings: 1,
10368 unanimous_initial: true,
10369 deliberated: false,
10370 changed_votes: 0,
10371 unanimous_final: true,
10372 tie_break: None,
10373 judges: 0,
10374 present: 0,
10375 quorum: 0,
10376 met_quorum: true,
10377 uncontested: Some("only candidate A produced a change".to_owned()),
10378 });
10379 state.reviews = vec![ReviewRound {
10383 round: 1,
10384 head: head.clone(),
10385 verified_head: None,
10386 verified_at: None,
10387 reviews: Vec::new(),
10388 e2e: Vec::new(),
10389 fix: None,
10390 blocking: 1,
10391 answered: 1,
10392 expected: 1,
10393 clean: false,
10394 verify_retried: false,
10395 e2e_deferred: true,
10396 e2e_defer_reason: Some("1 blocking finding(s) already required a fix".to_owned()),
10397 progressed: false,
10398 vote_split: false,
10399 reconsideration: Vec::new(),
10400 verdict: None,
10401 }];
10402
10403 let mut runner = Runner {
10404 state,
10405 roles: ResolvedRoles {
10406 implementers: Vec::new(),
10407 judges: Vec::new(),
10408 reviewers: Vec::new(),
10409 fixer: None,
10410 conductor: conductor(),
10411 implementer_roster: Vec::new(),
10412 judge_roster: Vec::new(),
10413 reviewer_roster: Vec::new(),
10414 },
10415 sem: Arc::new(Semaphore::new(1)),
10416 pause: Pause::new(),
10417 interrupt: Pause::new(),
10418 };
10419
10420 let shell = runner.state.config.shell();
10421 runner
10422 .stop_reviewing("round budget spent", &shell, &repo)
10423 .await
10424 .expect("stop_reviewing");
10425
10426 let last = runner.state.reviews.last().expect("round record");
10427 assert_eq!(
10428 last.e2e_status(),
10429 E2eStatus::ResourceBlocked,
10430 "the shared cache is still held; the attempt must read as blocked, not deferred or \
10431 failed: {last:?}"
10432 );
10433 assert_eq!(
10434 last.verified_head.as_deref(),
10435 Some(head.as_str()),
10436 "which commit this attempt targeted is known even though nothing finished checking \
10437 it"
10438 );
10439 let first_attempt_at = last
10440 .verified_at
10441 .expect("when this attempt ran is known too");
10442 assert_ne!(
10443 runner.state.status,
10444 RunStatus::Blocked,
10445 "contention is evidence about the machine, not the patch — it must not settle the \
10446 run as blocked: {:?}",
10447 runner.state.status
10448 );
10449 assert!(
10450 !runner
10451 .state
10452 .events
10453 .iter()
10454 .any(|e| e.node == "review" && e.message.contains("e2e failed")),
10455 "a resource-blocked attempt must never be logged as a failed e2e: {:?}",
10456 runner.state.events
10457 );
10458
10459 runner
10464 .stop_reviewing("round budget spent", &shell, &repo)
10465 .await
10466 .expect("stop_reviewing retry");
10467 assert_eq!(
10468 runner.state.reviews.len(),
10469 1,
10470 "no new round was started: {:?}",
10471 runner.state.reviews
10472 );
10473 let last = runner.state.reviews.last().expect("round record");
10474 assert_eq!(last.e2e_status(), E2eStatus::ResourceBlocked, "{last:?}");
10475 assert!(
10476 last.verified_at.expect("still known") > first_attempt_at,
10477 "a second reentry must be a fresh attempt, not a stale copy of the first"
10478 );
10479 assert_ne!(runner.state.status, RunStatus::Blocked);
10480
10481 held.release();
10482 }
10483
10484 #[tokio::test]
10496 async fn a_resumed_review_loop_retries_a_last_round_left_resource_blocked() {
10497 crate::run::pin_test_home();
10498 let home = crate::run::home();
10499
10500 let tmp = tempfile::tempdir().expect("tempdir");
10501 let repo = tmp.path().join("repo");
10502 std::fs::create_dir_all(&repo).unwrap();
10503 init_repo(&repo);
10504 let head = crate::git::rev_parse(&repo, "HEAD")
10505 .await
10506 .expect("rev-parse");
10507 let cache_dir = tmp.path().join("target");
10508
10509 let mut config = Config::default();
10510 config.verify.e2e = vec![format!(
10511 "CARGO_TARGET_DIR='{}' test -f README.md",
10512 cache_dir.display()
10513 )];
10514 config.graph.review_rounds = 1;
10515 config.graph.timeout_verify = Some(2);
10516
10517 let other = crate::cache::Owner::here("other-run", "e2e", "e2e", &repo, "deadbeef");
10518 let held = match crate::cache::try_acquire(&home, &cache_dir, &other)
10519 .expect("no io error acquiring directly")
10520 {
10521 crate::cache::AcquireOutcome::Acquired(g) => g,
10522 crate::cache::AcquireOutcome::Busy(b) => {
10523 panic!("expected the direct acquire to win the lease first: {b:?}")
10524 }
10525 };
10526
10527 let mut state = RunState::new(
10528 repo.clone(),
10529 "main".to_owned(),
10530 head.clone(),
10531 "task".to_owned(),
10532 config,
10533 );
10534 state.candidates = vec![Candidate {
10535 index: 0,
10536 label: 'A',
10537 agent: "alpha".to_owned(),
10538 branch: "does-not-exist".to_owned(),
10539 worktree: repo.clone(),
10540 summary: String::new(),
10541 stat: String::new(),
10542 files: 0,
10543 commits: 0,
10544 empty: false,
10545 failed: None,
10546 verified_noop: None,
10547 duration_ms: 0,
10548 folded: false,
10549 }];
10550 state.tally = Some(Tally {
10551 first_choice: BTreeMap::from([('A', 1)]),
10552 borda: BTreeMap::new(),
10553 winner: 'A',
10554 rankings: 1,
10555 unanimous_initial: true,
10556 deliberated: false,
10557 changed_votes: 0,
10558 unanimous_final: true,
10559 tie_break: None,
10560 judges: 0,
10561 present: 0,
10562 quorum: 0,
10563 met_quorum: true,
10564 uncontested: Some("only candidate A produced a change".to_owned()),
10565 });
10566 state.reviews = vec![ReviewRound {
10570 round: 1,
10571 head: head.clone(),
10572 verified_head: Some(head.clone()),
10573 verified_at: Some(jiff::Timestamp::now()),
10574 reviews: Vec::new(),
10575 e2e: vec![CommandOutcome {
10576 command: format!(
10577 "CARGO_TARGET_DIR='{}' test -f README.md",
10578 cache_dir.display()
10579 ),
10580 code: None,
10581 output_tail: "waiting for the shared build cache".to_owned(),
10582 duration_ms: 0,
10583 resource_blocked: true,
10584 }],
10585 fix: None,
10586 blocking: 1,
10587 answered: 1,
10588 expected: 1,
10589 clean: false,
10590 verify_retried: false,
10591 e2e_deferred: false,
10592 e2e_defer_reason: None,
10593 progressed: false,
10594 vote_split: false,
10595 reconsideration: Vec::new(),
10596 verdict: None,
10597 }];
10598
10599 let first_attempt_at = state.reviews[0].verified_at.expect("set above");
10600 let mut runner = Runner {
10601 state,
10602 roles: ResolvedRoles {
10603 implementers: Vec::new(),
10604 judges: Vec::new(),
10605 reviewers: Vec::new(),
10606 fixer: None,
10607 conductor: conductor(),
10608 implementer_roster: Vec::new(),
10609 judge_roster: Vec::new(),
10610 reviewer_roster: Vec::new(),
10611 },
10612 sem: Arc::new(Semaphore::new(1)),
10613 pause: Pause::new(),
10614 interrupt: Pause::new(),
10615 };
10616
10617 runner.review_loop().await.expect("review_loop");
10622
10623 assert_eq!(
10624 runner.state.reviews.len(),
10625 1,
10626 "no new round was started on top of the unresolved one: {:?}",
10627 runner.state.reviews
10628 );
10629 let last = &runner.state.reviews[0];
10630 assert_eq!(
10631 last.e2e_status(),
10632 E2eStatus::ResourceBlocked,
10633 "still contended: {last:?}"
10634 );
10635 assert!(
10636 last.verified_at.expect("still known") > first_attempt_at,
10637 "review_loop must have actually retried the check, not left it exactly as found"
10638 );
10639 assert_ne!(
10640 runner.state.status,
10641 RunStatus::Blocked,
10642 "a resumed run must not read leftover contention as a verdict on the patch: {:?}",
10643 runner.state.status
10644 );
10645
10646 held.release();
10647 }
10648
10649 #[tokio::test]
10650 async fn a_run_resumed_mid_landing_reenters_land_instead_of_opening_a_second_pull_request() {
10651 crate::run::pin_test_home();
10652 let tmp = tempfile::tempdir().expect("tempdir");
10653 let repo = tmp.path().join("repo");
10654 std::fs::create_dir_all(&repo).unwrap();
10655 init_repo(&repo);
10656
10657 let mut config = Config::default();
10658 config.merge.mode = MergeMode::Pr;
10659 config.graph.land = true;
10660 config.graph.land_approval = false;
10661
10662 let mut state = RunState::new(
10663 repo.clone(),
10664 "main".to_owned(),
10665 "deadbeef".to_owned(),
10666 "task".to_owned(),
10667 config,
10668 );
10669 state.candidates = vec![Candidate {
10670 index: 0,
10671 label: 'A',
10672 agent: "alpha".to_owned(),
10673 branch: "does-not-exist".to_owned(),
10674 worktree: repo.clone(),
10675 summary: String::new(),
10676 stat: String::new(),
10677 files: 0,
10678 commits: 0,
10679 empty: false,
10680 failed: None,
10681 verified_noop: None,
10682 duration_ms: 0,
10683 folded: false,
10684 }];
10685 state.tally = Some(Tally {
10686 first_choice: BTreeMap::from([('A', 1)]),
10687 borda: BTreeMap::new(),
10688 winner: 'A',
10689 rankings: 1,
10690 unanimous_initial: true,
10691 deliberated: false,
10692 changed_votes: 0,
10693 unanimous_final: true,
10694 tie_break: None,
10695 judges: 0,
10696 present: 0,
10697 quorum: 0,
10698 met_quorum: true,
10699 uncontested: Some("only candidate A produced a change".to_owned()),
10700 });
10701 state.reviews = vec![ReviewRound {
10702 round: 1,
10703 head: "deadbeef".to_owned(),
10704 verified_head: None,
10705 verified_at: None,
10706 reviews: Vec::new(),
10707 e2e: Vec::new(),
10708 fix: None,
10709 blocking: 0,
10710 answered: 0,
10711 expected: 0,
10712 clean: true,
10713 verify_retried: false,
10714 e2e_deferred: false,
10715 e2e_defer_reason: None,
10716 progressed: false,
10717 vote_split: false,
10718 reconsideration: Vec::new(),
10719 verdict: None,
10720 }];
10721 state.gate = vec![CommandOutcome {
10722 command: "test".to_owned(),
10723 code: Some(0),
10724 output_tail: String::new(),
10725 duration_ms: 0,
10726 resource_blocked: false,
10727 }];
10728 state.gate_ran = true;
10729 state.status = RunStatus::Landing;
10733 state.merge = Some(MergeOutcome {
10734 mode: MergeMode::Pr,
10735 ok: true,
10736 detail: "https://example.invalid/x/y/pull/1".to_owned(),
10737 empty: false,
10738 });
10739
10740 ask_test_home();
10744 let store = ask::Questions::open();
10745 let q = ask_open_question(&store, &state.id);
10746
10747 let mut runner = Runner {
10748 state,
10749 roles: ResolvedRoles {
10750 implementers: Vec::new(),
10751 judges: Vec::new(),
10752 reviewers: Vec::new(),
10753 fixer: None,
10754 conductor: conductor(),
10755 implementer_roster: Vec::new(),
10756 judge_roster: Vec::new(),
10757 reviewer_roster: Vec::new(),
10758 },
10759 sem: Arc::new(Semaphore::new(1)),
10760 pause: Pause::new(),
10761 interrupt: Pause::new(),
10762 };
10763
10764 runner.execute().await.expect("execute");
10769
10770 assert_eq!(
10771 runner.state.merge.as_ref().map(|m| m.detail.as_str()),
10772 Some("https://example.invalid/x/y/pull/1"),
10773 "reentry must not push again or open a second pull request over the \
10774 one `land` is already watching"
10775 );
10776 assert_ne!(
10777 runner.state.status,
10778 RunStatus::Landing,
10779 "land could not actually reach the fake pull request, so it must \
10780 have given up rather than left the run silently parked forever"
10781 );
10782 assert_eq!(runner.state.status, RunStatus::Blocked);
10786 assert!(
10787 store.get(&q.id).unwrap().status.open(),
10788 "Blocked is still alive; settle_questions must have been a no-op here"
10789 );
10790 }
10791
10792 fn state_with_round(round: ReviewRound) -> RunState {
10793 let mut s = RunState::new(
10794 PathBuf::from("/repo"),
10795 "main".to_owned(),
10796 "abc1234".to_owned(),
10797 "add retries".to_owned(),
10798 Config::default(),
10799 );
10800 s.reviews = vec![round];
10801 s
10802 }
10803
10804 fn finding(id: &str, severity: Severity, title: &str) -> crate::verdict::Finding {
10805 crate::verdict::Finding {
10806 id: id.to_owned(),
10807 severity,
10808 file: None,
10809 line: None,
10810 title: title.to_owned(),
10811 detail: String::new(),
10812 }
10813 }
10814
10815 #[test]
10816 fn pr_body_names_open_findings_and_declined_ones() {
10817 let round = ReviewRound {
10818 round: 2,
10819 head: "deadbee".to_owned(),
10820 verified_head: None,
10821 verified_at: None,
10822 reviews: vec![ReviewRecord {
10823 attempts: 0,
10824 reviewer: 1,
10825 agent: "alpha".to_owned(),
10826 summary: String::new(),
10827 findings: vec![finding("R2-1-1", Severity::Minor, "unused import")],
10828 vote: None,
10829 failed: None,
10830 duration_ms: 0,
10831 }],
10832 e2e: vec![CommandOutcome {
10833 command: "cargo test".to_owned(),
10834 code: Some(0),
10835 output_tail: String::new(),
10836 duration_ms: 0,
10837 resource_blocked: false,
10838 }],
10839 verify_retried: false,
10840 e2e_deferred: false,
10841 e2e_defer_reason: None,
10842 fix: Some(FixRecord {
10843 agent: "alpha".to_owned(),
10844 addressed: Vec::new(),
10845 rejected: vec![crate::verdict::Rejection {
10846 id: "R1-1-1".to_owned(),
10847 why: "not reachable from any caller".to_owned(),
10848 }],
10849 notes: String::new(),
10850 committed: true,
10851 failed: None,
10852 duration_ms: 0,
10853 continuation: None,
10854 }),
10855 blocking: 0,
10856 answered: 1,
10857 expected: 1,
10858 clean: false,
10859 progressed: true,
10860 vote_split: false,
10861 reconsideration: Vec::new(),
10862 verdict: None,
10863 };
10864 let state = state_with_round(round);
10865 let body = pr_message(&state, 'A').body;
10866
10867 assert!(body.contains("add retries"), "the task must still be there");
10868 assert!(body.contains("R2-1-1"), "{body}");
10869 assert!(body.contains("unused import"), "{body}");
10870 assert!(body.contains("R1-1-1"), "the declined finding: {body}");
10871 assert!(
10872 body.contains("not reachable from any caller"),
10873 "the reason it was declined: {body}"
10874 );
10875 }
10876
10877 #[test]
10878 fn pr_body_says_nothing_extra_when_the_round_was_clean() {
10879 let round = ReviewRound {
10880 round: 1,
10881 head: "deadbee".to_owned(),
10882 verified_head: None,
10883 verified_at: None,
10884 reviews: vec![ReviewRecord {
10885 attempts: 0,
10886 reviewer: 1,
10887 agent: "alpha".to_owned(),
10888 summary: String::new(),
10889 findings: Vec::new(),
10890 vote: None,
10891 failed: None,
10892 duration_ms: 0,
10893 }],
10894 e2e: Vec::new(),
10895 verify_retried: false,
10896 e2e_deferred: false,
10897 e2e_defer_reason: None,
10898 fix: None,
10899 blocking: 0,
10900 answered: 1,
10901 expected: 1,
10902 clean: true,
10903 progressed: false,
10904 vote_split: false,
10905 reconsideration: Vec::new(),
10906 verdict: None,
10907 };
10908 let state = state_with_round(round);
10909 let body = pr_message(&state, 'A').body;
10910 assert!(!body.contains("Open review findings"), "{body}");
10911 assert!(!body.contains("Declined"), "{body}");
10912 }
10913
10914 fn state_with_summary(instruction: &str, summary: &str) -> RunState {
10915 let mut state = RunState::new(
10916 PathBuf::from("/repo"),
10917 "main".to_owned(),
10918 "abc1234".to_owned(),
10919 instruction.to_owned(),
10920 Config::default(),
10921 );
10922 state.candidates.push(Candidate {
10923 index: 0,
10924 label: 'A',
10925 agent: "alpha".to_owned(),
10926 branch: "magi/x/A".to_owned(),
10927 worktree: PathBuf::from("/wt"),
10928 summary: summary.to_owned(),
10929 stat: String::new(),
10930 files: 1,
10931 commits: 1,
10932 empty: false,
10933 failed: None,
10934 verified_noop: None,
10935 folded: false,
10936 duration_ms: 0,
10937 });
10938 state
10939 }
10940
10941 fn review_state(subjects: &[&str]) -> RunState {
10942 let mut state = state_with_summary(
10943 "Review the work already on branch `magi/x/A`. There is no task statement: what the change claims to do is whatever its commits say.\n\nfirst\nsecond",
10944 "",
10945 );
10946 state.candidates[0].agent = EXISTING_BRANCH.to_owned();
10947 state.reviewed_commits = Some(subjects.iter().map(|s| (*s).to_owned()).collect());
10948 state
10949 }
10950
10951 #[tokio::test]
10954 async fn a_rebased_review_branch_is_titled_from_its_own_commits() {
10955 ask_test_home();
10956 let tmp = tempfile::tempdir().unwrap();
10957 let repo = tmp.path().join("repo");
10958 std::fs::create_dir_all(&repo).unwrap();
10959 init_repo(&repo);
10960 let origin = tmp.path().join("origin.git");
10961 let g = |dir: &Path, args: &[&str]| {
10962 let out = std::process::Command::new("git")
10963 .args(args)
10964 .current_dir(dir)
10965 .quiet()
10966 .output()
10967 .expect("spawn git");
10968 assert!(
10969 out.status.success(),
10970 "git {args:?}: {}",
10971 String::from_utf8_lossy(&out.stderr)
10972 );
10973 };
10974 g(
10975 tmp.path(),
10976 &[
10977 "clone",
10978 "--bare",
10979 "-q",
10980 repo.to_str().unwrap(),
10981 origin.to_str().unwrap(),
10982 ],
10983 );
10984 g(
10985 &repo,
10986 &["remote", "add", "origin", origin.to_str().unwrap()],
10987 );
10988 let c1 = git::rev_parse(&repo, "main").await.unwrap();
10989
10990 std::fs::write(repo.join("dep.txt"), "bump\n").unwrap();
10992 g(&repo, &["add", "-A"]);
10993 g(
10994 &repo,
10995 &["commit", "-q", "-m", "chore(deps): update a crate"],
10996 );
10997 g(&repo, &["push", "-q", "origin", "main"]);
10998 g(&repo, &["checkout", "-q", "-b", "feat/own"]);
10999 std::fs::write(repo.join("own.txt"), "own\n").unwrap();
11000 g(&repo, &["add", "-A"]);
11001 g(
11002 &repo,
11003 &["commit", "-q", "-m", "fix(daemon): apply a chosen action"],
11004 );
11005 g(&repo, &["checkout", "-q", "main"]);
11006
11007 let start = review_base(&repo, "origin", "main", &c1, "feat/own").await;
11008 assert_eq!(start, git::rev_parse(&repo, "main").await.unwrap());
11009 let fallback = review_base(&repo, "nowhere", "main", &c1, "feat/own").await;
11011 assert_eq!(fallback, c1);
11012
11013 let mut state = review_state(&[
11014 "chore(deps): update a crate",
11015 "fix(daemon): apply a chosen action",
11016 ]);
11017 state.repo = repo.clone();
11018 state.base_branch = "main".to_owned();
11019 state.base_commit = c1;
11020 refresh_reviewed_commits(&mut state, "feat/own").await;
11021 assert_eq!(
11022 state.reviewed_commits,
11023 Some(vec!["fix(daemon): apply a chosen action".to_owned()])
11024 );
11025 assert_eq!(
11026 review_title(&state).as_deref(),
11027 Some("fix(daemon): apply a chosen action")
11028 );
11029 assert_eq!(
11030 leaked_subjects(&state, "feat/own").await,
11031 Some(vec!["chore(deps): update a crate".to_owned()])
11032 );
11033 state.config.merge.remote = "nowhere".to_owned();
11036 assert_eq!(leaked_subjects(&state, "feat/own").await, None);
11037 }
11038
11039 #[test]
11040 fn pr_message_review_single_commit_uses_its_subject() {
11041 let state = review_state(&["feat(nats): per-role user"]);
11042 let m = pr_message(&state, 'A');
11043 assert_eq!(m.title, "feat(nats): per-role user");
11044 assert!(!m.body.contains("Review the work already"), "{}", m.body);
11045 assert!(m.body.contains("## Commits under review"), "{}", m.body);
11046 }
11047
11048 #[test]
11049 fn pr_message_review_multi_commit_takes_the_oldest() {
11050 let state = review_state(&["feat: the change", "fix: typo", "fix: again"]);
11051 let m = pr_message(&state, 'A');
11052 assert_eq!(m.title, "feat: the change");
11053 for s in ["feat: the change", "fix: typo", "fix: again"] {
11054 assert!(m.body.contains(&format!("- {s}\n")), "{}", m.body);
11055 }
11056 }
11057
11058 #[test]
11059 fn pr_message_review_without_a_usable_first_subject_is_neutral() {
11060 for first in ["日本語の件名", "", "magi: candidate A (uncommitted work)"] {
11061 let mut state = review_state(&[first, "fix: later fixup"]);
11062 state.candidates[0].branch = "機能/ログイン".to_owned();
11063 let m = pr_message(&state, 'A');
11064 assert!(
11065 m.title.starts_with("chore: land candidate A of run"),
11066 "{}",
11067 m.title
11068 );
11069 }
11070 }
11071
11072 fn facts(commits: &[(&str, &str)], stat: &str) -> BranchFacts {
11073 BranchFacts {
11074 commits: commits
11075 .iter()
11076 .map(|(s, b)| ((*s).to_owned(), (*b).to_owned()))
11077 .collect(),
11078 stat: stat.to_owned(),
11079 }
11080 }
11081
11082 fn round_with_notes(round: usize, notes: Option<&str>) -> ReviewRound {
11083 let mut r = review_round(true, 0, 1, 1, true, true);
11084 r.round = round;
11085 r.fix = notes.map(|n| FixRecord {
11086 agent: "fixer".to_owned(),
11087 addressed: Vec::new(),
11088 rejected: Vec::new(),
11089 notes: n.to_owned(),
11090 committed: true,
11091 failed: None,
11092 duration_ms: 0,
11093 continuation: None,
11094 });
11095 r
11096 }
11097
11098 #[test]
11099 fn pr_message_review_with_branch_facts_uses_commits_and_stat() {
11100 let state = review_state(&["ignored"]);
11101 let f = facts(
11102 &[
11103 (
11104 "fix(login): resolve PATH on macOS",
11105 "Login shells skip rc files.",
11106 ),
11107 ("fix: address review", ""),
11108 ],
11109 " src/a.rs | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)",
11110 );
11111 let m = pr_message_with(&state, 'A', Some(&f));
11112 assert_eq!(m.title, "fix(login): resolve PATH on macOS");
11113 assert!(
11114 m.body
11115 .contains("- fix(login): resolve PATH on macOS\n Login shells skip rc files.\n"),
11116 "{}",
11117 m.body
11118 );
11119 assert!(m.body.contains("- fix: address review\n"), "{}", m.body);
11120 assert!(m.body.contains("## Diff stat"), "{}", m.body);
11121 assert!(m.body.contains("src/a.rs | 2 +-"), "{}", m.body);
11122 for banned in [
11123 "Review the work already",
11124 "no task statement",
11125 "Original task",
11126 ] {
11127 assert!(!m.body.contains(banned), "{banned}: {}", m.body);
11128 }
11129 assert!(m.body.ends_with("magi:candidate-a\n"), "{}", m.body);
11130 }
11131
11132 #[test]
11133 fn pr_message_review_truncates_a_huge_first_commit_body() {
11134 let state = review_state(&["ignored"]);
11135 let f = facts(
11136 &[("feat: big", &"x".repeat(70_000)), ("fix: later", "")],
11137 "s",
11138 );
11139 let m = pr_message_with(&state, 'A', Some(&f));
11140 assert!(m.body.len() < 30_000, "{}", m.body.len());
11141 assert!(m.body.contains("(truncated)"), "{}", m.body.len());
11142 assert!(
11143 m.body.contains("- ... 1 more commit(s)"),
11144 "{}",
11145 m.body.len()
11146 );
11147 assert!(m.body.ends_with("magi:candidate-a\n"));
11148 }
11149
11150 #[test]
11151 fn pr_message_review_without_facts_falls_back_to_recorded_subjects() {
11152 let m = pr_message_with(&review_state(&["feat: x", "fix: y"]), 'A', None);
11153 assert_eq!(m.title, "feat: x");
11154 assert!(m.body.contains("- fix: y\n"), "{}", m.body);
11155 assert!(!m.body.contains("Diff stat"), "{}", m.body);
11156 assert!(!m.body.contains("no task statement"), "{}", m.body);
11157 }
11158
11159 #[test]
11160 fn pr_message_review_titles_from_the_branch_name_when_subjects_are_unusable() {
11161 let mut state = review_state(&["日本語の件名"]);
11162 state.candidates[0].branch = "fix/macos-login-path".to_owned();
11163 assert_eq!(pr_message(&state, 'A').title, "fix/macos-login-path");
11164 state.candidates[0].branch = "機能/ログイン".to_owned();
11165 assert!(
11166 pr_message(&state, 'A')
11167 .title
11168 .starts_with("chore: land candidate A")
11169 );
11170 }
11171
11172 #[test]
11173 fn pr_message_review_fixes_survive_a_clean_final_round() {
11174 let mut state = review_state(&["feat: x"]);
11175 state.reviews = vec![
11176 round_with_notes(1, Some("handled the PATH case")),
11177 round_with_notes(2, None),
11178 ];
11179 let body = pr_message(&state, 'A').body;
11180 assert!(
11181 body.contains("## Review fixes\n\nhandled the PATH case\n"),
11182 "{body}"
11183 );
11184 assert!(!body.contains("### Round"), "{body}");
11185
11186 state.reviews = vec![
11187 round_with_notes(1, Some("first fix")),
11188 round_with_notes(2, Some("")),
11189 round_with_notes(3, Some("second fix")),
11190 round_with_notes(4, None),
11191 ];
11192 let body = pr_message(&state, 'A').body;
11193 assert!(body.contains("### Round 1\n\nfirst fix"), "{body}");
11194 assert!(body.contains("### Round 3\n\nsecond fix"), "{body}");
11195 assert!(!body.contains("### Round 2"), "{body}");
11196 }
11197
11198 #[test]
11199 fn pr_message_implementation_run_keeps_its_shape_and_marker() {
11200 let state = state_with_summary(
11201 "add retries to the client",
11202 "TITLE: feat: retries\n\nDid it.",
11203 );
11204 let m = pr_message_with(&state, 'A', Some(&facts(&[("x", "")], "s")));
11205 assert_eq!(m.title, "feat: retries");
11206 assert!(
11207 m.body.contains("<summary>Original task</summary>"),
11208 "{}",
11209 m.body
11210 );
11211 assert!(!m.body.contains("Commits under review"), "{}", m.body);
11212 assert!(
11213 m.body
11214 .ends_with(&format!("magi:run/{} magi:candidate-a\n", state.id)),
11215 "{}",
11216 m.body
11217 );
11218 }
11219
11220 #[test]
11221 fn pr_message_review_bounds_a_long_english_subject() {
11222 let long = format!("feat: {}", "word ".repeat(100));
11223 let m = pr_message(&review_state(&[&long]), 'A');
11224 assert!(m.title.starts_with("feat: word"), "{}", m.title);
11225 assert!(m.title.chars().count() <= PR_TITLE_MAX, "{}", m.title);
11226 }
11227
11228 #[test]
11229 fn pr_message_implementation_run_is_unchanged_by_review_support() {
11230 let state = state_with_summary("add retries\n\ndetails", "- did some things");
11231 let m = pr_message(&state, 'A');
11232 assert_eq!(m.title, "add retries");
11233 assert!(m.body.contains("<summary>Original task</summary>"));
11234 assert!(!m.body.contains("Commits under review"));
11235 assert_eq!(landing_subject_source(&state), state.instruction);
11236 }
11237
11238 #[test]
11239 fn review_run_squash_subject_is_the_change_not_the_prompt() {
11240 let state = review_state(&["feat: the change", "fix: typo"]);
11241 let source = landing_subject_source(&state);
11242 assert_eq!(land::merge_subject("", &source), "feat: the change");
11243 assert_eq!(
11244 land::merge_subject("magi: candidate A (uncommitted work)", &source),
11245 "feat: the change"
11246 );
11247 assert_eq!(
11249 land::merge_subject("feat: renamed by hand", &source),
11250 "feat: renamed by hand"
11251 );
11252 let blank = review_state(&["日本語"]);
11253 assert!(
11254 land::merge_subject("", &landing_subject_source(&blank)).starts_with("chore: land")
11255 );
11256 }
11257
11258 #[test]
11259 fn review_run_drops_a_prompt_shaped_pr_title_at_landing() {
11260 let state = review_state(&["feat: the change"]);
11261 let source = landing_subject_source(&state);
11262 let old = "Review the work already on branch `magi/x/A`. There is no task statement";
11263 assert_eq!(
11264 land::merge_subject(landing_title(&state, old), &source),
11265 "feat: the change"
11266 );
11267 assert_eq!(landing_title(&state, "feat: renamed"), "feat: renamed");
11268 let task = state_with_summary("add retries", "");
11269 assert_eq!(landing_title(&task, old), old);
11270 }
11271
11272 #[test]
11273 fn pr_message_describes_the_change_not_the_task() {
11274 let state = state_with_summary(
11275 "今回やってほしいこと: results projector を直す",
11276 "TITLE: fix(web): batch the runs list reads\n- reads run.json once\n- risk: none",
11277 );
11278 let m = pr_message(&state, 'A');
11279 assert_eq!(m.title, "fix(web): batch the runs list reads");
11280 assert!(
11281 m.body.starts_with("## Summary\n\n- reads run.json once"),
11282 "{}",
11283 m.body
11284 );
11285 assert!(!m.body.contains("TITLE:"), "{}", m.body);
11286 let task_at = m.body.find("今回やってほしいこと").unwrap();
11287 let details_at = m.body.find("<details>").unwrap();
11288 assert!(
11289 details_at < task_at,
11290 "the task lives inside <details>: {}",
11291 m.body
11292 );
11293 assert!(m.body.contains(&format!("magi:run/{}", state.id)));
11294 assert!(m.body.contains("magi:candidate-a"));
11295 }
11296
11297 #[test]
11298 fn pr_message_falls_back_to_the_task_without_a_title_line() {
11299 let state = state_with_summary("\n\nadd retries\n\ndetails", "- did some things");
11300 let m = pr_message(&state, 'A');
11301 assert_eq!(m.title, "add retries");
11302 assert!(
11303 m.body.contains("## Summary\n\n- did some things"),
11304 "{}",
11305 m.body
11306 );
11307
11308 let none = RunState::new(
11309 PathBuf::from("/repo"),
11310 "main".to_owned(),
11311 "abc1234".to_owned(),
11312 "add retries".to_owned(),
11313 Config::default(),
11314 );
11315 let m = pr_message(&none, 'A');
11316 assert_eq!(m.title, "add retries");
11317 assert!(!m.body.contains("## Summary"), "{}", m.body);
11318 }
11319
11320 #[test]
11321 fn pr_message_refuses_the_candidate_commit_subject() {
11322 for bad in [
11323 "TITLE: magi: candidate A (uncommitted work)",
11324 "TITLE: chore: stuff (uncommitted work)",
11325 "TITLE: ",
11326 ] {
11327 let state = state_with_summary("add retries", bad);
11328 assert_eq!(pr_message(&state, 'A').title, "add retries", "{bad}");
11329 }
11330 }
11331
11332 #[test]
11333 fn pr_message_bounds_a_very_long_task_and_title() {
11334 let long = format!("fix the thing 🎉 {}", "x".repeat(5000));
11335 let state = state_with_summary(&long, "- nothing");
11336 let m = pr_message(&state, 'A');
11337 assert!(m.title.chars().count() <= PR_TITLE_MAX, "{}", m.title);
11338 assert!(!m.title.contains('\n'));
11339
11340 let state = state_with_summary("task", &format!("TITLE: feat: {}", "y".repeat(5000)));
11341 let m = pr_message(&state, 'A');
11342 assert!(m.title.starts_with("feat: "));
11343 assert!(m.title.chars().count() <= PR_TITLE_MAX, "{}", m.title);
11344 assert_eq!(m.commit_message().lines().next(), Some(m.title.as_str()));
11345 }
11346
11347 fn long_title_of(instruction: &str) -> String {
11348 pr_message(&state_with_summary(instruction, "- nothing"), 'A').title
11349 }
11350
11351 #[test]
11352 fn pr_message_cuts_a_long_english_line_at_its_first_sentence() {
11353 let first = "Make the landing path keep a readable title for long tasks";
11354 let line = format!(
11355 "{first}. {}",
11356 "And then keep going with more words ".repeat(20)
11357 );
11358 let t = long_title_of(&line);
11359 assert_eq!(t, first);
11360 assert!(!t.starts_with("chore: land"));
11361 }
11362
11363 #[test]
11364 fn pr_message_cuts_a_sentenceless_long_line_at_a_word() {
11365 let line = "word ".repeat(200);
11366 let t = long_title_of(&line);
11367 assert!(t.ends_with("word..."), "{t}");
11368 assert!(t.is_ascii() && t.chars().count() <= PR_TITLE_MAX, "{t}");
11369 }
11370
11371 #[test]
11372 fn pr_message_long_non_english_or_letterless_line_is_neutral() {
11373 for line in ["日本語のタスク ".repeat(80), "1234 ".repeat(100)] {
11374 assert!(long_title_of(&line).starts_with("chore: land"), "{line}");
11375 }
11376 }
11377
11378 #[test]
11379 fn pr_message_title_limit_is_exact() {
11380 let at = "a".repeat(PR_TITLE_MAX);
11381 assert_eq!(long_title_of(&at), at);
11382 let over = long_title_of(&"a".repeat(PR_TITLE_MAX + 1));
11383 assert!(over.ends_with("..."), "{over}");
11384 assert_eq!(over.chars().count(), PR_TITLE_MAX);
11385 }
11386
11387 #[test]
11388 fn pr_message_judges_the_kept_text_not_what_follows_the_cut() {
11389 let line = format!("{} \u{2014} tail", "alpha beta ".repeat(40));
11390 let t = long_title_of(&line);
11391 assert!(t.ends_with("..."), "{t}");
11392 assert!(t.is_ascii(), "{t}");
11393 }
11394
11395 #[test]
11396 fn pr_message_sentence_cut_skips_abbreviations_and_decimals() {
11397 let line = format!(
11398 "Support several shells, e.g. bash and zsh, at version 1.5 or newer when it matters {}",
11399 "plus more filler words ".repeat(20)
11400 );
11401 let t = long_title_of(&line);
11402 assert!(t.contains("e.g. bash") && t.contains("1.5 or newer"), "{t}");
11403 }
11404
11405 #[test]
11406 fn pr_message_long_title_survives_a_blank_first_line_and_the_squash_subject() {
11407 let line = format!("\n\n# {}", "title words ".repeat(40));
11408 let state = state_with_summary(&line, "- nothing");
11409 let m = pr_message(&state, 'A');
11410 assert!(m.title.starts_with("title words"), "{}", m.title);
11411 assert_eq!(
11412 land::merge_subject(&m.title, &landing_subject_source(&state)),
11413 m.title
11414 );
11415 assert_eq!(
11417 land::merge_subject("feat: renamed by hand", &landing_subject_source(&state)),
11418 "feat: renamed by hand"
11419 );
11420 }
11421
11422 #[test]
11423 fn pr_message_magi_text_is_english_and_the_task_is_verbatim() {
11424 let mut state = state_with_summary(
11428 "add retries",
11429 "TITLE: fix(web): batch reads\n- reads run.json once",
11430 );
11431 state.config.graph.language = "ja".to_owned();
11432 let m = pr_message(&state, 'A');
11433 assert!(m.title.is_ascii() && m.body.is_ascii(), "{}", m.body);
11434
11435 let task = "今回やってほしいこと: results projector を直す";
11438 let mut state = state_with_summary(task, "- no title line");
11439 state.config.graph.language = "ja".to_owned();
11440 let m = pr_message(&state, 'A');
11441 assert_eq!(
11442 m.title,
11443 format!("chore: land candidate A of run {}", state.id)
11444 );
11445 assert!(
11446 m.body.contains(&format!(
11447 "<summary>Original task</summary>\n\n{task}\n\n</details>"
11448 )),
11449 "{}",
11450 m.body
11451 );
11452 }
11453
11454 #[test]
11455 fn pr_message_scrubs_home_paths_and_addresses() {
11456 let state = state_with_summary(
11457 "fix it in /Users/someone/src/x",
11458 "TITLE: fix(x): y\n- edited /home/someone/repo/src/a.rs on 10.1.2.3",
11459 );
11460 let m = pr_message(&state, 'A');
11461 for leak in ["/Users/someone", "/home/someone", "10.1.2.3"] {
11462 assert!(!m.body.contains(leak), "{}", m.body);
11463 }
11464 assert!(m.body.contains("~/repo/src/a.rs"), "{}", m.body);
11465 }
11466
11467 #[test]
11468 fn pr_message_survives_a_task_that_closes_details() {
11469 let state = state_with_summary("a </details> b", "TITLE: fix: x");
11470 let m = pr_message(&state, 'A');
11471 assert_eq!(m.body.matches("</details>").count(), 1, "{}", m.body);
11472 }
11473
11474 #[test]
11475 fn manual_squash_subject_cannot_break_out_of_its_quotes() {
11476 let cmd = manual_merge_command(
11477 MergeStyle::Squash,
11478 Path::new("/repo"),
11479 "b",
11480 "fix: \"quoted\" $(x) `y`\n\nbody",
11481 );
11482 assert!(cmd.ends_with("commit -m \"fix: quoted (x) y\""), "{cmd}");
11483 }
11484
11485 #[test]
11486 fn manual_merge_command_matches_the_configured_style() {
11487 let repo = Path::new("/repo");
11488 let message = "Merge magi run 0832 (candidate A)\n\nadd retries";
11489
11490 let merge = manual_merge_command(MergeStyle::Merge, repo, "magi/0832/A", message);
11491 assert_eq!(merge, "git -C /repo merge --no-ff magi/0832/A");
11492
11493 let squash = manual_merge_command(MergeStyle::Squash, repo, "magi/0832/A", message);
11494 assert_eq!(
11495 squash,
11496 "git -C /repo merge --squash magi/0832/A && git -C /repo commit -m \
11497 \"Merge magi run 0832 (candidate A)\""
11498 );
11499
11500 let rebase = manual_merge_command(MergeStyle::Rebase, repo, "magi/0832/A", message);
11501 assert_eq!(rebase, "git -C /repo merge --ff-only magi/0832/A");
11502 }
11503
11504 #[test]
11505 fn a_nudge_gets_a_quarter_of_the_budget() {
11506 assert_eq!(retry_budget(secs(1200), true), secs(300));
11508 assert_eq!(retry_budget(secs(3600), true), secs(900));
11509 }
11510
11511 #[test]
11512 fn a_resent_prompt_keeps_the_whole_budget() {
11513 assert_eq!(retry_budget(secs(1200), false), secs(1200));
11516 assert_eq!(retry_budget(secs(60), false), secs(60));
11517 }
11518
11519 #[test]
11520 fn the_floor_never_exceeds_the_original_budget() {
11521 assert_eq!(retry_budget(secs(60), true), secs(60));
11525 assert_eq!(retry_budget(secs(480), true), secs(120));
11526 assert_eq!(retry_budget(secs(0), true), secs(0));
11527 }
11528
11529 fn evidence(exit_code: Option<i32>) -> agent::CommandEvidence {
11530 agent::CommandEvidence {
11531 id: "item1".to_owned(),
11532 description: "cargo test".to_owned(),
11533 exit_code,
11534 result_summary: String::new(),
11535 source: "codex".to_owned(),
11536 }
11537 }
11538
11539 #[test]
11540 fn a_reply_with_no_commands_at_all_is_not_unconfirmed() {
11541 assert!(!has_unconfirmed_command(&[]));
11545 }
11546
11547 #[test]
11548 fn a_command_with_a_real_exit_code_is_confirmed_whatever_its_value() {
11549 assert!(!has_unconfirmed_command(&[evidence(Some(0))]));
11553 assert!(!has_unconfirmed_command(&[evidence(Some(1))]));
11554 assert!(!has_unconfirmed_command(&[
11555 evidence(Some(0)),
11556 evidence(Some(101))
11557 ]));
11558 }
11559
11560 #[test]
11561 fn one_command_with_no_readable_exit_code_is_enough_to_flag_the_reply() {
11562 assert!(has_unconfirmed_command(&[
11563 evidence(Some(0)),
11564 evidence(None)
11565 ]));
11566 }
11567
11568 #[test]
11569 fn a_clean_usable_reply_with_the_marker_is_a_verified_claim() {
11570 let text = "NO CHANGE NEEDED: already fixed by b32cfc4, on main.";
11571 assert_eq!(
11572 verified_noop_claim(true, &[], text).as_deref(),
11573 Some("already fixed by b32cfc4, on main.")
11574 );
11575 }
11576
11577 #[test]
11578 fn an_unusable_reply_never_earns_the_benefit_of_the_doubt() {
11579 let text = "NO CHANGE NEEDED: already fixed by b32cfc4, on main.";
11582 assert!(verified_noop_claim(false, &[], text).is_none());
11583 }
11584
11585 #[test]
11586 fn an_unconfirmed_command_disqualifies_the_claim_even_on_a_usable_reply() {
11587 let text = "NO CHANGE NEEDED: already fixed by b32cfc4, on main.";
11588 assert!(verified_noop_claim(true, &[evidence(None)], text).is_none());
11589 assert!(verified_noop_claim(true, &[evidence(Some(0))], text).is_some());
11591 }
11592
11593 #[test]
11594 fn an_ordinary_reply_with_no_marker_is_never_a_claim() {
11595 assert!(verified_noop_claim(true, &[], "- did the thing\n- tested it").is_none());
11596 }
11597
11598 fn set_candidates(runner: &mut Runner, shape: &[(bool, Option<&str>)]) {
11601 runner.state.candidates = shape
11602 .iter()
11603 .enumerate()
11604 .map(|(i, &(empty, verified))| Candidate {
11605 index: i,
11606 label: (b'A' + i as u8) as char,
11607 agent: "sonnet".to_owned(),
11608 branch: format!("magi/x/{}", (b'A' + i as u8) as char),
11609 worktree: PathBuf::from(format!("/wt/{i}")),
11610 summary: String::new(),
11611 stat: String::new(),
11612 files: 0,
11613 commits: 0,
11614 empty,
11615 failed: None,
11616 verified_noop: verified.map(str::to_owned),
11617 duration_ms: 0,
11618 folded: false,
11619 })
11620 .collect();
11621 }
11622
11623 #[test]
11624 fn after_implement_reads_all_candidates_verified_as_a_noop_not_a_failure() {
11625 ask_test_home();
11626 let mut runner = runner_at(RunStatus::Implementing);
11627 set_candidates(
11628 &mut runner,
11629 &[
11630 (true, Some("already on main at b32cfc4")),
11631 (true, Some("same fix, see the existing test")),
11632 ],
11633 );
11634
11635 runner
11636 .after_implement()
11637 .expect("a verified no-op is not an error");
11638
11639 assert_eq!(runner.state.status, RunStatus::VerifiedNoop);
11640 }
11641
11642 #[test]
11643 fn after_implement_does_not_accept_one_candidates_claim_next_to_an_ordinary_loss() {
11644 ask_test_home();
11645 let mut runner = runner_at(RunStatus::Implementing);
11646 set_candidates(
11650 &mut runner,
11651 &[(true, Some("already on main at b32cfc4")), (true, None)],
11652 );
11653
11654 let err = runner
11655 .after_implement()
11656 .expect_err("an unverified empty candidate must still fail the run");
11657
11658 assert!(
11659 err.to_string().contains("no candidate produced a change"),
11660 "{err}"
11661 );
11662 assert_eq!(runner.state.status, RunStatus::Failed);
11663 }
11664
11665 #[test]
11666 fn after_implement_still_fails_an_ordinary_all_empty_run() {
11667 ask_test_home();
11668 let mut runner = runner_at(RunStatus::Implementing);
11669 set_candidates(&mut runner, &[(true, None), (true, None)]);
11670
11671 let err = runner
11672 .after_implement()
11673 .expect_err("no candidate declared anything; this is an ordinary failure");
11674
11675 assert!(
11676 err.to_string().contains("no candidate produced a change"),
11677 "{err}"
11678 );
11679 assert_eq!(runner.state.status, RunStatus::Failed);
11680 }
11681}