Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8a426a3
feat(work): reserve durable board leases and attempts atomically (#1017)
Nov 17, 2026
ba69400
test(work): cover poisoned claims and serialize first reservation (#1…
Nov 17, 2026
3cdd364
test(work): reproduce repeated lease identity and concurrent snapshot…
Nov 17, 2026
e6a2185
fix(work): never let a per-PR marker decide the claim write mode (#1017)
n0rpan Nov 17, 2026
646f6aa
Merge remote agent/1017-board-claims preserving both histories
n0rpan Nov 17, 2026
e9118cf
fix(work): retain helper claim delta and repair its compile errors (#…
Nov 17, 2026
266f37e
fix(work): serialize claim snapshots and replace release state (#1017)
Nov 17, 2026
b4d8ce4
fix(work): fence repeated reservations and accept canonical worker ID…
Nov 17, 2026
9cf1241
Merge main into board claims preserving assignment and facts work (#1…
Nov 17, 2026
ef39318
test(work): expose creation-witness gap on refused claims (#1017)
Nov 17, 2026
aa546cd
Merge main into board claims preserving both histories (#1017)
Nov 17, 2026
98f47ec
fix(work): repair claim witnesses before admission refusal (#1017)
Nov 17, 2026
ba7718e
feat(work): persist assignment controls in atomic claim records (#1017)
Nov 17, 2026
3d5cb68
Merge board claim witness repair into persistent controls (#1017)
Nov 17, 2026
08fe301
feat(work): add authenticated manual leases and reasoned releases (#1…
Nov 17, 2026
0db017d
feat(work): add typed issue intake and conservative claim import (#1017)
Nov 17, 2026
3c4288a
fix(work): label typed issue actions in the existing board projection…
Nov 17, 2026
d27f287
Merge main preserving landed claims and typed intake controls (#1017)
Nov 17, 2026
b654ef2
Merge main preserving landed claims and assignment controls (#1017)
Nov 17, 2026
6544b55
Merge current main and controls into manual board leases (#1017)
Nov 17, 2026
f10637f
Merge manual board leases into typed issue intake (#1017)
n0rpan Nov 17, 2026
99bfa54
test(work): expose witness loss on stale control updates (#1017)
Nov 17, 2026
0a83064
fix(work): restore witnesses before returning established claim state…
Nov 17, 2026
ecc98ed
Merge shared witness repair into manual board leases (#1017)
Nov 17, 2026
007a843
Merge landed manual leases while retaining the claim witness repair (…
Nov 17, 2026
0a0b4cf
Merge shared claim repair and landed main into typed issue intake (#1…
Nov 17, 2026
8715e59
test(work): reject reviewer issue leases through the legacy claim API…
Nov 17, 2026
d6c94a7
fix(work): require role-aware admission for issue builds (#1017)
Nov 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions oxa/oxa-cli/src/lead_page.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@ fn action(value: Action) -> &'static str {
Action::FixRequiredCi => "Fix required CI",
Action::ResolveConflict => "Resolve conflict",
Action::AddRemoves => "Add removal rationale",
Action::BuildIssue => "Build approved issue",
Action::PromoteDraft => "Promote green draft",
Action::Ready => "Ready to land",
Action::WaitRequiredCi => "Wait for required CI",
Action::WaitMergeability => "Wait for mergeability",
Action::WaitReview => "Wait for review",
Action::WaitIssue => "Wait for issue intake",
}
}
fn subject(value: &Subject) -> String {
Expand Down
64 changes: 44 additions & 20 deletions oxa/oxa-work/src/board.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ use std::collections::{BTreeMap, BTreeSet};
mod claims;
pub use claims::{Assignment, AssignmentBoard, AssignmentData, Claims, ReleaseRecord};
pub mod assignment;
mod intake;
pub use intake::{ImportState, Issue, Snapshot};

#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
#[serde(rename_all = "snake_case")]
Expand All @@ -13,11 +15,13 @@ pub enum Action {
FixRequiredCi,
ResolveConflict,
AddRemoves,
BuildIssue,
PromoteDraft,
Ready,
WaitRequiredCi,
WaitMergeability,
WaitReview,
WaitIssue,
}

#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq)]
Expand Down Expand Up @@ -71,7 +75,16 @@ impl std::fmt::Debug for PullRequest {

/// The adapter must return the complete open-PR snapshot or fail, never a partial page.
pub trait GitHub {
fn open_pull_requests(&mut self) -> crate::Result<Vec<PullRequest>>;
fn open_pull_requests(&mut self) -> crate::Result<Vec<PullRequest>> {
Err("adapter must implement a complete board snapshot".into())
}
/// One complete, caller-partitioned PR AND issue intake. Legacy PR adapters remain valid.
fn snapshot(&mut self) -> crate::Result<Snapshot> {
Ok(Snapshot {
pull_requests: self.open_pull_requests()?,
issues: vec![],
})
}
}

#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
Expand All @@ -89,7 +102,7 @@ pub fn valid_worker_id(id: &str) -> bool {
!id.is_empty() && id.len() <= 128 && id.split([':', '/']).all(crate::valid_task_id)
}

#[derive(Clone, Debug, Default, Deserialize, Serialize)]
#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
pub struct AttemptState {
pub utc_day: u64,
pub attempts: u32,
Expand All @@ -114,6 +127,7 @@ impl Default for Policy {
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Entry {
pub number: u64,
/// PR head, or frozen issue-source revision for BuildIssue/WaitIssue. Never a fabricated PR.
pub head: String,
pub release_pinned: bool,
pub action: Action,
Expand Down Expand Up @@ -145,7 +159,8 @@ impl Board {
return Ok(board);
}
let mut seen = BTreeSet::new();
for pr in github.open_pull_requests()? {
let snapshot = github.snapshot()?;
for pr in snapshot.pull_requests {
if pr.number == 0 || pr.head.is_empty() || !seen.insert(pr.number) {
return Err("invalid or duplicate pull request in board snapshot".into());
}
Expand Down Expand Up @@ -174,25 +189,34 @@ impl Board {
} else {
Action::WaitReview
};
let saved = state.get(&pr.number);
let attempts_today = saved
.filter(|s| s.utc_day >= now / 86_400)
.map_or(0, |s| s.attempts);
let lease = saved.and_then(|s| s.lease.clone());
let eligible = !matches!(
board.entries.push(intake::entry(
pr.number,
pr.head,
pr.release_pinned,
action,
Action::WaitReview | Action::WaitRequiredCi | Action::WaitMergeability
) && attempts_today < policy.max_attempts_per_day
&& lease.as_ref().is_none_or(|l| l.expires_at <= now);
board.entries.push(Entry {
number: pr.number,
head: pr.head,
release_pinned: pr.release_pinned,
state.get(&pr.number),
policy,
now,
));
}
for issue in snapshot.issues {
if issue.number == 0 || issue.revision.is_empty() || !seen.insert(issue.number) {
return Err("invalid or duplicate issue in board snapshot".into());
}
let action = if issue.approved && !issue.has_open_pull_request {
Action::BuildIssue
} else {
Action::WaitIssue
};
board.entries.push(intake::entry(
issue.number,
issue.revision,
issue.release_pinned,
action,
lease,
attempts_today,
eligible,
});
state.get(&issue.number),
policy,
now,
));
}
board
.entries
Expand Down
8 changes: 5 additions & 3 deletions oxa/oxa-work/src/board/assignment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,11 @@ impl AssignmentPolicy {
/// A manual pin narrows eligibility; it cannot bypass skills or action authority.
pub fn allows(&self, worker: &Worker, action: Action) -> bool {
let base_role = match action {
Action::FixFindings | Action::FixRequiredCi | Action::ResolveConflict | Action::AddRemoves => {
Role::Builder
}
Action::FixFindings
| Action::FixRequiredCi
| Action::ResolveConflict
| Action::AddRemoves
| Action::BuildIssue => Role::Builder,
Action::PromoteDraft | Action::Ready => Role::Orchestrator,
_ => return false,
};
Expand Down
9 changes: 7 additions & 2 deletions oxa/oxa-work/src/board/claims.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use std::path::{Path, PathBuf};

mod controls;
pub use controls::{Assignment, AssignmentBoard, AssignmentData, ReleaseRecord};
mod imports;

#[derive(Deserialize, Serialize)]
#[serde(deny_unknown_fields)]
Expand Down Expand Up @@ -125,6 +126,7 @@ impl Claims {
{
return Err("invalid board claim identity or lease".into());
}
self.mark(number)?;
Ok(saved)
}

Expand Down Expand Up @@ -196,7 +198,7 @@ impl Claims {
ttl: u64,
) -> Result<Option<Lease>> {
self.claim_checked(entry, policy, holder, (now, ttl), |row| {
Ok(row.data.policy.is_none())
Ok(entry.action != Action::BuildIssue && row.data.policy.is_none())
})
}

Expand All @@ -214,7 +216,7 @@ impl Claims {
|| !entry.eligible
|| matches!(
entry.action,
Action::WaitReview | Action::WaitRequiredCi | Action::WaitMergeability
Action::WaitReview | Action::WaitRequiredCi | Action::WaitMergeability | Action::WaitIssue
)
{
return Ok(None);
Expand All @@ -231,6 +233,9 @@ impl Claims {
if self.established(entry.number)? {
self.mark(entry.number)?;
}
if row.data.import_hold {
return Ok(None);
}
if !authorize(&mut row)? {
return Ok(None);
}
Expand Down
13 changes: 12 additions & 1 deletion oxa/oxa-work/src/board/claims/controls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ pub struct AssignmentData {
pub revision: u64,
pub policy: Option<AssignmentPolicy>,
#[serde(default)]
pub import_hold: bool,
#[serde(default)]
pub last_release: Option<ReleaseRecord>,
}

Expand Down Expand Up @@ -89,8 +91,17 @@ impl Claims {
{
return Err("invalid or duplicate worker catalog".into());
}
let mut board = Board::read(github, policy, &states, now)?;
for entry in &mut board.entries {
if assignments
.get(&entry.number)
.is_some_and(|row| row.data.import_hold)
{
entry.eligible = false;
}
}
Ok(AssignmentBoard {
board: Board::read(github, policy, &states, now)?,
board,
assignments,
workers: workers.to_vec(),
})
Expand Down
78 changes: 78 additions & 0 deletions oxa/oxa-work/src/board/claims/imports.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
//! Bootstrap is restartable, refuses conflicting native facts, and never refunds attempts.
use super::*;
use crate::board::{assignment::ManualAuthority, ImportState};
impl Claims {
/// Caller keeps activation OFF until the entire authoritative batch is imported and verified.
/// A partial I/O failure can be retried; an established, differing state is never overwritten.
pub fn import_snapshot(
&self,
authority: Option<ManualAuthority>,
incoming: &BTreeMap<u64, ImportState>,
now: u64,
) -> Result<()> {
if authority.is_none() {
return Err("owner or lead import required".into());
}
for (number, item) in incoming {
let state = &item.state;
if *number == 0
|| state.utc_day > now / 86_400
|| state.lease.as_ref().is_some_and(|l| {
state.attempts == 0
|| !valid_worker_id(&l.holder)
|| l.generation != (state.utc_day, state.attempts)
|| l.claimed_at.is_none_or(|at| at > now || at >= l.expires_at)
})
{
return Err("invalid imported claim state".into());
}
}
if Self::open(&self.root)?.uid != self.uid {
return Err("invalid import directory".into());
}
let lock = io(File::open(&self.root))?;
io(lock.lock())?;
let mut prepared = vec![];
for (number, item) in incoming {
let mut row = self.load(*number)?;
let exists = self.established(*number)?;
if exists && row.state != item.state {
return Err("import conflicts with established claims; reconciliation required".into());
}
let held = item.excluded || item.state.lease.as_ref().is_some_and(|l| l.expires_at > now);
let changed = !exists || (held && !row.data.import_hold);
row.state = item.state.clone();
row.data.import_hold |= held;
prepared.push((*number, row, exists, changed));
}
for (number, row, exists, changed) in prepared {
if changed {
self.save(number, row, exists)?;
}
self.mark(number)?;
}
Ok(())
}
/// Only after the trusted frontend verifies preserved queued/active work has ended.
pub fn clear_import_hold(
&self,
number: u64,
authority: Option<ManualAuthority>,
expected_revision: u64,
) -> Result<()> {
if authority.is_none() {
return Err("owner or lead reconciliation required".into());
}
let _lock = self.lock(number)?;
let mut row = self.load(number)?;
if row.data.revision != expected_revision {
return Err("assignment changed; refresh it".into());
}
if !row.data.import_hold {
return Ok(());
}
row.data.import_hold = false;
self.save(number, row, true)?;
self.mark(number)
}
}
51 changes: 51 additions & 0 deletions oxa/oxa-work/src/board/intake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
//! Typed intake and conservative bootstrap data; no acquisition, partitioner or second store.
use super::*;
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(deny_unknown_fields)]
pub struct Issue {
pub number: u64,
pub revision: String,
pub release_pinned: bool,
/// Trusted intake approval, never inferred from arbitrary issue text.
pub approved: bool,
pub has_open_pull_request: bool,
}
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Snapshot {
pub pull_requests: Vec<PullRequest>,
pub issues: Vec<Issue>,
}
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct ImportState {
pub state: AttemptState,
/// Queued OR active legacy work excludes native admission until explicitly reconciled.
pub excluded: bool,
}
pub(super) fn entry(
number: u64,
head: String,
release_pinned: bool,
action: Action,
saved: Option<&AttemptState>,
policy: &Policy,
now: u64,
) -> Entry {
let attempts_today = saved
.filter(|s| s.utc_day >= now / 86_400)
.map_or(0, |s| s.attempts);
let lease = saved.and_then(|s| s.lease.clone());
let eligible = !matches!(
action,
Action::WaitReview | Action::WaitRequiredCi | Action::WaitMergeability | Action::WaitIssue
) && attempts_today < policy.max_attempts_per_day
&& lease.as_ref().is_none_or(|l| l.expires_at <= now);
Entry {
number,
head,
release_pinned,
action,
lease,
attempts_today,
eligible,
}
}
Loading
Loading