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
feat(email): press b to create a calendar event from a thread (#9534)
gbirmana701da266b92
diff --git a/apps/web/src/components/app/split-layout/componentRegistry.tsx b/apps/web/src/components/app/split-layout/componentRegistry.tsxindex 53f0e551aa..8b98b3d5a1 100644--- a/apps/web/src/components/app/split-layout/componentRegistry.tsx+++ b/apps/web/src/components/app/split-layout/componentRegistry.tsx@@ -436,6 +436,11 @@ registerComponent('calendar-event-compose', (params) => {initialValues={params?.initialValues as EventEditorInitialValues | undefined}+ suggestedValues={+ params?.suggestedValues as+ | Promise<Partial<EventEditorInitialValues>>+ | undefined+ }onCalendarChange={params?.onCalendarChange as| ((calendarId: string, color: string) => void)diff --git a/apps/web/src/features/block-calendar/components/EventComposerSplit.test.tsx b/apps/web/src/features/block-calendar/components/EventComposerSplit.test.tsxindex 5aec654866..d091a81fe3 100644--- a/apps/web/src/features/block-calendar/components/EventComposerSplit.test.tsx+++ b/apps/web/src/features/block-calendar/components/EventComposerSplit.test.tsx@@ -1,7 +1,14 @@// @vitest-environment jsdomimport type { CalendarEventFormController } from '@app/features/calendar/components/composer/create-calendar-event-form-controller';+import type { EventEditorInitialValues } from '@app/features/calendar/components/composer/event-form-model';import type { CalendarEvent } from '@app/features/calendar/types';-import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';+import {+ cleanup,+ fireEvent,+ render,+ screen,+ waitFor,+} from '@solidjs/testing-library';import { createSignal, type JSX } from 'solid-js';import { afterEach, expect, it, vi } from 'vitest';import { EventComposerSplit } from './EventComposerSplit';@@ -61,6 +68,8 @@ vi.mock('@app/features/calendar/components/composer/EventForm', () => ({<output aria-label="Conference">{props.controller.state().conference}</output>+ <output aria-label="Start">{props.controller.state().start}</output>+ <output aria-label="Location">{props.controller.state().location}</output><inputaria-label="Title"value={props.controller.state().title}@@ -129,3 +138,75 @@ it('offers no forward when the viewer may not forward', () => {screen.queryByRole('button', { name: 'Forward invitation' })).toBeNull();});++const OPENED: EventEditorInitialValues = {+ title: 'Planning',+ allDay: false,+ start: '2030-01-07T10:00',+ end: '2030-01-07T11:00',+ recurrenceLines: [],+ guests: '[email protected]',+ location: '',+ description: '',+ conference: 'none',+};++function suggestion() {+ let resolve!: (values: Partial<EventEditorInitialValues>) => void;+ const pending = new Promise<Partial<EventEditorInitialValues>>((settle) => {+ resolve = settle;+ });+ return { pending, resolve };+}++it('fills an untouched new event with values suggested after it opened', async () => {+ mocks.flag = () => ({ loading: false, enabled: false });+ const { pending, resolve } = suggestion();+ render(() => (+ <EventComposerSplit initialValues={OPENED} suggestedValues={pending} />+ ));+ expect(+ screen.getByText('Reading the email for a time and place…')+ ).toBeTruthy();++ resolve({+ title: 'Q1 planning',+ start: '2030-01-08T14:00',+ end: '2030-01-08T15:00',+ location: 'Room 4',+ });++ await waitFor(() =>+ expect(screen.getByLabelText('Location').textContent).toBe('Room 4')+ );+ expect((screen.getByRole('textbox') as HTMLInputElement).value).toBe(+ 'Q1 planning'+ );+ expect(screen.getByLabelText('Start').textContent).toBe('2030-01-08T14:00');+ expect(+ screen.queryByText('Reading the email for a time and place…')+ ).toBeNull();+});++it('keeps what the user changed before suggestions arrived', async () => {+ mocks.flag = () => ({ loading: false, enabled: false });+ const { pending, resolve } = suggestion();+ render(() => (+ <EventComposerSplit initialValues={OPENED} suggestedValues={pending} />+ ));+ fireEvent.input(screen.getByRole('textbox'), {+ target: { value: 'My title' },+ });++ resolve({ title: 'Q1 planning', location: 'Room 4' });++ await waitFor(() =>+ expect(+ screen.queryByText('Reading the email for a time and place…')+ ).toBeNull()+ );+ expect((screen.getByRole('textbox') as HTMLInputElement).value).toBe(+ 'My title'+ );+ expect(screen.getByLabelText('Location').textContent).toBe('');+});diff --git a/apps/web/src/features/block-calendar/components/EventComposerSplit.tsx b/apps/web/src/features/block-calendar/components/EventComposerSplit.tsxindex c71ef492d8..40f063f9c5 100644--- a/apps/web/src/features/block-calendar/components/EventComposerSplit.tsx+++ b/apps/web/src/features/block-calendar/components/EventComposerSplit.tsx@@ -23,7 +23,15 @@ import { EventForwardInvitationAction } from '@app/features/calendar-view/componimport { useQuickCallsFlag } from '@app/features/meetings/use-quick-calls-flag';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { useHotkeyDOMScope } from '@core/hotkey/hotkeys';-import { type Accessor, createMemo, onMount, Show } from 'solid-js';+import { fireAndForget } from '@core/util/fireAndForget';+import {+ type Accessor,+ createMemo,+ createSignal,+ onCleanup,+ onMount,+ Show,+} from 'solid-js';/*** Forward invitation beside a guest list the viewer cannot add to, as the@@ -62,6 +70,8 @@ function PanelEventForm(props: EventFormProps) {type EventComposerSplitProps = {event?: CalendarEvent;initialValues?: EventEditorInitialValues;+ /** Values that arrive after the composer opens, applied only to an untouched form. */+ suggestedValues?: Promise<Partial<EventEditorInitialValues>>;onCalendarChange?: (calendarId: string, color: string) => void;onDirtyChange?: (dirty: boolean) => void;onSaveSuccess?: () => void;@@ -136,8 +146,36 @@ function EventComposerContent(panel.handle.setDisplayName(isEdit() ? 'Edit event' : 'New event'));+ const [suggesting, setSuggesting] = createSignal(false);+ let disposed = false;+ onCleanup(() => {+ disposed = true;+ });+ // Once the user has changed anything, a late suggestion could overwrite+ // their edit or a repeat rule the form state does not hold, so it is dropped.+ const applySuggestions = async (+ pending: Promise<Partial<EventEditorInitialValues>>+ ) => {+ setSuggesting(true);+ try {+ const suggested = await pending;+ if (disposed || controller.isDirty()) return;+ controller.replaceFromExternal({ ...controller.state(), ...suggested });+ } finally {+ if (!disposed) setSuggesting(false);+ }+ };+ if (props.suggestedValues && !isEdit()) {+ fireAndForget(applySuggestions(props.suggestedValues), 'event-composer');+ }+return (<div ref={attachHotkeys} class="flex h-full min-h-0 flex-col p-4 text-ink">+ <Show when={suggesting()}>+ <p role="status" class="pb-2 text-xs text-ink-muted">+ Reading the email for a time and place…+ </p>+ </Show><PanelEventFormcontroller={controller}macroCallsEnabled={macroCallsEnabled()}diff --git a/apps/web/src/features/block-email/EmailBlockAdapter.tsx b/apps/web/src/features/block-email/EmailBlockAdapter.tsxindex 0b0a82283e..222d670a3a 100644--- a/apps/web/src/features/block-email/EmailBlockAdapter.tsx+++ b/apps/web/src/features/block-email/EmailBlockAdapter.tsx@@ -129,11 +129,13 @@ export function EmailBlockAdapter(props: {threadTransport={props.threadTransport}host={host}sidePanelHeaderToggle={isTouchDevice()}- topBar={({ createTask }) => (+ topBar={({ createTask, createEvent, canCreateEvent }) => (<TopBarid={props.threadId()}title={props.title}onCreateTask={createTask}+ onCreateEvent={createEvent}+ canCreateEvent={canCreateEvent}/>)}/>diff --git a/apps/web/src/features/block-email/EmailThreadHostView.tsx b/apps/web/src/features/block-email/EmailThreadHostView.tsxindex 045cf9e8da..611f6d7e7e 100644--- a/apps/web/src/features/block-email/EmailThreadHostView.tsx+++ b/apps/web/src/features/block-email/EmailThreadHostView.tsx@@ -1,10 +1,15 @@import { openCalendarEventSplit } from '@app/features/calendar-view/open-calendar-event';import { AskMacroButton } from '@app/features/chat/ChatWithAgentButton';+import { useCreateEmailEvent } from '@app/features/email-compose/email-event';import type {EmailThreadHost,EmailThreadSource,} from '@app/features/email-thread/context/email-thread-context';import { useEmailThreadState } from '@app/features/email-thread/context/email-thread-state-context';+import {+ selectThreadMessages,+ selectThreadParticipants,+} from '@app/features/email-thread/core/thread-messages';import {EmailThread,type EmailThreadProps,@@ -13,9 +18,13 @@ import { taskSourceComposerContext } from '@app/features/task-composer/source-coimport { HeaderActionGroup } from '@components/app/HeaderActionGroup';import { SidePanel } from '@components/app/side-panel';import { useSplitLayout } from '@components/app/split-layout/layout';+import { useEmail } from '@core/context/user';import { isTouchDevice } from '@core/mobile/isTouchDevice';import { fireAndForget } from '@core/util/fireAndForget';import { buildMentionMarkdownString } from '@macro-inc/lexical-core';+import { useInboxEmail } from '@queries/email/inbox-email';+import { useEmailLinksQuery } from '@queries/email/link';+import { queryReadyGate } from '@queries/gate';import type { Accessor, JSX } from 'solid-js';import { Show } from 'solid-js';import { QueuedSendStatus } from '../email-compose/queued-send-status';@@ -24,6 +33,8 @@ import { EmailSidePanelSections } from './component/sidepanel/EmailSidePanelSectexport type EmailThreadHostViewContext = {createTask: () => void;+ createEvent: () => boolean;+ canCreateEvent: () => boolean;};export type EmailThreadHostViewProps = {@@ -65,6 +76,39 @@ export function EmailThreadHostView(props: EmailThreadHostViewProps) {},});+ const emailEvent = useCreateEmailEvent();+ const emailLinks = useEmailLinksQuery();+ const viewerEmail = useInboxEmail(() => props.source.thread()?.link_id);+ const loginEmail = useEmail();+ // Until the inbox addresses load, the viewer's own alias would be invited.+ const canCreateEvent = () =>+ emailEvent.enabled() &&+ !!props.source.thread() &&+ queryReadyGate(emailLinks);+ const createEvent = () => {+ const thread = props.source.thread();+ if (!thread || !canCreateEvent()) return false;+ return emailEvent.open({+ subject: props.title,+ guests: selectThreadParticipants(thread, viewerEmail(), loginEmail()),+ text: selectThreadMessages(thread).filtered.at(-1)?.body_text ?? '',+ });+ };+ const context: EmailThreadHostViewContext = {+ createTask,+ createEvent,+ canCreateEvent,+ };+ const host: EmailThreadHost = {+ ...props.host,+ registerKeyboard: (handlers) =>+ props.host.registerKeyboard?.({+ ...handlers,+ createEvent,+ canCreateEvent,+ }),+ };+return (<EmailThreadtitle={props.title}@@ -72,15 +116,15 @@ export function EmailThreadHostView(props: EmailThreadHostViewProps) {threadId={props.threadId}source={props.source}threadTransport={props.threadTransport}- host={props.host}+ host={host}openCalendar={(target) => {fireAndForget(openCalendarEventSplit(target), 'email-thread');}}- header={props.topBar?.({ createTask })}+ header={props.topBar?.(context)}actions={<ThreadActions title={props.title} onCreateTask={createTask} />}frame={(content) => (<>- {props.chrome?.({ createTask })}+ {props.chrome?.(context)}<QueuedSendStatus threadId={props.threadId()} /><SidePanel.Layoutfloatingdiff --git a/apps/web/src/features/block-email/component/useEmailThreadTools.tsx b/apps/web/src/features/block-email/component/useEmailThreadTools.tsxindex 52481c08f6..00528ab303 100644--- a/apps/web/src/features/block-email/component/useEmailThreadTools.tsx+++ b/apps/web/src/features/block-email/component/useEmailThreadTools.tsx@@ -37,6 +37,7 @@ import IconShared from '@icon/share.svg';import CheckBoldIcon from '@icon/system/bold/check-bold.svg?component-solid';import ArrowCounterClockwise from '@icon/system/regular/arrow-counter-clockwise.svg?component-solid';import ArrowRightIcon from '@icon/system/regular/arrow-right.svg';+import CalendarPlusIcon from '@icon/system/regular/calendar-plus.svg';import CheckIcon from '@icon/system/regular/check.svg';import DownloadIcon from '@icon/system/regular/download-simple.svg';import EnvelopeSimpleIcon from '@icon/system/regular/envelope-simple.svg';@@ -54,6 +55,8 @@ export type EmailThreadToolsOptions = {title: string;isDraft?: boolean;onCreateTask?: () => void;+ onCreateEvent?: () => boolean;+ canCreateEvent?: () => boolean;onMarkedUnread?: () => void;onDeleted?: () => void;listNavigation?: EmailThreadListNavigation;@@ -281,6 +284,15 @@ export function useEmailThreadTools(props: EmailThreadToolsOptions) {action: () => props.onCreateTask?.(),condition: () => !!props.onCreateTask && !!emailCtx.thread()?.db_id,},+ {+ get label() {+ return t('entityActions.createEvent');+ },+ icon: CalendarPlusIcon,+ action: () => props.onCreateEvent?.(),+ condition: () => props.canCreateEvent?.() === true,+ hotkeyToken: TOKENS.email.createEvent,+ },shareTool,{group: 'file',diff --git a/apps/web/src/features/block-email/util/emailHotkeys.ts b/apps/web/src/features/block-email/util/emailHotkeys.tsindex ab2b41692f..351e1982b9 100644--- a/apps/web/src/features/block-email/util/emailHotkeys.ts+++ b/apps/web/src/features/block-email/util/emailHotkeys.ts@@ -1,4 +1,5 @@import type { EmailThreadKeyboardHandlers } from '@app/features/email-thread/core/thread-keyboard';+import { t } from '@app/lib/i18n';import { registerHotkey } from '@core/hotkey/hotkeys';import { TOKENS } from '@core/hotkey/tokens';@@ -26,6 +27,18 @@ export function registerEmailHotkeys(displayPriority: 9,});+ if (handlers.createEvent) {+ registerHotkey({+ hotkey: 'b',+ scopeId,+ description: () => t('commands.createEventFromEmail'),+ keyDownHandler: handlers.createEvent,+ hotkeyToken: TOKENS.email.createEvent,+ displayPriority: 7,+ condition: handlers.canCreateEvent,+ });+ }+registerHotkey({hotkey: 'f',scopeId: scopeId,diff --git a/apps/web/src/features/calendar-view/components/use-open-event-composer.ts b/apps/web/src/features/calendar-view/components/use-open-event-composer.tsindex ad10eb0fad..58d752d38a 100644--- a/apps/web/src/features/calendar-view/components/use-open-event-composer.ts+++ b/apps/web/src/features/calendar-view/components/use-open-event-composer.ts@@ -9,6 +9,8 @@ import { getOwner } from 'solid-js';export interface OpenEventComposerOptions {event?: CalendarEvent;initialValues?: EventEditorInitialValues;+ /** Values that arrive after the composer opens, applied only to an untouched form. */+ suggestedValues?: Promise<Partial<EventEditorInitialValues>>;onCalendarChange?: (calendarId: string, color: string) => void;/** Called with a new event once it exists, before the composer closes. */onCreated?: (created: CreatedCalendarEvent) => void;@@ -32,6 +34,7 @@ export function useOpenEventComposer() {params: {event: options.event,initialValues: options.initialValues,+ suggestedValues: options.suggestedValues,onCalendarChange: options.onCalendarChange,onDirtyChange: (dirty: boolean) => {formDirty = dirty;diff --git a/apps/web/src/features/email-compose/components/create-event-button.tsx b/apps/web/src/features/email-compose/components/create-event-button.tsxnew file mode 100644index 0000000000..4afd5a07c0--- /dev/null+++ b/apps/web/src/features/email-compose/components/create-event-button.tsx@@ -0,0 +1,36 @@+import { t } from '@app/lib/i18n';+import CalendarPlusIcon from '@icon/system/regular/calendar-plus.svg';+import { Button, cn } from '@ui';++/**+ * Opens an event from the draft. It is accented while the draft reads like it+ * proposes a meeting, so the action is offered when it is likely wanted.+ */+export function CreateEventButton(props: {+ suggested: boolean;+ onClick: () => void;+ /** The thread's own key for the same action, shown in the tooltip. */+ shortcut?: string;+ disabled?: boolean;+}) {+ return (+ <Button+ variant="ghost"+ size="icon-md"+ aria-label={t('entityActions.createEvent')}+ tooltip={{+ content: t('entityActions.createEvent'),+ shortcut: props.shortcut,+ }}+ data-suggested={props.suggested ? '' : undefined}+ class={cn(+ props.suggested &&+ 'bg-accent/15 text-accent hover:bg-accent/20! hover:text-accent!'+ )}+ disabled={props.disabled}+ onClick={() => props.onClick()}+ >+ <CalendarPlusIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />+ </Button>+ );+}diff --git a/apps/web/src/features/email-compose/compose-adapter.ts b/apps/web/src/features/email-compose/compose-adapter.tsindex 474d61dc49..e188f17a1e 100644--- a/apps/web/src/features/email-compose/compose-adapter.ts+++ b/apps/web/src/features/email-compose/compose-adapter.ts@@ -105,6 +105,7 @@ import {} from './context/compose-capabilities';import { localDraftReadyForDelivery } from './core/local-draft';import { readDroppedEmailFiles, withVideoAttachments } from './editor-adapter';+import { useCreateEmailEvent } from './email-event';import { makeAttachmentPublic } from './make-attachment-public';import {emailDraftLifecycleSource,@@ -170,6 +171,7 @@ export function createEmailComposeContext(getDisplayName(tryMacroId(`macro|${email}`)));const signatures = useFeatureFlag(enableEmailSignatures);+ const calendarEvents = useCreateEmailEvent();const remove = useDeleteDraftMutation();const upload = useUploadDraftAttachmentsMutation();const forward = useAddForwardedAttachmentsMutation();@@ -239,6 +241,7 @@ export function createEmailComposeContext(};return {+ calendarEvents,draftLifecycle: emailDraftLifecycleSource,operations: createMessageOperationSource,recipientName: (id) => getDisplayName(tryMacroId(id)),diff --git a/apps/web/src/features/email-compose/context/compose-capabilities.ts b/apps/web/src/features/email-compose/context/compose-capabilities.tsindex f7d4b72192..1ebfb8ac6c 100644--- a/apps/web/src/features/email-compose/context/compose-capabilities.ts+++ b/apps/web/src/features/email-compose/context/compose-capabilities.ts@@ -413,8 +413,16 @@ export interface EmailEditorFiles {}): void;}+/** Opens a calendar event drafted from an email. */+export interface EmailCalendarEvents {+ enabled: Accessor<boolean>;+ open(email: { subject: string; guests: string[]; text: string }): boolean;+}+/** Production composition groups capabilities for views to wire into their consumers. */export interface EmailComposeContext {+ /** Absent where the composer has no calendar, such as isolated tests. */+ calendarEvents?: EmailCalendarEvents;operations?: MessageOperationSourceFactory;drafts: EmailDraftStorage;attachmentStorage: EmailAttachmentStorage;diff --git a/apps/web/src/features/email-compose/core/meeting-intent.test.ts b/apps/web/src/features/email-compose/core/meeting-intent.test.tsnew file mode 100644index 0000000000..5ddf22b8ae--- /dev/null+++ b/apps/web/src/features/email-compose/core/meeting-intent.test.ts@@ -0,0 +1,23 @@+import { expect, it } from 'vitest';+import { proposesMeeting } from './meeting-intent';++it.each([+ 'Want to meet tomorrow at 2 pm?',+ 'Can we hop on a call Thursday?',+ 'Are you available next week for a demo?',+ 'Lunch on Friday at 12:30?',+ "I'll send an invite for 3pm",+])('suggests an event for %j', (text) => {+ expect(proposesMeeting(text)).toBe(true);+});++it.each([+ '',+ 'Thanks, the report looks great.',+ 'Can we meet sometime?',+ 'I will send it tomorrow.',+ 'The meeting notes are attached.',+ 'Recall the numbers from Tuesday.',+])('does not suggest an event for %j', (text) => {+ expect(proposesMeeting(text)).toBe(false);+});diff --git a/apps/web/src/features/email-compose/core/meeting-intent.ts b/apps/web/src/features/email-compose/core/meeting-intent.tsnew file mode 100644index 0000000000..1003bf1122--- /dev/null+++ b/apps/web/src/features/email-compose/core/meeting-intent.ts@@ -0,0 +1,18 @@+const MEETING_WORDS =+ /\b(meet|meeting|call|chat|catch up|sync|hop on|jump on|coffee|lunch|dinner|drinks|demo|interview|invite|schedule|book a time|availability|available)\b/i;++const TIME_WORDS =+ /\b(today|tonight|tomorrow|next (week|month)|this (week|morning|afternoon|evening)|(mon|tues?|wed(nes)?|thu(rs)?|fri|sat(ur)?|sun)(day)?|morning|afternoon|evening|noon|\d{1,2}(:\d{2})?\s?(am|pm)|\d{1,2}:\d{2})\b/i;++/**+ * Whether a draft reads like it proposes a meeting: a meeting word and a time+ * reference, such as "Want to meet tomorrow at 2pm?".+ *+ * TODO: replace this keyword heuristic with the Jev binary classifier+ * (cognition `/decisions`, or the `calendar` score from+ * `/universal_input/classify`), checked on a typing pause, once its latency+ * and cost per draft are acceptable.+ */+export function proposesMeeting(text: string): boolean {+ return MEETING_WORDS.test(text) && TIME_WORDS.test(text);+}diff --git a/apps/web/src/features/email-compose/email-event.test.ts b/apps/web/src/features/email-compose/email-event.test.tsnew file mode 100644index 0000000000..084f181a82--- /dev/null+++ b/apps/web/src/features/email-compose/email-event.test.ts@@ -0,0 +1,69 @@+import { afterEach, expect, it, vi } from 'vitest';+import { suggestEmailEvent } from './email-event';++const extract = vi.hoisted(() => vi.fn());+vi.mock('@service-agent-harness/universal-input', () => ({+ universalInputClient: { extract },+}));++afterEach(() => extract.mockReset());++it('sends the subject and text and maps the extracted event', async () => {+ extract.mockResolvedValue({+ revision: 0,+ intent: 'calendar',+ suggestions: {+ title: 'Q1 planning',+ body: 'ignored',+ start: '2026-11-10T14:00',+ start_assumption: null,+ end: '2026-11-10T15:00',+ location: 'Room 4',+ guests: ['[email protected]'],+ recurrence: {+ frequency: 'WEEKLY',+ interval: 1,+ by_day: ['TU'],+ monthly_by_day: null,+ ends: { kind: 'never' },+ },+ },+ });++ const suggested = await suggestEmailEvent(+ 'Planning',+ 'Tuesday at 2pm in Room 4, every week until March.'+ );++ expect(extract).toHaveBeenCalledWith(+ 'Planning\n\nTuesday at 2pm in Room 4, every week until March.',+ 'calendar',+ 0+ );+ expect(suggested).toEqual({+ title: 'Q1 planning',+ start: '2026-11-10T14:00',+ end: '2026-11-10T15:00',+ location: 'Room 4',+ recurrenceLines: ['RRULE:FREQ=WEEKLY;BYDAY=TU'],+ });+});++it('suggests nothing for fields the email does not state', async () => {+ extract.mockResolvedValue({+ revision: 0,+ intent: 'calendar',+ suggestions: {+ title: null,+ body: null,+ start: null,+ start_assumption: null,+ end: null,+ location: null,+ guests: [],+ recurrence: null,+ },+ });++ expect(await suggestEmailEvent('Planning', 'Thanks!')).toEqual({});+});diff --git a/apps/web/src/features/email-compose/email-event.ts b/apps/web/src/features/email-compose/email-event.tsnew file mode 100644index 0000000000..eec0738a36--- /dev/null+++ b/apps/web/src/features/email-compose/email-event.ts@@ -0,0 +1,82 @@+import {+ defaultEditorInitialValues,+ type EventEditorInitialValues,+} from '@app/features/calendar/components/composer/event-form-model';+import { useCalendarUiFlag } from '@app/features/calendar/hooks/use-calendar-ui-flag';+import { buildRecurrenceLines } from '@app/features/calendar/utils/recurrence';+import { useOpenEventComposer } from '@app/features/calendar-view/components/use-open-event-composer';+import { useUniversalInputEnabled } from '@app/features/universal-input/use-universal-input';+import { universalInputClient } from '@service-agent-harness/universal-input';+import { displaySubject, isPlaceholderSubject } from './core/subject-text';++/** Well under the extractor's 16,000-character draft limit, leaving room for the subject. */+const MAX_TEXT_CHARS = 12_000;++/**+ * The event an email describes, read by the Command K event extractor: its+ * title, time, place and repeat rule. Guests come from the email's addresses,+ * which are exact where the extractor would guess.+ */+export async function suggestEmailEvent(+ subject: string,+ text: string+): Promise<Partial<EventEditorInitialValues>> {+ const response = await universalInputClient.extract(+ `${subject}\n\n${text.slice(0, MAX_TEXT_CHARS)}`,+ 'calendar',+ 0+ );+ if (response.intent !== 'calendar') return {};+ const { title, start, end, location, recurrence } = response.suggestions;+ return {+ ...(title ? { title } : {}),+ ...(start && end ? { start, end } : {}),+ ...(location ? { location } : {}),+ ...(recurrence+ ? {+ recurrenceLines: buildRecurrenceLines(+ {+ frequency: recurrence.frequency,+ interval: recurrence.interval,+ byDay: recurrence.by_day,+ monthlyByDay: recurrence.monthly_by_day ?? undefined,+ ends: recurrence.ends,+ },+ false,+ Intl.DateTimeFormat().resolvedOptions().timeZone+ ),+ }+ : {}),+ };+}++/**+ * Opens the event composer for an email: the subject as the title and the+ * given addresses as guests at once, then the time and place the extractor+ * reads from `text`.+ */+export function useCreateEmailEvent() {+ const calendarEnabled = useCalendarUiFlag();+ const extractionEnabled = useUniversalInputEnabled();+ const openEventComposer = useOpenEventComposer();+ return {+ enabled: calendarEnabled,+ open(email: { subject: string; guests: string[]; text: string }) {+ if (!calendarEnabled()) return false;+ const shown = displaySubject(email.subject);+ const title = isPlaceholderSubject(shown) ? '' : shown;+ openEventComposer({+ suggestedValues: extractionEnabled()+ ? suggestEmailEvent(title, email.text)+ : undefined,+ initialValues: {+ // The composer settles the Macro call default once its flag loads.+ ...defaultEditorInitialValues(new Date(), true),+ title,+ guests: email.guests.join(', '),+ },+ });+ return true;+ },+ };+}diff --git a/apps/web/src/features/email-compose/primitives/compose-view-state.ts b/apps/web/src/features/email-compose/primitives/compose-view-state.tsindex 56efa98035..7748410072 100644--- a/apps/web/src/features/email-compose/primitives/compose-view-state.ts+++ b/apps/web/src/features/email-compose/primitives/compose-view-state.ts@@ -1,5 +1,6 @@import type { LexicalEditor } from 'lexical';import type { Accessor, JSX } from 'solid-js';+import type { EmailCalendarEvents } from '../context/compose-capabilities';import type { ComposeBodyActions } from '../context/editor-capabilities';import type {EmailFormRecipients,@@ -18,6 +19,7 @@ export interface ComposeContextValue extends ComposeState {bodyActions: ComposeBodyActions;isMobile: Accessor<boolean>;scheduleEnabled: boolean;+ calendarEvents?: EmailCalendarEvents;onUpgrade?: () => void;viewerLoading?: Accessor<boolean>;}diff --git a/apps/web/src/features/email-compose/primitives/written-text.test.ts b/apps/web/src/features/email-compose/primitives/written-text.test.tsnew file mode 100644index 0000000000..b9e955fb3f--- /dev/null+++ b/apps/web/src/features/email-compose/primitives/written-text.test.ts@@ -0,0 +1,38 @@+import { $createClassedBlockNode } from '@macro-inc/lexical-core';+import { $createParagraphNode, $createTextNode, $getRoot } from 'lexical';+import { createRoot } from 'solid-js';+import { expect, it } from 'vitest';+import { createEmailEditor } from '../tests/editor';+import { createWrittenText } from './written-text';++it('follows what the user writes and leaves out the quoted thread', () => {+ const editor = createEmailEditor('Want to meet');+ editor.update(+ () => {+ const quote = $createClassedBlockNode({+ tag: 'div',+ classes: ['macro_quote', 'gmail_quote'],+ });+ quote.append(+ $createParagraphNode().append($createTextNode('Lunch tomorrow at 1pm?'))+ );+ $getRoot().append(quote);+ },+ { discrete: true }+ );++ const [text, dispose] = createRoot((dispose) => [+ createWrittenText(() => editor),+ dispose,+ ]);+ expect(text()).toBe('Want to meet');++ editor.update(+ () => {+ $getRoot().getFirstChildOrThrow().selectEnd().insertText(' Friday?');+ },+ { discrete: true }+ );+ expect(text()).toBe('Want to meet Friday?');+ dispose();+});diff --git a/apps/web/src/features/email-compose/primitives/written-text.ts b/apps/web/src/features/email-compose/primitives/written-text.tsnew file mode 100644index 0000000000..825636ac72--- /dev/null+++ b/apps/web/src/features/email-compose/primitives/written-text.ts@@ -0,0 +1,32 @@+import { $isClassedBlockNode } from '@macro-inc/lexical-core';+import { $getRoot, type LexicalEditor } from 'lexical';+import { type Accessor, createEffect, createSignal, onCleanup } from 'solid-js';++/** The text the user wrote, above the quoted thread a reply carries. */+export function $writtenText(): string {+ const lines: string[] = [];+ for (const node of $getRoot().getChildren()) {+ if ($isClassedBlockNode(node) && node.__classes.includes('macro_quote'))+ break;+ lines.push(node.getTextContent());+ }+ return lines.join('\n');+}++/** The editor's written text, kept current as it changes. */+export function createWrittenText(+ editor: Accessor<LexicalEditor | undefined>+): Accessor<string> {+ const [text, setText] = createSignal('');+ createEffect(() => {+ const current = editor();+ if (!current) return;+ setText(current.getEditorState().read($writtenText));+ onCleanup(+ current.registerUpdateListener(({ editorState }) => {+ setText(editorState.read($writtenText));+ })+ );+ });+ return text;+}diff --git a/apps/web/src/features/email-compose/views/compose-toolbar.tsx b/apps/web/src/features/email-compose/views/compose-toolbar.tsxindex 24d7e0d226..46334a5b88 100644--- a/apps/web/src/features/email-compose/views/compose-toolbar.tsx+++ b/apps/web/src/features/email-compose/views/compose-toolbar.tsx@@ -18,10 +18,13 @@ import Trash from '@icon/system/regular/trash.svg';import { Button, SendButton } from '@ui';import { FORMAT_TEXT_COMMAND, type LexicalEditor } from 'lexical';import { createSignal, Show } from 'solid-js';+import { CreateEventButton } from '../components/create-event-button';import { EmailDateSelector } from '../components/email-date-selector';import { EmailScheduleSummary } from '../components/email-schedule-summary';import { MobileComposeActions } from '../components/mobile-compose-actions';import { useCompose } from '../context/compose-context';+import { proposesMeeting } from '../core/meeting-intent';+import { createWrittenText } from '../primitives/written-text';export function EmailComposeToolbar(props: {editor?: () => LexicalEditor | undefined;@@ -30,6 +33,17 @@ export function EmailComposeToolbar(props: {}) {const ctx = useCompose();const [showFormatRibbon, setShowFormatRibbon] = createSignal(false);+ const writtenText = createWrittenText(() => props.editor?.());+ const createEvent = () => {+ const recipients = ctx.recipients();+ ctx.calendarEvents?.open({+ subject: ctx.subject(),+ guests: [...recipients.to, ...recipients.cc].map(+ (recipient) => recipient.data.email+ ),+ text: writtenText(),+ });+ };return (<Show when={props.inline || !ctx.isMobile()} fallback={<MobileToolbar />}>@@ -104,6 +118,13 @@ export function EmailComposeToolbar(props: {><TextAa class="size-4 touch:size-6 shrink-0 pointer-events-none" /></Button>+ <Show when={ctx.calendarEvents?.enabled()}>+ <CreateEventButton+ suggested={proposesMeeting(writtenText())}+ disabled={ctx.disabled()}+ onClick={createEvent}+ />+ </Show><Show when={ctx.scheduleEnabled}><div class="shrink-0"><EmailDateSelectordiff --git a/apps/web/src/features/email-compose/views/email-compose.tsx b/apps/web/src/features/email-compose/views/email-compose.tsxindex 930f3a2116..b67b16692a 100644--- a/apps/web/src/features/email-compose/views/email-compose.tsx+++ b/apps/web/src/features/email-compose/views/email-compose.tsx@@ -177,6 +177,7 @@ function LoadedEmailComposeView(},isMobile: composeContext.presentation.isMobile,scheduleEnabled: composeContext.presentation.scheduleEnabled,+ calendarEvents: composeContext.calendarEvents,onUpgrade: composeContext.presentation.onUpgrade,viewerLoading: composeContext.presentation.viewerLoading,signaturePreview: () => (diff --git a/apps/web/src/features/email-compose/views/reply-input.tsx b/apps/web/src/features/email-compose/views/reply-input.tsxindex bb40f272e2..b25b3a4a0e 100644--- a/apps/web/src/features/email-compose/views/reply-input.tsx+++ b/apps/web/src/features/email-compose/views/reply-input.tsx@@ -30,6 +30,7 @@ import {} from 'solid-js';import { MessageOperationRecovery } from '../../email-message/views/message-operation-recovery';import { createAttachmentViewer } from '../components/attachment-viewer';+import { CreateEventButton } from '../components/create-event-button';import { DraftBackMenu } from '../components/draft-back-menu';import { DraftSyncStatus } from '../components/draft-sync-status';import { EmailDateSelector } from '../components/email-date-selector';@@ -43,12 +44,14 @@ import { SignaturePreview } from '../components/signature-preview';import type { EmailComposeContext } from '../context/compose-capabilities';import { getOrInitEmailFormContext } from '../context/email-form-context';import { decodeBase64Utf8 } from '../core/decode-base64';+import { proposesMeeting } from '../core/meeting-intent';import { plainTextToHtml } from '../core/plain-text-to-html';import { registerCcBccHotkeys } from '../primitives/cc-bcc-hotkeys';import { registerDraftActionHotkeys } from '../primitives/draft-action-hotkeys';import { createDraftSyncStatus } from '../primitives/draft-sync-status';import { EMAIL_FORMAT_SHORTCUTS } from '../primitives/format-shortcuts';import { registerToggleAppendedThread } from '../primitives/prepare-email-body';+import { createWrittenText } from '../primitives/written-text';import { ReplyEnvelope } from './reply-envelope';false && fileFolderDrop;@@ -222,6 +225,19 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {composeContext.presentation.signaturesEnabled()? state.signatureHtml(): undefined;+ const writtenText = createWrittenText(editor);+ const createEvent = () => {+ const recipients = form.recipients();+ composeContext.calendarEvents?.open({+ subject: form.subject() || (props.replyingTo()?.subject ?? ''),+ guests: [...recipients.to, ...recipients.cc].map(+ (recipient) => recipient.data.email+ ),+ text: [writtenText(), props.replyingTo()?.body_text ?? '']+ .filter(Boolean)+ .join('\n\n'),+ });+ };const [draftBackMenuOpen, setDraftBackMenuOpen] = createSignal(false);const requestClose = () => {// The full-screen dialog owns Escape; dismiss the nested draft choices first.@@ -798,6 +814,14 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {<Trash class="size-4 touch:size-6 shrink-0 pointer-events-none" /></Button><AttachButton />+ <Show when={composeContext.calendarEvents?.enabled()}>+ <CreateEventButton+ suggested={proposesMeeting(writtenText())}+ shortcut="b"+ disabled={editingDisabled()}+ onClick={createEvent}+ />+ </Show><Showwhen={composeContext.presentation.scheduleEnabled &&diff --git a/apps/web/src/features/email-thread/core/thread-keyboard.ts b/apps/web/src/features/email-thread/core/thread-keyboard.tsindex 6cf016cfee..de9ac87fd2 100644--- a/apps/web/src/features/email-thread/core/thread-keyboard.ts+++ b/apps/web/src/features/email-thread/core/thread-keyboard.ts@@ -27,4 +27,8 @@ export interface EmailThreadKeyboardHandlers {/** Expands the focused message, or collapses it if already expanded. */expandFocusedMessage: () => boolean;expandAllMessages: () => boolean;+ /** Opens a new calendar event prefilled from the thread, where the host can. */+ createEvent?: () => boolean;+ /** Gates `createEvent`, e.g. while the calendar is unavailable. */+ canCreateEvent?: () => boolean;}diff --git a/apps/web/src/features/email-thread/core/thread-messages.test.ts b/apps/web/src/features/email-thread/core/thread-messages.test.tsindex 2c844d6c36..a03359f685 100644--- a/apps/web/src/features/email-thread/core/thread-messages.test.ts+++ b/apps/web/src/features/email-thread/core/thread-messages.test.ts@@ -3,6 +3,7 @@ import { message, thread } from '../tests/fixtures';import {selectEmlMessage,selectThreadMessages,+ selectThreadParticipants,selectThreadSender,} from './thread-messages';@@ -70,6 +71,43 @@ describe('thread message selection', () => {);});+ it('invites everyone the thread was from, to or cc, once each, without the viewer, bcc or drafts', () => {+ const later = message('later', {+ from: { email: '[email protected]' },+ to: [{ email: '[email protected]' }, { email: '[email protected]' }],+ cc: [{ email: '[email protected]' }],+ bcc: [{ email: '[email protected]' }],+ internal_date_ts: '2026-09-02T00:00:00Z',+ });+ const original = message('original', {+ from: { email: '[email protected]' },+ to: [{ email: '[email protected]' }, { email: '[email protected]' }],+ internal_date_ts: '2026-09-01T00:00:00Z',+ });+ const fromLogin = message('from-login', {+ from: { email: '[email protected]' },+ to: [{ email: '[email protected]' }],+ internal_date_ts: '2026-09-03T00:00:00Z',+ });+ const draft = message('draft', {+ is_draft: true,+ replying_to_id: 'later',+ to: [{ email: '[email protected]' }],+ internal_date_ts: '2026-09-04T00:00:00Z',+ });+ expect(+ selectThreadParticipants(+ thread([draft, fromLogin, later, original]),+ '[email protected]',+ )+ ).toEqual([+ '[email protected]',+ '[email protected]',+ '[email protected]',+ '[email protected]',+ ]);+ });it('never offers a deleted draft as the reply draft or the draft to edit', () => {const parent = message('parent');const live = message('live', {diff --git a/apps/web/src/features/email-thread/core/thread-messages.ts b/apps/web/src/features/email-thread/core/thread-messages.tsindex 7521457b77..0342eaf203 100644--- a/apps/web/src/features/email-thread/core/thread-messages.ts+++ b/apps/web/src/features/email-thread/core/thread-messages.ts@@ -21,6 +21,36 @@ export function selectThreadSender()?.from?.email;}+/**+ * Everyone the thread's sent and received messages were from, to or cc'd,+ * earliest first and each address once, without the viewer's own addresses.+ * Bcc stays out: those recipients were hidden from the others.+ */+export function selectThreadParticipants(+ thread: EmailThread,+ ...viewerEmails: (string | undefined)[]+) {+ const participants = new Map<string, string>();+ for (const message of selectThreadMessages(thread).filtered) {+ for (const contact of [+ ...(message.from ? [message.from] : []),+ ...message.to,+ ...message.cc,+ ]) {+ const key = contact.email.toLowerCase();+ if (+ !contact.email ||+ participants.has(key) ||+ viewerEmails.some((email) => isViewerAddress(contact.email, email))+ ) {+ continue;+ }+ participants.set(key, contact.email);+ }+ }+ return [...participants.values()];+}+/*** The message a thread downloads as `.eml`: the newest one sent or received,* which quotes the conversation before it. Drafts and sends still on theirdiff --git a/apps/web/src/features/email-view/components/EmailDetailView.tsx b/apps/web/src/features/email-view/components/EmailDetailView.tsxindex 0822850ca5..6934802ee6 100644--- a/apps/web/src/features/email-view/components/EmailDetailView.tsx+++ b/apps/web/src/features/email-view/components/EmailDetailView.tsx@@ -295,7 +295,7 @@ export function EmailDetailView(props: {source={source}threadTransport={() => threadQuery.transport}host={host}- chrome={({ createTask }) => (+ chrome={({ createTask, createEvent, canCreateEvent }) => (<EmailDetailHeaderonEmailReminderSaved={async () => {await listNavigation.afterReminderSaved?.();@@ -303,6 +303,8 @@ export function EmailDetailView(props: {id={props.thread.id}title={title()}onCreateTask={createTask}+ onCreateEvent={createEvent}+ canCreateEvent={canCreateEvent}onMarkedUnread={closeThread}onDeleted={closeThread}listNavigation={listNavigation}diff --git a/apps/web/src/lib/core/hotkey/tokens.ts b/apps/web/src/lib/core/hotkey/tokens.tsindex accfb9a957..5ee41cca6e 100644--- a/apps/web/src/lib/core/hotkey/tokens.ts+++ b/apps/web/src/lib/core/hotkey/tokens.ts@@ -173,6 +173,7 @@ export const TOKENS = {toggleReadingPane: 'email.toggleReadingPane',star: 'email.star',mute: 'email.mute',+ createEvent: 'email.createEvent',compose: {edit: {recipients: 'email.compose.edit.recipients',diff --git a/apps/web/src/lib/i18n/locales/en/commands.ts b/apps/web/src/lib/i18n/locales/en/commands.tsindex 0ea24539ec..177a808595 100644--- a/apps/web/src/lib/i18n/locales/en/commands.ts+++ b/apps/web/src/lib/i18n/locales/en/commands.ts@@ -32,4 +32,5 @@ export default {goForward: 'Go forward',focusSplitRight: 'Focus split right',focusSplitLeft: 'Focus split left',+ createEventFromEmail: 'Create event from email',};diff --git a/apps/web/src/lib/i18n/locales/en/entity-actions.ts b/apps/web/src/lib/i18n/locales/en/entity-actions.tsindex d657e057cb..90e15b4de6 100644--- a/apps/web/src/lib/i18n/locales/en/entity-actions.ts+++ b/apps/web/src/lib/i18n/locales/en/entity-actions.ts@@ -66,6 +66,7 @@ export default {downloadDocx: 'Download',downloadEml: 'Download .eml',downloadEmlFailed: 'Failed to download email. Please try again.',+ createEvent: 'Create event',senderToSignal: 'Sender → Signal',senderToNoise: 'Sender → Noise',blockSender: 'Block Sender',diff --git a/docs/agent-guide/email.md b/docs/agent-guide/email.mdindex 0ba898e51a..63d785d42f 100644--- a/docs/agent-guide/email.md+++ b/docs/agent-guide/email.md@@ -65,7 +65,22 @@ view. `Shift+M` mutes the selected rows or the open thread, and `S` and`Shift+M` also work on a thread opened in its own split. In a thread, `O` opensor closes the selected message (the latest when none is selected), `Shift+O`opens every message including the collapsed middle run, and `N`/`P` step-messages like the arrows. `Cmd+Up`/`Cmd+Down` jump to either end of a list.+messages like the arrows. `B` in an open thread, or `Create event` in its+title menu, opens the event composer with the subject as the title and every+From, To and Cc address except the viewer's as guests (Bcc and drafts are left+out); both are hidden while the calendar is off. With `enable-universal-input`+on, the composer also sends the subject and latest message to+`/universal_input/extract` (`intent: 'calendar'`, the Cmd+K event extractor)+and, while "Reading the email for a time and place…" shows, fills in the+suggested title, time, location and repeat rule. Suggestions that arrive after+any edit are dropped. The desktop reply and standalone composers have the same+action as a calendar button between attach and the schedule clock (tooltip+`Create event`, plus `B` in a reply). It uses the draft instead: subject, To+and Cc as guests, and the written text (with the replied-to message in a+reply) for extraction. The button is accented while the written text, above+any quoted thread, pairs a meeting word with a time (`proposesMeeting` in+`email-compose/core/meeting-intent.ts`, a keyword heuristic until a classifier+replaces it). `Cmd+Up`/`Cmd+Down` jump to either end of a list.In every composer `Cmd+Shift+.`, `Cmd+Shift+,` and `Cmd+Shift+D` discard thedraft exactly like its trash button, `Cmd+Shift+U` opens the attach picker, and`Cmd+Shift+X`, `7`, `8` and `9` apply strikethrough, numbered list, bulleted