From 1fe1b7463fb6458ec3335148fbe55b51d3a0daf2 Mon Sep 17 00:00:00 2001 From: Hare Date: Mon, 17 Aug 2026 07:41:03 +0900 Subject: [PATCH] fix: align merge requests with selector thread contract --- Cargo.lock | 1 + crates/merge-request/Cargo.toml | 1 + crates/merge-request/src/lib.rs | 2238 ++++++----------- crates/merge-request/tests/store.rs | 564 ++--- .../src/feature/builtin/merge_request.rs | 308 +-- crates/worker/src/spawn/tool.rs | 19 +- crates/worker/src/worker.rs | 6 - crates/workspace-server/src/server.rs | 782 ++---- resources/prompts/common/git.md | 2 +- resources/prompts/role/coder.md | 4 +- resources/prompts/role/orchestrator.md | 2 +- resources/prompts/role/reviewer.md | 4 +- .../tickets/[ticketId]/+page.svelte | 81 +- 13 files changed, 1354 insertions(+), 2658 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9016734a..4d76aaca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2539,6 +2539,7 @@ dependencies = [ "serde_json", "tempfile", "thiserror 2.0.18", + "uuid", ] [[package]] diff --git a/crates/merge-request/Cargo.toml b/crates/merge-request/Cargo.toml index e8a5ed85..7c0b5664 100644 --- a/crates/merge-request/Cargo.toml +++ b/crates/merge-request/Cargo.toml @@ -10,6 +10,7 @@ rusqlite.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true thiserror.workspace = true +uuid = { workspace = true, features = ["v7"] } [dev-dependencies] tempfile.workspace = true diff --git a/crates/merge-request/src/lib.rs b/crates/merge-request/src/lib.rs index 74b52a11..b9dca36d 100644 --- a/crates/merge-request/src/lib.rs +++ b/crates/merge-request/src/lib.rs @@ -1,13 +1,16 @@ -use std::path::Path; -use std::sync::{Arc, Mutex}; - use chrono::{DateTime, Utc}; use rusqlite::{Connection, OptionalExtension, Transaction, params}; use serde::{Deserialize, Serialize}; +use std::{ + path::Path, + sync::{Arc, Mutex}, +}; use thiserror::Error; +use uuid::Uuid; const SCHEMA_VERSION: i64 = 12; const PREVIOUS_SCHEMA_VERSION: i64 = 11; +const MAX_BODY_BYTES: usize = 16 * 1024; #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] @@ -16,35 +19,22 @@ pub enum MergeRequestState { Merged, Closed, } - impl MergeRequestState { - fn as_str(self) -> &'static str { - match self { - Self::Open => "open", - Self::Merged => "merged", - Self::Closed => "closed", - } - } - - fn parse(value: &str) -> Result { - match value { - "open" | "draft" => Ok(Self::Open), + fn parse(v: &str) -> Result { + match v { + "draft" | "open" => Ok(Self::Open), "merged" => Ok(Self::Merged), "closed" => Ok(Self::Closed), - other => Err(MergeRequestError::Corrupt(format!( - "unknown merge request state `{other}`" - ))), + _ => Err(MergeRequestError::Corrupt(format!("unknown state `{v}`"))), } } } - #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] pub enum ReviewDecision { Approve, RequestChanges, } - #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] pub enum FindingSeverity { @@ -53,23 +43,22 @@ pub enum FindingSeverity { Minor, Note, } - #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct ReviewFinding { pub severity: FindingSeverity, #[serde(default, skip_serializing_if = "Option::is_none")] + pub code: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] pub path: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub line: Option, - pub message: String, + pub body: String, } - #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct WorkerIdentity { pub runtime_id: String, pub worker_id: String, } - #[derive(Debug, Clone, PartialEq, Eq)] pub struct MergeRequestAuth { pub workspace_id: String, @@ -80,47 +69,59 @@ pub struct MergeRequestAuth { } #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub struct RequestForReview { - pub base_commit: String, - pub head_commit: String, - #[serde(default)] - pub changed_paths: Vec, - #[serde(default)] - pub summary: String, -} - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub struct RequestForReviewEvent { - pub event_seq: u64, - pub base_commit: String, - pub head_commit: String, - pub changed_paths: Vec, - pub summary: String, - pub assignment_id: String, +pub struct ReviewRequestedEvent { + pub event_id: String, + pub sequence: u64, + pub subject_ref: String, pub requested_by: WorkerIdentity, + pub reviewer: WorkerIdentity, pub created_at: DateTime, } - #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct ReviewEvent { - pub event_seq: u64, - pub request_event_seq: u64, - pub head_commit: String, - pub reviewer_worker: WorkerIdentity, - pub reviewer_profile: String, + pub event_id: String, + pub sequence: u64, + pub request_event_id: String, + pub subject_ref: String, pub decision: ReviewDecision, pub body: String, pub findings: Vec, + pub reviewer: WorkerIdentity, + pub created_at: DateTime, +} +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct ReviewRevokedEvent { + pub event_id: String, + pub sequence: u64, + pub review_event_id: String, + pub subject_ref: String, + pub reason: String, + pub revoked_by: WorkerIdentity, + pub created_at: DateTime, +} +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct ReviewCancelledEvent { + pub event_id: String, + pub sequence: u64, + pub request_event_id: String, + pub subject_ref: String, + pub reason: String, + pub created_at: DateTime, +} +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct CommentEvent { + pub event_id: String, + pub sequence: u64, + pub body: String, + pub author: WorkerIdentity, pub created_at: DateTime, } - #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] pub enum MergeStrategy { FastForward, Merge, } - #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] pub enum ConflictResolution { @@ -128,46 +129,39 @@ pub enum ConflictResolution { Clean, ConflictsResolved, } - #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct MergeEvent { - pub event_seq: u64, + pub event_id: String, + pub sequence: u64, pub operation_id: String, - pub target_commit: String, - pub source_commit: String, - pub result_commit: String, + pub approval_event_id: String, + pub approved_source_ref: String, + pub target_ref_before: String, + pub target_ref_after: String, pub strategy: MergeStrategy, pub resolution: ConflictResolution, pub merged_by: WorkerIdentity, pub created_at: DateTime, } - -#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -pub struct LifecycleEvent { - pub event_seq: u64, - pub actor: WorkerIdentity, - #[serde(default)] - pub body: String, - pub created_at: DateTime, -} - #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(tag = "kind", rename_all = "snake_case")] pub enum MergeRequestThreadEvent { - RequestForReview(RequestForReviewEvent), + ReviewRequested(ReviewRequestedEvent), Review(ReviewEvent), + ReviewRevoked(ReviewRevokedEvent), + ReviewCancelled(ReviewCancelledEvent), + Comment(CommentEvent), Merge(MergeEvent), - Reopen(LifecycleEvent), - Close(LifecycleEvent), } - impl MergeRequestThreadEvent { - pub fn event_seq(&self) -> u64 { + pub fn sequence(&self) -> u64 { match self { - Self::RequestForReview(value) => value.event_seq, - Self::Review(value) => value.event_seq, - Self::Merge(value) => value.event_seq, - Self::Reopen(value) | Self::Close(value) => value.event_seq, + Self::ReviewRequested(v) => v.sequence, + Self::Review(v) => v.sequence, + Self::ReviewRevoked(v) => v.sequence, + Self::ReviewCancelled(v) => v.sequence, + Self::Comment(v) => v.sequence, + Self::Merge(v) => v.sequence, } } } @@ -176,44 +170,19 @@ impl MergeRequestThreadEvent { pub struct MergeRequest { pub workspace_id: String, pub merge_request_id: String, - pub ticket_id: String, pub repository_id: String, pub state: MergeRequestState, - pub selector_from: String, + pub selector_from: Option, pub selector_to: String, - pub opened_by_worker: WorkerIdentity, + pub ticket_ids: Vec, pub created_at: DateTime, pub updated_at: DateTime, #[serde(default)] pub thread: Vec, } - impl MergeRequest { - pub fn current_request(&self) -> Option<&RequestForReviewEvent> { - let reopened_at = self.thread.iter().rev().find_map(|event| match event { - MergeRequestThreadEvent::Reopen(value) => Some(value.event_seq), - _ => None, - }); - self.thread.iter().rev().find_map(|event| match event { - MergeRequestThreadEvent::RequestForReview(value) - if reopened_at.is_none_or(|seq| value.event_seq > seq) => - { - Some(value) - } - _ => None, - }) - } - - pub fn current_review(&self) -> Option<&ReviewEvent> { - let request = self.current_request()?; - self.thread.iter().rev().find_map(|event| match event { - MergeRequestThreadEvent::Review(value) - if value.request_event_seq == request.event_seq => - { - Some(value) - } - _ => None, - }) + pub fn effective_review(&self, subject: &str) -> Option<&ReviewEvent> { + self.thread.iter().rev().find_map(|e|match e{MergeRequestThreadEvent::Review(v)if v.subject_ref==subject&&!self.thread.iter().any(|x|matches!(x,MergeRequestThreadEvent::ReviewRevoked(r)if r.review_event_id==v.event_id))=>Some(v),_=>None}) } } @@ -224,36 +193,23 @@ pub struct OpenMergeRequest { pub repository_id: String, pub selector_from: String, pub selector_to: String, - pub request: RequestForReview, + pub summary: String, pub auth: MergeRequestAuth, pub now: DateTime, } - #[derive(Debug, Clone)] pub struct RequestMergeRequestReview { pub ticket_id: String, - pub expected_head_commit: String, - pub request: RequestForReview, - pub auth: MergeRequestAuth, - pub now: DateTime, -} - -#[derive(Debug, Clone)] -pub struct RegisterReviewCapability { - pub ticket_id: String, - pub expected_head_commit: String, + pub subject_ref: String, pub child_session_id: String, pub capability_token: String, pub auth: MergeRequestAuth, pub now: DateTime, } - #[derive(Debug, Clone, PartialEq, Eq)] -pub struct RegisteredReviewCapability { - pub capability_token: String, - pub request_event_seq: u64, +pub struct RequestedMergeRequestReview { + pub request_event: ReviewRequestedEvent, } - #[derive(Debug, Clone)] pub struct RegisterReviewerChildSession { pub workspace_id: String, @@ -263,57 +219,61 @@ pub struct RegisterReviewerChildSession { pub reviewer_profile: String, pub now: DateTime, } - #[derive(Debug, Clone)] pub struct SubmitMergeRequestReview { pub ticket_id: String, - pub expected_head_commit: String, + pub current_subject_ref: String, pub capability_token: String, pub decision: ReviewDecision, pub body: String, pub findings: Vec, pub now: DateTime, } - +#[derive(Debug, Clone)] +pub struct RevokeMergeRequestReview { + pub ticket_id: String, + pub review_event_id: String, + pub reason: String, + pub auth: MergeRequestAuth, + pub now: DateTime, +} +#[derive(Debug, Clone)] +pub struct RepairSelectorFrom { + pub workspace_id: String, + pub ticket_id: String, + pub selector_from: String, + pub repaired_by: WorkerIdentity, + pub reason: String, + pub now: DateTime, +} #[derive(Debug, Clone)] pub struct ReadinessCheck { pub ticket_id: String, - pub expected_head_commit: Option, + pub current_subject_ref: Option, pub auth: MergeRequestAuth, } - #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct ReadinessReport { pub ready: bool, pub blockers: Vec, #[serde(default, skip_serializing_if = "Option::is_none")] - pub request: Option, + pub subject_ref: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub review: Option, } - #[derive(Debug, Clone)] pub struct CompleteMergeRequest { pub ticket_id: String, - pub expected_head_commit: String, pub operation_id: String, - pub target_commit: String, - pub source_commit: String, - pub result_commit: String, + pub approval_event_id: String, + pub current_subject_ref: String, + pub target_ref_before: String, + pub target_ref_after: String, pub strategy: MergeStrategy, pub resolution: ConflictResolution, pub auth: MergeRequestAuth, pub now: DateTime, } - -#[derive(Debug, Clone)] -pub struct ChangeMergeRequestState { - pub ticket_id: String, - pub body: String, - pub auth: MergeRequestAuth, - pub now: DateTime, -} - #[derive(Debug, Clone, PartialEq, Eq)] pub struct CurrentAssignment { pub assignment_id: String, @@ -321,7 +281,6 @@ pub struct CurrentAssignment { pub runtime_id: String, pub worker_id: String, } - pub trait AssignmentSource: Send + Sync { fn current_assignment( &self, @@ -329,40 +288,30 @@ pub trait AssignmentSource: Send + Sync { ticket_id: &str, ) -> Result, String>; } - pub trait RepositorySource: Send + Sync { fn repository_belongs_to_workspace( &self, workspace_id: &str, repository_id: &str, ) -> Result; - - fn is_ancestor( - &self, - workspace_id: &str, - repository_id: &str, - ancestor: &str, - descendant: &str, - ) -> Result; } - #[derive(Debug, Error)] pub enum MergeRequestError { - #[error("merge request not found")] + #[error("Merge Request not found")] NotFound, - #[error("merge request conflict: {0}")] + #[error("Merge Request conflict: {0}")] Conflict(String), - #[error("merge request unauthorized: {0}")] + #[error("Merge Request unauthorized: {0}")] Unauthorized(String), - #[error("merge request is not ready: {0}")] + #[error("Merge Request is not ready: {0}")] NotReady(String), - #[error("merge request validation failed: {0}")] + #[error("Merge Request validation failed: {0}")] Validation(String), - #[error("merge request operation failed: {0}")] + #[error("Merge Request operation failed: {0}")] Operation(String), - #[error("merge request storage is corrupt: {0}")] + #[error("Merge Request storage is corrupt: {0}")] Corrupt(String), - #[error("merge request storage error: {0}")] + #[error("Merge Request storage error: {0}")] Storage(#[from] rusqlite::Error), } @@ -371,7 +320,6 @@ pub struct MergeRequestStore { assignments: Arc, repositories: Arc, } - impl MergeRequestStore { pub fn open( path: impl AsRef, @@ -379,1342 +327,760 @@ impl MergeRequestStore { repositories: Arc, ) -> Result { let conn = Connection::open(path)?; - Self::from_connection(conn, assignments, repositories) - } - - pub fn open_in_memory( - assignments: Arc, - repositories: Arc, - ) -> Result { - Self::from_connection(Connection::open_in_memory()?, assignments, repositories) - } - - fn from_connection( - mut conn: Connection, - assignments: Arc, - repositories: Arc, - ) -> Result { conn.pragma_update(None, "foreign_keys", "ON")?; - migrate(&mut conn)?; + migrate(&conn)?; Ok(Self { conn: Arc::new(Mutex::new(conn)), assignments, repositories, }) } - pub fn open_merge_request( &self, - input: OpenMergeRequest, + i: OpenMergeRequest, ) -> Result { - validate_nonempty("merge_request_id", &input.merge_request_id)?; - validate_nonempty("ticket_id", &input.ticket_id)?; - validate_nonempty("selector_from", &input.selector_from)?; - validate_nonempty("selector_to", &input.selector_to)?; - self.validate_auth(&input.auth, &input.ticket_id, &input.repository_id)?; - validate_request(&input.request)?; - - let mut conn = self.lock_conn()?; - let tx = conn.transaction()?; - if load_merge_request_tx(&tx, &input.auth.workspace_id, &input.ticket_id)?.is_some() { - return Err(MergeRequestError::Conflict( - "an open merge request already exists for this ticket".into(), + bounded_body("summary", &i.summary)?; + for (n, v) in [ + ("merge_request_id", i.merge_request_id.as_str()), + ("ticket_id", &i.ticket_id), + ("repository_id", &i.repository_id), + ("selector_from", &i.selector_from), + ("selector_to", &i.selector_to), + ] { + nonempty(n, v)? + } + if i.selector_from == i.selector_to { + return Err(MergeRequestError::Validation( + "selectors must differ".into(), )); } - let now = input.now.to_rfc3339(); - tx.execute( - "INSERT INTO merge_requests ( - workspace_id, merge_request_id, ticket_id, repository_id, state, - selector_from, selector_to, opened_by_runtime_id, opened_by_worker_id, - created_at, updated_at - ) VALUES (?1, ?2, ?3, ?4, 'open', ?5, ?6, ?7, ?8, ?9, ?9)", + self.assigned(&i.auth, &i.ticket_id, &i.repository_id)?; + let mut c = self.lock()?; + let t = c.transaction()?; + let conflict:bool=t.query_row("SELECT EXISTS(SELECT 1 FROM merge_request_ticket_relations rel JOIN merge_requests mr ON mr.workspace_id=rel.workspace_id AND mr.merge_request_id=rel.merge_request_id WHERE rel.workspace_id=?1 AND rel.ticket_id=?2 AND mr.state='open')",params![i.auth.workspace_id,i.ticket_id],|r|r.get(0))?; + if conflict { + return Err(MergeRequestError::Conflict( + "Ticket already has an open Merge Request".into(), + )); + } + let now = i.now.to_rfc3339(); + t.execute( + "INSERT INTO merge_requests VALUES(?1,?2,?3,'open',?4,?5,?6,?6)", params![ - input.auth.workspace_id, - input.merge_request_id, - input.ticket_id, - input.repository_id, - input.selector_from, - input.selector_to, - input.auth.runtime_id, - input.auth.worker_id, - now, + i.auth.workspace_id, + i.merge_request_id, + i.repository_id, + i.selector_from, + i.selector_to, + now ], )?; - append_request_event_tx( - &tx, - &input.auth.workspace_id, - &input.merge_request_id, - &input.auth, - &input.request, - input.now, + t.execute( + "INSERT INTO merge_request_ticket_relations VALUES(?1,?2,?3,'implements',?4)", + params![i.auth.workspace_id, i.merge_request_id, i.ticket_id, now], )?; - tx.commit()?; - drop(conn); - self.get(&input.auth.workspace_id, &input.ticket_id) - } - - pub fn request_review( - &self, - input: RequestMergeRequestReview, - ) -> Result { - validate_request(&input.request)?; - let current = self.get(&input.auth.workspace_id, &input.ticket_id)?; - self.validate_auth(&input.auth, &input.ticket_id, ¤t.repository_id)?; - ensure_open(¤t)?; - let current_request = current - .thread - .iter() - .rev() - .find_map(|event| match event { - MergeRequestThreadEvent::RequestForReview(value) => Some(value), - _ => None, - }) - .ok_or_else(|| { - MergeRequestError::Corrupt("open merge request has no review request".into()) - })?; - if current_request.head_commit != input.expected_head_commit { - return Err(MergeRequestError::Conflict( - "expected head commit is stale".into(), - )); + if !i.summary.trim().is_empty() { + let e = CommentEvent { + event_id: Uuid::now_v7().to_string(), + sequence: 1, + body: i.summary, + author: WorkerIdentity { + runtime_id: i.auth.runtime_id, + worker_id: i.auth.worker_id, + }, + created_at: i.now, + }; + insert_event( + &t, + &i.auth.workspace_id, + &i.merge_request_id, + "comment", + &e, + i.now, + None, + )? } - - let mut conn = self.lock_conn()?; - let tx = conn.transaction()?; - let event = append_request_event_tx( - &tx, - ¤t.workspace_id, - ¤t.merge_request_id, - &input.auth, - &input.request, - input.now, - )?; - tx.commit()?; - Ok(event) + t.commit()?; + drop(c); + self.get(&i.auth.workspace_id, &i.ticket_id) } - - pub fn register_review_capability( - &self, - input: RegisterReviewCapability, - ) -> Result { - let mr = self.get(&input.auth.workspace_id, &input.ticket_id)?; - self.validate_auth(&input.auth, &input.ticket_id, &mr.repository_id)?; - ensure_open(&mr)?; - let request = mr.current_request().ok_or_else(|| { - MergeRequestError::Corrupt("open merge request has no review request".into()) - })?; - if request.head_commit != input.expected_head_commit { - return Err(MergeRequestError::Conflict( - "expected head commit is stale".into(), - )); - } - validate_nonempty("capability_token", &input.capability_token)?; - let mut conn = self.lock_conn()?; - let tx = conn.transaction()?; - let child: Option<(String, String, String)> = tx - .query_row( - "SELECT parent_runtime_id, child_session_id, reviewer_profile - FROM merge_request_reviewer_child_sessions - WHERE workspace_id = ?1 AND child_session_id = ?2 - AND parent_runtime_id = ?3 AND parent_worker_id = ?4 - AND status = 'active'", - params![ - input.auth.workspace_id, - input.child_session_id, - input.auth.runtime_id, - input.auth.worker_id - ], - |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)), - ) - .optional()?; - let Some((reviewer_runtime_id, reviewer_worker_id, reviewer_profile)) = child else { - return Err(MergeRequestError::Unauthorized( - "reviewer child session is missing or no longer active".into(), - )); - }; - validate_reviewer_profile(&reviewer_profile)?; - tx.execute( - "INSERT INTO merge_request_review_capabilities ( - workspace_id, merge_request_id, request_event_seq, capability_token, - issued_by_assignment_id, reviewer_runtime_id, reviewer_worker_id, - reviewer_profile, issued_at, status - ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, 'issued')", - params![ - mr.workspace_id, - mr.merge_request_id, - request.event_seq, - input.capability_token, - input.auth.assignment_id, - reviewer_runtime_id, - reviewer_worker_id, - reviewer_profile, - input.now.to_rfc3339() - ], - )?; - tx.execute( - "UPDATE merge_request_reviewer_child_sessions SET status = 'consumed' - WHERE workspace_id = ?1 AND child_session_id = ?2 AND status = 'active'", - params![input.auth.workspace_id, input.child_session_id], - )?; - tx.commit()?; - Ok(RegisteredReviewCapability { - capability_token: input.capability_token, - request_event_seq: request.event_seq, - }) - } - pub fn register_reviewer_child_session( &self, - input: RegisterReviewerChildSession, + i: RegisterReviewerChildSession, ) -> Result<(), MergeRequestError> { - validate_reviewer_profile(&input.reviewer_profile)?; - let conn = self.lock_conn()?; - conn.execute( - "INSERT INTO merge_request_reviewer_child_sessions ( - workspace_id, child_session_id, parent_runtime_id, parent_worker_id, - reviewer_profile, registered_at, status - ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, 'active')", + if i.reviewer_profile != "builtin:reviewer" { + return Err(MergeRequestError::Unauthorized( + "reviewer profile mismatch".into(), + )); + } + self.lock()?.execute( + "INSERT INTO merge_request_reviewer_child_sessions VALUES(?1,?2,?3,?4,?5,?6,'active')", params![ - input.workspace_id, - input.child_session_id, - input.parent_runtime_id, - input.parent_worker_id, - input.reviewer_profile, - input.now.to_rfc3339() + i.workspace_id, + i.child_session_id, + i.parent_runtime_id, + i.parent_worker_id, + i.reviewer_profile, + i.now.to_rfc3339() ], )?; Ok(()) } - - pub fn submit_review( + pub fn request_review( &self, - input: SubmitMergeRequestReview, - ) -> Result { - if input.body.trim().is_empty() { - return Err(MergeRequestError::Validation( - "review body must not be empty".into(), + i: RequestMergeRequestReview, + ) -> Result { + nonempty("subject_ref", &i.subject_ref)?; + let mr = self.get(&i.auth.workspace_id, &i.ticket_id)?; + self.assigned(&i.auth, &i.ticket_id, &mr.repository_id)?; + if mr.state != MergeRequestState::Open || mr.selector_from.is_none() { + return Err(MergeRequestError::Conflict( + "Merge Request is not reviewable".into(), )); } - let mut conn = self.lock_conn()?; - let tx = conn.transaction()?; - let capability: Option<(String, String, i64, String)> = tx - .query_row( - "SELECT c.workspace_id, c.merge_request_id, c.request_event_seq, c.status - FROM merge_request_review_capabilities c - JOIN merge_requests m - ON m.workspace_id = c.workspace_id - AND m.merge_request_id = c.merge_request_id - WHERE c.capability_token = ?1 AND m.ticket_id = ?2", - params![input.capability_token, input.ticket_id], - |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?)), - ) - .optional()?; - let Some((workspace_id, merge_request_id, request_event_seq, status)) = capability else { + let mut c = self.lock()?; + let t = c.transaction()?; + let child:Option<(String,String,String)>=t.query_row("SELECT parent_runtime_id,child_session_id,reviewer_profile FROM merge_request_reviewer_child_sessions WHERE workspace_id=?1 AND child_session_id=?2 AND parent_runtime_id=?3 AND parent_worker_id=?4 AND status='active'",params![i.auth.workspace_id,i.child_session_id,i.auth.runtime_id,i.auth.worker_id],|r|Ok((r.get(0)?,r.get(1)?,r.get(2)?))).optional()?; + let Some((rr, rw, p)) = child else { return Err(MergeRequestError::Unauthorized( - "review capability is invalid".into(), + "reviewer child attestation missing".into(), )); }; - if status != "issued" { - return Err(MergeRequestError::Conflict( - "review capability has already been consumed".into(), - )); - } - let reviewer: Option<(String, String, String)> = tx - .query_row( - "SELECT reviewer_runtime_id, reviewer_worker_id, reviewer_profile - FROM merge_request_review_capabilities - WHERE capability_token = ?1 AND status = 'issued'", - params![input.capability_token], - |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)), - ) - .optional()?; - let Some((reviewer_runtime_id, reviewer_worker_id, reviewer_profile)) = reviewer else { + if p != "builtin:reviewer" { return Err(MergeRequestError::Unauthorized( - "review source is not the registered reviewer child".into(), - )); - }; - validate_reviewer_profile(&reviewer_profile)?; - let request_payload: String = tx.query_row( - "SELECT payload_json FROM merge_request_thread_events - WHERE workspace_id = ?1 AND merge_request_id = ?2 - AND event_seq = ?3 AND kind = 'request_for_review'", - params![workspace_id, merge_request_id, request_event_seq], - |row| row.get(0), - )?; - let request: RequestForReviewEvent = decode_payload(&request_payload)?; - if request.head_commit != input.expected_head_commit { - return Err(MergeRequestError::Conflict( - "expected head commit is stale".into(), + "reviewer profile mismatch".into(), )); } - let latest_request_seq: i64 = tx.query_row( - "SELECT MAX(event_seq) FROM merge_request_thread_events - WHERE workspace_id = ?1 AND merge_request_id = ?2 AND kind = 'request_for_review'", - params![workspace_id, merge_request_id], - |row| row.get(0), - )?; - if latest_request_seq != request_event_seq { - return Err(MergeRequestError::Conflict( - "review request has been superseded".into(), - )); - } - let event_seq = next_event_seq_tx(&tx, &workspace_id, &merge_request_id)?; - let event = ReviewEvent { - event_seq, - request_event_seq: request_event_seq as u64, - head_commit: request.head_commit, - reviewer_worker: WorkerIdentity { - runtime_id: reviewer_runtime_id, - worker_id: reviewer_worker_id, + let e = ReviewRequestedEvent { + event_id: Uuid::now_v7().to_string(), + sequence: next_seq(&t, &mr.workspace_id, &mr.merge_request_id)?, + subject_ref: i.subject_ref, + requested_by: WorkerIdentity { + runtime_id: i.auth.runtime_id, + worker_id: i.auth.worker_id, }, - reviewer_profile, - decision: input.decision, - body: input.body, - findings: input.findings, - created_at: input.now, + reviewer: WorkerIdentity { + runtime_id: rr.clone(), + worker_id: rw.clone(), + }, + created_at: i.now, }; - insert_event_tx( - &tx, - &workspace_id, - &merge_request_id, - "review", - &event, - input.now, + insert_event( + &t, + &mr.workspace_id, + &mr.merge_request_id, + "review_requested", + &e, + i.now, None, )?; - tx.execute( - "UPDATE merge_request_review_capabilities SET status = 'consumed', consumed_at = ?2 - WHERE capability_token = ?1 AND status = 'issued'", - params![input.capability_token, input.now.to_rfc3339()], - )?; - tx.commit()?; - Ok(event) + t.execute("INSERT INTO merge_request_review_grants VALUES(?1,?2,?3,?4,?5,?6,?7,?8,NULL,NULL,'issued')",params![mr.workspace_id,mr.merge_request_id,e.event_id,e.subject_ref,rr,rw,i.capability_token,i.now.to_rfc3339()])?; + t.execute("UPDATE merge_request_reviewer_child_sessions SET status='consumed' WHERE workspace_id=?1 AND child_session_id=?2",params![mr.workspace_id,i.child_session_id])?; + t.commit()?; + Ok(RequestedMergeRequestReview { request_event: e }) } - - pub fn readiness(&self, input: ReadinessCheck) -> Result { - let mr = self.get(&input.auth.workspace_id, &input.ticket_id)?; - if mr.repository_id != input.auth.repository_id { + pub fn submit_review( + &self, + i: SubmitMergeRequestReview, + ) -> Result { + bounded_body("review body", &i.body)?; + for finding in &i.findings { + bounded_body("review finding", &finding.body)?; + } + let mut c = self.lock()?; + let t = c.transaction()?; + let g:Option<(String,String,String,String,String,String)>=t.query_row("SELECT g.workspace_id,g.merge_request_id,g.request_event_id,g.subject_ref,g.reviewer_runtime_id,g.reviewer_worker_id FROM merge_request_review_grants g JOIN merge_request_ticket_relations rel ON rel.workspace_id=g.workspace_id AND rel.merge_request_id=g.merge_request_id WHERE g.capability_token=?1 AND rel.ticket_id=?2 AND g.status='issued'",params![i.capability_token,i.ticket_id],|r|Ok((r.get(0)?,r.get(1)?,r.get(2)?,r.get(3)?,r.get(4)?,r.get(5)?))).optional()?; + let Some((ws, mr, req, subject, rr, rw)) = g else { return Err(MergeRequestError::Unauthorized( - "repository does not match merge request".into(), + "review grant invalid".into(), + )); + }; + if subject != i.current_subject_ref { + let e = ReviewCancelledEvent { + event_id: Uuid::now_v7().to_string(), + sequence: next_seq(&t, &ws, &mr)?, + request_event_id: req, + subject_ref: subject, + reason: "selector_from moved before submission".into(), + created_at: i.now, + }; + insert_event(&t, &ws, &mr, "review_cancelled", &e, i.now, None)?; + t.execute("UPDATE merge_request_review_grants SET status='revoked',revoked_at=?2 WHERE capability_token=?1",params![i.capability_token,i.now.to_rfc3339()])?; + t.commit()?; + return Err(MergeRequestError::Conflict( + "selector_from moved; review cancelled".into(), )); } - let request = mr.current_request().cloned(); - let review = mr.current_review().cloned(); - let mut blockers = Vec::new(); + let e = ReviewEvent { + event_id: Uuid::now_v7().to_string(), + sequence: next_seq(&t, &ws, &mr)?, + request_event_id: req, + subject_ref: subject, + decision: i.decision, + body: i.body, + findings: i.findings, + reviewer: WorkerIdentity { + runtime_id: rr, + worker_id: rw, + }, + created_at: i.now, + }; + insert_event(&t, &ws, &mr, "review", &e, i.now, None)?; + t.execute("UPDATE merge_request_review_grants SET status='consumed',consumed_at=?2 WHERE capability_token=?1",params![i.capability_token,i.now.to_rfc3339()])?; + t.commit()?; + Ok(e) + } + pub fn revoke_review( + &self, + i: RevokeMergeRequestReview, + ) -> Result { + bounded_body("revocation reason", &i.reason)?; + let mr = self.get(&i.auth.workspace_id, &i.ticket_id)?; + self.assigned(&i.auth, &i.ticket_id, &mr.repository_id)?; + let r = mr + .thread + .iter() + .find_map(|x| match x { + MergeRequestThreadEvent::Review(v) if v.event_id == i.review_event_id => Some(v), + _ => None, + }) + .ok_or(MergeRequestError::NotFound)?; + if mr.thread.iter().any(|x|matches!(x,MergeRequestThreadEvent::ReviewRevoked(v)if v.review_event_id==r.event_id)){return Err(MergeRequestError::Conflict("already revoked".into()))} + let mut c = self.lock()?; + let t = c.transaction()?; + let e = ReviewRevokedEvent { + event_id: Uuid::now_v7().to_string(), + sequence: next_seq(&t, &mr.workspace_id, &mr.merge_request_id)?, + review_event_id: r.event_id.clone(), + subject_ref: r.subject_ref.clone(), + reason: i.reason, + revoked_by: WorkerIdentity { + runtime_id: i.auth.runtime_id, + worker_id: i.auth.worker_id, + }, + created_at: i.now, + }; + insert_event( + &t, + &mr.workspace_id, + &mr.merge_request_id, + "review_revoked", + &e, + i.now, + None, + )?; + t.commit()?; + Ok(e) + } + pub fn readiness(&self, i: ReadinessCheck) -> Result { + let mr = self.get(&i.auth.workspace_id, &i.ticket_id)?; + let review = i + .current_subject_ref + .as_deref() + .and_then(|s| mr.effective_review(s)) + .cloned(); + let mut b = vec![]; if mr.state != MergeRequestState::Open { - blockers.push("merge request is not open".into()); + b.push("Merge Request is not open".into()) } - match &request { - None => blockers.push("merge request has no review request".into()), - Some(value) => { - if input - .expected_head_commit - .as_deref() - .is_some_and(|expected| expected != value.head_commit) - { - blockers.push("expected head commit is stale".into()); - } - match &review { - None => blockers.push("current review request has no review result".into()), - Some(review) if review.decision != ReviewDecision::Approve => { - blockers.push("current review requests changes".into()) - } - Some(review) if review.head_commit != value.head_commit => blockers - .push("current review does not match the requested head commit".into()), - Some(_) => {} - } + if mr.selector_from.is_none() { + b.push("selector_from requires repair".into()) + } + match (&i.current_subject_ref, &review) { + (None, _) => b.push("selector_from could not be resolved".into()), + (Some(_), None) => b.push("current source ref has no valid review".into()), + (_, Some(r)) if r.decision == ReviewDecision::RequestChanges => { + b.push("current source ref requests changes".into()) } + _ => {} } Ok(ReadinessReport { - ready: blockers.is_empty(), - blockers, - request, + ready: b.is_empty(), + blockers: b, + subject_ref: i.current_subject_ref, review, }) } - - pub fn complete(&self, input: CompleteMergeRequest) -> Result { - validate_nonempty("operation_id", &input.operation_id)?; - let mr = self.get(&input.auth.workspace_id, &input.ticket_id)?; - self.validate_completion_auth(&input.auth, &input.ticket_id, &mr.repository_id)?; - - if let Some(existing) = mr.thread.iter().find_map(|event| match event { - MergeRequestThreadEvent::Merge(value) if value.operation_id == input.operation_id => { - Some(value) - } + pub fn complete(&self, i: CompleteMergeRequest) -> Result { + let mr = self.get(&i.auth.workspace_id, &i.ticket_id)?; + self.completion_auth(&i.auth, &i.ticket_id, &mr.repository_id)?; + if let Some(v) = mr.thread.iter().find_map(|x| match x { + MergeRequestThreadEvent::Merge(v) if v.operation_id == i.operation_id => Some(v), _ => None, }) { - if merge_matches(existing, &input) { - return Ok(existing.clone()); + if v.approval_event_id == i.approval_event_id + && v.target_ref_before == i.target_ref_before + && v.target_ref_after == i.target_ref_after + { + return Ok(v.clone()); } return Err(MergeRequestError::Conflict( - "operation id was already used with a different completion fingerprint".into(), + "operation fingerprint mismatch".into(), )); } - - let readiness = self.readiness(ReadinessCheck { - ticket_id: input.ticket_id.clone(), - expected_head_commit: Some(input.expected_head_commit.clone()), - auth: input.auth.clone(), - })?; - if !readiness.ready { - return Err(MergeRequestError::NotReady(readiness.blockers.join("; "))); - } - let request = readiness.request.expect("ready request"); - if input.source_commit != request.head_commit - || input.expected_head_commit != request.head_commit - { - return Err(MergeRequestError::Conflict( - "completion source does not match current review request".into(), + let review = mr + .thread + .iter() + .find_map(|x| match x { + MergeRequestThreadEvent::Review(v) if v.event_id == i.approval_event_id => Some(v), + _ => None, + }) + .ok_or_else(|| MergeRequestError::NotReady("approval event missing".into()))?; + if review.decision!=ReviewDecision::Approve||review.subject_ref!=i.current_subject_ref||mr.thread.iter().any(|x|matches!(x,MergeRequestThreadEvent::ReviewRevoked(v)if v.review_event_id==review.event_id)){return Err(MergeRequestError::NotReady("approval is not valid for current source ref".into()))} + if i.target_ref_before == i.target_ref_after { + return Err(MergeRequestError::Validation( + "target ref did not change".into(), )); } - validate_completion_shape(&input, &request, self.repositories.as_ref(), &mr)?; - - let mut conn = self.lock_conn()?; - let tx = conn.transaction()?; - let current_ticket_state: Option = tx + let mut c = self.lock()?; + let t = c.transaction()?; + let state: Option = t .query_row( - "SELECT workflow_state FROM typed_tickets WHERE workspace_id = ?1 AND ticket_id = ?2", - params![mr.workspace_id, input.ticket_id], - |row| row.get(0), + "SELECT workflow_state FROM typed_tickets WHERE workspace_id=?1 AND ticket_id=?2", + params![mr.workspace_id, i.ticket_id], + |r| r.get(0), ) .optional()?; - match current_ticket_state.as_deref() { - Some("inprogress") => {} - Some(other) => { - return Err(MergeRequestError::Conflict(format!( - "Ticket state `{other}` cannot be completed" - ))); - } - None => return Err(MergeRequestError::NotFound), - } - let changed = tx.execute( - "UPDATE typed_tickets - SET workflow_state = 'done', workflow_state_explicit = 1, updated_at = ?3 - WHERE workspace_id = ?1 AND ticket_id = ?2 AND workflow_state = 'inprogress'", - params![mr.workspace_id, input.ticket_id, input.now.to_rfc3339()], - )?; - if changed != 1 { + if state.as_deref() != Some("inprogress") { return Err(MergeRequestError::Conflict( - "Ticket state changed concurrently".into(), + "Ticket must be inprogress".into(), )); } - let implementation_assignment_id = input.auth.assignment_id.clone(); - let event_seq = next_event_seq_tx(&tx, &mr.workspace_id, &mr.merge_request_id)?; - let event = MergeEvent { - event_seq, - operation_id: input.operation_id, - target_commit: input.target_commit, - source_commit: input.source_commit, - result_commit: input.result_commit, - strategy: input.strategy, - resolution: input.resolution, + t.execute("UPDATE typed_tickets SET workflow_state='done',workflow_state_explicit=1,updated_at=?3 WHERE workspace_id=?1 AND ticket_id=?2",params![mr.workspace_id,i.ticket_id,i.now.to_rfc3339()])?; + let e = MergeEvent { + event_id: Uuid::now_v7().to_string(), + sequence: next_seq(&t, &mr.workspace_id, &mr.merge_request_id)?, + operation_id: i.operation_id, + approval_event_id: i.approval_event_id, + approved_source_ref: review.subject_ref.clone(), + target_ref_before: i.target_ref_before, + target_ref_after: i.target_ref_after, + strategy: i.strategy, + resolution: i.resolution, merged_by: WorkerIdentity { - runtime_id: input.auth.runtime_id, - worker_id: input.auth.worker_id, + runtime_id: i.auth.runtime_id, + worker_id: i.auth.worker_id, }, - created_at: input.now, + created_at: i.now, }; - insert_event_tx( - &tx, + insert_event( + &t, &mr.workspace_id, &mr.merge_request_id, "merge", - &event, - input.now, - Some(&event.operation_id), + &e, + i.now, + Some(&e.operation_id), )?; - tx.execute( - "UPDATE merge_requests SET state = 'merged', updated_at = ?3 - WHERE workspace_id = ?1 AND merge_request_id = ?2 AND state = 'open'", - params![mr.workspace_id, mr.merge_request_id, input.now.to_rfc3339()], - )?; - append_ticket_completion_event_tx(&tx, &mr, &event, &implementation_assignment_id)?; - tx.commit()?; - Ok(event) + t.execute("UPDATE merge_requests SET state='merged',updated_at=?3 WHERE workspace_id=?1 AND merge_request_id=?2",params![mr.workspace_id,mr.merge_request_id,i.now.to_rfc3339()])?; + ticket_event(&t, &mr, &e, &i.auth.assignment_id)?; + t.commit()?; + Ok(e) } - - pub fn close(&self, input: ChangeMergeRequestState) -> Result { - self.change_state(input, MergeRequestState::Closed, "close") - } - - pub fn reopen( + pub fn repair_selector_from( &self, - input: ChangeMergeRequestState, + i: RepairSelectorFrom, ) -> Result { - self.change_state(input, MergeRequestState::Open, "reopen") - } - - fn change_state( - &self, - input: ChangeMergeRequestState, - target: MergeRequestState, - kind: &str, - ) -> Result { - let mr = self.get(&input.auth.workspace_id, &input.ticket_id)?; - self.validate_lifecycle_auth(&input.auth, &mr.repository_id)?; - match (mr.state, target) { - (MergeRequestState::Open, MergeRequestState::Closed) - | (MergeRequestState::Closed, MergeRequestState::Open) - | (MergeRequestState::Merged, MergeRequestState::Open) => {} - _ => { - return Err(MergeRequestError::Conflict( - "illegal merge request state transition".into(), - )); - } + nonempty("selector_from", &i.selector_from)?; + let mr = self.get(&i.workspace_id, &i.ticket_id)?; + if mr.selector_from.is_some() { + return Err(MergeRequestError::Conflict( + "selector_from is immutable after it is set".into(), + )); } - let mut conn = self.lock_conn()?; - let tx = conn.transaction()?; - let event_seq = next_event_seq_tx(&tx, &mr.workspace_id, &mr.merge_request_id)?; - let event = LifecycleEvent { - event_seq, - actor: WorkerIdentity { - runtime_id: input.auth.runtime_id, - worker_id: input.auth.worker_id, - }, - body: input.body, - created_at: input.now, + let mut c = self.lock()?; + let t = c.transaction()?; + let changed=t.execute("UPDATE merge_requests SET selector_from=?3,updated_at=?4 WHERE workspace_id=?1 AND merge_request_id=?2 AND selector_from IS NULL",params![mr.workspace_id,mr.merge_request_id,i.selector_from,i.now.to_rfc3339()])?; + if changed != 1 { + return Err(MergeRequestError::Conflict( + "selector_from repair raced with another update".into(), + )); + } + let e = CommentEvent { + event_id: Uuid::now_v7().to_string(), + sequence: next_seq(&t, &mr.workspace_id, &mr.merge_request_id)?, + body: format!("selector_from repaired: {}", i.reason), + author: i.repaired_by, + created_at: i.now, }; - insert_event_tx( - &tx, + insert_event( + &t, &mr.workspace_id, &mr.merge_request_id, - kind, - &event, - input.now, + "comment", + &e, + i.now, None, )?; - tx.execute( - "UPDATE merge_requests SET state = ?3, updated_at = ?4 - WHERE workspace_id = ?1 AND merge_request_id = ?2", - params![ - mr.workspace_id, - mr.merge_request_id, - target.as_str(), - input.now.to_rfc3339() - ], - )?; - tx.commit()?; - drop(conn); - self.get(&input.auth.workspace_id, &input.ticket_id) + t.commit()?; + drop(c); + self.get(&i.workspace_id, &i.ticket_id) } - - pub fn get( - &self, - workspace_id: &str, - ticket_id: &str, - ) -> Result { - let conn = self.lock_conn()?; - load_merge_request(&conn, workspace_id, ticket_id)?.ok_or(MergeRequestError::NotFound) - } - - pub fn list_for_ticket( - &self, - workspace_id: &str, - ticket_id: &str, - ) -> Result, MergeRequestError> { - let conn = self.lock_conn()?; - let mut stmt = conn.prepare( - "SELECT merge_request_id FROM merge_requests - WHERE workspace_id = ?1 AND ticket_id = ?2 - ORDER BY created_at DESC, merge_request_id DESC", - )?; - let ids = stmt - .query_map(params![workspace_id, ticket_id], |row| { - row.get::<_, String>(0) - })? - .collect::, _>>()?; - ids.into_iter() - .map(|id| { - load_merge_request_by_id(&conn, workspace_id, &id)? - .ok_or(MergeRequestError::NotFound) - }) - .collect() - } - - fn validate_auth( - &self, - auth: &MergeRequestAuth, - ticket_id: &str, - repository_id: &str, - ) -> Result<(), MergeRequestError> { - if auth.repository_id != repository_id { - return Err(MergeRequestError::Unauthorized( - "repository does not match request".into(), - )); + pub fn get(&self, ws: &str, ticket: &str) -> Result { + let c = self.lock()?; + let id:Option=c.query_row("SELECT rel.merge_request_id FROM merge_request_ticket_relations rel JOIN merge_requests mr ON mr.workspace_id=rel.workspace_id AND mr.merge_request_id=rel.merge_request_id WHERE rel.workspace_id=?1 AND rel.ticket_id=?2 ORDER BY CASE mr.state WHEN 'open' THEN 0 ELSE 1 END,mr.created_at DESC LIMIT 1",params![ws,ticket],|r|r.get(0)).optional()?; + match id { + Some(id) => load_mr(&c, ws, &id)?.ok_or(MergeRequestError::NotFound), + None => Err(MergeRequestError::NotFound), } - if !self - .repositories - .repository_belongs_to_workspace(&auth.workspace_id, repository_id) - .map_err(MergeRequestError::Operation)? - { - return Err(MergeRequestError::Unauthorized( - "repository does not belong to workspace".into(), - )); - } - let assignment = self + } + pub fn thread_page( + &self, + ws: &str, + ticket: &str, + after: Option, + limit: usize, + ) -> Result, MergeRequestError> { + let mr = self.get(ws, ticket)?; + let c = self.lock()?; + load_thread(&c, ws, &mr.merge_request_id, after, limit.clamp(1, 200)) + } + fn assigned(&self, a: &MergeRequestAuth, t: &str, r: &str) -> Result<(), MergeRequestError> { + self.repo(a, r)?; + let x = self .assignments - .current_assignment(&auth.workspace_id, ticket_id) + .current_assignment(&a.workspace_id, t) .map_err(MergeRequestError::Operation)? - .ok_or_else(|| { - MergeRequestError::Unauthorized("ticket has no current assignment".into()) - })?; - if assignment.assignment_id != auth.assignment_id - || assignment.runtime_id != auth.runtime_id - || assignment.worker_id != auth.worker_id - || assignment.ticket_id != ticket_id + .ok_or_else(|| MergeRequestError::Unauthorized("no assignment".into()))?; + if x.assignment_id != a.assignment_id + || x.runtime_id != a.runtime_id + || x.worker_id != a.worker_id { return Err(MergeRequestError::Unauthorized( - "caller is not the current assigned worker".into(), + "not current assigned Worker".into(), )); } Ok(()) } - - fn validate_lifecycle_auth( + fn completion_auth( &self, - auth: &MergeRequestAuth, - repository_id: &str, + a: &MergeRequestAuth, + t: &str, + r: &str, ) -> Result<(), MergeRequestError> { - if auth.repository_id != repository_id { - return Err(MergeRequestError::Unauthorized( - "repository does not match request".into(), - )); - } - if !self - .repositories - .repository_belongs_to_workspace(&auth.workspace_id, repository_id) - .map_err(MergeRequestError::Operation)? - { - return Err(MergeRequestError::Unauthorized( - "repository does not belong to workspace".into(), - )); - } - Ok(()) - } - - fn validate_completion_auth( - &self, - auth: &MergeRequestAuth, - ticket_id: &str, - repository_id: &str, - ) -> Result<(), MergeRequestError> { - if auth.repository_id != repository_id { - return Err(MergeRequestError::Unauthorized( - "repository does not match request".into(), - )); - } - if !self - .repositories - .repository_belongs_to_workspace(&auth.workspace_id, repository_id) - .map_err(MergeRequestError::Operation)? - { - return Err(MergeRequestError::Unauthorized( - "repository does not belong to workspace".into(), - )); - } - let assignment = self + self.repo(a, r)?; + let x = self .assignments - .current_assignment(&auth.workspace_id, ticket_id) + .current_assignment(&a.workspace_id, t) .map_err(MergeRequestError::Operation)? - .ok_or_else(|| { - MergeRequestError::Unauthorized("ticket has no current assignment".into()) - })?; - if assignment.assignment_id != auth.assignment_id || assignment.ticket_id != ticket_id { + .ok_or_else(|| MergeRequestError::Unauthorized("no assignment".into()))?; + if x.assignment_id != a.assignment_id { + return Err(MergeRequestError::Unauthorized("stale assignment".into())); + } + Ok(()) + } + fn repo(&self, a: &MergeRequestAuth, r: &str) -> Result<(), MergeRequestError> { + if a.repository_id != r + || !self + .repositories + .repository_belongs_to_workspace(&a.workspace_id, r) + .map_err(MergeRequestError::Operation)? + { return Err(MergeRequestError::Unauthorized( - "completion does not match the current assignment".into(), + "repository scope mismatch".into(), )); } Ok(()) } - - fn lock_conn(&self) -> Result, MergeRequestError> { + fn lock(&self) -> Result, MergeRequestError> { self.conn .lock() .map_err(|_| MergeRequestError::Operation("database lock poisoned".into())) } } -fn validate_request(request: &RequestForReview) -> Result<(), MergeRequestError> { - validate_nonempty("base_commit", &request.base_commit)?; - validate_nonempty("head_commit", &request.head_commit)?; - if request - .changed_paths - .iter() - .any(|path| path.trim().is_empty()) - { - return Err(MergeRequestError::Validation( - "changed_paths must not contain empty entries".into(), - )); - } - Ok(()) -} - -fn validate_nonempty(field: &str, value: &str) -> Result<(), MergeRequestError> { - if value.trim().is_empty() { +fn bounded_body(name: &str, value: &str) -> Result<(), MergeRequestError> { + if value.len() > MAX_BODY_BYTES { Err(MergeRequestError::Validation(format!( - "{field} must not be empty" + "{name} exceeds {MAX_BODY_BYTES} bytes" ))) } else { Ok(()) } } -fn validate_reviewer_profile(profile: &str) -> Result<(), MergeRequestError> { - if profile == "builtin:reviewer" { - Ok(()) +fn nonempty(n: &str, v: &str) -> Result<(), MergeRequestError> { + if v.trim().is_empty() { + Err(MergeRequestError::Validation(format!( + "{n} must not be empty" + ))) } else { - Err(MergeRequestError::Unauthorized( - "review source must use builtin:reviewer".into(), - )) - } -} - -fn ensure_open(mr: &MergeRequest) -> Result<(), MergeRequestError> { - if mr.state == MergeRequestState::Open { Ok(()) - } else { - Err(MergeRequestError::Conflict( - "merge request is not open".into(), - )) } } - -fn merge_matches(existing: &MergeEvent, input: &CompleteMergeRequest) -> bool { - existing.target_commit == input.target_commit - && existing.source_commit == input.source_commit - && existing.result_commit == input.result_commit - && existing.strategy == input.strategy - && existing.resolution == input.resolution +fn next_seq(t: &Transaction<'_>, w: &str, m: &str) -> Result { + Ok(t.query_row("SELECT COALESCE(MAX(sequence),0)+1 FROM merge_request_thread_events WHERE workspace_id=?1 AND merge_request_id=?2",params![w,m],|r|r.get::<_,i64>(0))? as u64) } - -fn validate_completion_shape( - input: &CompleteMergeRequest, - request: &RequestForReviewEvent, - repositories: &dyn RepositorySource, - mr: &MergeRequest, +fn insert_event( + t: &Transaction<'_>, + w: &str, + m: &str, + k: &str, + e: &T, + at: DateTime, + op: Option<&str>, ) -> Result<(), MergeRequestError> { - match input.strategy { - MergeStrategy::FastForward => { - if input.resolution != ConflictResolution::None - || input.target_commit != request.base_commit - || input.result_commit != input.source_commit - { - return Err(MergeRequestError::Validation( - "fast-forward completion must use the review base as target, the source as result, and resolution none".into(), - )); - } - if !repositories - .is_ancestor( - &mr.workspace_id, - &mr.repository_id, - &input.target_commit, - &input.source_commit, - ) - .map_err(MergeRequestError::Operation)? - { - return Err(MergeRequestError::Conflict( - "source commit is not a descendant of target commit".into(), - )); - } - } - MergeStrategy::Merge => { - if input.resolution == ConflictResolution::None - || input.result_commit == input.target_commit - { - return Err(MergeRequestError::Validation( - "merge completion requires an explicit resolution and a new result commit" - .into(), - )); - } - if !repositories - .is_ancestor( - &mr.workspace_id, - &mr.repository_id, - &input.target_commit, - &input.result_commit, - ) - .map_err(MergeRequestError::Operation)? - || !repositories - .is_ancestor( - &mr.workspace_id, - &mr.repository_id, - &input.source_commit, - &input.result_commit, - ) - .map_err(MergeRequestError::Operation)? - { - return Err(MergeRequestError::Conflict( - "merge result must descend from both target and source commits".into(), - )); - } - } - } - Ok(()) -} - -fn append_ticket_completion_event_tx( - tx: &Transaction<'_>, - mr: &MergeRequest, - event: &MergeEvent, - implementation_assignment_id: &str, -) -> Result<(), MergeRequestError> { - let event_index: i64 = tx.query_row( - "SELECT COALESCE(MAX(event_index), -1) + 1 FROM typed_ticket_events - WHERE workspace_id = ?1 AND ticket_id = ?2", - params![mr.workspace_id, mr.ticket_id], - |row| row.get(0), - )?; - tx.execute( - "INSERT INTO typed_ticket_events ( - workspace_id, ticket_id, event_index, kind, author, at, - from_state, to_state, heading, body - ) VALUES (?1, ?2, ?3, 'state_changed', ?4, ?5, - 'inprogress', 'done', 'Merge Request completed', ?6)", + let v = serde_json::to_value(e).map_err(|x| MergeRequestError::Operation(x.to_string()))?; + let id = v["event_id"] + .as_str() + .ok_or_else(|| MergeRequestError::Operation("event_id missing".into()))?; + let seq = v["sequence"] + .as_u64() + .ok_or_else(|| MergeRequestError::Operation("sequence missing".into()))?; + t.execute( + "INSERT INTO merge_request_thread_events VALUES(?1,?2,?3,?4,?5,?6,?7,?8)", params![ - mr.workspace_id, - mr.ticket_id, - event_index, - format!( - "worker:{}:{}", - event.merged_by.runtime_id, event.merged_by.worker_id - ), - event.created_at.to_rfc3339(), - format!( - "Approved candidate `{}` completed implementation.", - event.source_commit - ), + w, + m, + id, + seq as i64, + k, + serde_json::to_string(e).map_err(|x| MergeRequestError::Operation(x.to_string()))?, + op, + at.to_rfc3339() ], )?; - let event_seq = event.event_seq.to_string(); - for (key, value) in [ - ("implementation_assignment_id", implementation_assignment_id), - ("merge_request_event_seq", event_seq.as_str()), - ("merge_request_head_commit", event.source_commit.as_str()), - ("operation_id", event.operation_id.as_str()), - ("completion_authority", "workspace_orchestrator"), - ("runtime_id", event.merged_by.runtime_id.as_str()), - ("worker_id", event.merged_by.worker_id.as_str()), + Ok(()) +} +fn load_mr(c: &Connection, w: &str, m: &str) -> Result, MergeRequestError> { + let row:Option<(String,String,Option,String,String,String)>=c.query_row("SELECT repository_id,state,selector_from,selector_to,created_at,updated_at FROM merge_requests WHERE workspace_id=?1 AND merge_request_id=?2",params![w,m],|r|Ok((r.get(0)?,r.get(1)?,r.get(2)?,r.get(3)?,r.get(4)?,r.get(5)?))).optional()?; + let Some((repo, state, from, to, created, updated)) = row else { + return Ok(None); + }; + let mut s=c.prepare("SELECT ticket_id FROM merge_request_ticket_relations WHERE workspace_id=?1 AND merge_request_id=?2 ORDER BY ticket_id")?; + let tickets = s + .query_map(params![w, m], |r| r.get(0))? + .collect::, _>>()?; + Ok(Some(MergeRequest { + workspace_id: w.into(), + merge_request_id: m.into(), + repository_id: repo, + state: MergeRequestState::parse(&state)?, + selector_from: from, + selector_to: to, + ticket_ids: tickets, + created_at: time(&created)?, + updated_at: time(&updated)?, + thread: load_thread(c, w, m, None, 100)?, + })) +} +fn load_thread( + c: &Connection, + w: &str, + m: &str, + after: Option, + limit: usize, +) -> Result, MergeRequestError> { + let mut s=c.prepare("SELECT kind,payload_json FROM merge_request_thread_events WHERE workspace_id=?1 AND merge_request_id=?2 AND sequence>?3 ORDER BY sequence LIMIT ?4")?; + let rows = s + .query_map( + params![w, m, after.unwrap_or(0) as i64, limit as i64], + |r| Ok((r.get::<_, String>(0)?, r.get::<_, String>(1)?)), + )? + .collect::, _>>()?; + rows.into_iter() + .map(|(k, j)| { + Ok(match k.as_str() { + "review_requested" => MergeRequestThreadEvent::ReviewRequested(json(&j)?), + "review" => MergeRequestThreadEvent::Review(json(&j)?), + "review_revoked" => MergeRequestThreadEvent::ReviewRevoked(json(&j)?), + "review_cancelled" => MergeRequestThreadEvent::ReviewCancelled(json(&j)?), + "comment" => MergeRequestThreadEvent::Comment(json(&j)?), + "merge" => MergeRequestThreadEvent::Merge(json(&j)?), + _ => return Err(MergeRequestError::Corrupt(format!("unknown event `{k}`"))), + }) + }) + .collect() +} +fn json Deserialize<'a>>(v: &str) -> Result { + serde_json::from_str(v).map_err(|e| MergeRequestError::Corrupt(e.to_string())) +} +fn time(v: &str) -> Result, MergeRequestError> { + DateTime::parse_from_rfc3339(v) + .map(|x| x.with_timezone(&Utc)) + .map_err(|e| MergeRequestError::Corrupt(e.to_string())) +} +fn ticket_event( + t: &Transaction<'_>, + mr: &MergeRequest, + e: &MergeEvent, + a: &str, +) -> Result<(), MergeRequestError> { + let ticket = &mr.ticket_ids[0]; + let n:i64=t.query_row("SELECT COALESCE(MAX(event_index),-1)+1 FROM typed_ticket_events WHERE workspace_id=?1 AND ticket_id=?2",params![mr.workspace_id,ticket],|r|r.get(0))?; + t.execute("INSERT INTO typed_ticket_events(workspace_id,ticket_id,event_index,kind,author,at,from_state,to_state,heading,body)VALUES(?1,?2,?3,'state_changed',?4,?5,'inprogress','done','Merge Request completed',?6)",params![mr.workspace_id,ticket,n,format!("worker:{}:{}",e.merged_by.runtime_id,e.merged_by.worker_id),e.created_at.to_rfc3339(),format!("Approved source ref `{}` completed implementation.",e.approved_source_ref)])?; + for (k, v) in [ + ("implementation_assignment_id", a), + ("approval_event_id", &e.approval_event_id), + ("approved_source_ref", &e.approved_source_ref), + ("operation_id", &e.operation_id), ] { - tx.execute( - "INSERT INTO typed_ticket_event_attributes ( - workspace_id, ticket_id, event_index, key, value - ) VALUES (?1, ?2, ?3, ?4, ?5)", - params![mr.workspace_id, mr.ticket_id, event_index, key, value], + t.execute( + "INSERT INTO typed_ticket_event_attributes VALUES(?1,?2,?3,?4,?5)", + params![mr.workspace_id, ticket, n, k, v], )?; } Ok(()) } -fn append_request_event_tx( - tx: &Transaction<'_>, - workspace_id: &str, - merge_request_id: &str, - auth: &MergeRequestAuth, - request: &RequestForReview, - now: DateTime, -) -> Result { - let event_seq = next_event_seq_tx(tx, workspace_id, merge_request_id)?; - let event = RequestForReviewEvent { - event_seq, - base_commit: request.base_commit.clone(), - head_commit: request.head_commit.clone(), - changed_paths: request.changed_paths.clone(), - summary: request.summary.clone(), - assignment_id: auth.assignment_id.clone(), - requested_by: WorkerIdentity { - runtime_id: auth.runtime_id.clone(), - worker_id: auth.worker_id.clone(), - }, - created_at: now, - }; - insert_event_tx( - tx, - workspace_id, - merge_request_id, - "request_for_review", - &event, - now, - None, - )?; - tx.execute( - "UPDATE merge_requests SET updated_at = ?3 - WHERE workspace_id = ?1 AND merge_request_id = ?2", - params![workspace_id, merge_request_id, now.to_rfc3339()], - )?; - tx.execute( - "UPDATE merge_request_review_capabilities SET status = 'revoked' - WHERE workspace_id = ?1 AND merge_request_id = ?2 AND status = 'issued'", - params![workspace_id, merge_request_id], - )?; - Ok(event) -} - -fn next_event_seq_tx( - tx: &Transaction<'_>, - workspace_id: &str, - merge_request_id: &str, -) -> Result { - let current: i64 = tx.query_row( - "SELECT COALESCE(MAX(event_seq), 0) FROM merge_request_thread_events - WHERE workspace_id = ?1 AND merge_request_id = ?2", - params![workspace_id, merge_request_id], - |row| row.get(0), - )?; - Ok((current + 1) as u64) -} - -fn insert_event_tx( - tx: &Transaction<'_>, - workspace_id: &str, - merge_request_id: &str, - kind: &str, - payload: &T, - now: DateTime, - operation_id: Option<&str>, -) -> Result<(), MergeRequestError> { - let event_seq = serde_json::to_value(payload) - .map_err(|error| MergeRequestError::Operation(error.to_string()))? - .get("event_seq") - .and_then(serde_json::Value::as_u64) - .ok_or_else(|| MergeRequestError::Operation("event payload has no event_seq".into()))?; - let payload_json = serde_json::to_string(payload) - .map_err(|error| MergeRequestError::Operation(error.to_string()))?; - tx.execute( - "INSERT INTO merge_request_thread_events ( - workspace_id, merge_request_id, event_seq, kind, payload_json, - operation_id, created_at - ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)", - params![ - workspace_id, - merge_request_id, - event_seq as i64, - kind, - payload_json, - operation_id, - now.to_rfc3339() - ], - )?; - Ok(()) -} - -fn load_merge_request( - conn: &Connection, - workspace_id: &str, - ticket_id: &str, -) -> Result, MergeRequestError> { - let id: Option = conn - .query_row( - "SELECT merge_request_id FROM merge_requests - WHERE workspace_id = ?1 AND ticket_id = ?2 - ORDER BY CASE state WHEN 'open' THEN 0 ELSE 1 END, created_at DESC - LIMIT 1", - params![workspace_id, ticket_id], - |row| row.get(0), - ) - .optional()?; - id.map(|id| load_merge_request_by_id(conn, workspace_id, &id)) - .transpose() - .map(Option::flatten) -} - -fn load_merge_request_tx( - tx: &Transaction<'_>, - workspace_id: &str, - ticket_id: &str, -) -> Result, MergeRequestError> { - let id: Option = tx - .query_row( - "SELECT merge_request_id FROM merge_requests - WHERE workspace_id = ?1 AND ticket_id = ?2 AND state = 'open' LIMIT 1", - params![workspace_id, ticket_id], - |row| row.get(0), - ) - .optional()?; - id.map(|id| load_merge_request_by_id(tx, workspace_id, &id)) - .transpose() - .map(Option::flatten) -} - -fn load_merge_request_by_id( - conn: &Connection, - workspace_id: &str, - merge_request_id: &str, -) -> Result, MergeRequestError> { - let row: Option<( - String, - String, - String, - String, - String, - String, - String, - String, - String, - String, - )> = conn - .query_row( - "SELECT ticket_id, repository_id, state, selector_from, selector_to, - opened_by_runtime_id, opened_by_worker_id, created_at, updated_at, - merge_request_id - FROM merge_requests - WHERE workspace_id = ?1 AND merge_request_id = ?2", - params![workspace_id, merge_request_id], - |row| { - Ok(( - row.get(0)?, - row.get(1)?, - row.get(2)?, - row.get(3)?, - row.get(4)?, - row.get(5)?, - row.get(6)?, - row.get(7)?, - row.get(8)?, - row.get(9)?, - )) - }, - ) - .optional()?; - let Some(( - ticket_id, - repository_id, - state, - selector_from, - selector_to, - opened_runtime, - opened_worker, - created_at, - updated_at, - id, - )) = row - else { - return Ok(None); - }; - let mut stmt = conn.prepare( - "SELECT kind, payload_json FROM merge_request_thread_events - WHERE workspace_id = ?1 AND merge_request_id = ?2 ORDER BY event_seq", - )?; - let rows = stmt - .query_map(params![workspace_id, merge_request_id], |row| { - Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)) - })? - .collect::, _>>()?; - let mut thread = Vec::with_capacity(rows.len()); - for (kind, payload) in rows { - thread.push(match kind.as_str() { - "request_for_review" => { - MergeRequestThreadEvent::RequestForReview(decode_payload(&payload)?) - } - "review" => MergeRequestThreadEvent::Review(decode_payload(&payload)?), - "merge" => MergeRequestThreadEvent::Merge(decode_payload(&payload)?), - "reopen" => MergeRequestThreadEvent::Reopen(decode_payload(&payload)?), - "close" => MergeRequestThreadEvent::Close(decode_payload(&payload)?), - other => { - return Err(MergeRequestError::Corrupt(format!( - "unknown merge request thread event kind `{other}`" - ))); - } - }); - } - Ok(Some(MergeRequest { - workspace_id: workspace_id.to_string(), - merge_request_id: id, - ticket_id, - repository_id, - state: MergeRequestState::parse(&state)?, - selector_from, - selector_to, - opened_by_worker: WorkerIdentity { - runtime_id: opened_runtime, - worker_id: opened_worker, - }, - created_at: parse_timestamp(&created_at)?, - updated_at: parse_timestamp(&updated_at)?, - thread, - })) -} - -fn decode_payload Deserialize<'de>>(value: &str) -> Result { - serde_json::from_str(value).map_err(|error| MergeRequestError::Corrupt(error.to_string())) -} - -fn parse_timestamp(value: &str) -> Result, MergeRequestError> { - DateTime::parse_from_rfc3339(value) - .map(|value| value.with_timezone(&Utc)) - .map_err(|error| MergeRequestError::Corrupt(error.to_string())) -} - -pub fn migrate(conn: &Connection) -> Result<(), MergeRequestError> { - let version = schema_version(conn)?; - match version { - None => create_latest_schema(conn), - Some(SCHEMA_VERSION) => verify_latest_schema(conn), - Some(PREVIOUS_SCHEMA_VERSION) => migrate_v11_to_v12(conn), - Some(other) => Err(MergeRequestError::Operation(format!( - "unsupported merge request schema version {other}; expected {PREVIOUS_SCHEMA_VERSION} or {SCHEMA_VERSION}" +pub fn migrate(c: &Connection) -> Result<(), MergeRequestError> { + match schema_version(c)? { + None => fresh(c), + Some(SCHEMA_VERSION) => verify(c), + Some(PREVIOUS_SCHEMA_VERSION) => from_v11(c), + Some(v) => Err(MergeRequestError::Operation(format!( + "unsupported schema {v}" ))), } } - -fn schema_version(conn: &Connection) -> Result, MergeRequestError> { - let exists: bool = conn.query_row( - "SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'merge_request_schema')", - [], - |row| row.get(0), - )?; - if !exists { +fn schema_version(c: &Connection) -> Result, MergeRequestError> { + let e:bool=c.query_row("SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name='merge_request_schema')",[],|r|r.get(0))?; + if !e { return Ok(None); } - conn.query_row( - "SELECT version FROM merge_request_schema WHERE singleton = 1", + c.query_row( + "SELECT version FROM merge_request_schema WHERE singleton=1", [], - |row| row.get(0), + |r| r.get(0), ) .optional() .map_err(Into::into) } - -fn create_latest_schema(conn: &Connection) -> Result<(), MergeRequestError> { - let tx = conn.unchecked_transaction()?; - create_v12_tables(&tx)?; - tx.execute( - "INSERT INTO merge_request_schema (singleton, version) VALUES (1, ?1)", - params![SCHEMA_VERSION], - )?; - foreign_key_check(&tx)?; - tx.commit()?; +fn fresh(c: &Connection) -> Result<(), MergeRequestError> { + let t = c.unchecked_transaction()?; + tables(&t, true)?; + t.execute("INSERT INTO merge_request_schema VALUES(1,12)", [])?; + fk(&t)?; + t.commit()?; Ok(()) } - -fn migrate_v11_to_v12(conn: &Connection) -> Result<(), MergeRequestError> { - let tx = conn.unchecked_transaction()?; - let incompatible: Option = tx - .query_row( - "SELECT mr.merge_request_id - FROM merge_requests mr - LEFT JOIN merge_request_revisions r - ON r.workspace_id = mr.workspace_id - AND r.revision_id = mr.current_revision_id - WHERE r.revision_id IS NULL - LIMIT 1", - [], - |row| row.get(0), - ) - .optional()?; - if let Some(id) = incompatible { - return Err(MergeRequestError::Operation(format!( - "cannot migrate merge request `{id}`: current revision is missing" - ))); +fn tables(t: &Transaction<'_>, marker: bool) -> Result<(), MergeRequestError> { + if marker { + t.execute_batch("CREATE TABLE merge_request_schema(singleton INTEGER PRIMARY KEY CHECK(singleton=1),version INTEGER NOT NULL);")? } - - tx.execute_batch( - "ALTER TABLE merge_requests RENAME TO merge_requests_v11; - ALTER TABLE merge_request_revisions RENAME TO merge_request_revisions_v11; - ALTER TABLE merge_request_review_attempts RENAME TO merge_request_review_attempts_v11; - ALTER TABLE merge_request_reviews RENAME TO merge_request_reviews_v11; - ALTER TABLE merge_request_completion_operations RENAME TO merge_request_completion_operations_v11; - ALTER TABLE merge_request_reviewer_child_sessions RENAME TO merge_request_reviewer_child_sessions_v11;", - )?; - create_v12_domain_tables(&tx)?; - tx.execute( - "INSERT INTO merge_requests ( - workspace_id, merge_request_id, ticket_id, repository_id, state, - selector_from, selector_to, opened_by_runtime_id, opened_by_worker_id, - created_at, updated_at - ) - SELECT mr.workspace_id, mr.merge_request_id, mr.ticket_id, mr.repository_id, - CASE mr.state WHEN 'draft' THEN 'open' ELSE mr.state END, - r.head_commit, mr.target_ref_selector, - mr.opened_by_worker_runtime_id, mr.opened_by_worker_id, - mr.created_at, mr.updated_at - FROM merge_requests_v11 mr - JOIN merge_request_revisions_v11 r - ON r.workspace_id = mr.workspace_id AND r.revision_id = mr.current_revision_id", - [], - )?; - - migrate_v11_events(&tx)?; - tx.execute_batch( - "DROP TABLE merge_request_reviewer_child_sessions_v11; - DROP TABLE merge_request_completion_operations_v11; - DROP TABLE merge_request_reviews_v11; - DROP TABLE merge_request_review_attempts_v11; - DROP TABLE merge_request_revisions_v11; - DROP TABLE merge_requests_v11; - UPDATE merge_request_schema SET version = 12 WHERE singleton = 1;", - )?; - foreign_key_check(&tx)?; - tx.commit()?; + t.execute_batch("CREATE TABLE merge_requests(workspace_id TEXT NOT NULL,merge_request_id TEXT NOT NULL,repository_id TEXT NOT NULL,state TEXT NOT NULL CHECK(state IN('open','merged','closed')),selector_from TEXT,selector_to TEXT NOT NULL,created_at TEXT NOT NULL,updated_at TEXT NOT NULL,PRIMARY KEY(workspace_id,merge_request_id),FOREIGN KEY(workspace_id,repository_id)REFERENCES repositories(workspace_id,repository_id));CREATE TABLE merge_request_ticket_relations(workspace_id TEXT NOT NULL,merge_request_id TEXT NOT NULL,ticket_id TEXT NOT NULL,relation_kind TEXT NOT NULL CHECK(relation_kind='implements'),created_at TEXT NOT NULL,PRIMARY KEY(workspace_id,merge_request_id,ticket_id),FOREIGN KEY(workspace_id,merge_request_id)REFERENCES merge_requests(workspace_id,merge_request_id)ON DELETE CASCADE,FOREIGN KEY(workspace_id,ticket_id)REFERENCES typed_tickets(workspace_id,ticket_id)ON DELETE CASCADE);CREATE TABLE merge_request_thread_events(workspace_id TEXT NOT NULL,merge_request_id TEXT NOT NULL,event_id TEXT NOT NULL,sequence INTEGER NOT NULL,kind TEXT NOT NULL CHECK(kind IN('review_requested','review','review_revoked','review_cancelled','comment','merge')),payload_json TEXT NOT NULL,operation_id TEXT,created_at TEXT NOT NULL,PRIMARY KEY(workspace_id,merge_request_id,event_id),UNIQUE(workspace_id,merge_request_id,sequence),FOREIGN KEY(workspace_id,merge_request_id)REFERENCES merge_requests(workspace_id,merge_request_id)ON DELETE CASCADE);CREATE UNIQUE INDEX merge_request_merge_operations ON merge_request_thread_events(workspace_id,operation_id)WHERE operation_id IS NOT NULL;CREATE TABLE merge_request_review_grants(workspace_id TEXT NOT NULL,merge_request_id TEXT NOT NULL,request_event_id TEXT NOT NULL,subject_ref TEXT NOT NULL,reviewer_runtime_id TEXT NOT NULL,reviewer_worker_id TEXT NOT NULL,capability_token TEXT PRIMARY KEY,issued_at TEXT NOT NULL,consumed_at TEXT,revoked_at TEXT,status TEXT NOT NULL CHECK(status IN('issued','consumed','revoked')),FOREIGN KEY(workspace_id,merge_request_id,request_event_id)REFERENCES merge_request_thread_events(workspace_id,merge_request_id,event_id)ON DELETE CASCADE);CREATE TABLE merge_request_reviewer_child_sessions(workspace_id TEXT NOT NULL,child_session_id TEXT NOT NULL,parent_runtime_id TEXT NOT NULL,parent_worker_id TEXT NOT NULL,reviewer_profile TEXT NOT NULL,registered_at TEXT NOT NULL,status TEXT NOT NULL CHECK(status IN('active','consumed')),PRIMARY KEY(workspace_id,child_session_id));")?; Ok(()) } - -fn migrate_v11_events(tx: &Transaction<'_>) -> Result<(), MergeRequestError> { - let mut stmt = tx.prepare( - "SELECT r.workspace_id, r.merge_request_id, r.revision_id, r.base_commit, r.head_commit, - r.changed_paths_json, r.summary, r.assignment_id, - r.coder_worker_runtime_id, r.coder_worker_id, r.created_at - FROM merge_request_revisions_v11 r - ORDER BY r.workspace_id, r.merge_request_id, r.created_at, r.revision_id", - )?; - let revisions = stmt - .query_map([], |row| { +fn from_v11(c: &Connection) -> Result<(), MergeRequestError> { + let t = c.unchecked_transaction()?; + t.execute_batch("ALTER TABLE merge_requests RENAME TO merge_requests_v11;ALTER TABLE merge_request_ticket_relations RENAME TO merge_request_ticket_relations_v11;ALTER TABLE merge_request_revisions RENAME TO merge_request_revisions_v11;ALTER TABLE merge_request_revision_paths RENAME TO merge_request_revision_paths_v11;ALTER TABLE merge_request_reviewer_child_sessions RENAME TO merge_request_reviewer_child_sessions_v11;ALTER TABLE merge_request_review_attempts RENAME TO merge_request_review_attempts_v11;ALTER TABLE merge_request_reviews RENAME TO merge_request_reviews_v11;ALTER TABLE merge_request_review_findings RENAME TO merge_request_review_findings_v11;ALTER TABLE merge_request_completion_operations RENAME TO merge_request_completion_operations_v11;")?; + tables(&t, false)?; + t.execute("INSERT INTO merge_requests SELECT workspace_id,merge_request_id,repository_id,CASE state WHEN 'draft'THEN'open'ELSE state END,NULL,target_ref_selector,created_at,updated_at FROM merge_requests_v11",[])?; + t.execute("INSERT INTO merge_request_ticket_relations SELECT * FROM merge_request_ticket_relations_v11",[])?; + migrate_events(&t)?; + t.execute_batch("DROP TABLE merge_request_review_findings_v11;DROP TABLE merge_request_reviews_v11;DROP TABLE merge_request_review_attempts_v11;DROP TABLE merge_request_reviewer_child_sessions_v11;DROP TABLE merge_request_revision_paths_v11;DROP TABLE merge_request_revisions_v11;DROP TABLE merge_request_completion_operations_v11;DROP TABLE merge_request_ticket_relations_v11;DROP TABLE merge_requests_v11;UPDATE merge_request_schema SET version=12 WHERE singleton=1;")?; + fk(&t)?; + t.commit()?; + Ok(()) +} +fn migrate_events(t: &Transaction<'_>) -> Result<(), MergeRequestError> { + let attempts = { + let mut s=t.prepare("SELECT a.workspace_id,a.attempt_id,a.merge_request_id,a.parent_runtime_id,a.parent_worker_id,a.child_session_id,a.status,a.created_at,a.consumed_at,r.head_commit FROM merge_request_review_attempts_v11 a JOIN merge_request_revisions_v11 r ON r.workspace_id=a.workspace_id AND r.merge_request_id=a.merge_request_id AND r.revision_id=a.revision_id ORDER BY a.created_at")?; + s.query_map([], |r| { Ok(( - row.get::<_, String>(0)?, - row.get::<_, String>(1)?, - row.get::<_, String>(2)?, - row.get::<_, String>(3)?, - row.get::<_, String>(4)?, - row.get::<_, String>(5)?, - row.get::<_, String>(6)?, - row.get::<_, String>(7)?, - row.get::<_, String>(8)?, - row.get::<_, String>(9)?, - row.get::<_, String>(10)?, + r.get::<_, String>(0)?, + r.get::<_, String>(1)?, + r.get::<_, String>(2)?, + r.get::<_, String>(3)?, + r.get::<_, String>(4)?, + r.get::<_, String>(5)?, + r.get::<_, String>(6)?, + r.get::<_, String>(7)?, + r.get::<_, Option>(8)?, + r.get::<_, String>(9)?, )) })? - .collect::, _>>()?; - drop(stmt); - for ( - workspace_id, - mr_id, - revision_id, - base, - head, - paths_json, - summary, - assignment, - runtime, - worker, - created_at, - ) in revisions - { - let event_seq = next_event_seq_tx(tx, &workspace_id, &mr_id)?; - let event = RequestForReviewEvent { - event_seq, - base_commit: base, - head_commit: head, - changed_paths: serde_json::from_str(&paths_json).map_err(|error| { - MergeRequestError::Operation(format!( - "cannot migrate revision `{revision_id}` changed paths: {error}" - )) - })?, - summary, - assignment_id: assignment, + .collect::, _>>()? + }; + for (ws, a, mr, pr, pw, child, status, created, consumed, subject) in attempts { + let req = ReviewRequestedEvent { + event_id: format!("migrated-request-{a}"), + sequence: next_seq(t, &ws, &mr)?, + subject_ref: subject.clone(), requested_by: WorkerIdentity { - runtime_id: runtime, - worker_id: worker, + runtime_id: pr.clone(), + worker_id: pw, }, - created_at: parse_timestamp(&created_at)?, + reviewer: WorkerIdentity { + runtime_id: pr, + worker_id: child, + }, + created_at: time(&created)?, }; - insert_event_tx( - tx, - &workspace_id, - &mr_id, - "request_for_review", - &event, - event.created_at, - None, - )?; - - let reviews = { - let mut reviews_stmt = tx.prepare( - "SELECT reviewer_worker_runtime_id, reviewer_worker_id, reviewer_profile, - decision, body, findings_json, created_at - FROM merge_request_reviews_v11 - WHERE workspace_id = ?1 AND revision_id = ?2 - ORDER BY created_at, review_id", - )?; - reviews_stmt - .query_map(params![workspace_id, revision_id], |row| { - Ok(( - row.get::<_, String>(0)?, - row.get::<_, String>(1)?, - row.get::<_, String>(2)?, - row.get::<_, String>(3)?, - row.get::<_, String>(4)?, - row.get::<_, String>(5)?, - row.get::<_, String>(6)?, - )) + insert_event(t, &ws, &mr, "review_requested", &req, req.created_at, None)?; + if status == "submitted" { + let(row_dec,row_body,row_at):(String,String,String)=t.query_row("SELECT decision,body,submitted_at FROM merge_request_reviews_v11 WHERE workspace_id=?1 AND attempt_id=?2",params![ws,a],|r|Ok((r.get(0)?,r.get(1)?,r.get(2)?)))?; + let findings = { + let mut s=t.prepare("SELECT severity,code,path,line,body FROM merge_request_review_findings_v11 WHERE workspace_id=?1 AND attempt_id=?2 ORDER BY ordinal")?; + s.query_map(params![ws, a], |r| { + Ok(ReviewFinding { + severity: match r.get::<_, String>(0)?.as_str() { + "blocker" => FindingSeverity::Blocker, + "major" => FindingSeverity::Major, + "minor" => FindingSeverity::Minor, + _ => FindingSeverity::Note, + }, + code: r.get(1)?, + path: r.get(2)?, + line: r.get(3)?, + body: r.get(4)?, + }) })? .collect::, _>>()? - }; - for ( - review_runtime, - review_worker, - profile, - decision, - body, - findings_json, - review_created, - ) in reviews - { - let review_seq = next_event_seq_tx(tx, &workspace_id, &mr_id)?; - let review = ReviewEvent { - event_seq: review_seq, - request_event_seq: event_seq, - head_commit: event.head_commit.clone(), - reviewer_worker: WorkerIdentity { - runtime_id: review_runtime, - worker_id: review_worker, - }, - reviewer_profile: profile, - decision: match decision.as_str() { - "approve" => ReviewDecision::Approve, - "request_changes" => ReviewDecision::RequestChanges, - other => { - return Err(MergeRequestError::Operation(format!( - "cannot migrate unknown review decision `{other}`" - ))); - } - }, - body, - findings: serde_json::from_str(&findings_json).map_err(|error| { - MergeRequestError::Operation(format!("cannot migrate review findings: {error}")) - })?, - created_at: parse_timestamp(&review_created)?, }; - insert_event_tx( - tx, - &workspace_id, - &mr_id, - "review", - &review, - review.created_at, - None, - )?; + let rev = ReviewEvent { + event_id: format!("migrated-review-{a}"), + sequence: next_seq(t, &ws, &mr)?, + request_event_id: req.event_id, + subject_ref: subject, + decision: if row_dec == "approve" { + ReviewDecision::Approve + } else { + ReviewDecision::RequestChanges + }, + body: row_body, + findings, + reviewer: req.reviewer, + created_at: time(&row_at)?, + }; + insert_event(t, &ws, &mr, "review", &rev, rev.created_at, None)? + } else if status == "revoked" { + let at = consumed.as_deref().unwrap_or(&created); + let e = ReviewCancelledEvent { + event_id: format!("migrated-cancel-{a}"), + sequence: next_seq(t, &ws, &mr)?, + request_event_id: req.event_id, + subject_ref: subject, + reason: "legacy review attempt revoked".into(), + created_at: time(at)?, + }; + insert_event(t, &ws, &mr, "review_cancelled", &e, e.created_at, None)? } } - - let mut completion_stmt = tx.prepare( - "SELECT workspace_id, merge_request_id, operation_id, target_commit, source_commit, - result_commit, strategy, resolution, requested_by_runtime_id, - requested_by_worker_id, completed_at - FROM merge_request_completion_operations_v11 - WHERE status = 'succeeded' - ORDER BY completed_at, operation_id", - )?; - let completions = completion_stmt - .query_map([], |row| { + let completed = { + let mut q=t.prepare("SELECT c.workspace_id,c.operation_id,c.ticket_id,c.target_commit,c.source_commit,c.result_commit,c.strategy,c.resolution,c.completion_actor_runtime_id,c.completion_actor_worker_id,c.updated_at,rel.merge_request_id FROM merge_request_completion_operations_v11 c JOIN merge_request_ticket_relations_v11 rel ON rel.workspace_id=c.workspace_id AND rel.ticket_id=c.ticket_id WHERE c.status='completed' ORDER BY c.updated_at")?; + q.query_map([], |r| { Ok(( - row.get::<_, String>(0)?, - row.get::<_, String>(1)?, - row.get::<_, String>(2)?, - row.get::<_, String>(3)?, - row.get::<_, String>(4)?, - row.get::<_, String>(5)?, - row.get::<_, String>(6)?, - row.get::<_, String>(7)?, - row.get::<_, String>(8)?, - row.get::<_, String>(9)?, - row.get::<_, Option>(10)?, + r.get::<_, String>(0)?, + r.get::<_, String>(1)?, + r.get::<_, String>(2)?, + r.get::<_, Option>(3)?, + r.get::<_, Option>(4)?, + r.get::<_, Option>(5)?, + r.get::<_, Option>(6)?, + r.get::<_, Option>(7)?, + r.get::<_, Option>(8)?, + r.get::<_, Option>(9)?, + r.get::<_, String>(10)?, + r.get::<_, String>(11)?, )) })? - .collect::, _>>()?; - drop(completion_stmt); + .collect::, _>>()? + }; for ( - workspace_id, - mr_id, - operation_id, + ws, + op, + _ticket, target, source, result, @@ -1722,170 +1088,86 @@ fn migrate_v11_events(tx: &Transaction<'_>) -> Result<(), MergeRequestError> { resolution, runtime, worker, - completed_at, - ) in completions + updated, + mr, + ) in completed { - let created_at = parse_timestamp(completed_at.as_deref().ok_or_else(|| { + let subject = source.ok_or_else(|| { + MergeRequestError::Operation(format!("completed operation {op} lacks source evidence")) + })?; + let approval:Option=t.query_row("SELECT event_id FROM merge_request_thread_events WHERE workspace_id=?1 AND merge_request_id=?2 AND kind='review' AND json_extract(payload_json,'$.subject_ref')=?3 AND json_extract(payload_json,'$.decision')='approve' ORDER BY sequence DESC LIMIT 1",params![ws,mr,subject],|r|r.get(0)).optional()?; + let approval = approval.ok_or_else(|| { MergeRequestError::Operation(format!( - "cannot migrate completion `{operation_id}` without completed_at" + "completed operation {op} lacks approval evidence" )) - })?)?; - let event = MergeEvent { - event_seq: next_event_seq_tx(tx, &workspace_id, &mr_id)?, - operation_id, - target_commit: target, - source_commit: source, - result_commit: result, - strategy: match strategy.as_str() { - "fast_forward" => MergeStrategy::FastForward, - "merge" => MergeStrategy::Merge, - other => { - return Err(MergeRequestError::Operation(format!( - "cannot migrate unknown merge strategy `{other}`" - ))); - } + })?; + let e = MergeEvent { + event_id: format!("migrated-merge-{op}"), + sequence: next_seq(t, &ws, &mr)?, + operation_id: op, + approval_event_id: approval, + approved_source_ref: subject, + target_ref_before: target.ok_or_else(|| { + MergeRequestError::Operation("completed operation lacks target evidence".into()) + })?, + target_ref_after: result.ok_or_else(|| { + MergeRequestError::Operation("completed operation lacks result evidence".into()) + })?, + strategy: if strategy.as_deref() == Some("merge") { + MergeStrategy::Merge + } else { + MergeStrategy::FastForward }, - resolution: match resolution.as_str() { - "none" => ConflictResolution::None, - "clean" => ConflictResolution::Clean, - "conflicts_resolved" => ConflictResolution::ConflictsResolved, - other => { - return Err(MergeRequestError::Operation(format!( - "cannot migrate unknown conflict resolution `{other}`" - ))); - } + resolution: match resolution.as_deref() { + Some("clean") => ConflictResolution::Clean, + Some("conflicts_resolved") => ConflictResolution::ConflictsResolved, + _ => ConflictResolution::None, }, merged_by: WorkerIdentity { - runtime_id: runtime, - worker_id: worker, + runtime_id: runtime.unwrap_or_else(|| "legacy".into()), + worker_id: worker.unwrap_or_else(|| "legacy".into()), }, - created_at, + created_at: time(&updated)?, }; - insert_event_tx( - tx, - &workspace_id, - &mr_id, + insert_event( + t, + &ws, + &mr, "merge", - &event, - created_at, - Some(&event.operation_id), + &e, + e.created_at, + Some(&e.operation_id), )?; } Ok(()) } - -fn create_v12_tables(tx: &Transaction<'_>) -> Result<(), MergeRequestError> { - tx.execute_batch( - "CREATE TABLE merge_request_schema ( - singleton INTEGER PRIMARY KEY CHECK (singleton = 1), - version INTEGER NOT NULL - );", - )?; - create_v12_domain_tables(tx) -} - -fn create_v12_domain_tables(tx: &Transaction<'_>) -> Result<(), MergeRequestError> { - tx.execute_batch( - "CREATE TABLE merge_requests ( - workspace_id TEXT NOT NULL, - merge_request_id TEXT NOT NULL, - ticket_id TEXT NOT NULL, - repository_id TEXT NOT NULL, - state TEXT NOT NULL CHECK (state IN ('open', 'merged', 'closed')), - selector_from TEXT NOT NULL CHECK (length(trim(selector_from)) > 0), - selector_to TEXT NOT NULL CHECK (length(trim(selector_to)) > 0), - opened_by_runtime_id TEXT NOT NULL, - opened_by_worker_id TEXT NOT NULL, - created_at TEXT NOT NULL, - updated_at TEXT NOT NULL, - PRIMARY KEY (workspace_id, merge_request_id), - FOREIGN KEY (workspace_id) REFERENCES workspaces(workspace_id) ON DELETE CASCADE, - FOREIGN KEY (workspace_id, repository_id) - REFERENCES repositories(workspace_id, repository_id) ON DELETE RESTRICT, - FOREIGN KEY (workspace_id, ticket_id) - REFERENCES typed_tickets(workspace_id, ticket_id) ON DELETE CASCADE - ); - CREATE UNIQUE INDEX merge_requests_one_open_per_ticket - ON merge_requests(workspace_id, ticket_id) WHERE state = 'open'; - CREATE INDEX merge_requests_ticket_history - ON merge_requests(workspace_id, ticket_id, created_at DESC); - - CREATE TABLE merge_request_thread_events ( - workspace_id TEXT NOT NULL, - merge_request_id TEXT NOT NULL, - event_seq INTEGER NOT NULL CHECK (event_seq > 0), - kind TEXT NOT NULL CHECK (kind IN ('request_for_review', 'review', 'merge', 'reopen', 'close')), - payload_json TEXT NOT NULL, - operation_id TEXT, - created_at TEXT NOT NULL, - PRIMARY KEY (workspace_id, merge_request_id, event_seq), - FOREIGN KEY (workspace_id, merge_request_id) - REFERENCES merge_requests(workspace_id, merge_request_id) ON DELETE CASCADE - ); - CREATE UNIQUE INDEX merge_request_merge_operation_ids - ON merge_request_thread_events(workspace_id, operation_id) - WHERE operation_id IS NOT NULL; - - CREATE TABLE merge_request_review_capabilities ( - workspace_id TEXT NOT NULL, - merge_request_id TEXT NOT NULL, - request_event_seq INTEGER NOT NULL, - capability_token TEXT PRIMARY KEY, - issued_by_assignment_id TEXT NOT NULL, - reviewer_runtime_id TEXT NOT NULL, - reviewer_worker_id TEXT NOT NULL, - reviewer_profile TEXT NOT NULL, - issued_at TEXT NOT NULL, - consumed_at TEXT, - status TEXT NOT NULL CHECK (status IN ('issued', 'consumed', 'revoked')), - FOREIGN KEY (workspace_id, merge_request_id, request_event_seq) - REFERENCES merge_request_thread_events(workspace_id, merge_request_id, event_seq) - ON DELETE CASCADE - ); - CREATE TABLE merge_request_reviewer_child_sessions ( - workspace_id TEXT NOT NULL, - child_session_id TEXT NOT NULL, - parent_runtime_id TEXT NOT NULL, - parent_worker_id TEXT NOT NULL, - reviewer_profile TEXT NOT NULL, - registered_at TEXT NOT NULL, - status TEXT NOT NULL CHECK (status IN ('active', 'consumed')), - PRIMARY KEY (workspace_id, child_session_id) - );", - )?; - Ok(()) -} - -fn verify_latest_schema(conn: &Connection) -> Result<(), MergeRequestError> { - for table in [ +fn verify(c: &Connection) -> Result<(), MergeRequestError> { + for n in [ "merge_requests", + "merge_request_ticket_relations", "merge_request_thread_events", - "merge_request_review_capabilities", - "merge_request_reviewer_child_sessions", + "merge_request_review_grants", ] { - let exists: bool = conn.query_row( - "SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ?1)", - params![table], - |row| row.get(0), + let e: bool = c.query_row( + "SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table'AND name=?1)", + params![n], + |r| r.get(0), )?; - if !exists { - return Err(MergeRequestError::Corrupt(format!( - "schema v{SCHEMA_VERSION} is missing table `{table}`" - ))); + if !e { + return Err(MergeRequestError::Corrupt(format!("missing `{n}`"))); } } - foreign_key_check(conn) + fk(c) } - -fn foreign_key_check(conn: &Connection) -> Result<(), MergeRequestError> { - let violation: Option<(String, i64)> = conn - .query_row("PRAGMA foreign_key_check", [], |row| { - Ok((row.get(0)?, row.get(1)?)) +fn fk(c: &Connection) -> Result<(), MergeRequestError> { + let v: Option<(String, i64)> = c + .query_row("PRAGMA foreign_key_check", [], |r| { + Ok((r.get(0)?, r.get(1)?)) }) .optional()?; - if let Some((table, rowid)) = violation { + if let Some((t, r)) = v { return Err(MergeRequestError::Corrupt(format!( - "foreign key violation in `{table}` row {rowid}" + "foreign key violation {t}:{r}" ))); } Ok(()) diff --git a/crates/merge-request/tests/store.rs b/crates/merge-request/tests/store.rs index 8b5654d5..24a47e7c 100644 --- a/crates/merge-request/tests/store.rs +++ b/crates/merge-request/tests/store.rs @@ -1,407 +1,215 @@ -use std::sync::{Arc, Mutex}; - use chrono::{TimeZone, Utc}; -use merge_request::{ - AssignmentSource, CompleteMergeRequest, ConflictResolution, CurrentAssignment, FindingSeverity, - MergeRequestAuth, MergeRequestState, MergeRequestStore, MergeRequestThreadEvent, MergeStrategy, - OpenMergeRequest, ReadinessCheck, RegisterReviewCapability, RegisterReviewerChildSession, - RepositorySource, RequestForReview, RequestMergeRequestReview, ReviewDecision, ReviewFinding, - SubmitMergeRequestReview, -}; -use rusqlite::{Connection, params}; - +use merge_request::*; +use rusqlite::Connection; +use std::sync::{Arc, Mutex}; #[derive(Clone)] -struct Assignments { - current: Arc>, -} - +struct Assignments(Arc>); impl AssignmentSource for Assignments { - fn current_assignment( - &self, - _workspace_id: &str, - _ticket_id: &str, - ) -> Result, String> { - Ok(Some(self.current.lock().unwrap().clone())) + fn current_assignment(&self, _: &str, _: &str) -> Result, String> { + Ok(Some(self.0.lock().unwrap().clone())) } } - struct Repositories; - impl RepositorySource for Repositories { - fn repository_belongs_to_workspace( - &self, - workspace_id: &str, - repository_id: &str, - ) -> Result { - Ok(workspace_id == "W" && repository_id == "R") - } - - fn is_ancestor( - &self, - _workspace_id: &str, - _repository_id: &str, - ancestor: &str, - descendant: &str, - ) -> Result { - Ok(matches!( - (ancestor, descendant), - ("base", "head-1") | ("base", "head-2") - )) + fn repository_belongs_to_workspace(&self, w: &str, r: &str) -> Result { + Ok(w == "W" && r == "R") } } - -fn now(second: u32) -> chrono::DateTime { - Utc.with_ymd_and_hms(2026, 7, 26, 12, 0, second) +fn at(s: u32) -> chrono::DateTime { + Utc.with_ymd_and_hms(2026, 7, 26, 12, 0, s) .single() .unwrap() } - -fn fixture() -> (tempfile::TempDir, MergeRequestStore, Assignments) { - let dir = tempfile::tempdir().unwrap(); - let path = dir.path().join("server.db"); - let conn = Connection::open(&path).unwrap(); - conn.execute_batch( - "PRAGMA foreign_keys = ON; - CREATE TABLE workspaces (workspace_id TEXT PRIMARY KEY); - CREATE TABLE repositories ( - workspace_id TEXT NOT NULL, - repository_id TEXT NOT NULL, - PRIMARY KEY (workspace_id, repository_id), - FOREIGN KEY (workspace_id) REFERENCES workspaces(workspace_id) - ); - CREATE TABLE typed_tickets ( - workspace_id TEXT NOT NULL, - ticket_id TEXT NOT NULL, - workflow_state TEXT NOT NULL, - workflow_state_explicit INTEGER NOT NULL, - updated_at TEXT NOT NULL, - PRIMARY KEY (workspace_id, ticket_id) - ); - CREATE TABLE typed_ticket_events ( - workspace_id TEXT NOT NULL, ticket_id TEXT NOT NULL, event_index INTEGER NOT NULL, - kind TEXT NOT NULL, author TEXT NOT NULL, at TEXT NOT NULL, - from_state TEXT, to_state TEXT, heading TEXT, body TEXT, - PRIMARY KEY (workspace_id, ticket_id, event_index) - ); - CREATE TABLE typed_ticket_event_attributes ( - workspace_id TEXT NOT NULL, ticket_id TEXT NOT NULL, event_index INTEGER NOT NULL, - key TEXT NOT NULL, value TEXT NOT NULL, - PRIMARY KEY (workspace_id, ticket_id, event_index, key) - ); - INSERT INTO workspaces VALUES ('W'); - INSERT INTO repositories VALUES ('W', 'R'); - INSERT INTO typed_tickets VALUES ('W', 'T', 'inprogress', 1, '2026-07-26T12:00:00Z');", - ) - .unwrap(); - drop(conn); - let assignments = Assignments { - current: Arc::new(Mutex::new(CurrentAssignment { - assignment_id: "A1".into(), - ticket_id: "T".into(), - runtime_id: "runtime".into(), - worker_id: "coder".into(), - })), - }; - let store = - MergeRequestStore::open(&path, Arc::new(assignments.clone()), Arc::new(Repositories)) - .unwrap(); - (dir, store, assignments) -} - -fn auth(assignment_id: &str) -> MergeRequestAuth { +fn auth() -> MergeRequestAuth { MergeRequestAuth { workspace_id: "W".into(), repository_id: "R".into(), runtime_id: "runtime".into(), worker_id: "coder".into(), - assignment_id: assignment_id.into(), + assignment_id: "A".into(), } } - -fn open(store: &MergeRequestStore) { - store - .open_merge_request(OpenMergeRequest { - merge_request_id: "MR".into(), - ticket_id: "T".into(), - repository_id: "R".into(), - selector_from: "work/t-feature".into(), - selector_to: "develop".into(), - request: RequestForReview { - base_commit: "base".into(), - head_commit: "head-1".into(), - changed_paths: vec!["src/lib.rs".into()], - summary: "first candidate".into(), - }, - auth: auth("A1"), - now: now(1), - }) - .unwrap(); -} - -fn approve(store: &MergeRequestStore, expected_head_commit: &str, token: &str) { - store - .register_reviewer_child_session(RegisterReviewerChildSession { - workspace_id: "W".into(), - parent_runtime_id: "runtime".into(), - parent_worker_id: "coder".into(), - child_session_id: format!("child-{token}"), - reviewer_profile: "builtin:reviewer".into(), - now: now(2), - }) - .unwrap(); - store - .register_review_capability(RegisterReviewCapability { - ticket_id: "T".into(), - expected_head_commit: expected_head_commit.into(), - child_session_id: format!("child-{token}"), - capability_token: token.into(), - auth: auth("A1"), - now: now(3), - }) - .unwrap(); - store - .submit_review(SubmitMergeRequestReview { - ticket_id: "T".into(), - expected_head_commit: expected_head_commit.into(), - capability_token: token.into(), - decision: ReviewDecision::Approve, - body: "approved independently".into(), - findings: vec![ReviewFinding { - severity: FindingSeverity::Note, - path: None, - line: None, - message: "looks good".into(), - }], - now: now(4), - }) - .unwrap(); -} - -#[test] -fn thread_drives_review_readiness_and_completion_without_public_revision_identity() { - let (_dir, store, _assignments) = fixture(); - open(&store); - approve(&store, "head-1", "token-1"); - - let readiness = store - .readiness(ReadinessCheck { - ticket_id: "T".into(), - expected_head_commit: Some("head-1".into()), - auth: auth("A1"), - }) - .unwrap(); - assert!(readiness.ready, "{:?}", readiness.blockers); - - let merged = store - .complete(CompleteMergeRequest { - ticket_id: "T".into(), - expected_head_commit: "head-1".into(), - operation_id: "op-1".into(), - target_commit: "base".into(), - source_commit: "head-1".into(), - result_commit: "head-1".into(), - strategy: MergeStrategy::FastForward, - resolution: ConflictResolution::None, - auth: auth("A1"), - now: now(5), - }) - .unwrap(); - assert_eq!(merged.result_commit, "head-1"); - - let mr = store.get("W", "T").unwrap(); - assert_eq!(mr.state, MergeRequestState::Merged); - assert!(matches!( - mr.thread.last(), - Some(MergeRequestThreadEvent::Merge(_)) - )); - assert_eq!(mr.selector_from, "work/t-feature"); - assert_eq!(mr.selector_to, "develop"); - let json = serde_json::to_string(&mr).unwrap(); - for forbidden in [ - "revision_id", - "current_revision", - "attempt_id", - "review_attempt", - "head_tree", - "diff_digest", - "merged_revision_id", - ] { - assert!( - !json.contains(forbidden), - "unexpected `{forbidden}` in {json}" - ); - } -} - -#[test] -fn new_review_request_invalidates_prior_approval_and_fences_stale_capability() { - let (_dir, store, _assignments) = fixture(); - open(&store); - approve(&store, "head-1", "token-1"); - store - .request_review(RequestMergeRequestReview { - ticket_id: "T".into(), - expected_head_commit: "head-1".into(), - request: RequestForReview { - base_commit: "base".into(), - head_commit: "head-2".into(), - changed_paths: vec!["src/lib.rs".into(), "tests/store.rs".into()], - summary: "address review".into(), - }, - auth: auth("A1"), - now: now(6), - }) - .unwrap(); - - let readiness = store - .readiness(ReadinessCheck { - ticket_id: "T".into(), - expected_head_commit: Some("head-2".into()), - auth: auth("A1"), - }) - .unwrap(); - assert!(!readiness.ready); - assert!( - readiness - .blockers - .iter() - .any(|value| value.contains("no review result")) - ); - assert!( - store - .submit_review(SubmitMergeRequestReview { - ticket_id: "T".into(), - expected_head_commit: "head-1".into(), - capability_token: "token-1".into(), - decision: ReviewDecision::Approve, - body: "stale".into(), - findings: vec![], - now: now(7), - }) - .is_err() - ); -} - -#[test] -fn assignment_change_rejects_candidate_mutation() { - let (_dir, store, assignments) = fixture(); - open(&store); - *assignments.current.lock().unwrap() = CurrentAssignment { - assignment_id: "A2".into(), +fn fixture() -> (tempfile::TempDir, MergeRequestStore) { + let d = tempfile::tempdir().unwrap(); + let p = d.path().join("db"); + let c = Connection::open(&p).unwrap(); + c.execute_batch("CREATE TABLE workspaces(workspace_id TEXT PRIMARY KEY);CREATE TABLE repositories(workspace_id TEXT,repository_id TEXT,PRIMARY KEY(workspace_id,repository_id));CREATE TABLE typed_tickets(workspace_id TEXT,ticket_id TEXT,workflow_state TEXT,workflow_state_explicit INTEGER,updated_at TEXT,PRIMARY KEY(workspace_id,ticket_id));CREATE TABLE typed_ticket_events(workspace_id TEXT,ticket_id TEXT,event_index INTEGER,kind TEXT,author TEXT,at TEXT,from_state TEXT,to_state TEXT,heading TEXT,body TEXT,PRIMARY KEY(workspace_id,ticket_id,event_index));CREATE TABLE typed_ticket_event_attributes(workspace_id TEXT,ticket_id TEXT,event_index INTEGER,key TEXT,value TEXT,PRIMARY KEY(workspace_id,ticket_id,event_index,key));INSERT INTO workspaces VALUES('W');INSERT INTO repositories VALUES('W','R');INSERT INTO typed_tickets VALUES('W','T','inprogress',1,'t');").unwrap(); + drop(c); + let a = Assignments(Arc::new(Mutex::new(CurrentAssignment { + assignment_id: "A".into(), ticket_id: "T".into(), runtime_id: "runtime".into(), - worker_id: "other".into(), - }; - let error = store - .request_review(RequestMergeRequestReview { + worker_id: "coder".into(), + }))); + let s = MergeRequestStore::open(&p, Arc::new(a), Arc::new(Repositories)).unwrap(); + (d, s) +} +fn open(s: &MergeRequestStore) { + s.open_merge_request(OpenMergeRequest { + merge_request_id: "MR".into(), + ticket_id: "T".into(), + repository_id: "R".into(), + selector_from: "work/t".into(), + selector_to: "develop".into(), + summary: "summary".into(), + auth: auth(), + now: at(1), + }) + .unwrap(); +} +fn request(s: &MergeRequestStore, subject: &str, token: &str) -> ReviewRequestedEvent { + s.register_reviewer_child_session(RegisterReviewerChildSession { + workspace_id: "W".into(), + parent_runtime_id: "runtime".into(), + parent_worker_id: "coder".into(), + child_session_id: format!("child-{token}"), + reviewer_profile: "builtin:reviewer".into(), + now: at(2), + }) + .unwrap(); + s.request_review(RequestMergeRequestReview { + ticket_id: "T".into(), + subject_ref: subject.into(), + child_session_id: format!("child-{token}"), + capability_token: token.into(), + auth: auth(), + now: at(3), + }) + .unwrap() + .request_event +} +fn approve(s: &MergeRequestStore, subject: &str, token: &str) -> ReviewEvent { + request(s, subject, token); + s.submit_review(SubmitMergeRequestReview { + ticket_id: "T".into(), + current_subject_ref: subject.into(), + capability_token: token.into(), + decision: ReviewDecision::Approve, + body: "approved".into(), + findings: vec![], + now: at(4), + }) + .unwrap() +} +#[test] +fn selectors_thread_and_completion_have_no_revision_or_commit_api() { + let (_d, s) = fixture(); + open(&s); + let review = approve(&s, "opaque-source-ref", "token"); + let ready = s + .readiness(ReadinessCheck { ticket_id: "T".into(), - expected_head_commit: "head-1".into(), - request: RequestForReview { - base_commit: "base".into(), - head_commit: "head-2".into(), - changed_paths: vec![], - summary: String::new(), - }, - auth: auth("A1"), - now: now(6), + current_subject_ref: Some("opaque-source-ref".into()), + auth: auth(), }) - .unwrap_err(); - assert!(error.to_string().contains("current assigned worker")); + .unwrap(); + assert!(ready.ready); + let merged = s + .complete(CompleteMergeRequest { + ticket_id: "T".into(), + operation_id: "op".into(), + approval_event_id: review.event_id, + current_subject_ref: "opaque-source-ref".into(), + target_ref_before: "old-target-ref".into(), + target_ref_after: "new-target-ref".into(), + strategy: MergeStrategy::FastForward, + resolution: ConflictResolution::None, + auth: auth(), + now: at(5), + }) + .unwrap(); + assert_eq!(merged.approved_source_ref, "opaque-source-ref"); + let mr = s.get("W", "T").unwrap(); + assert_eq!(mr.selector_from.as_deref(), Some("work/t")); + assert_eq!(mr.state, MergeRequestState::Merged); + let json = serde_json::to_string(&mr).unwrap(); + for banned in [ + "revision_id", + "attempt_id", + "base_commit", + "head_commit", + "source_commit", + "result_commit", + "current_revision", + ] { + assert!(!json.contains(banned), "{banned} in {json}") + } +} +#[test] +fn source_move_cancels_submission_and_old_approval_is_reusable_when_source_returns() { + let (_d, s) = fixture(); + open(&s); + let approved = approve(&s, "source-a", "one"); + request(&s, "source-b", "two"); + assert!( + s.submit_review(SubmitMergeRequestReview { + ticket_id: "T".into(), + current_subject_ref: "source-c".into(), + capability_token: "two".into(), + decision: ReviewDecision::Approve, + body: "stale".into(), + findings: vec![], + now: at(6) + }) + .is_err() + ); + let mr = s.get("W", "T").unwrap(); + assert!( + mr.thread + .iter() + .any(|e| matches!(e, MergeRequestThreadEvent::ReviewCancelled(_))) + ); + assert_eq!( + mr.effective_review("source-a").map(|r| &r.event_id), + Some(&approved.event_id) + ); +} +#[test] +fn review_revocation_invalidates_readiness() { + let (_d, s) = fixture(); + open(&s); + let review = approve(&s, "source", "one"); + s.revoke_review(RevokeMergeRequestReview { + ticket_id: "T".into(), + review_event_id: review.event_id, + reason: "bad evidence".into(), + auth: auth(), + now: at(7), + }) + .unwrap(); + let r = s + .readiness(ReadinessCheck { + ticket_id: "T".into(), + current_subject_ref: Some("source".into()), + auth: auth(), + }) + .unwrap(); + assert!(!r.ready); } #[test] -fn v11_migration_builds_thread_events_and_removes_revision_tables() { - let conn = Connection::open_in_memory().unwrap(); - conn.execute_batch( - "PRAGMA foreign_keys = OFF; - CREATE TABLE workspaces (workspace_id TEXT PRIMARY KEY); - CREATE TABLE repositories ( - workspace_id TEXT NOT NULL, repository_id TEXT NOT NULL, - PRIMARY KEY (workspace_id, repository_id) - ); - INSERT INTO workspaces VALUES ('W'); - INSERT INTO repositories VALUES ('W', 'R'); - CREATE TABLE typed_tickets ( - workspace_id TEXT NOT NULL, ticket_id TEXT NOT NULL, - PRIMARY KEY (workspace_id, ticket_id) - ); - INSERT INTO typed_tickets VALUES ('W', 'T'); - CREATE TABLE merge_request_schema (singleton INTEGER PRIMARY KEY, version INTEGER NOT NULL); - INSERT INTO merge_request_schema VALUES (1, 11); - CREATE TABLE merge_requests ( - workspace_id TEXT, merge_request_id TEXT, ticket_id TEXT, repository_id TEXT, - state TEXT, target_ref_selector TEXT, current_revision_id TEXT, - opened_by_worker_runtime_id TEXT, opened_by_worker_id TEXT, created_at TEXT, updated_at TEXT - ); - CREATE TABLE merge_request_revisions ( - workspace_id TEXT, revision_id TEXT, merge_request_id TEXT, base_commit TEXT, - head_commit TEXT, changed_paths_json TEXT, summary TEXT, assignment_id TEXT, - coder_worker_runtime_id TEXT, coder_worker_id TEXT, created_at TEXT - ); - CREATE TABLE merge_request_review_attempts (attempt_id TEXT); - CREATE TABLE merge_request_reviews ( - workspace_id TEXT, review_id TEXT, revision_id TEXT, - reviewer_worker_runtime_id TEXT, reviewer_worker_id TEXT, reviewer_profile TEXT, - decision TEXT, body TEXT, findings_json TEXT, created_at TEXT - ); - CREATE TABLE merge_request_completion_operations ( - workspace_id TEXT, merge_request_id TEXT, operation_id TEXT, target_commit TEXT, - source_commit TEXT, result_commit TEXT, strategy TEXT, resolution TEXT, - requested_by_runtime_id TEXT, requested_by_worker_id TEXT, completed_at TEXT, status TEXT - ); - CREATE TABLE merge_request_reviewer_child_sessions (child_session_id TEXT); - INSERT INTO merge_requests VALUES ( - 'W', 'MR', 'T', 'R', 'open', 'develop', 'REV', - 'runtime', 'coder', '2026-07-26T12:00:00Z', '2026-07-26T12:00:00Z' - ); - INSERT INTO merge_request_revisions VALUES ( - 'W', 'REV', 'MR', 'base', 'head-1', '[\"src/lib.rs\"]', 'legacy', 'A1', - 'runtime', 'coder', '2026-07-26T12:00:00Z' - ); - INSERT INTO merge_request_reviews VALUES ( - 'W', 'REVIEW', 'REV', 'runtime', 'child', 'builtin:reviewer', - 'approve', 'approved', '[]', '2026-07-26T12:00:01Z' - );", - ) - .unwrap(); - - merge_request::migrate(&conn).unwrap(); - assert_eq!( - conn.query_row("SELECT version FROM merge_request_schema", [], |row| row - .get::<_, i64>(0)) - .unwrap(), - 12 - ); - assert_eq!( - conn.query_row("SELECT selector_from FROM merge_requests", [], |row| row - .get::<_, String>( - 0 - )) - .unwrap(), - "head-1" - ); - assert_eq!( - conn.query_row( - "SELECT COUNT(*) FROM merge_request_thread_events", +fn v11_migration_preserves_review_events_and_requires_selector_repair() { + let c = Connection::open_in_memory().unwrap(); + c.execute_batch("CREATE TABLE repositories(workspace_id TEXT,repository_id TEXT,PRIMARY KEY(workspace_id,repository_id));CREATE TABLE typed_tickets(workspace_id TEXT,ticket_id TEXT,PRIMARY KEY(workspace_id,ticket_id));INSERT INTO repositories VALUES('W','R');INSERT INTO typed_tickets VALUES('W','T');CREATE TABLE merge_request_schema(singleton INTEGER PRIMARY KEY,version INTEGER);INSERT INTO merge_request_schema VALUES(1,11);CREATE TABLE merge_requests(workspace_id TEXT,merge_request_id TEXT,repository_id TEXT,state TEXT,target_ref_selector TEXT,current_revision_ordinal INTEGER,current_revision_id TEXT,created_at TEXT,updated_at TEXT,merged_revision_id TEXT,merged_at TEXT);CREATE TABLE merge_request_ticket_relations(workspace_id TEXT,merge_request_id TEXT,ticket_id TEXT,relation_kind TEXT,created_at TEXT);CREATE TABLE merge_request_revisions(workspace_id TEXT,merge_request_id TEXT,revision_id TEXT,ordinal INTEGER,base_commit TEXT,head_commit TEXT,diff_digest TEXT,summary TEXT,assignment_id TEXT,created_at TEXT);CREATE TABLE merge_request_revision_paths(workspace_id TEXT,merge_request_id TEXT,revision_id TEXT,ordinal INTEGER,path TEXT);CREATE TABLE merge_request_reviewer_child_sessions(workspace_id TEXT,child_session_id TEXT,parent_runtime_id TEXT,parent_worker_id TEXT,reviewer_profile TEXT,registered_at TEXT);CREATE TABLE merge_request_review_attempts(workspace_id TEXT,attempt_id TEXT,merge_request_id TEXT,ticket_id TEXT,revision_id TEXT,revision_ordinal INTEGER,parent_assignment_id TEXT,parent_runtime_id TEXT,parent_worker_id TEXT,child_session_id TEXT,reviewer_effective_profile TEXT,capability_token TEXT,status TEXT,created_at TEXT,consumed_at TEXT);CREATE TABLE merge_request_reviews(workspace_id TEXT,attempt_id TEXT,merge_request_id TEXT,revision_id TEXT,decision TEXT,body TEXT,submitted_at TEXT);CREATE TABLE merge_request_review_findings(workspace_id TEXT,attempt_id TEXT,ordinal INTEGER,severity TEXT,code TEXT,path TEXT,line INTEGER,body TEXT);CREATE TABLE merge_request_completion_operations(workspace_id TEXT,operation_id TEXT,ticket_id TEXT,revision_id TEXT,authority_kind TEXT,implementation_assignment_id TEXT,completion_actor_runtime_id TEXT,completion_actor_worker_id TEXT,target_commit TEXT,source_commit TEXT,result_commit TEXT,strategy TEXT,resolution TEXT,fingerprint TEXT,status TEXT,result_ticket_state TEXT,created_at TEXT,updated_at TEXT);INSERT INTO merge_requests VALUES('W','MR','R','open','develop',1,'V','2026-07-26T12:00:00Z','2026-07-26T12:00:00Z',NULL,NULL);INSERT INTO merge_request_ticket_relations VALUES('W','MR','T','implements','2026-07-26T12:00:00Z');INSERT INTO merge_request_revisions VALUES('W','MR','V',1,'base','subject','digest','summary','A','2026-07-26T12:00:00Z');INSERT INTO merge_request_review_attempts VALUES('W','AT','MR','T','V',1,'A','runtime','coder','child','builtin:reviewer','token','submitted','2026-07-26T12:00:00Z','2026-07-26T12:00:01Z');INSERT INTO merge_request_reviews VALUES('W','AT','MR','V','approve','approved','2026-07-26T12:00:01Z');").unwrap(); + merge_request::migrate(&c).unwrap(); + let selector: Option = c + .query_row("SELECT selector_from FROM merge_requests", [], |r| r.get(0)) + .unwrap(); + assert!(selector.is_none()); + let kinds: String = c + .query_row( + "SELECT group_concat(kind,',') FROM merge_request_thread_events ORDER BY sequence", [], - |row| row.get::<_, i64>(0) + |r| r.get(0), ) - .unwrap(), - 2 - ); - for removed in [ - "merge_request_revisions", - "merge_request_review_attempts", - "merge_request_reviews", - "merge_request_completion_operations", - ] { - let exists: bool = conn - .query_row( - "SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name=?1)", - params![removed], - |row| row.get(0), - ) - .unwrap(); - assert!(!exists, "legacy table `{removed}` still exists"); - } + .unwrap(); + assert_eq!(kinds, "review_requested,review"); + let old: bool = c + .query_row( + "SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE name='merge_request_revisions')", + [], + |r| r.get(0), + ) + .unwrap(); + assert!(!old); } diff --git a/crates/worker/src/feature/builtin/merge_request.rs b/crates/worker/src/feature/builtin/merge_request.rs index 56a60bb0..b2dd5c57 100644 --- a/crates/worker/src/feature/builtin/merge_request.rs +++ b/crates/worker/src/feature/builtin/merge_request.rs @@ -11,77 +11,51 @@ pub const MERGE_REQUEST_COMMON_TOOL_NAMES: &[&str] = &[ "MergeRequestShow", "MergeRequestReadinessCheck", "MergeRequestOpen", - "MergeRequestRequestReview", "MergeRequestComplete", ]; pub const MERGE_REQUEST_REVIEW_TOOL_NAME: &str = "MergeRequestReviewSubmit"; - #[derive(Clone, Copy)] enum Kind { Show, Readiness, Open, - RequestReview, Complete, Review, } - #[derive(Clone)] struct MergeRequestTool { client: Arc, kind: Kind, } - #[derive(Debug, Deserialize, JsonSchema)] struct ShowInput { ticket: String, } - #[derive(Debug, Deserialize, JsonSchema)] struct OpenInput { ticket: String, repository_id: String, selector_from: String, selector_to: String, - base_commit: String, - head_commit: String, - #[serde(default)] - changed_paths: Vec, #[serde(default)] summary: String, } - -#[derive(Debug, Deserialize, JsonSchema)] -struct RequestReviewInput { - ticket: String, - expected_head_commit: String, - base_commit: String, - head_commit: String, - #[serde(default)] - changed_paths: Vec, - #[serde(default)] - summary: String, -} - #[derive(Debug, Deserialize, JsonSchema)] struct CompleteInput { ticket: String, operation_id: String, - expected_head_commit: String, - target_commit: String, - source_commit: String, - result_commit: String, + approval_event_id: String, + target_ref_before: String, + target_ref_after: String, strategy: MergeStrategyInput, resolution: MergeResolutionInput, } - #[derive(Debug, Deserialize, JsonSchema)] #[serde(rename_all = "snake_case")] enum MergeStrategyInput { FastForward, Merge, } - #[derive(Debug, Deserialize, JsonSchema)] #[serde(rename_all = "snake_case")] enum MergeResolutionInput { @@ -89,7 +63,6 @@ enum MergeResolutionInput { Clean, ConflictsResolved, } - #[derive(Debug, Deserialize, JsonSchema)] struct ReviewInput { decision: ReviewDecisionInput, @@ -98,211 +71,133 @@ struct ReviewInput { #[serde(default)] findings: Vec, } - #[derive(Debug, Deserialize, JsonSchema)] #[serde(rename_all = "snake_case")] enum ReviewDecisionInput { Approve, RequestChanges, } - #[derive(Debug, Deserialize, JsonSchema)] struct ReviewFindingInput { severity: String, #[serde(default)] + code: Option, + #[serde(default)] path: Option, #[serde(default)] line: Option, - message: String, + body: String, } - impl Kind { fn name(self) -> &'static str { match self { Self::Show => "MergeRequestShow", Self::Readiness => "MergeRequestReadinessCheck", Self::Open => "MergeRequestOpen", - Self::RequestReview => "MergeRequestRequestReview", Self::Complete => "MergeRequestComplete", Self::Review => "MergeRequestReviewSubmit", } } - - fn description(self) -> &'static str { - description(self.name()).unwrap_or("Merge Request operation.") - } - fn schema(self) -> serde_json::Value { match self { Self::Show | Self::Readiness => json!(schemars::schema_for!(ShowInput)), Self::Open => json!(schemars::schema_for!(OpenInput)), - Self::RequestReview => json!(schemars::schema_for!(RequestReviewInput)), Self::Complete => json!(schemars::schema_for!(CompleteInput)), Self::Review => json!(schemars::schema_for!(ReviewInput)), } } } - #[async_trait] impl Tool for MergeRequestTool { - async fn execute( - &self, - input: &str, - _context: ToolExecutionContext, - ) -> Result { - let workspace_id = self.client.workspace_id().ok_or_else(|| { + async fn execute(&self, input: &str, _: ToolExecutionContext) -> Result { + let ws = self.client.workspace_id().ok_or_else(|| { ToolError::ExecutionFailed("Merge Request tools require Workspace identity".into()) })?; let (method, path, body) = match self.kind { - Kind::Show => { - let value: ShowInput = parse(input)?; - nonempty(&value.ticket)?; + Kind::Show | Kind::Readiness => { + let v: ShowInput = parse(input)?; + nonempty(&v.ticket)?; ( WorkspaceRequestMethod::Get, format!( - "/api/w/{workspace_id}/tickets/{}/merge-request", - value.ticket - ), - None, - ) - } - Kind::Readiness => { - let value: ShowInput = parse(input)?; - nonempty(&value.ticket)?; - ( - WorkspaceRequestMethod::Get, - format!( - "/api/w/{workspace_id}/tickets/{}/merge-request/readiness", - value.ticket + "/api/w/{ws}/tickets/{}/merge-request{}", + v.ticket, + if matches!(self.kind, Kind::Readiness) { + "/readiness" + } else { + "" + } ), None, ) } Kind::Open => { - let value: OpenInput = parse(input)?; - nonempty(&value.ticket)?; + let v: OpenInput = parse(input)?; + nonempty(&v.ticket)?; ( WorkspaceRequestMethod::Post, - format!( - "/api/w/{workspace_id}/tickets/{}/merge-request", - value.ticket + format!("/api/w/{ws}/tickets/{}/merge-request", v.ticket), + Some( + json!({"repository_id":v.repository_id,"selector_from":v.selector_from,"selector_to":v.selector_to,"summary":v.summary}), ), - Some(json!({ - "repository_id": value.repository_id, - "selector_from": value.selector_from, - "selector_to": value.selector_to, - "base_commit": value.base_commit, - "head_commit": value.head_commit, - "changed_paths": value.changed_paths, - "summary": value.summary, - })), - ) - } - Kind::RequestReview => { - let value: RequestReviewInput = parse(input)?; - nonempty(&value.ticket)?; - ( - WorkspaceRequestMethod::Post, - format!( - "/api/w/{workspace_id}/tickets/{}/merge-request/review-requests", - value.ticket - ), - Some(json!({ - "expected_head_commit": value.expected_head_commit, - "base_commit": value.base_commit, - "head_commit": value.head_commit, - "changed_paths": value.changed_paths, - "summary": value.summary, - })), ) } Kind::Complete => { - let value: CompleteInput = parse(input)?; - nonempty(&value.ticket)?; - let strategy = match value.strategy { - MergeStrategyInput::FastForward => "fast_forward", - MergeStrategyInput::Merge => "merge", - }; - let resolution = match value.resolution { - MergeResolutionInput::None => "none", - MergeResolutionInput::Clean => "clean", - MergeResolutionInput::ConflictsResolved => "conflicts_resolved", - }; + let v: CompleteInput = parse(input)?; + nonempty(&v.ticket)?; ( WorkspaceRequestMethod::Post, - format!( - "/api/w/{workspace_id}/tickets/{}/merge-request/complete", - value.ticket + format!("/api/w/{ws}/tickets/{}/merge-request/complete", v.ticket), + Some( + json!({"operation_id":v.operation_id,"approval_event_id":v.approval_event_id,"target_ref_before":v.target_ref_before,"target_ref_after":v.target_ref_after,"strategy":match v.strategy{MergeStrategyInput::FastForward=>"fast_forward",MergeStrategyInput::Merge=>"merge"},"resolution":match v.resolution{MergeResolutionInput::None=>"none",MergeResolutionInput::Clean=>"clean",MergeResolutionInput::ConflictsResolved=>"conflicts_resolved"}}), ), - Some(json!({ - "operation_id": value.operation_id, - "expected_head_commit": value.expected_head_commit, - "target_commit": value.target_commit, - "source_commit": value.source_commit, - "result_commit": value.result_commit, - "strategy": strategy, - "resolution": resolution, - })), ) } Kind::Review => { - let value: ReviewInput = parse(input)?; - let context = self.client.reviewer_context().ok_or_else(|| { + let v: ReviewInput = parse(input)?; + let ctx = self.client.reviewer_context().ok_or_else(|| { ToolError::ExecutionFailed( - "MergeRequestReviewSubmit is available only to an attested Reviewer child" - .into(), + "Review submit requires injected Reviewer capability".into(), ) })?; ( WorkspaceRequestMethod::Post, format!( - "/api/w/{workspace_id}/tickets/{}/merge-request/reviews", - context.ticket_id + "/api/w/{ws}/tickets/{}/merge-request/reviews", + ctx.ticket_id + ), + Some( + json!({"decision":match v.decision{ReviewDecisionInput::Approve=>"approve",ReviewDecisionInput::RequestChanges=>"request_changes"},"body":v.body,"findings":v.findings.into_iter().map(|f|json!({"severity":f.severity,"code":f.code,"path":f.path,"line":f.line,"body":f.body})).collect::>() }), ), - Some(json!({ - "decision": match value.decision { - ReviewDecisionInput::Approve => "approve", - ReviewDecisionInput::RequestChanges => "request_changes", - }, - "body": value.body, - "findings": value.findings.into_iter().map(|finding| json!({ - "severity": finding.severity, - "path": finding.path, - "line": finding.line, - "message": finding.message, - })).collect::>(), - })), ) } }; - let request = match body { - Some(body) => WorkspaceRequest::json(method, path, body.to_string()), + let req = match body { + Some(v) => WorkspaceRequest::json(method, path, v.to_string()), None => WorkspaceRequest::get(path), }; - let response = self + let res = self .client - .execute(request) - .map_err(|error| ToolError::ExecutionFailed(error.to_string()))?; - if !response.is_success() { + .execute(req) + .map_err(|e| ToolError::ExecutionFailed(e.to_string()))?; + if !res.is_success() { return Err(ToolError::ExecutionFailed(format!( "Merge Request API returned HTTP {}: {}", - response.status, response.body + res.status, res.body ))); } Ok(ToolOutput { - summary: self.kind.name().to_string(), - content: Some(response.body), - attachments: Vec::new(), + summary: self.kind.name().into(), + content: Some(res.body), + attachments: vec![], }) } } - -fn parse(value: &str) -> Result { - serde_json::from_str(value).map_err(|error| ToolError::InvalidArgument(error.to_string())) +fn parse(v: &str) -> Result { + serde_json::from_str(v).map_err(|e| ToolError::InvalidArgument(e.to_string())) } - -fn nonempty(value: &str) -> Result<(), ToolError> { - if value.trim().is_empty() { +fn nonempty(v: &str) -> Result<(), ToolError> { + if v.trim().is_empty() { Err(ToolError::InvalidArgument( "ticket must not be empty".into(), )) @@ -310,84 +205,77 @@ fn nonempty(value: &str) -> Result<(), ToolError> { Ok(()) } } - fn definition(client: Arc, kind: Kind) -> ToolDefinition { Arc::new(move || { - let meta = ToolMeta::new(kind.name()) - .description(kind.description()) - .input_schema(kind.schema()); - let tool: Arc = Arc::new(MergeRequestTool { - client: client.clone(), - kind, - }); - (meta, tool) + ( + ToolMeta::new(kind.name()) + .description(description(kind.name()).unwrap_or("Merge Request operation.")) + .input_schema(kind.schema()), + Arc::new(MergeRequestTool { + client: client.clone(), + kind, + }) as Arc, + ) }) } - -pub fn common_tools(client: Arc) -> Vec { +pub fn common_tools(c: Arc) -> Vec { vec![ - definition(client.clone(), Kind::Show), - definition(client.clone(), Kind::Readiness), - definition(client.clone(), Kind::Open), - definition(client.clone(), Kind::RequestReview), - definition(client, Kind::Complete), + definition(c.clone(), Kind::Show), + definition(c.clone(), Kind::Readiness), + definition(c.clone(), Kind::Open), + definition(c, Kind::Complete), ] } - -pub fn reviewer_tools(client: Arc) -> Vec { - if client.reviewer_context().is_some() { +pub fn reviewer_tools(c: Arc) -> Vec { + if c.reviewer_context().is_some() { vec![ - definition(client.clone(), Kind::Show), - definition(client, Kind::Review), + definition(c.clone(), Kind::Show), + definition(c, Kind::Review), ] } else { - Vec::new() + vec![] } } - -pub fn description(name: &str) -> Option<&'static str> { - match name { - "MergeRequestShow" => Some( - "Read the authoritative Merge Request, selector pair, append-only thread, and current review status.", - ), +pub fn description(n: &str) -> Option<&'static str> { + match n { + "MergeRequestShow" => Some("Read the selector-based Merge Request and append-only thread."), "MergeRequestReadinessCheck" => { - Some("Check derived merge readiness for the current review request.") + Some("Resolve current provider refs and derive readiness from valid review events.") + } + "MergeRequestOpen" => { + Some("Open a Merge Request with immutable source and target selectors.") + } + "MergeRequestComplete" => { + Some("Complete using an approved review event and final target-ref evidence.") } - "MergeRequestOpen" => Some( - "Open a Merge Request with immutable source/target selectors and its first review request.", - ), - "MergeRequestRequestReview" => Some( - "Append a RequestForReview event for new candidate evidence; prior approval cannot carry forward.", - ), - "MergeRequestComplete" => Some( - "CAS-complete the approved current candidate with operation-id replay and crash fencing.", - ), "MergeRequestReviewSubmit" => { - Some("Submit the attested direct-child Reviewer result for the current candidate.") + Some("Submit the injected Reviewer capability result for its captured subject ref.") } _ => None, } } - #[cfg(test)] mod tests { use super::*; - #[test] - fn merge_request_tool_contract_uses_selectors_and_commit_fences_without_revision_ids() { - let open = serde_json::to_string(&schemars::schema_for!(OpenInput)).unwrap(); - let request = serde_json::to_string(&schemars::schema_for!(RequestReviewInput)).unwrap(); - let complete = serde_json::to_string(&schemars::schema_for!(CompleteInput)).unwrap(); - assert!(open.contains("selector_from")); - assert!(open.contains("selector_to")); - assert!(request.contains("expected_head_commit")); - assert!(complete.contains("expected_head_commit")); - for schema in [&open, &request, &complete] { - assert!(!schema.contains("revision_id")); - assert!(!schema.contains("attempt_id")); - assert!(!schema.contains("head_tree")); - assert!(!schema.contains("diff_digest")); + fn schemas_hide_revision_and_commit_authority() { + let schemas = [ + schemars::schema_for!(OpenInput), + schemars::schema_for!(CompleteInput), + ]; + for s in schemas { + let j = serde_json::to_string(&s).unwrap(); + for banned in [ + "revision_id", + "attempt_id", + "base_commit", + "head_commit", + "source_commit", + "result_commit", + ] { + assert!(!j.contains(banned), "{banned} in {j}") + } } - assert!(!MERGE_REQUEST_COMMON_TOOL_NAMES.contains(&"MergeRequestAddRevision")); + assert!(!MERGE_REQUEST_COMMON_TOOL_NAMES.contains(&"MergeRequestRequestReview")); } } diff --git a/crates/worker/src/spawn/tool.rs b/crates/worker/src/spawn/tool.rs index 0583daaf..17096356 100644 --- a/crates/worker/src/spawn/tool.rs +++ b/crates/worker/src/spawn/tool.rs @@ -67,7 +67,6 @@ struct SubWorkerSpawnInput { #[derive(Debug, Deserialize, schemars::JsonSchema)] struct ReviewerHandoffInput { ticket_id: String, - expected_head_commit: String, } #[derive(Debug, Deserialize, schemars::JsonSchema)] @@ -337,9 +336,9 @@ fn validate_reviewer_handoff(input: &SubWorkerSpawnInput) -> Result<(), ToolErro let Some(review) = &input.review else { return Ok(()); }; - if review.ticket_id.trim().is_empty() || review.expected_head_commit.trim().is_empty() { + if review.ticket_id.trim().is_empty() { return Err(ToolError::InvalidArgument( - "reviewer handoff requires non-empty ticket_id and expected_head_commit".to_string(), + "reviewer handoff requires non-empty ticket_id".to_string(), )); } if input.profile.as_deref() != Some("builtin:reviewer") { @@ -421,7 +420,6 @@ impl Tool for SubWorkerSpawnTool { let reviewer_capability = input.review.as_ref().map(|review| { ( review.ticket_id.clone(), - review.expected_head_commit.clone(), format!( "{}{}", uuid::Uuid::now_v7().simple(), @@ -430,8 +428,7 @@ impl Tool for SubWorkerSpawnTool { ) }); let child_workspace_context = - if let Some((ticket_id, expected_head_commit, capability_token)) = &reviewer_capability - { + if let Some((ticket_id, capability_token)) = &reviewer_capability { let workspace_id = self.workspace_context .workspace_id() @@ -452,7 +449,6 @@ impl Tool for SubWorkerSpawnTool { parent_client.clone(), ReviewerContext { ticket_id: ticket_id.clone(), - expected_head_commit: expected_head_commit.clone(), }, capability_token.clone(), )); @@ -547,7 +543,7 @@ impl Tool for SubWorkerSpawnTool { } }; - if let Some((ticket_id, expected_head_commit, capability_token)) = &reviewer_capability { + if let Some((ticket_id, capability_token)) = &reviewer_capability { let workspace_id = self.workspace_context.workspace_id().ok_or_else(|| { ToolError::ExecutionFailed("review capability lost Workspace identity".to_string()) })?; @@ -577,7 +573,6 @@ impl Tool for SubWorkerSpawnTool { ))); } let body = serde_json::json!({ - "expected_head_commit": expected_head_commit, "child_session_id": child_session_id, "capability_token": capability_token, }); @@ -1043,21 +1038,21 @@ mod tests { let valid: SubWorkerSpawnInput = serde_json::from_value(serde_json::json!({ "name":"reviewer","task":"review","profile":"builtin:reviewer", "scope":[{"target":"/tmp/work","permission":"read"}], - "review":{"ticket_id":"T1","expected_head_commit":"V1"} + "review":{"ticket_id":"T1"} })) .unwrap(); assert!(validate_reviewer_handoff(&valid).is_ok()); let wrong_profile: SubWorkerSpawnInput = serde_json::from_value(serde_json::json!({ "name":"reviewer","task":"review","profile":"builtin:coder", "scope":[{"target":"/tmp/work","permission":"read"}], - "review":{"ticket_id":"T1","expected_head_commit":"V1"} + "review":{"ticket_id":"T1"} })) .unwrap(); assert!(validate_reviewer_handoff(&wrong_profile).is_err()); let writable: SubWorkerSpawnInput = serde_json::from_value(serde_json::json!({ "name":"reviewer","task":"review","profile":"builtin:reviewer", "scope":[{"target":"/tmp/work","permission":"write"}], - "review":{"ticket_id":"T1","expected_head_commit":"V1"} + "review":{"ticket_id":"T1"} })) .unwrap(); assert!(validate_reviewer_handoff(&writable).is_err()); diff --git a/crates/worker/src/worker.rs b/crates/worker/src/worker.rs index 9f7fa723..40a0ec7e 100644 --- a/crates/worker/src/worker.rs +++ b/crates/worker/src/worker.rs @@ -248,7 +248,6 @@ pub trait WorkspaceClient: std::fmt::Debug + Send + Sync { #[derive(Debug, Clone, PartialEq, Eq)] pub struct ReviewerContext { pub ticket_id: String, - pub expected_head_commit: String, } #[derive(Debug)] @@ -306,10 +305,6 @@ impl WorkspaceClient for ReviewerChildWorkspaceClient { "review submission body must be an object".to_string(), ) })?; - object.insert( - "expected_head_commit".to_string(), - serde_json::Value::String(self.context.expected_head_commit.clone()), - ); object.insert( "capability_token".to_string(), serde_json::Value::String(self.capability_token.clone()), @@ -452,7 +447,6 @@ mod reviewer_client_tests { inner, ReviewerContext { ticket_id: "T1".into(), - expected_head_commit: "head".into(), }, "secret".into(), ); diff --git a/crates/workspace-server/src/server.rs b/crates/workspace-server/src/server.rs index 19067849..2ec15e45 100644 --- a/crates/workspace-server/src/server.rs +++ b/crates/workspace-server/src/server.rs @@ -94,8 +94,8 @@ use crate::observation::{ use crate::profile_settings::UpdateWorkspaceMetadataRequest; use crate::records::{ObjectiveDetail, ProjectRecordList, TicketDetail}; use crate::repositories::{ - ConfiguredRepository, MergeTargetObservation, RepositoryListProjection, RepositoryLogRead, - RepositoryLookupError, RepositoryRegistryReader, RepositorySummary, + ConfiguredRepository, RepositoryListProjection, RepositoryLogRead, RepositoryLookupError, + RepositoryRegistryReader, RepositorySummary, }; use crate::resource_broker::BackendResourceBroker; use crate::runtime_subscription::RuntimeSubscriptionBroker; @@ -1324,8 +1324,12 @@ pub fn build_router(api: WorkspaceApi) -> Router { get(scoped_merge_request_readiness), ) .route( - "/api/w/{workspace_id}/tickets/{id}/merge-request/review-requests", - post(scoped_request_merge_request_review), + "/api/w/{workspace_id}/tickets/{id}/merge-request/thread", + get(scoped_merge_request_thread), + ) + .route( + "/api/w/{workspace_id}/tickets/{id}/merge-request/repair-source", + post(scoped_repair_merge_request_selector), ) .route( "/api/w/{workspace_id}/internal/reviewer-child-sessions", @@ -1339,18 +1343,15 @@ pub fn build_router(api: WorkspaceApi) -> Router { "/api/w/{workspace_id}/tickets/{id}/merge-request/reviews", post(scoped_submit_merge_request_review), ) + .route( + "/api/w/{workspace_id}/tickets/{id}/merge-request/reviews/revoke", + post(scoped_revoke_merge_request_review), + ) .route( "/api/w/{workspace_id}/tickets/{id}/merge-request/complete", post(scoped_complete_merge_request), ) - .route( - "/api/w/{workspace_id}/tickets/{id}/merge-request/close", - post(scoped_close_merge_request), - ) - .route( - "/api/w/{workspace_id}/tickets/{id}/merge-request/reopen", - post(scoped_reopen_merge_request), - ) + .route( "/api/w/{workspace_id}/tickets/{id}/workflow/close", post(scoped_close_ticket_record), @@ -3583,23 +3584,28 @@ struct OpenMergeRequestRequest { repository_id: String, selector_from: String, selector_to: String, - base_commit: String, - head_commit: String, - #[serde(default)] - changed_paths: Vec, #[serde(default)] summary: String, } #[derive(Debug, serde::Deserialize)] -struct RequestMergeRequestReviewRequest { - expected_head_commit: String, - base_commit: String, - head_commit: String, - #[serde(default)] - changed_paths: Vec, - #[serde(default)] - summary: String, +struct RepairMergeRequestSelectorRequest { + selector_from: String, + reason: String, + explicit_confirmation: bool, +} + +#[derive(Debug, serde::Deserialize)] +struct RevokeMergeRequestReviewRequest { + review_event_id: String, + reason: String, + explicit_confirmation: bool, +} + +#[derive(Debug, serde::Deserialize)] +struct MergeRequestThreadQuery { + after: Option, + limit: Option, } #[derive(Debug, serde::Deserialize)] @@ -3609,14 +3615,12 @@ struct RegisterReviewerChildSessionRequest { #[derive(Debug, serde::Deserialize)] struct RegisterMergeRequestReviewCapabilityRequest { - expected_head_commit: String, child_session_id: String, capability_token: String, } #[derive(Debug, serde::Deserialize)] struct SubmitMergeRequestReviewRequest { - expected_head_commit: String, capability_token: String, decision: merge_request::ReviewDecision, #[serde(default)] @@ -3628,21 +3632,13 @@ struct SubmitMergeRequestReviewRequest { #[derive(Debug, serde::Deserialize)] struct CompleteMergeRequestRequest { operation_id: String, - expected_head_commit: String, - target_commit: String, - source_commit: String, - result_commit: String, + approval_event_id: String, + target_ref_before: String, + target_ref_after: String, strategy: merge_request::MergeStrategy, resolution: merge_request::ConflictResolution, } -#[derive(Debug, serde::Deserialize)] -struct MergeRequestStateRequest { - #[serde(default)] - body: String, - explicit_confirmation: bool, -} - fn parse_workspace_id(value: &str) -> ApiResult { if value.trim().is_empty() { return Err(Error::InvalidInput("workspace_id must not be empty".to_string()).into()); @@ -3699,26 +3695,6 @@ impl merge_request::RepositorySource for MergeRequestRepositorySource { } Ok(self.reader.summary(repository_id).is_ok()) } - - fn is_ancestor( - &self, - workspace_id: &str, - repository_id: &str, - ancestor: &str, - descendant: &str, - ) -> std::result::Result { - if workspace_id != self.workspace_id { - return Ok(false); - } - match self - .reader - .ensure_ancestor(repository_id, ancestor, descendant) - { - Ok(()) => Ok(true), - Err(RepositoryLookupError::InvalidCommitRelation { .. }) => Ok(false), - Err(error) => Err(format!("{error:?}")), - } - } } fn merge_request_store( @@ -3747,65 +3723,36 @@ fn repository_merge_evidence_error(error: RepositoryLookupError) -> ApiError { .into() } -fn validate_open_merge_request_evidence( - api: &WorkspaceApi, - ticket_id: &str, - repository_id: &str, - base_commit: &str, - head_commit: &str, -) -> ApiResult<(String, String, MergeTargetObservation)> { - let ticket = browser_ticket_backend(api)? - .show(TicketIdOrSlug::Id(ticket_id.into())) - .map_err(Error::from)?; - if ticket.meta.repository_id.as_deref() != Some(repository_id) { - return Err(Error::InvalidInput( - "Merge Request repository must match the authoritative Ticket target".into(), - ) - .into()); - } - let reader = api.repository_reader(); - let target = reader - .observe_merge_target(repository_id, ticket.meta.ref_selector.as_deref()) - .map_err(repository_merge_evidence_error)?; - let base = reader - .observe_commit(repository_id, base_commit) - .map_err(repository_merge_evidence_error)?; - let source = reader - .observe_commit(repository_id, head_commit) - .map_err(repository_merge_evidence_error)?; - reader - .ensure_ancestor(repository_id, &base.commit, &source.commit) - .map_err(repository_merge_evidence_error)?; - Ok((base.commit, source.commit, target)) -} - -fn validate_revision_evidence( - api: &WorkspaceApi, - repository_id: &str, - base_commit: &str, - head_commit: &str, -) -> ApiResult<(String, String)> { - let reader = api.repository_reader(); - let base = reader - .observe_commit(repository_id, base_commit) - .map_err(repository_merge_evidence_error)?; - let source = reader - .observe_commit(repository_id, head_commit) - .map_err(repository_merge_evidence_error)?; - reader - .ensure_ancestor(repository_id, &base.commit, &source.commit) - .map_err(repository_merge_evidence_error)?; - Ok((base.commit, source.commit)) -} - async fn scoped_show_merge_request( State(api): State, AxumPath((workspace_id, ticket_id)): AxumPath<(String, String)>, -) -> ApiResult> { +) -> ApiResult> { let workspace_id = parse_workspace_id(&workspace_id)?; - Ok(Json( - merge_request_store(&api, &workspace_id)?.get(&workspace_id, &ticket_id)?, - )) + let mr = merge_request_store(&api, &workspace_id)?.get(&workspace_id, &ticket_id)?; + let reader = api.repository_reader(); + let observed_at = Utc::now().to_rfc3339(); + let source = match mr.selector_from.as_deref() { + Some(selector) => match reader.observe_merge_target(&mr.repository_id, Some(selector)) { + Ok(value) => { + serde_json::json!({"status":"known","ref":value.commit,"observed_at":observed_at}) + } + Err(_) => serde_json::json!({"status":"unknown","observed_at":observed_at}), + }, + None => serde_json::json!({"status":"requires_repair","observed_at":observed_at}), + }; + let target = match reader.observe_merge_target(&mr.repository_id, Some(&mr.selector_to)) { + Ok(value) => { + serde_json::json!({"status":"known","ref":value.commit,"observed_at":observed_at}) + } + Err(_) => serde_json::json!({"status":"unknown","observed_at":observed_at}), + }; + let mut response = + serde_json::to_value(mr).map_err(|error| Error::InvalidInput(error.to_string()))?; + if let Some(object) = response.as_object_mut() { + object.insert("source".into(), source); + object.insert("target".into(), target); + } + Ok(Json(response)) } async fn scoped_merge_request_readiness( @@ -3815,9 +3762,15 @@ async fn scoped_merge_request_readiness( let workspace_id = parse_workspace_id(&workspace_id)?; let store = merge_request_store(&api, &workspace_id)?; let mr = store.get(&workspace_id, &ticket_id)?; + let current_subject_ref = mr.selector_from.as_deref().and_then(|selector| { + api.repository_reader() + .observe_merge_target(&mr.repository_id, Some(selector)) + .ok() + .map(|v| v.commit) + }); Ok(Json(store.readiness(merge_request::ReadinessCheck { ticket_id, - expected_head_commit: None, + current_subject_ref, auth: merge_request::MergeRequestAuth { workspace_id, repository_id: mr.repository_id, @@ -3847,117 +3800,94 @@ async fn scoped_open_merge_request( || assignment.worker.worker_id != source.worker_id { return Err(Error::TicketAssignmentConflict( - "authenticated Worker is not the current Ticket assignee".into(), + "authenticated Worker is not current assignee".into(), ) .into()); } - let (base_commit, source_commit, target) = validate_open_merge_request_evidence( - &api, - &ticket_id, - &input.repository_id, - &input.base_commit, - &input.head_commit, - )?; - if input.selector_to != target.selector { + let ticket = browser_ticket_backend(&api)? + .show(TicketIdOrSlug::Id(ticket_id.clone().into())) + .map_err(Error::from)?; + if ticket.meta.repository_id.as_deref() != Some(input.repository_id.as_str()) + || ticket.meta.ref_selector.as_deref() != Some(input.selector_to.as_str()) + { return Err(Error::InvalidInput( - "selector_to must match the authoritative Ticket target selector".into(), + "selectors must match the authoritative Ticket repository target".into(), ) .into()); } - let observed_source = api - .repository_reader() + let reader = api.repository_reader(); + reader .observe_merge_target(&input.repository_id, Some(&input.selector_from)) .map_err(repository_merge_evidence_error)?; - if observed_source.commit != source_commit { - return Err(Error::InvalidInput( - "selector_from does not resolve to the nominated head commit".into(), - ) - .into()); - } - let mr = merge_request_store(&api, &workspace_id)?.open_merge_request( - merge_request::OpenMergeRequest { - merge_request_id: Uuid::now_v7().to_string(), - ticket_id, - repository_id: input.repository_id.clone(), - selector_from: input.selector_from, - selector_to: input.selector_to, - request: merge_request::RequestForReview { - base_commit, - head_commit: source_commit, - changed_paths: input.changed_paths, + reader + .observe_merge_target(&input.repository_id, Some(&input.selector_to)) + .map_err(repository_merge_evidence_error)?; + Ok(Json( + merge_request_store(&api, &workspace_id)?.open_merge_request( + merge_request::OpenMergeRequest { + merge_request_id: Uuid::now_v7().to_string(), + ticket_id, + repository_id: input.repository_id.clone(), + selector_from: input.selector_from, + selector_to: input.selector_to, summary: input.summary, + auth: merge_request::MergeRequestAuth { + workspace_id, + repository_id: input.repository_id, + runtime_id: source.runtime_id, + worker_id: source.worker_id, + assignment_id: assignment.assignment_id, + }, + now: Utc::now(), }, - auth: merge_request::MergeRequestAuth { - workspace_id, - repository_id: input.repository_id, - runtime_id: source.runtime_id, - worker_id: source.worker_id, - assignment_id: assignment.assignment_id, - }, - now: Utc::now(), - }, - )?; - Ok(Json(mr)) + )?, + )) } -async fn scoped_request_merge_request_review( +async fn scoped_merge_request_thread( + State(api): State, + AxumPath((workspace_id, ticket_id)): AxumPath<(String, String)>, + Query(query): Query, +) -> ApiResult>> { + let workspace_id = parse_workspace_id(&workspace_id)?; + Ok(Json( + merge_request_store(&api, &workspace_id)?.thread_page( + &workspace_id, + &ticket_id, + query.after, + query.limit.unwrap_or(100), + )?, + )) +} + +async fn scoped_repair_merge_request_selector( State(api): State, headers: HeaderMap, AxumPath((workspace_id, ticket_id)): AxumPath<(String, String)>, - Json(input): Json, -) -> ApiResult> { + Json(input): Json, +) -> ApiResult> { let workspace_id = parse_workspace_id(&workspace_id)?; require_workspace_access(&workspace_id, &api)?; - let source = authenticate_worker_mutation_source(&api, &workspace_id, &headers)?; - let assignment = api - .store - .get_current_ticket_worker_assignment(&workspace_id, &ticket_id)? - .ok_or_else(|| { - Error::TicketAssignmentConflict("Ticket has no current assigned Coder".into()) - })?; - if assignment.worker.runtime_id != source.runtime_id - || assignment.worker.worker_id != source.worker_id - { - return Err(Error::TicketAssignmentConflict( - "authenticated Worker is not the current Ticket assignee".into(), - ) - .into()); + reject_non_browser_reopen_auth(&headers)?; + let _actor = require_actor(&api, &headers).await?; + if !input.explicit_confirmation { + return Err(Error::BrowserReopenConfirmationRequired.into()); } let store = merge_request_store(&api, &workspace_id)?; - let current = store.get(&workspace_id, &ticket_id)?; - let (base_commit, source_commit) = validate_revision_evidence( - &api, - ¤t.repository_id, - &input.base_commit, - &input.head_commit, - )?; - let observed_source = api - .repository_reader() - .observe_merge_target(¤t.repository_id, Some(¤t.selector_from)) + let mr = store.get(&workspace_id, &ticket_id)?; + api.repository_reader() + .observe_merge_target(&mr.repository_id, Some(&input.selector_from)) .map_err(repository_merge_evidence_error)?; - if observed_source.commit != source_commit { - return Err(Error::InvalidInput( - "selector_from does not resolve to the nominated head commit".into(), - ) - .into()); - } - Ok(Json(store.request_review( - merge_request::RequestMergeRequestReview { + Ok(Json(store.repair_selector_from( + merge_request::RepairSelectorFrom { + workspace_id, ticket_id, - expected_head_commit: input.expected_head_commit, - request: merge_request::RequestForReview { - base_commit, - head_commit: source_commit, - changed_paths: input.changed_paths, - summary: input.summary, - }, - auth: merge_request::MergeRequestAuth { - workspace_id, - repository_id: current.repository_id, - runtime_id: source.runtime_id, - worker_id: source.worker_id, - assignment_id: assignment.assignment_id, + selector_from: input.selector_from, + repaired_by: merge_request::WorkerIdentity { + runtime_id: "browser".into(), + worker_id: "authenticated-user".into(), }, + reason: input.reason, now: Utc::now(), }, )?)) @@ -4004,20 +3934,29 @@ async fn scoped_register_merge_request_review_capability( || assignment.worker.worker_id != source.worker_id { return Err(Error::TicketAssignmentConflict( - "authenticated Worker is not the current Ticket assignee".into(), + "authenticated Worker is not current assignee".into(), ) .into()); } let store = merge_request_store(&api, &workspace_id)?; - let current = store.get(&workspace_id, &ticket_id)?; - store.register_review_capability(merge_request::RegisterReviewCapability { + let mr = store.get(&workspace_id, &ticket_id)?; + let selector = mr + .selector_from + .as_deref() + .ok_or_else(|| Error::InvalidInput("selector_from requires repair".into()))?; + let subject_ref = api + .repository_reader() + .observe_merge_target(&mr.repository_id, Some(selector)) + .map_err(repository_merge_evidence_error)? + .commit; + store.request_review(merge_request::RequestMergeRequestReview { ticket_id, - expected_head_commit: input.expected_head_commit, + subject_ref, child_session_id: input.child_session_id, capability_token: input.capability_token, auth: merge_request::MergeRequestAuth { workspace_id, - repository_id: current.repository_id, + repository_id: mr.repository_id, runtime_id: source.runtime_id, worker_id: source.worker_id, assignment_id: assignment.assignment_id, @@ -4033,19 +3972,73 @@ async fn scoped_submit_merge_request_review( Json(input): Json, ) -> ApiResult> { let workspace_id = parse_workspace_id(&workspace_id)?; - Ok(Json( - merge_request_store(&api, &workspace_id)?.submit_review( - merge_request::SubmitMergeRequestReview { - ticket_id, - expected_head_commit: input.expected_head_commit, - capability_token: input.capability_token, - decision: input.decision, - body: input.body, - findings: input.findings, - now: Utc::now(), + let store = merge_request_store(&api, &workspace_id)?; + let mr = store.get(&workspace_id, &ticket_id)?; + let selector = mr + .selector_from + .as_deref() + .ok_or_else(|| Error::InvalidInput("selector_from requires repair".into()))?; + let current_subject_ref = api + .repository_reader() + .observe_merge_target(&mr.repository_id, Some(selector)) + .map_err(repository_merge_evidence_error)? + .commit; + Ok(Json(store.submit_review( + merge_request::SubmitMergeRequestReview { + ticket_id, + current_subject_ref, + capability_token: input.capability_token, + decision: input.decision, + body: input.body, + findings: input.findings, + now: Utc::now(), + }, + )?)) +} + +async fn scoped_revoke_merge_request_review( + State(api): State, + headers: HeaderMap, + AxumPath((workspace_id, ticket_id)): AxumPath<(String, String)>, + Json(input): Json, +) -> ApiResult> { + let workspace_id = parse_workspace_id(&workspace_id)?; + require_workspace_access(&workspace_id, &api)?; + if !input.explicit_confirmation { + return Err(Error::BrowserReopenConfirmationRequired.into()); + } + let source = authenticate_worker_mutation_source(&api, &workspace_id, &headers)?; + let assignment = api + .store + .get_current_ticket_worker_assignment(&workspace_id, &ticket_id)? + .ok_or_else(|| { + Error::TicketAssignmentConflict("Ticket has no current assigned Coder".into()) + })?; + if assignment.worker.runtime_id != source.runtime_id + || assignment.worker.worker_id != source.worker_id + { + return Err(Error::TicketAssignmentConflict( + "authenticated Worker is not current assignee".into(), + ) + .into()); + } + let store = merge_request_store(&api, &workspace_id)?; + let mr = store.get(&workspace_id, &ticket_id)?; + Ok(Json(store.revoke_review( + merge_request::RevokeMergeRequestReview { + ticket_id, + review_event_id: input.review_event_id, + reason: input.reason, + auth: merge_request::MergeRequestAuth { + workspace_id, + repository_id: mr.repository_id, + runtime_id: source.runtime_id, + worker_id: source.worker_id, + assignment_id: assignment.assignment_id, }, - )?, - )) + now: Utc::now(), + }, + )?)) } async fn scoped_complete_merge_request( @@ -4066,48 +4059,42 @@ async fn scoped_complete_merge_request( })?; let store = merge_request_store(&api, &workspace_id)?; let mr = store.get(&workspace_id, &ticket_id)?; - let current_request = mr.current_request().ok_or_else(|| { - Error::InvalidInput("Merge Request has no current RequestForReview event".into()) - })?; - if current_request.head_commit != input.expected_head_commit - || input.source_commit != current_request.head_commit - { + let selector = mr + .selector_from + .as_deref() + .ok_or_else(|| Error::InvalidInput("selector_from requires repair".into()))?; + let repositories = api.repository_reader(); + let current_source_ref = repositories + .observe_merge_target(&mr.repository_id, Some(selector)) + .map_err(repository_merge_evidence_error)? + .commit; + let observed = repositories + .observe_merge_target(&mr.repository_id, Some(&mr.selector_to)) + .map_err(repository_merge_evidence_error)?; + if observed.commit != input.target_ref_before && observed.commit != input.target_ref_after { return Err(Error::InvalidInput( - "source commit does not match the current review request".into(), + "target selector moved outside completion evidence".into(), ) .into()); } - let repositories = api.repository_reader(); - let observed_target = repositories - .observe_merge_target(&mr.repository_id, Some(&mr.selector_to)) - .map_err(repository_merge_evidence_error)?; - if observed_target.commit != input.target_commit - && observed_target.commit != input.result_commit - { - return Err(Error::InvalidInput(format!( - "Merge Request target moved: expected {}, observed {}", - input.target_commit, observed_target.commit - )) - .into()); - } - let target_was_already_updated = observed_target.commit == input.result_commit; - if !target_was_already_updated { + let already = observed.commit == input.target_ref_after; + if !already { repositories .update_merge_target( &mr.repository_id, &mr.selector_to, - &input.target_commit, - &input.result_commit, + &input.target_ref_before, + &input.target_ref_after, ) - .map_err(repository_merge_evidence_error)?; + .map_err(repository_merge_evidence_error)? } let completion = merge_request::CompleteMergeRequest { ticket_id, - expected_head_commit: input.expected_head_commit, operation_id: input.operation_id, - target_commit: input.target_commit.clone(), - source_commit: input.source_commit, - result_commit: input.result_commit.clone(), + approval_event_id: input.approval_event_id, + current_subject_ref: current_source_ref, + target_ref_before: input.target_ref_before.clone(), + target_ref_after: input.target_ref_after.clone(), strategy: input.strategy, resolution: input.resolution, auth: merge_request::MergeRequestAuth { @@ -4120,75 +4107,21 @@ async fn scoped_complete_merge_request( now: Utc::now(), }; match store.complete(completion) { - Ok(event) => Ok(Json(event)), - Err(error) => { - if !target_was_already_updated { + Ok(v) => Ok(Json(v)), + Err(e) => { + if !already { let _ = repositories.update_merge_target( &mr.repository_id, &mr.selector_to, - &input.result_commit, - &input.target_commit, + &input.target_ref_after, + &input.target_ref_before, ); } - Err(error.into()) + Err(e.into()) } } } -async fn scoped_close_merge_request( - State(api): State, - headers: HeaderMap, - AxumPath((workspace_id, ticket_id)): AxumPath<(String, String)>, - Json(input): Json, -) -> ApiResult> { - scoped_change_merge_request_state(api, headers, workspace_id, ticket_id, input, false).await -} - -async fn scoped_reopen_merge_request( - State(api): State, - headers: HeaderMap, - AxumPath((workspace_id, ticket_id)): AxumPath<(String, String)>, - Json(input): Json, -) -> ApiResult> { - scoped_change_merge_request_state(api, headers, workspace_id, ticket_id, input, true).await -} - -async fn scoped_change_merge_request_state( - api: WorkspaceApi, - headers: HeaderMap, - workspace_id: String, - ticket_id: String, - input: MergeRequestStateRequest, - reopen: bool, -) -> ApiResult> { - let workspace_id = parse_workspace_id(&workspace_id)?; - require_workspace_access(&workspace_id, &api)?; - reject_non_browser_reopen_auth(&headers)?; - let _actor = require_actor(&api, &headers).await?; - if !input.explicit_confirmation { - return Err(Error::BrowserReopenConfirmationRequired.into()); - } - let store = merge_request_store(&api, &workspace_id)?; - let mr = store.get(&workspace_id, &ticket_id)?; - let operation = merge_request::ChangeMergeRequestState { - ticket_id, - body: input.body, - auth: merge_request::MergeRequestAuth { - workspace_id, - repository_id: mr.repository_id, - runtime_id: "browser".into(), - worker_id: "authenticated-user".into(), - assignment_id: String::new(), - }, - now: Utc::now(), - }; - Ok(Json(if reopen { - store.reopen(operation)? - } else { - store.close(operation)? - })) -} - fn reject_non_browser_reopen_auth(headers: &HeaderMap) -> Result<()> { if headers.contains_key("authorization") { return Err(Error::BrowserReopenConfirmationRequired); @@ -12738,241 +12671,6 @@ mod tests { )); } - #[tokio::test] - async fn merge_request_completion_endpoint_rejects_coder_and_accepts_orchestrator() { - let workspace = tempfile::tempdir().unwrap(); - init_clean_git_workspace(workspace.path()); - let git_value = |args: &[&str]| { - let output = std::process::Command::new("git") - .arg("-C") - .arg(workspace.path()) - .args(args) - .output() - .unwrap(); - assert!(output.status.success()); - String::from_utf8(output.stdout).unwrap().trim().to_string() - }; - let target_commit = git_value(&["rev-parse", "HEAD"]); - let target_ref = git_value(&["symbolic-ref", "HEAD"]); - std::fs::write(workspace.path().join("README.md"), "merge source\n").unwrap(); - for args in [&["add", "README.md"][..], &["commit", "-m", "source"][..]] { - assert!( - std::process::Command::new("git") - .arg("-C") - .arg(workspace.path()) - .args(args) - .status() - .unwrap() - .success() - ); - } - let source_commit = git_value(&["rev-parse", "HEAD"]); - assert!( - std::process::Command::new("git") - .arg("-C") - .arg(workspace.path()) - .args(["reset", "--hard", &target_commit]) - .status() - .unwrap() - .success() - ); - let api = test_api(workspace.path()).await; - let workspace_id = api.config.workspace_id.clone(); - let backend = browser_ticket_backend(&api).unwrap(); - let mut input = ticket::NewTicket::new("Orchestrator completion authority"); - input.workflow_state = Some(TicketWorkflowState::InProgress); - let ticket = backend.create(input).unwrap(); - let Json(coder) = create_workspace_worker( - State(api.clone()), - HeaderMap::new(), - Json(CreateWorkspaceWorkerRequest { - runtime_id: EMBEDDED_WORKER_RUNTIME_ID.to_string(), - display_name: "Assigned Coder".to_string(), - profile: Some("builtin:coder".to_string()), - ticket_assignment: Some(CreateWorkspaceWorkerTicketAssignmentRequest { - ticket_id: ticket.id.clone(), - operation_id: "completion-coder-assignment".to_string(), - }), - initial_submit: vec![Segment::Flow { - selector: "builtin:coder-review".to_string(), - }], - working_directory: None, - control_operation_id: None, - resolved_control_operation: None, - }), - ) - .await - .unwrap(); - let assignment = api - .store - .get_current_ticket_worker_assignment(&workspace_id, &ticket.id) - .unwrap() - .unwrap(); - let mr_store = merge_request_store(&api, &workspace_id).unwrap(); - mr_store - .open_merge_request(merge_request::OpenMergeRequest { - merge_request_id: "MR-server-completion".into(), - ticket_id: ticket.id.clone(), - repository_id: TEST_REPOSITORY_ID.into(), - selector_from: source_commit.clone(), - selector_to: target_ref.clone(), - request: merge_request::RequestForReview { - base_commit: target_commit.clone(), - head_commit: source_commit.clone(), - changed_paths: vec!["src/lib.rs".into()], - summary: "approved candidate".into(), - }, - auth: merge_request::MergeRequestAuth { - workspace_id: workspace_id.clone(), - repository_id: TEST_REPOSITORY_ID.into(), - runtime_id: coder.worker_ref.runtime_id.clone(), - worker_id: coder.worker_ref.worker_id.clone(), - assignment_id: assignment.assignment_id.clone(), - }, - now: Utc::now(), - }) - .unwrap(); - mr_store - .register_reviewer_child_session(merge_request::RegisterReviewerChildSession { - workspace_id: workspace_id.clone(), - parent_runtime_id: coder.worker_ref.runtime_id.clone(), - parent_worker_id: coder.worker_ref.worker_id.clone(), - child_session_id: "reviewer-child".into(), - reviewer_profile: "builtin:reviewer".into(), - now: Utc::now(), - }) - .unwrap(); - mr_store - .register_review_capability(merge_request::RegisterReviewCapability { - ticket_id: ticket.id.clone(), - expected_head_commit: source_commit.clone(), - child_session_id: "reviewer-child".into(), - capability_token: "review-token".into(), - auth: merge_request::MergeRequestAuth { - workspace_id: workspace_id.clone(), - repository_id: TEST_REPOSITORY_ID.into(), - runtime_id: coder.worker_ref.runtime_id.clone(), - worker_id: coder.worker_ref.worker_id.clone(), - assignment_id: assignment.assignment_id.clone(), - }, - now: Utc::now(), - }) - .unwrap(); - mr_store - .submit_review(merge_request::SubmitMergeRequestReview { - ticket_id: ticket.id.clone(), - expected_head_commit: source_commit.clone(), - capability_token: "review-token".into(), - decision: merge_request::ReviewDecision::Approve, - body: "approved".into(), - findings: Vec::new(), - now: Utc::now(), - }) - .unwrap(); - - let worker_headers = |worker: &RuntimeWorkerRef| { - let mut headers = HeaderMap::new(); - headers.insert( - "x-yoi-runtime-id", - axum::http::HeaderValue::from_str(&worker.runtime_id).unwrap(), - ); - headers.insert( - "x-yoi-worker-id", - axum::http::HeaderValue::from_str(&worker.worker_id).unwrap(), - ); - headers - }; - let request = || CompleteMergeRequestRequest { - operation_id: "complete-operation".into(), - expected_head_commit: source_commit.clone(), - target_commit: target_commit.clone(), - source_commit: source_commit.clone(), - result_commit: source_commit.clone(), - strategy: merge_request::MergeStrategy::FastForward, - resolution: merge_request::ConflictResolution::None, - }; - let coder_error = scoped_complete_merge_request( - State(api.clone()), - worker_headers(&coder.worker_ref), - AxumPath((workspace_id.clone(), ticket.id.clone())), - Json(request()), - ) - .await - .unwrap_err(); - assert!(matches!( - coder_error.error, - Error::TicketAssignmentConflict(_) - )); - - let Json(started) = scoped_start_workspace_orchestrator( - State(api.clone()), - AxumPath(ScopedWorkspacePath { - workspace_id: workspace_id.clone(), - }), - ) - .await - .unwrap(); - let orchestrator = started.worker.unwrap().worker; - let Json(completed) = scoped_complete_merge_request( - State(api.clone()), - worker_headers(&orchestrator), - AxumPath((workspace_id, ticket.id.clone())), - Json(request()), - ) - .await - .unwrap(); - assert_eq!(completed.result_commit, source_commit); - assert_eq!( - backend - .show(ticket.id.clone().into()) - .unwrap() - .meta - .workflow_state, - TicketWorkflowState::Done - ); - assert_eq!( - api.repository_reader() - .observe_merge_target(TEST_REPOSITORY_ID, Some(&target_ref)) - .unwrap() - .commit, - source_commit - ); - let mr = mr_store.get(&api.config.workspace_id, &ticket.id).unwrap(); - assert_eq!(mr.state, merge_request::MergeRequestState::Merged); - let merge = mr.thread.iter().find_map(|event| match event { - merge_request::MergeRequestThreadEvent::Merge(value) => Some(value), - _ => None, - }); - assert_eq!( - merge.map(|value| value.result_commit.as_str()), - Some(source_commit.as_str()) - ); - let Json(replayed) = scoped_complete_merge_request( - State(api.clone()), - worker_headers(&orchestrator), - AxumPath((api.config.workspace_id.clone(), ticket.id.clone())), - Json(request()), - ) - .await - .unwrap(); - assert_eq!(replayed.result_commit, source_commit); - let conn = rusqlite::Connection::open(&api.config.database_path).unwrap(); - let actor: String = conn - .query_row( - "SELECT author FROM typed_ticket_events WHERE workspace_id=?1 AND ticket_id=?2 AND kind='state_changed'", - rusqlite::params![api.config.workspace_id, ticket.id], - |row| row.get(0), - ) - .unwrap(); - assert_eq!( - actor, - format!( - "worker:{}:{}", - orchestrator.runtime_id, orchestrator.worker_id - ) - ); - } - #[tokio::test] async fn production_profile_backend_launches_and_restores_workspace_orchestrator() { let workspace = tempfile::tempdir().unwrap(); diff --git a/resources/prompts/common/git.md b/resources/prompts/common/git.md index cdb63df7..72e8b3e2 100644 --- a/resources/prompts/common/git.md +++ b/resources/prompts/common/git.md @@ -10,4 +10,4 @@ When creating a commit, use the change type as the subject prefix, not the affec A change made because review, validation, or user feedback found a defect is a `fix:` even when it belongs to the same feature Ticket and has not been merged yet. Do not keep reusing a domain prefix such as `merge-request:`, `runtime:`, or `worker:` across a series; those labels identify where the code lives rather than why each commit exists. If one prospective commit contains distinct change types, split it into coherent validated commits when practical; otherwise name it for the dominant intent. -Before opening a Merge Request or appending a `RequestForReview` event, inspect the proposed commit subjects and correct misclassified local, unshared commits when safe. Do not rewrite shared history solely to rename existing commits unless the user explicitly requests it. +Before opening a Merge Request or requesting review, inspect the proposed commit subjects and correct misclassified local, unshared commits when safe. Do not rewrite shared history solely to rename existing commits unless the user explicitly requests it. diff --git a/resources/prompts/role/coder.md b/resources/prompts/role/coder.md index 1823cd7c..adfa0e54 100644 --- a/resources/prompts/role/coder.md +++ b/resources/prompts/role/coder.md @@ -4,6 +4,6 @@ Treat the first committed user message as the bounded Ticket/action context and {% include "common.git" %} -Before review, open a Merge Request with immutable `selector_from` / `selector_to`, then append a `RequestForReview` thread event containing the exact base/head commit and changed-path evidence. Spawn the Reviewer only as your actual direct-child `builtin:reviewer` SubWorker, delegate read-only scope, and include the structured review handoff with the Ticket id and current candidate head commit. Reviewer prose is not approval: the child must commit `MergeRequestReviewSubmit` through its injected capability authority. +Before review, open a Merge Request with immutable `selector_from` / `selector_to`. Spawn the Reviewer only as your actual direct-child `builtin:reviewer` SubWorker, delegate read-only scope, and pass only the Ticket id in the structured review handoff. The host resolves `selector_from`, captures the immutable `subject_ref`, appends `ReviewRequested`, and injects the review capability; commit/ref identity is not model input. Reviewer prose is not approval: the child must commit `MergeRequestReviewSubmit` through its injected capability authority. -A request-changes result requires a new `RequestForReview` event and a fresh Reviewer child capability. Flow terminal state is not Ticket completion authority. Complete only through `MergeRequestComplete` with a unique operation id and the currently approved candidate head commit; the Server revalidates assignment and fences Ticket state side effects. +A request-changes result requires a fresh Reviewer child request. Flow terminal state is not Ticket completion authority. Complete only through `MergeRequestComplete` with a unique operation id, the approved `Review` event id, and final target-ref evidence; the Server re-resolves selectors, revalidates assignment, and fences Ticket state side effects. diff --git a/resources/prompts/role/orchestrator.md b/resources/prompts/role/orchestrator.md index 08ac7478..32092653 100644 --- a/resources/prompts/role/orchestrator.md +++ b/resources/prompts/role/orchestrator.md @@ -4,7 +4,7 @@ You are the Ticket Orchestrator role. Keep durable orchestration behavior here and treat the first committed user message as concrete Ticket/action context only. Use typed Ticket tools and current repository state as authority. Record `inprogress` before implementation side effects, then use `SpawnTicketCoder` so Worker creation, the fixed Coder profile/Flow, and the current Ticket assignment are one guarded operation. After spawn, reread the Ticket and verify its current assignment names that Coder before asking it to implement; never route implementation to an unassigned Coder. Route implementation work to sibling Coder Workers, and stop for human authority when merge/closure is not explicitly delegated. -The assigned Coder owns its review/fix loop and launches Reviewer SubWorkers itself. Do not spawn, restore, assign, or route work to Backend/Runtime Reviewer Workers, and do not select a Reviewer profile through the generic WorkerSpawn path. If durable review evidence for the current `RequestForReview` candidate is missing, indeterminate, or requests changes, keep the Ticket in progress and return the requirement to the same assigned Coder; never compensate by creating an independent Reviewer Worker. +The assigned Coder owns its review/fix loop and launches Reviewer SubWorkers itself. Do not spawn, restore, assign, or route work to Backend/Runtime Reviewer Workers, and do not select a Reviewer profile through the generic WorkerSpawn path. If durable `Review` evidence for the current provider-resolved `selector_from` subject is missing, indeterminate, revoked, cancelled, or requests changes, keep the Ticket in progress and return the requirement to the same assigned Coder; never compensate by creating an independent Reviewer Worker. Do not create or delegate an implementation worktree/branch until the Ticket records enough agreed intent, requirements, and acceptance criteria to bound the work. diff --git a/resources/prompts/role/reviewer.md b/resources/prompts/role/reviewer.md index 4e29746b..112c412c 100644 --- a/resources/prompts/role/reviewer.md +++ b/resources/prompts/role/reviewer.md @@ -1,7 +1,7 @@ You are the Ticket Reviewer role running as an actual Runtime-owned direct child of the assigned Coder. -Keep role behavior here and treat the first committed user message as bounded Ticket/Merge Request context only. Review the current `RequestForReview` candidate against Ticket intent, binding decisions/invariants, acceptance criteria, and project design boundaries. Use read-only inspection and focused validation; do not merge, close, mutate the Workdir, or take over implementation. +Keep role behavior here and treat the first committed user message as bounded Ticket/Merge Request context only. Review the host-captured `ReviewRequested.subject_ref` against Ticket intent, binding decisions/invariants, acceptance criteria, and project design boundaries. Use read-only inspection and focused validation; do not merge, close, mutate the Workdir, or take over implementation. -Your prose response is not review authority. Before finishing, call `MergeRequestReviewSubmit` exactly once with `approve` or `request_changes`, a bounded evidence summary, and concrete structured findings. Capability authority and the expected candidate head commit are injected by your child Workspace client and are not model inputs. If a newer `RequestForReview` event supersedes the candidate, submission must fail rather than approving stale work. +Your prose response is not review authority. Before finishing, call `MergeRequestReviewSubmit` exactly once with `approve` or `request_changes`, a bounded evidence summary, and concrete structured findings. Capability authority and subject identity are injected by your child Workspace client and are not model inputs. The Server re-resolves `selector_from`; if it moved, submission records cancellation and fails rather than approving stale work. Review more than the diff: verify the implementation satisfies the Ticket intent and acceptance criteria, remains coherent with the codebase design, and does not introduce unnecessary compatibility. diff --git a/web/workspace/src/routes/w/[workspaceId]/tickets/[ticketId]/+page.svelte b/web/workspace/src/routes/w/[workspaceId]/tickets/[ticketId]/+page.svelte index 673cd1ff..53db1bc7 100644 --- a/web/workspace/src/routes/w/[workspaceId]/tickets/[ticketId]/+page.svelte +++ b/web/workspace/src/routes/w/[workspaceId]/tickets/[ticketId]/+page.svelte @@ -19,34 +19,49 @@ type MergeRequestThreadEvent = | { - kind: "request_for_review"; - event_seq: number; - head_commit: string; - changed_paths: string[]; - summary: string; + kind: "review_requested"; + event_id: string; + sequence: number; + subject_ref: string; + requested_by: { runtime_id: string; worker_id: string }; + reviewer: { runtime_id: string; worker_id: string }; } | { kind: "review"; - event_seq: number; - request_event_seq: number; + event_id: string; + sequence: number; + request_event_id: string; + subject_ref: string; decision: "approve" | "request_changes"; body: string; - reviewer_profile: string; + reviewer: { runtime_id: string; worker_id: string }; + } + | { kind: "review_revoked"; sequence: number; review_event_id: string; reason: string } + | { kind: "review_cancelled"; sequence: number; request_event_id: string; reason: string } + | { + kind: "comment"; + sequence: number; + body: string; + author: { runtime_id: string; worker_id: string }; } | { kind: "merge"; - event_seq: number; - result_commit: string; + sequence: number; + approval_event_id: string; + approved_source_ref: string; + target_ref_after: string; strategy: "fast_forward" | "merge"; resolution: "none" | "clean" | "conflicts_resolved"; merged_by: { runtime_id: string; worker_id: string }; - } - | { kind: "reopen" | "close"; event_seq: number; body: string }; + }; + type RefProjection = { status: "known" | "unknown" | "requires_repair"; ref?: string }; type MergeRequestDetail = { state: "open" | "closed" | "merged"; - selector_from: string; + selector_from: string | null; selector_to: string; + source: RefProjection; + target: RefProjection; thread: MergeRequestThreadEvent[]; }; @@ -72,14 +87,12 @@ let ticket = $state(loadedTicket); let mergeRequest = $state(initialData.mergeRequest.data ?? null); const currentReviewRequest = $derived( - mergeRequest?.thread.findLast((event) => event.kind === "request_for_review") ?? null, + mergeRequest?.thread.findLast((event) => event.kind === "review_requested") ?? null, ); const currentReview = $derived( - currentReviewRequest - ? mergeRequest?.thread.findLast( - (event) => - event.kind === "review" && - event.request_event_seq === currentReviewRequest.event_seq, + mergeRequest?.source.status === "known" + ? mergeRequest.thread.findLast( + (event) => event.kind === "review" && event.subject_ref === mergeRequest?.source.ref, ) ?? null : null, ); @@ -384,21 +397,37 @@

{data.mergeRequest.error}

{:else if mergeRequest}

{mergeRequest.state}

-

From {mergeRequest.selector_from}

-

To {mergeRequest.selector_to}

- {#if currentReviewRequest?.kind === "request_for_review"} -

Candidate {currentReviewRequest.head_commit}

- {#if currentReviewRequest.summary}

{currentReviewRequest.summary}

{/if} +

From {mergeRequest.selector_from ?? "requires repair"} · {mergeRequest.source.status}{mergeRequest.source.ref ? ` @ ${mergeRequest.source.ref}` : ""}

+

To {mergeRequest.selector_to} · {mergeRequest.target.status}{mergeRequest.target.ref ? ` @ ${mergeRequest.target.ref}` : ""}

+ {#if currentReviewRequest?.kind === "review_requested"} +

Review requested for {currentReviewRequest.subject_ref}

{/if} {#if currentReview?.kind === "review"} -

{currentReview.decision} by {currentReview.reviewer_profile}

+

{currentReview.decision} by {currentReview.reviewer.runtime_id}/{currentReview.reviewer.worker_id}

{#if currentReview.body}{/if} {/if} {#if mergeEvent?.kind === "merge"}

Final merge · {mergeEvent.strategy} / {mergeEvent.resolution}

-

Result {mergeEvent.result_commit}

+

Target ref {mergeEvent.target_ref_after}

Completed by {mergeEvent.merged_by.runtime_id}/{mergeEvent.merged_by.worker_id}

{/if} +

Thread

+ {#each mergeRequest.thread as event (event.sequence)} +

+ #{event.sequence} · {event.kind} + {#if event.kind === "review_requested"} + · {event.subject_ref} · {event.requested_by.runtime_id}/{event.requested_by.worker_id} + {:else if event.kind === "review"} + · {event.subject_ref} · {event.reviewer.runtime_id}/{event.reviewer.worker_id} + {:else if event.kind === "comment"} + · {event.author.runtime_id}/{event.author.worker_id} · {event.body} + {:else if event.kind === "review_cancelled" || event.kind === "review_revoked"} + · {event.reason} + {:else if event.kind === "merge"} + · approval {event.approval_event_id} + {/if} +

+ {/each} {:else}

The assigned Coder has not opened a Merge Request.

{/if}