diff --git a/oxa/oxa-work/src/committed.rs b/oxa/oxa-work/src/committed.rs index 3d2deabb6..029860003 100644 --- a/oxa/oxa-work/src/committed.rs +++ b/oxa/oxa-work/src/committed.rs @@ -646,6 +646,7 @@ mod tests { model: "fake".into(), prompt: "Synthetic task".into(), max_time: 2700, + reviewed_pull_request: None, }; assert!(tree::prepare( &fixture.source, diff --git a/oxa/oxa-work/src/github.rs b/oxa/oxa-work/src/github.rs index ab6434de3..393badb5c 100644 --- a/oxa/oxa-work/src/github.rs +++ b/oxa/oxa-work/src/github.rs @@ -34,20 +34,42 @@ query($owner: String!, $repo: String!, $number: Int!) { }"#; fn oid(value: &str) -> bool { - value.len() == 40 - && value - .bytes() - .all(|byte| byte.is_ascii_hexdigit() && !byte.is_ascii_uppercase()) + value.len() == 40 && crate::board::queue::is_object_id(value) +} + +/// The pull request reviewed before an attempt was admitted. +#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, PartialEq, Eq)] +#[serde(deny_unknown_fields)] +pub struct ReviewedPullRequest { + pub number: u64, + pub head: String, } impl Task { - pub(crate) fn reviewed_head(&self) -> Option<&str> { + pub(crate) fn reviewed_source(&self) -> Option<(u64, &str)> { if !self.prompt.starts_with(GITHUB_RUNNER_LEAD) { return None; } - let (number, head) = self.id.strip_prefix("pr-")?.split_once('-')?; - number.parse::().ok().filter(|n| *n > 0)?; - oid(head).then_some(head) + let legacy = self.id.strip_prefix("pr-").and_then(|id| { + let (number, head) = id.split_once('-')?; + let number = number.parse::().ok()?; + (number != 0 && oid(head)).then_some((number, head)) + }); + if let Some(source) = &self.reviewed_pull_request { + let reviewed = (source.number, source.head.as_str()); + if source.number == 0 + || !crate::board::queue::is_object_id(&source.head) + || (self.id.starts_with("pr-") && legacy != Some(reviewed)) + { + return None; + } + return Some(reviewed); + } + legacy + } + + pub(crate) fn reviewed_head(&self) -> Option<&str> { + self.reviewed_source().map(|(_, head)| head) } } @@ -111,6 +133,7 @@ pub fn pull_request_task( base, prompt, max_time: default_max_time(), + reviewed_pull_request: None, }) } @@ -254,6 +277,29 @@ mod tests { const HEAD: &str = "0123456789abcdef0123456789abcdef01234567"; + #[test] + fn explicit_reviewed_source_accepts_full_sha256_without_extending_legacy_ids() { + let head = "a".repeat(64); + let mut task = Task { + id: "board-fixture-1-1".into(), + model: "fixture".into(), + branch: "agent/fixture".into(), + base: "main".into(), + prompt: github_runner_guidance("pull request"), + max_time: default_max_time(), + reviewed_pull_request: Some(ReviewedPullRequest { + number: 1, + head: head.clone(), + }), + }; + assert_eq!(task.reviewed_source(), Some((1, head.as_str()))); + task.id = format!("pr-1-{head}"); + assert_eq!(task.reviewed_source(), None); + task.id = format!("pr-1-{HEAD}"); + task.reviewed_pull_request = None; + assert_eq!(task.reviewed_source(), Some((1, HEAD))); + } + fn packet() -> Value { json!({ "title": "Synthetic PR", diff --git a/oxa/oxa-work/src/lib.rs b/oxa/oxa-work/src/lib.rs index 8e3f09910..b1b4aa313 100644 --- a/oxa/oxa-work/src/lib.rs +++ b/oxa/oxa-work/src/lib.rs @@ -51,7 +51,7 @@ pub mod events; mod facts_io; pub use facts_io::require_private_directory; mod github; -pub use github::pull_request_task; +pub use github::{pull_request_task, ReviewedPullRequest}; pub mod incidents; pub mod situation; pub mod standing; @@ -67,6 +67,9 @@ pub struct Task { pub prompt: String, #[serde(default = "default_max_time")] pub max_time: u64, + /// Reviewed source for attempts whose execution IDs use a different namespace. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub reviewed_pull_request: Option, } fn default_max_time() -> u64 { 45 * 60 @@ -582,6 +585,9 @@ fn valid_task_id(id: &str) -> bool { .all(|byte| byte.is_ascii_alphanumeric() || b"-_".contains(&byte)) } fn validate(task: &Task) -> Result<()> { + if task.reviewed_pull_request.is_some() && task.reviewed_source().is_none() { + return Err("invalid reviewed pull request source".into()); + } if !valid_task_id(&task.id) { return Err("task id must contain 1..128 letters, digits, - or _".into()); } @@ -640,6 +646,7 @@ pub fn issue_task( base: default_base(), prompt: issue_prompt(number, &issue)?, max_time: default_max_time(), + reviewed_pull_request: None, }) } diff --git a/oxa/oxa-work/src/queue/native.rs b/oxa/oxa-work/src/queue/native.rs index 3253c724f..547d5466e 100644 --- a/oxa/oxa-work/src/queue/native.rs +++ b/oxa/oxa-work/src/queue/native.rs @@ -55,6 +55,7 @@ pub(super) fn from_packet(binding: &board::NativeBinding, packet: &str) -> Resul base: base.into(), prompt: body.into(), max_time: crate::default_max_time(), + reviewed_pull_request: None, }, ) } @@ -208,6 +209,7 @@ mod tests { base: "main".into(), prompt: "Synthetic task".into(), max_time: 30, + reviewed_pull_request: None, }; let policy = RunPolicy { git_binary: "/usr/bin/git".into(), diff --git a/oxa/oxa-work/src/state.rs b/oxa/oxa-work/src/state.rs index f02a4c263..9ba490217 100644 --- a/oxa/oxa-work/src/state.rs +++ b/oxa/oxa-work/src/state.rs @@ -301,6 +301,7 @@ mod tests { model: "fake".into(), prompt: "Synthetic task".into(), max_time: crate::default_max_time(), + reviewed_pull_request: None, }; let record = crate::blocked_record(&task, String::new()); State::new(task, record, false)