Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(email): let users trash an Outlook draft right after it autosaves (#9286)

teoa882dc26ca54
diff --git a/.sqlx/query-70074b9300d224c8f60445a89834b39f5d641e76099a633999bc0583d4c68474.json b/.sqlx/query-70074b9300d224c8f60445a89834b39f5d641e76099a633999bc0583d4c68474.json
new file mode 100644
index 0000000000..8e50be0242
--- /dev/null
+++ b/.sqlx/query-70074b9300d224c8f60445a89834b39f5d641e76099a633999bc0583d4c68474.json
@@ -0,0 +1,17 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n UPDATE email_mailbox_drafts SET lease_id = NULL,lease_until = NULL,available_at = now() + make_interval(secs => $3::double precision),\n checkpoint = CASE WHEN delete_requested AND NOT $4 AND checkpoint->>'stage' IS DISTINCT FROM 'creating' THEN NULL ELSE checkpoint END\n WHERE message_id = $1 AND lease_id = $2 AND lease_until > now() AND state = 'running'\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Uuid",
+ "Float8",
+ "Bool"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "70074b9300d224c8f60445a89834b39f5d641e76099a633999bc0583d4c68474"
+}
diff --git a/.sqlx/query-8f79723e03feac3b2c758fcd2ca090c2570443650ed036c84d2213b38416ab45.json b/.sqlx/query-8f79723e03feac3b2c758fcd2ca090c2570443650ed036c84d2213b38416ab45.json
new file mode 100644
index 0000000000..812323f561
--- /dev/null
+++ b/.sqlx/query-8f79723e03feac3b2c758fcd2ca090c2570443650ed036c84d2213b38416ab45.json
@@ -0,0 +1,17 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n UPDATE email_mailbox_drafts SET lease_id = NULL,lease_until = NULL,updated_at = now(),\n state = CASE WHEN delete_requested AND NOT $4 THEN 'pending' ELSE $2 END,\n error_code = CASE WHEN delete_requested AND NOT $4 THEN NULL ELSE $3 END,\n checkpoint = CASE WHEN delete_requested AND NOT $4 AND checkpoint->>'stage' IS DISTINCT FROM 'creating' THEN NULL ELSE checkpoint END,\n available_at = CASE WHEN delete_requested AND NOT $4 THEN now() ELSE available_at END\n WHERE message_id = $1\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Text",
+ "Text",
+ "Bool"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "8f79723e03feac3b2c758fcd2ca090c2570443650ed036c84d2213b38416ab45"
+}
diff --git a/.sqlx/query-bc3d7668db5f473f6a35cb237c9162548a4f80ec6414d9e1f42a8b7374603ef6.json b/.sqlx/query-bc3d7668db5f473f6a35cb237c9162548a4f80ec6414d9e1f42a8b7374603ef6.json
new file mode 100644
index 0000000000..0cae9b967d
--- /dev/null
+++ b/.sqlx/query-bc3d7668db5f473f6a35cb237c9162548a4f80ec6414d9e1f42a8b7374603ef6.json
@@ -0,0 +1,24 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n UPDATE email_mailbox_drafts d SET delete_requested = true,actor_id = $3,updated_at = now()\n FROM email_messages m WHERE d.message_id = $1 AND m.id = d.message_id AND m.link_id = $2 AND m.is_draft AND NOT m.is_sent\n AND NOT EXISTS (SELECT 1 FROM email_scheduled_messages WHERE message_id = m.id)\n RETURNING d.message_id\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "message_id",
+ "type_info": "Uuid"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Uuid",
+ "Text"
+ ]
+ },
+ "nullable": [
+ false
+ ]
+ },
+ "hash": "bc3d7668db5f473f6a35cb237c9162548a4f80ec6414d9e1f42a8b7374603ef6"
+}
diff --git a/.sqlx/query-c5e81a2428957d4ae7ecbb8321c92d62aaef2751bdda44847d78b7cd8104d3ed.json b/.sqlx/query-c5e81a2428957d4ae7ecbb8321c92d62aaef2751bdda44847d78b7cd8104d3ed.json
deleted file mode 100644
index 51e1abaa0b..0000000000
--- a/.sqlx/query-c5e81a2428957d4ae7ecbb8321c92d62aaef2751bdda44847d78b7cd8104d3ed.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "UPDATE email_mailbox_drafts SET state = $2,error_code = $3,lease_id = NULL,lease_until = NULL,updated_at = now() WHERE message_id = $1",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Uuid",
- "Text",
- "Text"
- ]
- },
- "nullable": []
- },
- "hash": "c5e81a2428957d4ae7ecbb8321c92d62aaef2751bdda44847d78b7cd8104d3ed"
-}
diff --git a/.sqlx/query-ecf3a30d7bfcfbda69fcf33c68fb8a009d907ae570d8b388b2880fbd564913f1.json b/.sqlx/query-ecf3a30d7bfcfbda69fcf33c68fb8a009d907ae570d8b388b2880fbd564913f1.json
deleted file mode 100644
index 236247537e..0000000000
--- a/.sqlx/query-ecf3a30d7bfcfbda69fcf33c68fb8a009d907ae570d8b388b2880fbd564913f1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n UPDATE email_mailbox_drafts SET lease_id = NULL,lease_until = NULL,available_at = now() + make_interval(secs => $3::double precision)\n WHERE message_id = $1 AND lease_id = $2 AND lease_until > now() AND state = 'running'\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Uuid",
- "Uuid",
- "Float8"
- ]
- },
- "nullable": []
- },
- "hash": "ecf3a30d7bfcfbda69fcf33c68fb8a009d907ae570d8b388b2880fbd564913f1"
-}
diff --git a/crates/email/src/outbound/email_pg_repo/message.rs b/crates/email/src/outbound/email_pg_repo/message.rs
index 3713343c08..2081e2beb7 100644
--- a/crates/email/src/outbound/email_pg_repo/message.rs
+++ b/crates/email/src/outbound/email_pg_repo/message.rs
@@ -441,16 +441,20 @@ pub(crate) async fn delete_draft_message(
let operation = sqlx::query!("SELECT state,error_code,checkpoint->>'stage' AS stage,lease_until FROM email_mailbox_drafts WHERE message_id=$1 FOR UPDATE",message_id)
.fetch_optional(&mut *tx).await?;
- if operation.as_ref().is_some_and(|operation| {
+ // The Outlook draft worker holds a lease while it writes a save to Outlook.
+ let syncing = operation.as_ref().is_some_and(|operation| {
operation
.lease_until
.is_some_and(|until| until > chrono::Utc::now())
- || matches!(
+ });
+ if (syncing && outlook.is_none())
+ || operation.as_ref().is_some_and(|operation| {
+ matches!(
operation.stage.as_deref(),
Some("submitting" | "confirming")
- )
- || operation.error_code.as_deref() == Some("send_unknown")
- }) {
+ ) || operation.error_code.as_deref() == Some("send_unknown")
+ })
+ {
return Ok(None);
}
sqlx::query!(r#"
@@ -462,7 +466,18 @@ pub(crate) async fn delete_draft_message(
"#,message_id,thread_db_id,link_ids).execute(&mut *tx).await?;
if let Some(link) = outlook {
- let queued = sqlx::query!(r#"
+ let queued = if syncing {
+ // Leave the worker its lease and checkpoint, so the provider call
+ // it is making is still recorded. It reads the request when that
+ // step ends (`settle_draft` or `fail_draft`) and deletes next.
+ sqlx::query_scalar!(r#"
+ UPDATE email_mailbox_drafts d SET delete_requested = true,actor_id = $3,updated_at = now()
+ FROM email_messages m WHERE d.message_id = $1 AND m.id = d.message_id AND m.link_id = $2 AND m.is_draft AND NOT m.is_sent
+ AND NOT EXISTS (SELECT 1 FROM email_scheduled_messages WHERE message_id = m.id)
+ RETURNING d.message_id
+ "#,message_id,link.id,actor).fetch_optional(&mut *tx).await?
+ } else {
+ sqlx::query_scalar!(r#"
INSERT INTO email_mailbox_drafts (message_id,link_id,generation,actor_id,desired_content,base_version,provider_id,delete_requested)
SELECT m.id,m.link_id,$3,$4,
jsonb_build_object('db_id',m.id,'thread_db_id',m.thread_id,'subject',COALESCE(m.subject,''),'to','[]'::jsonb,'cc','[]'::jsonb,'bcc','[]'::jsonb),
@@ -475,7 +490,8 @@ pub(crate) async fn delete_draft_message(
error_code = NULL,lease_id=NULL,lease_until=NULL,
available_at = now(),updated_at = now()
RETURNING message_id
- "#,message_id,link.id,link.sync_generation,actor).fetch_optional(&mut *tx).await?;
+ "#,message_id,link.id,link.sync_generation,actor).fetch_optional(&mut *tx).await?
+ };
if queued.is_none() {
return Ok(None);
}
diff --git a/crates/email/src/outbound/mailbox_pg/drafts.rs b/crates/email/src/outbound/mailbox_pg/drafts.rs
index 085d0990d8..ff17cc5a70 100644
--- a/crates/email/src/outbound/mailbox_pg/drafts.rs
+++ b/crates/email/src/outbound/mailbox_pg/drafts.rs
@@ -196,10 +196,14 @@ impl DraftRepository for PgMailboxSync {
}
async fn release_draft(&self, lease: &DraftLease, seconds: u32) -> Result<(), MailboxError> {
+ // A discard that arrived during this lease restarts from inspection,
+ // which deletes whichever version Outlook holds; this step's
+ // checkpoint can expect a version a lost response never confirmed.
let changed = sqlx::query!(r#"
- UPDATE email_mailbox_drafts SET lease_id = NULL,lease_until = NULL,available_at = now() + make_interval(secs => $3::double precision)
+ UPDATE email_mailbox_drafts SET lease_id = NULL,lease_until = NULL,available_at = now() + make_interval(secs => $3::double precision),
+ checkpoint = CASE WHEN delete_requested AND NOT $4 AND checkpoint->>'stage' IS DISTINCT FROM 'creating' THEN NULL ELSE checkpoint END
WHERE message_id = $1 AND lease_id = $2 AND lease_until > now() AND state = 'running'
- "#,lease.message_id,lease.lease_id,f64::from(seconds)).execute(&self.db).await.map_err(db_error)?.rows_affected();
+ "#,lease.message_id,lease.lease_id,f64::from(seconds),lease.delete_requested).execute(&self.db).await.map_err(db_error)?.rows_affected();
if changed != 1 {
return Err(MailboxError::Stale);
}
@@ -213,7 +217,16 @@ impl DraftRepository for PgMailboxSync {
) -> Result<(), MailboxError> {
let mut tx = self.db.begin().await.map_err(db_error)?;
Self::lock_draft(&mut tx, lease).await?;
- sqlx::query!("UPDATE email_mailbox_drafts SET state = $2,error_code = $3,lease_id = NULL,lease_until = NULL,updated_at = now() WHERE message_id = $1",lease.message_id,failure.state(),failure.code()).execute(&mut *tx).await.map_err(db_error)?;
+ // A discard that arrived during this lease runs next instead, as it
+ // would have after the failure (see `delete_draft_message`).
+ sqlx::query!(r#"
+ UPDATE email_mailbox_drafts SET lease_id = NULL,lease_until = NULL,updated_at = now(),
+ state = CASE WHEN delete_requested AND NOT $4 THEN 'pending' ELSE $2 END,
+ error_code = CASE WHEN delete_requested AND NOT $4 THEN NULL ELSE $3 END,
+ checkpoint = CASE WHEN delete_requested AND NOT $4 AND checkpoint->>'stage' IS DISTINCT FROM 'creating' THEN NULL ELSE checkpoint END,
+ available_at = CASE WHEN delete_requested AND NOT $4 THEN now() ELSE available_at END
+ WHERE message_id = $1
+ "#,lease.message_id,failure.state(),failure.code(),lease.delete_requested).execute(&mut *tx).await.map_err(db_error)?;
if matches!(failure, DraftFailure::Invalid) {
// A deterministic save rejection never submitted the message. Let
// the user correct it without leaving a committed schedule behind.
diff --git a/crates/email/src/outbound/mailbox_pg/drafts/test.rs b/crates/email/src/outbound/mailbox_pg/drafts/test.rs
index 9236926f6d..d125296ceb 100644
--- a/crates/email/src/outbound/mailbox_pg/drafts/test.rs
+++ b/crates/email/src/outbound/mailbox_pg/drafts/test.rs
@@ -633,6 +633,61 @@ async fn deletion_retains_a_fenced_remote_cleanup_intent(db: PgPool) {
));
}
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn a_discard_while_the_worker_writes_a_save_runs_after_that_write(db: PgPool) {
+ let (sync, repo, input, link) = setup(&db, false).await;
+ let second = ResolvedDraftInput {
+ db_id: Uuid::now_v7(),
+ ..input.clone()
+ };
+ repo.insert_message(
+ &second,
+ &UpsertedContacts {
+ from_contact_id: None,
+ recipients: Vec::new(),
+ },
+ link,
+ None,
+ true,
+ )
+ .await
+ .unwrap()
+ .unwrap();
+ let claim = || sync.claim_draft(Uuid::now_v7(), DraftClaimMode::All);
+ let (lost, rejected) = (
+ claim().await.unwrap().unwrap(),
+ claim().await.unwrap().unwrap(),
+ );
+ for (lease, provider_id) in [(&lost, "a"), (&rejected, "b")] {
+ assert!(
+ repo.delete_draft_message(
+ lease.message_id,
+ input.thread_db_id,
+ &[link],
+ Some(ACTOR),
+ 0
+ )
+ .await
+ .unwrap()
+ .is_some()
+ );
+ // The write still records its progress under its lease.
+ let mut progress = checkpoint(lease, DraftStage::Updating);
+ progress.draft.as_mut().unwrap().id = ProviderId::new(provider_id).unwrap();
+ sync.checkpoint_draft(lease, &progress).await.unwrap();
+ }
+ // One write's response is lost; Outlook reports the other edited there.
+ sync.release_draft(&lost, 0).await.unwrap();
+ sync.fail_draft(&rejected, DraftFailure::Conflict)
+ .await
+ .unwrap();
+ for _ in 0..2 {
+ let discard = claim().await.unwrap().unwrap();
+ assert!(discard.delete_requested);
+ assert!(discard.checkpoint.is_none());
+ }
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn sync_before_creation_response_binds_the_existing_macro_message(db: PgPool) {
let (sync, _, input, link) = setup(&db, false).await;