Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(email-compose): poll draft status only after the server confirms it (#8339)
teocc89cf6f3cc9
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.tsindex 806552d227..f6625fc677 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@@ -1,3 +1,4 @@+import type { Accessor } from 'solid-js';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { message } from '../../email-message/tests/messages';import {@@ -523,6 +524,34 @@ describe.each(['reply', 'compose'] as const)(}});+ it('reads operation status only under a server-confirmed draft ID', async () => {+ const context = createComposeContext();+ let operationId: Accessor<string | undefined> = () => undefined;+ context.operations = (messageId) => {+ operationId = messageId;+ return { operation: () => undefined, resolve: async () => {} };+ };+ vi.mocked(context.drafts.saveDraft).mockImplementation(async (input) =>+ queued(input)+ );+ const root = mount(context);+ try {+ root.edit('Queued behind the durable queue');+ await vi.advanceTimersByTimeAsync(600);+ expect(savedInputs(context)[0].clientHandles?.draftId).toBeTruthy();+ expect(operationId()).toBeUndefined();++ vi.mocked(context.drafts.saveDraft).mockResolvedValue(+ committed('server-operation')+ );+ root.edit('Confirmed by the server');+ await vi.advanceTimersByTimeAsync(600);+ expect(operationId()).toBe('server-operation');+ } finally {+ root.dispose();+ }+ });+it('does not send or schedule over a queued update to an existing server draft', async () => {const context = createComposeContext();vi.mocked(context.drafts.saveDraft)diff --git a/apps/web/src/features/email-compose/primitives/email-composer.ts b/apps/web/src/features/email-compose/primitives/email-composer.tsindex 1f8017cfd2..50c354bcae 100644--- a/apps/web/src/features/email-compose/primitives/email-composer.ts+++ b/apps/web/src/features/email-compose/primitives/email-composer.ts@@ -425,7 +425,10 @@ export function createEmailComposer(props: EmailComposerOptions) {'sent' | 'missing' | undefined>();let schedule: ReturnType<typeof createEmailSendSchedule>;- const operationSource = props.operations?.(currentDraftId, currentThreadId);+ const operationSource = props.operations?.(+ () => (session.serverConfirmed() ? currentDraftId() : undefined),+ currentThreadId+ );const currentOperation = () => {const live = operationSource?.operation();return live === undefined ? props.draft?.operation : live;