Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

fix: capture ticket edit preimages atomically

Browse Source
This commit is contained in:
Hare
2026-10-01 14:06:33 +09:00
parent d101b4bacb
commit f742362b03
3 changed files with 134 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ticket/src/lib.rs
+22 -2
View File
@@ -1915,6 +1915,15 @@ pub trait TicketBackend {
Ok((reference, ticket))
}
fn edit_item(&self, id: TicketIdOrSlug, edit: TicketItemEdit) -> Result<Ticket>;
fn edit_item_with_snapshots(
&self,
id: TicketIdOrSlug,
edit: TicketItemEdit,
) -> Result<(Ticket, Ticket)> {
let previous = self.show(id.clone())?;
let current = self.edit_item(id, edit)?;
Ok((previous, current))
}
fn dependency_check(&self, id: TicketIdOrSlug) -> Result<TicketDependencyCheck>;
fn add_event(&self, id: TicketIdOrSlug, event: NewTicketEvent) -> Result<()>;
fn add_state_changed(&self, id: TicketIdOrSlug, change: TicketStateChange) -> Result<()>;
@@ -3189,6 +3198,15 @@ impl TicketBackend for SqliteTicketBackend {
}
fn edit_item(&self, id: TicketIdOrSlug, edit: TicketItemEdit) -> Result<Ticket> {
self.edit_item_with_snapshots(id, edit)
.map(|(_, current)| current)
}
fn edit_item_with_snapshots(
&self,
id: TicketIdOrSlug,
edit: TicketItemEdit,
) -> Result<(Ticket, Ticket)> {
self.with_write(|conn| {
edit.validate_body_edit_request()?;
if !edit.has_changes() {
@@ -3204,8 +3222,9 @@ impl TicketBackend for SqliteTicketBackend {
validate_required_event_value("author", author)?;
}
let ticket_id = self.resolve_ticket_id(conn, id)?;
let previous = self.load_ticket(conn, &ticket_id)?;
if edit.targets.is_some() {
let current = self.load_ticket(conn, &ticket_id)?.meta.workflow_state;
let current = previous.meta.workflow_state;
if current != TicketWorkflowState::Planning {
return Err(TicketError::Conflict(format!(
"ticket implementation target is locked after planning (current state: {})",
@@ -3286,7 +3305,8 @@ impl TicketBackend for SqliteTicketBackend {
};
let event = TicketEvent { kind: TicketEventKind::Other("item_edit".to_string()), author: Some(edit.author.unwrap_or_else(default_author)), at: Some(now), status: None, from: None, to: None, reason: None, state_field: None, heading: Some("Item edit".to_string()), body, references: Vec::new(), attributes };
self.insert_event(conn, &ticket_id, &event)?;
self.load_ticket(conn, &ticket_id)
let current = self.load_ticket(conn, &ticket_id)?;
Ok((previous, current))
})
}
crates/ticket/src/tool.rs
+8
View File
@@ -276,6 +276,14 @@ impl TicketBackend for TicketToolBackend {
self.backend.edit_item(id, edit)
}
fn edit_item_with_snapshots(
&self,
id: TicketIdOrSlug,
edit: crate::TicketItemEdit,
) -> TicketResult<(Ticket, Ticket)> {
self.backend.edit_item_with_snapshots(id, edit)
}
fn dependency_check(&self, id: TicketIdOrSlug) -> TicketResult<crate::TicketDependencyCheck> {
self.backend.dependency_check(id)
}
crates/workspace-server/src/server.rs
+104 -24
View File
@@ -12492,7 +12492,7 @@ async fn execute_ticket_rest_operation(
reject_unguarded_ticket_completion(&operation)?;
validate_ticket_repository_operation(api, &operation)?;
let before = target.as_ref().and_then(|id| backend.show(id.clone()).ok());
let ticket_item_check = source
let mut ticket_item_check = source
.as_ref()
.cloned()
.zip(ticket_item_check_edit(&operation, before.as_ref()));
@@ -12587,6 +12587,27 @@ async fn execute_ticket_rest_operation(
Some(ticket),
)
}
TicketBackendOperation::EditItem { id, edit } => {
let (previous, ticket) = backend
.edit_item_with_snapshots(id, edit)
.map_err(Error::from)?;
if let Some((
_,
TicketItemCheckEdit::Edit {
title_changed,
body_changed,
previous_title,
previous_body,
..
},
)) = ticket_item_check.as_mut()
{
*previous_title = (*title_changed).then(|| previous.meta.title.clone());
*previous_body =
(*body_changed).then(|| previous.document.body.as_str().to_string());
}
(TicketBackendOperationResult::Ticket(ticket), None)
}
operation => (
execute_ticket_backend_operation(&backend, operation).map_err(Error::from)?,
None,
@@ -34578,56 +34599,82 @@ mod tests {
#[tokio::test]
async fn ticket_checker_fake_model_regressions_preserve_classification_boundaries() {
struct FakeTicketCheckerModel;
impl FakeTicketCheckerModel {
fn respond(request: &BackendJobRequest) -> Value {
let input = ticket_item_checker::parse_input(&request.input).unwrap();
assert!(request.instruction.contains("writer_scope"));
assert!(request.instruction.contains("internal_inconsistency"));
assert!(request.instruction.contains("ambiguous_boundary"));
assert!(
request
.instruction
.contains("Production deployment requires approval")
);
assert!(request.instruction.contains("background, quotations"));
if input
.body
.contains("This time I only create the Ticket; I will not implement it.")
&& !input.body.starts_with("Background bug example:")
{
serde_json::json!({"findings": [{
"category": "writer_scope",
"quote": "I will not implement it",
"reason": "The active requirement records the writer's own implementation boundary.",
"suggestion": "Remove the writer-specific action boundary."
}]})
} else if input.body.contains("The rollout region is undecided.")
&& input.body.contains("The rollout region is us-east-1.")
{
serde_json::json!({"findings": [{
"category": "internal_inconsistency",
"quote": "The rollout region is undecided.",
"reason": "The same active text also settles the rollout region as us-east-1.",
"suggestion": "Choose either the unresolved or settled rollout-region statement."
}]})
} else if input.body == "Implementation stops after Ticket creation." {
serde_json::json!({"findings": [{
"category": "ambiguous_boundary",
"quote": "Implementation stops after Ticket creation.",
"reason": "The text alone does not establish whether this is a delivery constraint or the writer's current action boundary.",
"suggestion": "Confirm whether this limits the product workflow or only the current writer."
}]})
} else {
serde_json::json!({"findings": []})
}
}
}
struct Case {
name: &'static str,
body: &'static str,
fake_model_result: Value,
advisory_quote: Option<&'static str>,
}
let cases = vec![
Case {
name: "writer-scope-positive",
body: "This time I only create the Ticket; I will not implement it.",
fake_model_result: serde_json::json!({"findings": [{
"category": "writer_scope",
"quote": "I will not implement it",
"reason": "The active requirement records the writer's own implementation boundary.",
"suggestion": "Remove the writer-specific action boundary."
}]}),
advisory_quote: Some("I will not implement it"),
},
Case {
name: "production-approval-negative",
body: "Production deployment requires approval.",
fake_model_result: serde_json::json!({"findings": []}),
advisory_quote: None,
},
Case {
name: "quoted-background-negative",
body: "Background bug example: a generated Ticket once said “I will not implement it.” Do not reproduce that sentence in generated requirements.",
fake_model_result: serde_json::json!({"findings": []}),
advisory_quote: None,
},
Case {
name: "unresolved-versus-settled-positive",
body: "The rollout region is undecided. The rollout region is us-east-1.",
fake_model_result: serde_json::json!({"findings": [{
"category": "internal_inconsistency",
"quote": "The rollout region is undecided.",
"reason": "The same active text also settles the rollout region as us-east-1.",
"suggestion": "Choose either the unresolved or settled rollout-region statement."
}]}),
advisory_quote: Some("The rollout region is undecided."),
},
Case {
name: "ambiguous-boundary-confirmation",
body: "Implementation stops after Ticket creation.",
fake_model_result: serde_json::json!({"findings": [{
"category": "ambiguous_boundary",
"quote": "Implementation stops after Ticket creation.",
"reason": "The text alone does not establish whether this is a delivery constraint or the writer's current action boundary.",
"suggestion": "Confirm whether this limits the product workflow or only the current writer."
}]}),
advisory_quote: Some("Implementation stops after Ticket creation."),
},
];
@@ -34660,8 +34707,8 @@ mod tests {
&BackendJobResultSubmission {
job_id: job.request.job_id.clone(),
attempt_id: attempt.attempt_id,
input_revision: job.request.input_revision,
result: case.fake_model_result,
input_revision: job.request.input_revision.clone(),
result: FakeTicketCheckerModel::respond(&job.request),
},
)
.unwrap_or_else(|error| panic!("{}: {error}", case.name));
@@ -34804,6 +34851,14 @@ mod tests {
.unwrap()
.create(ticket::NewTicket::new("Concurrent checker snapshots"))
.unwrap();
let initial_body = browser_ticket_backend(&api)
.unwrap()
.show(ticket_ref.id.clone().into())
.unwrap()
.document
.body
.as_str()
.to_string();
let barrier = Arc::new(std::sync::Barrier::new(2));
let run_edit = |source: RuntimeWorkerRef, body: &'static str| {
let api = api.clone();
@@ -34843,6 +34898,7 @@ mod tests {
(ticket_a, source_a, "Exact body from worker A."),
(ticket_b, source_b, "Exact body from worker B."),
];
let mut checked_inputs = Vec::new();
for (ticket, source, expected_body) in snapshots {
let revision = ticket_item_checker::item_revision(&ticket);
let job = api
@@ -34858,7 +34914,31 @@ mod tests {
assert_eq!(input.body, expected_body);
assert_eq!(job.request.source_worker.as_ref(), Some(&source));
assert_eq!(job.request.notification_target.as_ref(), Some(&source));
checked_inputs.push(input);
}
let first = checked_inputs
.iter()
.find(|input| {
matches!(
&input.edit,
TicketItemCheckEdit::Edit {
previous_body: Some(previous),
..
} if previous == &initial_body
)
})
.expect("one edit must atomically observe the initial preimage");
let second = checked_inputs
.iter()
.find(|input| input.revision != first.revision)
.unwrap();
assert!(matches!(
&second.edit,
TicketItemCheckEdit::Edit {
previous_body: Some(previous),
..
} if previous == &first.body
));
}
#[tokio::test]