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-compose): stop copying sent drafts into new drafts (#9623)

Peter Chinman6c0bfb08b190
diff --git a/apps/web/src/features/email-compose/primitives/draft-identity.ts b/apps/web/src/features/email-compose/primitives/draft-identity.ts
index a129640bb0..eb79aca9c1 100644
--- a/apps/web/src/features/email-compose/primitives/draft-identity.ts
+++ b/apps/web/src/features/email-compose/primitives/draft-identity.ts
@@ -4,6 +4,7 @@ import type {
EmailComposeFeedback,
EmailDraftStorage,
} from '../context/compose-capabilities';
+import type { LocalDraft } from '../core/local-draft';
import type { DraftSession } from './draft-session';
/** Refresh identity only: a cache settlement must never reseed a dirty editor. */
@@ -13,7 +14,8 @@ export function observeDraftIdentity(
notices: Pick<EmailComposeFeedback, 'feedback' | 'reportError'>,
recover: () => void,
onAlreadySent: () => void,
- onConfirmed?: () => Promise<boolean | void>
+ onConfirmed?: () => Promise<boolean | void>,
+ onAcknowledged?: (local: LocalDraft) => void
) {
createEffect(
on(
@@ -28,7 +30,8 @@ export function observeDraftIdentity(
recover,
onAlreadySent,
!!storage.retryDraft,
- onConfirmed
+ onConfirmed,
+ onAcknowledged
);
}
)
@@ -43,7 +46,8 @@ function observeAvailableDraftIdentity(
recover: () => void,
onAlreadySent: () => void,
durableRecovery: boolean,
- onConfirmed?: () => Promise<boolean | void>
+ onConfirmed?: () => Promise<boolean | void>,
+ onAcknowledged?: (local: LocalDraft) => void
) {
let generation = 0;
let mutationUuid: string | undefined;
@@ -82,6 +86,9 @@ function observeAvailableDraftIdentity(
if (!result.draft) return;
const current = session.identity();
const confirmed = result.persistence === 'committed';
+ // Before the session confirms: a confirmed session lets delivery
+ // observers compare edits, and a queued save's edits must count by then.
+ if (confirmed && result.local) onAcknowledged?.(result.local);
const handoff = async () => {
const version = `${result.draft!.db_id}:${result.local?.generation ?? ''}:${result.local?.acknowledgedRevision ?? result.draft!.updated_at}`;
if (version === uploadHandoff) return;
diff --git a/apps/web/src/features/email-compose/primitives/draft-persistence.ts b/apps/web/src/features/email-compose/primitives/draft-persistence.ts
index 081287b11b..625661b13e 100644
--- a/apps/web/src/features/email-compose/primitives/draft-persistence.ts
+++ b/apps/web/src/features/email-compose/primitives/draft-persistence.ts
@@ -1,3 +1,4 @@
+import { Telemetry } from '@macro-inc/observability';
import { v7 as uuidv7 } from 'uuid';
import {
type DeleteEmailDraft,
@@ -16,6 +17,28 @@ export type DraftPersistence = ReturnType<typeof createDraftPersistence>;
export const isAlreadySentRejection = (error: unknown) =>
error instanceof DraftPersistRejected && error.code === 'DRAFT_ALREADY_SENT';
+/** Why a composer moved its text to a new draft instead of the one it edited. */
+export type KeptAsNewDraftReason =
+ | 'save-rejected'
+ | 'scheduled-elsewhere'
+ | 'sent-elsewhere'
+ | 'changed-elsewhere';
+
+/**
+ * A new draft beside a delivered one reads as a duplicate of the sent email,
+ * so every such move is recorded. Identity and counts only, never content.
+ */
+export function recordKeptAsNewDraft(
+ reason: KeptAsNewDraftReason,
+ draft: { draftId: string | undefined; unacknowledgedEdits: number }
+): void {
+ Telemetry.warn('email_draft.kept_as_new', {
+ 'email_draft.reason': reason,
+ 'email_draft.draft_id': draft.draftId,
+ 'email_draft.unacknowledged_edits': draft.unacknowledgedEdits,
+ });
+}
+
/**
* A discard's delete. An already-sent verdict is not a failure: the reset
* the caller performs next is exactly what that verdict asks for, so it is
@@ -67,11 +90,17 @@ export function createDraftPersistence(options: {
const { session } = options;
let localRevision = options.localDraft?.revision;
let localGeneration = options.localDraft?.generation;
+ // The caller's edit counter as of the newest local write, so a server
+ // acknowledgement of that working-copy revision can name the edits it covers.
+ let lastLocalEdit:
+ | { edit: number; generation: string; revision: number }
+ | undefined;
let removal: Promise<void> = Promise.resolve();
const mint = (draft: EmailDraft) => {
if (session.draftId()) return;
localRevision = undefined;
localGeneration = undefined;
+ lastLocalEdit = undefined;
session.dispatch({
type: 'minted',
draftId: uuidv7(),
@@ -99,11 +128,31 @@ export function createDraftPersistence(options: {
restored(local: Pick<LocalDraft, 'revision' | 'generation'> | undefined) {
localRevision = local?.revision;
localGeneration = local?.generation;
+ lastLocalEdit = undefined;
+ },
+ /**
+ * The newest edit a server acknowledgement of the working copy covers, or
+ * undefined when the acknowledged revision predates the newest local write.
+ * A save that rode the offline queue commits after its call returned, so
+ * this is how the caller learns those edits reached the server.
+ */
+ acknowledgedEdit(
+ local: Pick<LocalDraft, 'generation' | 'acknowledgedRevision'>
+ ): number | undefined {
+ if (
+ !lastLocalEdit ||
+ local.generation !== lastLocalEdit.generation ||
+ local.acknowledgedRevision < lastLocalEdit.revision
+ )
+ return undefined;
+ return lastLocalEdit.edit;
},
async saveLocally(input: {
draft: EmailDraft | null;
inboxId?: string;
attachments: readonly DraftFormAttachment[];
+ /** The caller's edit counter for this snapshot. */
+ edit: number;
}) {
if (!options.drafts.saveLocalDraft) return;
// The copy being deleted refuses edits. Address the draft the delete
@@ -140,6 +189,11 @@ export function createDraftPersistence(options: {
if (!session.isStale(epoch)) {
localRevision = local.revision;
localGeneration = local.generation;
+ lastLocalEdit = {
+ edit: input.edit,
+ generation: local.generation,
+ revision: local.revision,
+ };
}
},
async retry() {
diff --git a/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts b/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts
index 44d49d98ef..5c962cbefb 100644
--- a/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts
+++ b/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts
@@ -6,6 +6,8 @@ import {
type DraftSaveResult,
type SaveEmailDraft,
} from '../context/compose-capabilities';
+import { decodeBase64Utf8 } from '../core/decode-base64';
+import type { LocalDraft } from '../core/local-draft';
import { createComposeContext } from '../tests/capabilities';
import { mountEmailComposer } from '../tests/composer';
import { mountReplyComposer } from '../tests/reply';
@@ -639,5 +641,127 @@ describe.each(['reply', 'compose'] as const)(
root.dispose();
}
});
+
+ /**
+ * Saves ride the offline queue and commit later. `acknowledge` makes the
+ * server accept the working copy's newest revision and tells mounted
+ * composers, as a queue settlement does.
+ */
+ function queuedWorkingCopy(
+ context: ReturnType<typeof createComposeContext>
+ ) {
+ let local: LocalDraft | undefined;
+ let notify!: () => void;
+ vi.mocked(context.drafts.saveDraft).mockImplementation(async (input) =>
+ queued(input)
+ );
+ context.drafts.saveLocalDraft = vi.fn(async (input) => {
+ local = {
+ key: input.clientHandles?.draftId ?? input.draft.db_id!,
+ draftId: input.clientHandles?.draftId ?? input.draft.db_id!,
+ threadId: input.clientHandles?.threadId ?? 'thread',
+ accountId: 'owner',
+ generation: 'local-generation',
+ revision: (local?.revision ?? 0) + 1,
+ acknowledgedRevision: local?.acknowledgedRevision ?? 0,
+ status: 'dirty',
+ updatedAt: Date.now(),
+ content: input.draft,
+ attachments: [],
+ };
+ return local;
+ });
+ context.drafts.readDraft = vi.fn(async () =>
+ local && local.acknowledgedRevision > 0
+ ? {
+ draft: message('server-draft', { is_draft: true }),
+ persistence:
+ local.acknowledgedRevision >= local.revision
+ ? ('committed' as const)
+ : ('queued' as const),
+ local,
+ }
+ : undefined
+ );
+ context.drafts.watchDrafts = (changed) => {
+ notify = () => changed();
+ return () => {};
+ };
+ return {
+ acknowledge() {
+ if (local) local = { ...local, acknowledgedRevision: local.revision };
+ notify();
+ },
+ };
+ }
+ const sentElsewhere = {
+ type: 'sent' as const,
+ draftId: 'server-draft',
+ threadId: 'thread',
+ inboxId: 'inbox',
+ observedAt: 0,
+ };
+ const newDraftSaves = (
+ context: ReturnType<typeof createComposeContext>
+ ) => {
+ const [first, ...rest] = savedInputs(context);
+ return rest.filter(
+ (input) =>
+ input.clientHandles &&
+ input.clientHandles.draftId !== first.clientHandles?.draftId
+ );
+ };
+
+ it('does not copy a draft sent elsewhere into a new draft after its queued saves commit', async () => {
+ const context = createComposeContext();
+ const workingCopy = queuedWorkingCopy(context);
+ const root = mount(context);
+ try {
+ root.edit('Reply that another tab sends');
+ await vi.advanceTimersByTimeAsync(600);
+ workingCopy.acknowledge();
+ await vi.advanceTimersByTimeAsync(0);
+ const observer = vi.mocked(context.draftLifecycle.observe).mock
+ .calls[0][0];
+ expect(observer.draftId()).toBe('server-draft');
+
+ context.setDraftLifecycle(sentElsewhere);
+ await vi.advanceTimersByTimeAsync(1000);
+
+ expect(newDraftSaves(context)).toEqual([]);
+ expect(context.notices.feedback.alert).not.toHaveBeenCalledWith(
+ 'This email was already sent. Your newer text was kept as a new draft and was not sent.'
+ );
+ } finally {
+ root.dispose();
+ }
+ });
+
+ it('keeps text the server never acknowledged as a new draft when the draft is sent elsewhere', async () => {
+ const context = createComposeContext();
+ const workingCopy = queuedWorkingCopy(context);
+ const root = mount(context);
+ try {
+ root.edit('Reply that another device sends');
+ await vi.advanceTimersByTimeAsync(600);
+ workingCopy.acknowledge();
+ await vi.advanceTimersByTimeAsync(0);
+ root.edit('Text typed after that save');
+ await vi.advanceTimersByTimeAsync(0);
+
+ context.setDraftLifecycle(sentElsewhere);
+ await vi.advanceTimersByTimeAsync(1000);
+
+ const [kept] = newDraftSaves(context);
+ expect(decodeBase64Utf8(kept.draft.body_html ?? '')).toContain(
+ 'Text typed after that save'
+ );
+ expect(context.notices.feedback.alert).toHaveBeenCalledWith(
+ 'This email was already sent. Your newer text was kept as a new draft and was not sent.'
+ );
+ } finally {
+ root.dispose();
+ }
+ });
}
);
diff --git a/apps/web/src/features/email-compose/primitives/email-composer.ts b/apps/web/src/features/email-compose/primitives/email-composer.ts
index b26675302b..b3afa3f399 100644
--- a/apps/web/src/features/email-compose/primitives/email-composer.ts
+++ b/apps/web/src/features/email-compose/primitives/email-composer.ts
@@ -75,6 +75,8 @@ import { observeDraftIdentity } from './draft-identity';
import {
createDraftPersistence,
deleteDraftForDiscard,
+ type KeptAsNewDraftReason,
+ recordKeptAsNewDraft,
} from './draft-persistence';
import { observeDraftRestoration } from './draft-restoration';
import { createDraftSaveNotice } from './draft-save-notice';
@@ -271,7 +273,11 @@ export function createEmailComposer(props: EmailComposerOptions) {
if (persistencePaused()) return;
if (props.drafts.retryDraft) {
void retryDraft().catch(props.notices.reportError);
- } else detachFromObsoleteDraft('Saving your edits as a new draft.');
+ } else
+ detachFromObsoleteDraft(
+ 'save-rejected',
+ 'Saving your edits as a new draft.'
+ );
},
handleAlreadySent,
async () => {
@@ -285,6 +291,11 @@ export function createEmailComposer(props: EmailComposerOptions) {
const draftId = session.draftId();
if (draftId && session.serverConfirmed())
await attachmentPersistence.upload(draftId);
+ },
+ (local) => {
+ const edit = persistence.acknowledgedEdit(local);
+ if (edit !== undefined)
+ persistedEditVersion = Math.max(persistedEditVersion, edit);
}
);
const persistedInboxId = session.inboxId;
@@ -543,6 +554,7 @@ export function createEmailComposer(props: EmailComposerOptions) {
draft: snapshot.draft,
inboxId: snapshot.inboxId,
attachments: snapshot.attachments,
+ edit: snapshot.revision,
});
},
paused: persistencePaused,
@@ -1175,7 +1187,14 @@ export function createEmailComposer(props: EmailComposerOptions) {
}
};
- const detachFromObsoleteDraft = (message: string) => {
+ const detachFromObsoleteDraft = (
+ reason: KeptAsNewDraftReason,
+ message: string
+ ) => {
+ recordKeptAsNewDraft(reason, {
+ draftId: session.draftId(),
+ unacknowledgedEdits: editVersion - persistedEditVersion,
+ });
identityVersion += 1;
autosave.cancel();
session.dispatch({ type: 'reset' });
@@ -1235,6 +1254,7 @@ export function createEmailComposer(props: EmailComposerOptions) {
if (state.type === 'scheduled') {
if (editVersion > persistedEditVersion) {
detachFromObsoleteDraft(
+ 'scheduled-elsewhere',
'This email was scheduled in another tab. Your newer text was kept as a new draft.'
);
return;
@@ -1274,6 +1294,7 @@ export function createEmailComposer(props: EmailComposerOptions) {
const wasScheduled = schedule.state().type === 'scheduled';
if (editVersion > persistedEditVersion) {
detachFromObsoleteDraft(
+ state.type === 'sent' ? 'sent-elsewhere' : 'changed-elsewhere',
state.type !== 'sent'
? 'The draft changed elsewhere. Your newer text was kept as a new draft.'
: wasScheduled
diff --git a/apps/web/src/features/email-compose/primitives/reply-composer.ts b/apps/web/src/features/email-compose/primitives/reply-composer.ts
index 21faf1a28e..e3bc34d674 100644
--- a/apps/web/src/features/email-compose/primitives/reply-composer.ts
+++ b/apps/web/src/features/email-compose/primitives/reply-composer.ts
@@ -63,6 +63,8 @@ import { observeDraftIdentity } from './draft-identity';
import {
createDraftPersistence,
deleteDraftForDiscard,
+ type KeptAsNewDraftReason,
+ recordKeptAsNewDraft,
} from './draft-persistence';
import { observeDraftRestoration } from './draft-restoration';
import { createDraftSaveNotice } from './draft-save-notice';
@@ -363,7 +365,11 @@ export function createReplyComposer(
if (scheduleBlocked() || schedule.state().type === 'scheduled') return;
if (props.drafts.retryDraft) {
void retryDraft().catch(props.notices.reportError);
- } else detachFromObsoleteDraft('Saving your edits as a new draft.');
+ } else
+ detachFromObsoleteDraft(
+ 'save-rejected',
+ 'Saving your edits as a new draft.'
+ );
},
handleAlreadySent,
async () => {
@@ -377,6 +383,11 @@ export function createReplyComposer(
const draftId = session.draftId();
if (draftId && session.serverConfirmed())
await attachmentPersistence.upload(draftId);
+ },
+ (local) => {
+ const edit = persistence.acknowledgedEdit(local);
+ if (edit !== undefined)
+ persistedEditVersion = Math.max(persistedEditVersion, edit);
}
);
const persistedInboxId = session.inboxId;
@@ -807,6 +818,7 @@ export function createReplyComposer(
: null,
inboxId: snapshot.inboxId,
attachments: snapshot.attachments,
+ edit: snapshot.revision,
});
},
paused: () =>
@@ -1595,7 +1607,14 @@ export function createReplyComposer(
const handleSendTimeChange = (date: Date | null) =>
scheduleBlocked() ? false : schedule.select(date);
- const detachFromObsoleteDraft = (message: string) => {
+ const detachFromObsoleteDraft = (
+ reason: KeptAsNewDraftReason,
+ message: string
+ ) => {
+ recordKeptAsNewDraft(reason, {
+ draftId: session.draftId(),
+ unacknowledgedEdits: editVersion - persistedEditVersion,
+ });
identityVersion += 1;
autosave.cancel();
session.dispatch({ type: 'reset' });
@@ -1653,6 +1672,7 @@ export function createReplyComposer(
if (state.type === 'scheduled') {
if (editVersion > persistedEditVersion) {
detachFromObsoleteDraft(
+ 'scheduled-elsewhere',
'This email was scheduled in another tab. Your newer text was kept as a new draft.'
);
return;
@@ -1692,6 +1712,7 @@ export function createReplyComposer(
const wasScheduled = schedule.state().type === 'scheduled';
if (editVersion > persistedEditVersion) {
detachFromObsoleteDraft(
+ state.type === 'sent' ? 'sent-elsewhere' : 'changed-elsewhere',
state.type !== 'sent'
? 'The draft changed elsewhere. Your newer text was kept as a new draft.'
: wasScheduled
diff --git a/apps/web/src/features/email-thread/primitives/email-thread-state.test.ts b/apps/web/src/features/email-thread/primitives/email-thread-state.test.ts
index 838ffb5e07..33b078c236 100644
--- a/apps/web/src/features/email-thread/primitives/email-thread-state.test.ts
+++ b/apps/web/src/features/email-thread/primitives/email-thread-state.test.ts
@@ -288,6 +288,28 @@ describe('thread state with an injected source', () => {
}
}));
+ it('stops offering a reply draft once a snapshot shows it was sent', () =>
+ createRoot((dispose) => {
+ try {
+ const draft = message('draft', {
+ is_draft: true,
+ replying_to_id: 'parent',
+ body_html_sanitized: '<p>Reply</p>',
+ });
+ const [snapshot, setSnapshot] = createSignal(
+ thread([message('parent'), draft])
+ );
+ const state = createEmailThreadState(
+ createThreadContext({ thread: snapshot })
+ );
+ expect(state.drafts.getDraftForMessage('parent')).toEqual(draft);
+ setSnapshot(thread([message('parent'), { ...draft, is_draft: false }]));
+ expect(state.drafts.getDraftForMessage('parent')).toBeUndefined();
+ } finally {
+ dispose();
+ }
+ }));
+
it('keeps selection and programmatic scrolling local to each mounted thread', () =>
createRoot((dispose) => {
try {
diff --git a/apps/web/src/features/email-thread/primitives/thread-drafts.ts b/apps/web/src/features/email-thread/primitives/thread-drafts.ts
index 9f90dbd72c..9f7bbac164 100644
--- a/apps/web/src/features/email-thread/primitives/thread-drafts.ts
+++ b/apps/web/src/features/email-thread/primitives/thread-drafts.ts
@@ -8,6 +8,7 @@ export function createThreadDrafts(
| {
db_id: string;
draftMap: Record<string, EmailMessage>;
+ filtered: EmailMessage[];
}
| undefined
>
@@ -20,6 +21,8 @@ export function createThreadDrafts(
// revalidation of a stale cache wins, but an out-of-order response can't
// downgrade a draft. Entries missing from a fetch are kept: deletes are
// handled locally below, and dropping one would collapse an open composer.
+ // A draft the snapshot lists as a sent message is gone for good: keeping it
+ // would reopen the sent email as an editable draft.
const serverDrafts = createMemo<
{ threadDbId: string; map: Record<string, EmailMessage> } | undefined
>((prev) => {
@@ -29,9 +32,11 @@ export function createThreadDrafts(
if (!prev || prev.threadDbId !== data.db_id) {
return { threadDbId: data.db_id, map: next };
}
+ const sent = new Set(data.filtered.map((message) => message.db_id));
const map: Record<string, EmailMessage> = { ...next };
for (const [messageId, prevDraft] of Object.entries(prev.map)) {
const nextDraft = map[messageId];
+ if (sent.has(prevDraft.db_id)) continue;
if (
!nextDraft ||
(nextDraft.db_id === prevDraft.db_id &&
diff --git a/docs/agent-guide/email.md b/docs/agent-guide/email.md
index 686b254419..833c6d22c8 100644
--- a/docs/agent-guide/email.md
+++ b/docs/agent-guide/email.md
@@ -930,6 +930,12 @@ edit, an attachment upload completing during another local save, and Discard
while an attachment snapshot is still being saved. A snapshot based on an older
local revision must fail without replacing newer content or files, including
when another tab saves first. Reopen the draft to use the latest version.
+Then open one reply in two tabs, type in the first, wait for its queued save to
+reach the server, and send from the second. The first tab's composer must clear
+without "Your newer text was kept as a new draft", Drafts must not gain a copy
+of the sent reply, and the thread must not reopen it as a draft. Text typed
+after the server last acknowledged the draft is still kept as a new draft;
+each such move logs `email_draft.kept_as_new` with its reason.
A completed discard must not resurrect on reload. A clean,
fully synchronized local copy must not hide newer server edits or sent state.
While online, create a disposable reply, wait for its server identity, discard