fix(email-compose): preview the reply signature above the quoted text

apps/web/package.json

@@ -187,6 +187,9 @@
     "@graphql-codegen/cli": "^7.1.3",
     "@graphql-codegen/typed-document-node": "^7.0.3",
     "@graphql-codegen/typescript-operations": "^6.0.5",
+    "@opentelemetry/api": "^1.9.1",
+    "@opentelemetry/core": "^2.9.0",
+    "@opentelemetry/sdk-trace-base": "^2.9.0",
     "@playwright/test": "^1.55.1",
     "@solidjs/meta": "^0.29.4",
     "@solidjs/testing-library": "^0.8.10",

apps/web/src/features/email-compose/components/draft-sync-status.tsx

@@ -2,7 +2,7 @@ import { Button } from '@ui';
 import { Show } from 'solid-js';
 import type { DraftSyncViewState } from '../core/local-draft';
 
-/** In-composer banner for draft failures; saving itself stays silent. */
+/** In-composer banner for draft failures and offline edits; saving itself stays silent. */
 export function DraftSyncStatus(props: {
   state?: DraftSyncViewState;
   busy: boolean;
@@ -15,7 +15,7 @@ export function DraftSyncStatus(props: {
       {(state) => (
         <div
           class="flex flex-wrap items-center gap-2 border-b border-edge-muted p-3 text-sm"
-          role="alert"
+          role={state().failed ? 'alert' : 'status'}
         >
           <div class="min-w-0 flex-1">
             <p>{state().message}</p>

apps/web/src/features/email-compose/compose-adapter.ts

@@ -65,6 +65,7 @@ import {
 import { confirmLocalDraftSave } from '@queries/email/local-draft-confirmation';
 import {
   clearLocalAttachmentReceipt,
+  forgetLocalDraft,
   readLocalDraft,
   recordLocalAttachment,
   reviveLocalDraft,
@@ -111,6 +112,7 @@ import {
 } from './queries/draft-lifecycle';
 import { createEmailInboxSource } from './queries/inbox-source';
 import { queuedDraftSaveArgs } from './queries/queued-draft';
+import { watchEmailSendProgress } from './queries/send-progress';
 import {
   restoreDraftBodyAfterUndo,
   runQueuedUndoSend,
@@ -150,7 +152,7 @@ export function createEmailComposeContext(
       options.threadTransport?.() ??
         (graphqlSoupFlag().enabled ? 'graphql' : 'rest')
     );
-  const sends = useQueuedEmailSends(() => true);
+  const sends = useQueuedEmailSends();
   // Attach handlers run as event handlers, which have no Solid owner of
   // their own; the dialog needs the surface's.
   const dialogOwner = getOwner();
@@ -357,6 +359,7 @@ export function createEmailComposeContext(
       get retryDraft() {
         return queueActive() ? retryEmailDraftSynchronization : undefined;
       },
+      forgetLocalDraft: (draftId) => forgetLocalDraft(draftId),
       readDraft: readEmailDraft,
       watchDrafts: watchEmailDrafts,
       async saveDraft({
@@ -571,6 +574,7 @@ export function createEmailComposeContext(
                 emailSendMatchesDraft(intent, draftId) &&
                 emailSendLocked(intent)
             )),
+      watchSend: watchEmailSendProgress,
       async sendMessage({ inboxId, ...input }) {
         if (
           !inboxSource
@@ -597,7 +601,7 @@ export function createEmailComposeContext(
             !inbox.settings.signature_on_replies_forwards)
             ? ''
             : (inbox.settings.signature ?? '');
-        return await sendEmailQueued({
+        const queued = await sendEmailQueued({
           signatureHtml,
           expectedLocalVersion: input.expectedLocalVersion,
           draft: {
@@ -623,6 +627,10 @@ export function createEmailComposeContext(
           restoreBodyText: input.restoreBodyText,
           restoreBodyMacro: input.restoreBodyMacro,
         });
+        // The thread shown after Send renders from this snapshot on mount; it
+        // must already hold the send, or the thread shows the draft instead.
+        await sends.refresh();
+        return queued;
       },
       async unschedule({ draftId, threadId, inboxId, draftGeneration }) {
         const local = sends

apps/web/src/features/email-compose/compose-host-adapter.ts

@@ -1,15 +1,18 @@
 import { useSplitBackInterceptor } from '@components/app/split-layout/back-interceptor';
 import { useSplitLayout } from '@components/app/split-layout/layout';
 import { useSplitPanel } from '@components/app/split-layout/layoutUtils';
+import type { createComposeRouteDraft } from './compose-route-draft';
 import type { EmailComposeHost } from './context/compose-capabilities';
 import { createPanelFocusSibling } from './editor-adapter';
-export function createEmailComposeHost(): EmailComposeHost {
+
+function createSplitComposeHost() {
   const { replaceSplit } = useSplitLayout();
   const panel = useSplitPanel();
+  const showThread = (id: string) => {
+    replaceSplit({ content: { type: 'email', id }, mergeHistory: true });
+  };
   return {
-    showThread: (id: string) => {
-      replaceSplit({ content: { type: 'email', id }, mergeHistory: true });
-    },
+    showThread,
     showDraft: (id: string) => {
       replaceSplit({
         content: {
@@ -27,3 +30,19 @@ export function createEmailComposeHost(): EmailComposeHost {
     },
   };
 }
+
+/** A thread route names the draft's thread, so it follows a moved draft there. */
+export function createEmailComposeHost(): EmailComposeHost {
+  const host = createSplitComposeHost();
+  return {
+    ...host,
+    showMovedDraft: ({ threadId }) => host.showThread(threadId),
+  };
+}
+
+/** The compose route keeps a moved draft in place and records its new id instead. */
+export function createComposeRouteHost(
+  route: Pick<ReturnType<typeof createComposeRouteDraft>, 'record'>
+): EmailComposeHost {
+  return { ...createSplitComposeHost(), recordDraft: route.record };
+}