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): promote CATEGORY_PERSONAL per-sender across thread (#4592)
Evan Hutnik236208a57416
diff --git a/js/app/packages/block-email/component/EmailContext.tsx b/js/app/packages/block-email/component/EmailContext.tsxindex 7d378d938b..ba9c1b5376 100644--- a/js/app/packages/block-email/component/EmailContext.tsx+++ b/js/app/packages/block-email/component/EmailContext.tsx@@ -96,6 +96,8 @@ type EmailContextValues = {setReplyingToMessageId: (id: string | undefined) => void;bottomReplyOpen: Accessor<boolean>;setBottomReplyOpen: (open: boolean) => void;+ // Sender emails (lowercased) with a CATEGORY_PERSONAL message in the thread+ personalSenders: Accessor<Set<string>>;};thread: Accessor<ApiThread | undefined>;permissions: Accessor<{@@ -583,6 +585,21 @@ export function EmailProvider(props: FlowProps<{ threadID: string }>) {setTargetMessageID: setTargetMessageId,list: createMemo(() => threadQuery.data?.filtered ?? []),unfiltered: createMemo(() => threadQuery.data?.messages ?? []),+ // Google's CATEGORY_PERSONAL classification is inconsistent across+ // identical messages, so promote it per-sender across the thread+ personalSenders: createMemo(() => {+ const senders = new Set<string>();+ for (const message of threadQuery.data?.messages ?? []) {+ const email = message.from?.email?.toLowerCase();+ if (!email) continue;+ if (+ message.labels.some((l) => l.name === 'CATEGORY_PERSONAL')+ ) {+ senders.add(email);+ }+ }+ return senders;+ }),expandedBodyIds: expandedMessageBodyIds,setExpandedBodyId: onExpandMessageBody,isBodyExpanded: (id: string) => expandedMessageBodyIds[id] ?? false,diff --git a/js/app/packages/block-email/component/EmailMessageBody.tsx b/js/app/packages/block-email/component/EmailMessageBody.tsxindex 5b89531818..0de2ea7adb 100644--- a/js/app/packages/block-email/component/EmailMessageBody.tsx+++ b/js/app/packages/block-email/component/EmailMessageBody.tsx@@ -30,6 +30,8 @@ import {interface EmailMessageBodyProps {message: ApiMessage;+ /** Sender emails (lowercased) with a CATEGORY_PERSONAL message in the thread */+ personalSenders: Accessor<Set<string>>;isBodyExpanded: Accessor<boolean>;setExpandedMessageBody: (id: string) => void;setFocusedMessageId: (messageID: string | undefined) => void;@@ -109,9 +111,12 @@ export function EmailMessageBody(props: EmailMessageBodyProps) {// TODO it might be nice to do some additional checks here, e.g. check if this message was sent from a user that the user has sent a message to before.const isPersonal = createMemo(() => {+ const senderEmail = props.message.from?.email?.toLowerCase();return (- props.message.from?.email === userEmail() ||- props.message.labels.some((l) => l.name === 'CATEGORY_PERSONAL')+ (senderEmail !== undefined &&+ senderEmail === userEmail()?.toLowerCase()) ||+ props.message.labels.some((l) => l.name === 'CATEGORY_PERSONAL') ||+ (senderEmail !== undefined && props.personalSenders().has(senderEmail)));});diff --git a/js/app/packages/block-email/component/MessageContainer.tsx b/js/app/packages/block-email/component/MessageContainer.tsxindex 2b94c73a24..6a923bde0b 100644--- a/js/app/packages/block-email/component/MessageContainer.tsx+++ b/js/app/packages/block-email/component/MessageContainer.tsx@@ -267,6 +267,7 @@ export function MessageContainer(props: MessageContainerProps) {<Message.Body><EmailMessageBodymessage={props.message}+ personalSenders={context.messages.personalSenders}isBodyExpanded={isBodyExpanded}setExpandedMessageBody={(id) =>context.messages.setExpandedBodyId(id, true)