{searchThreads.map((thread) => (
account.id === thread.latestEmail.accountId)
+ ?.email.split("@")[0]
+ : undefined
+ }
onClick={() => handleThreadClick(thread)}
/>
))}
@@ -819,13 +884,18 @@ export default function App() {
isConnected: accountList.find((a) => a.id === acc.id)?.isConnected ?? false,
}),
);
- setAccounts(fullAccounts);
- // Set current account to primary or first available
+ const settingsResult = (await window.api.settings.get()) as IpcResponse;
+ const selectedAccountId = resolveStoredAccountSelection(
+ settingsResult.success ? settingsResult.data : undefined,
+ fullAccounts,
+ );
+ setAccounts(fullAccounts, selectedAccountId);
+
+ // Identify user in analytics with the primary account even if the UI
+ // opens in the unified account view.
const primaryAccount = fullAccounts.find((a) => a.isPrimary) || fullAccounts[0];
if (primaryAccount) {
- setCurrentAccountId(primaryAccount.id);
- // Identify user in PostHog using primary email
identifyUser(primaryAccount.email, {
account_count: fullAccounts.length,
});
@@ -885,7 +955,7 @@ export default function App() {
context: "initializeSync",
});
}
- }, [setAccounts, setCurrentAccountId, addEmails, setSentEmails]);
+ }, [setAccounts, addEmails, setSentEmails]);
// Set up sync event listeners
useEffect(() => {
@@ -1107,7 +1177,8 @@ export default function App() {
// Save sidebar tab — startAgentTask unconditionally sets it to "agent",
// but background auto-drafts shouldn't steal focus from the user
const prevTab = store.sidebarTab;
- store.startAgentTask(taskId, emailId, ["claude"], "", {
+ const providerId = event.providerId ?? "codex";
+ store.startAgentTask(taskId, emailId, [providerId], "", {
accountId: email.accountId || "",
currentEmailId: emailId,
currentThreadId: email.threadId,
@@ -1315,11 +1386,14 @@ export default function App() {
hasCredentials: boolean;
hasTokens: boolean;
hasAnthropicKey: boolean;
+ codexCliAvailable: boolean;
+ hasCodexAuth: boolean;
+ hasLlmAuth: boolean;
}>,
) => {
if (result.success) {
// Credentials are always bundled at build time — only check API key and tokens
- setNeedsSetup(!result.data.hasAnthropicKey || !result.data.hasTokens);
+ setNeedsSetup(!result.data.hasLlmAuth || !result.data.hasTokens);
} else {
setNeedsSetup(true);
}
@@ -1382,7 +1456,7 @@ export default function App() {
const hasActiveProgressiveSync = Object.values(syncProgress).some(
(p) => p !== null && p.fetched < p.total,
);
- const { refetch: fetchEmails, isFetching } = useQuery({
+ const { isFetching } = useQuery({
queryKey: ["emails", currentAccountId],
queryFn: async () => {
const result = await window.api.gmail.fetchUnread(100, currentAccountId ?? undefined);
@@ -1463,8 +1537,20 @@ export default function App() {
// Reload sent emails too
await reloadSentEmailsForAccount(currentAccountId);
} else {
- // Fallback to legacy fetch for default account
- await fetchEmails();
+ await Promise.all(accounts.map((account) => window.api.sync.now(account.id)));
+ const [emailResults, sentResults] = await Promise.all([
+ Promise.all(accounts.map((account) => window.api.sync.getEmails(account.id))),
+ Promise.all(accounts.map((account) => window.api.sync.getSentEmails(account.id))),
+ ]);
+ const refreshedEmails = emailResults.flatMap((result) =>
+ result.success && result.data ? result.data : [],
+ );
+ const refreshedSent = sentResults.flatMap((result) =>
+ result.success && result.data ? result.data : [],
+ );
+ setEmails(refreshedEmails);
+ setSentEmails(refreshedSent);
+ prefetchEmailBodies(refreshedEmails.map((e: DashboardEmail) => e.id)).catch(console.error);
}
} catch (err) {
setError(err instanceof Error ? err.message : "Failed to fetch emails");
@@ -1487,6 +1573,7 @@ export default function App() {
setAccounts(updatedAccounts);
setCurrentAccountId(accountId);
+ window.api.settings.set({ selectedAccountId: accountId }).catch(console.error);
// Load emails from DB now that sync is running
const emailsResult = await window.api.sync.getEmails(accountId);
@@ -1551,10 +1638,14 @@ export default function App() {
const currentAccount = accounts.find((a) => a.id === currentAccountId);
const currentSyncStatus = currentAccountId
? syncStatuses.get(currentAccountId) || "idle"
- : "idle";
+ : accounts.some((account) => (syncStatuses.get(account.id) || "idle") === "syncing")
+ ? "syncing"
+ : accounts.some((account) => (syncStatuses.get(account.id) || "idle") === "error")
+ ? "error"
+ : "idle";
const isSyncing = currentSyncStatus === "syncing";
const isCurrentAccountExpired =
- currentAccountId != null && expiredAccountIds.has(currentAccountId);
+ currentAccountId != null ? expiredAccountIds.has(currentAccountId) : expiredAccountIds.size > 0;
// Build list of expired accounts with their email addresses for the banner
const expiredAccounts = accounts.filter((a) => expiredAccountIds.has(a.id));
@@ -1563,11 +1654,22 @@ export default function App() {
// already in the store from initial load + background sync. We just flip
// currentAccountId and let useThreadedEmails filter; background sync
// picks up anything new without blocking the UI.
- const handleAccountSwitch = (accountId: string) => {
+ const handleAccountSwitch = (accountId: string | null) => {
setCurrentAccountId(accountId);
+ window.api.settings.set({ selectedAccountId: accountId }).catch(console.error);
setAccountMenuOpen(false);
- trackEvent("account_switched", { account_count: accounts.length });
+ trackEvent("account_switched", {
+ account_count: accounts.length,
+ scope: accountId ?? "all",
+ });
+
+ if (accountId === null) {
+ accounts.forEach((account) => {
+ window.api.sync.now(account.id).catch(console.error);
+ });
+ return;
+ }
// Backfill inbox/sent emails independently if missing for this account.
const storeState = useAppStore.getState();
@@ -1634,7 +1736,9 @@ export default function App() {
className="flex items-center space-x-2 px-3 py-1.5 text-sm bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 rounded-lg transition-colors"
>
- {currentAccount?.email || "Select account"}
+ {currentAccountId === null
+ ? "All accounts"
+ : currentAccount?.email || "Select account"}
{/* Sync status indicator */}
{isSyncing && (
@@ -1686,6 +1790,25 @@ export default function App() {
{accountMenuOpen && (
]+src=["'](https?:\/\/[^"']+)["']/gi;
- let match;
- while ((match = srcRegex.exec(iframeSrcDoc)) !== null) {
- const img = new Image();
- img.src = match[1];
- }
- }, [iframeSrcDoc]);
-
useEffect(() => {
if (!iframeRef.current || !shouldRenderIframe || !iframeSrcDoc) return;
@@ -2218,25 +2204,22 @@ interface EmailDetailProps {
}
export function EmailDetail({ isFullView = false }: EmailDetailProps) {
- const {
- emails,
- selectedEmailId,
- selectedThreadId,
- setSelectedEmailId,
- setSelectedThreadId: _setSelectedThreadId,
- updateEmail,
- addEmails,
- removeEmailsAndAdvance,
- markThreadAsRead,
- setViewMode,
- accounts,
- currentAccountId,
- composeState,
- closeCompose,
- openCompose,
- removeLocalDraft,
- addLocalDraft,
- } = useAppStore();
+ const emails = useAppStore((s) => s.emails);
+ const selectedEmailId = useAppStore((s) => s.selectedEmailId);
+ const selectedThreadId = useAppStore((s) => s.selectedThreadId);
+ const setSelectedEmailId = useAppStore((s) => s.setSelectedEmailId);
+ const updateEmail = useAppStore((s) => s.updateEmail);
+ const addEmails = useAppStore((s) => s.addEmails);
+ const removeEmailsAndAdvance = useAppStore((s) => s.removeEmailsAndAdvance);
+ const markThreadAsRead = useAppStore((s) => s.markThreadAsRead);
+ const setViewMode = useAppStore((s) => s.setViewMode);
+ const accounts = useAppStore((s) => s.accounts);
+ const currentAccountId = useAppStore((s) => s.currentAccountId);
+ const composeState = useAppStore((s) => s.composeState);
+ const closeCompose = useAppStore((s) => s.closeCompose);
+ const openCompose = useAppStore((s) => s.openCompose);
+ const removeLocalDraft = useAppStore((s) => s.removeLocalDraft);
+ const addLocalDraft = useAppStore((s) => s.addLocalDraft);
const addRecentlyRepliedThread = useAppStore((s) => s.addRecentlyRepliedThread);
const addUndoAction = useAppStore((s) => s.addUndoAction);
@@ -2340,9 +2323,15 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
const selectedEmail = storeEmail ?? fetchedEmail;
- // Get current user email for "Me" detection
- const currentAccount = accounts.find((a) => a.id === currentAccountId);
- const currentUserEmail = currentAccount?.email;
+ const selectedAccountId = selectedEmail?.accountId ?? currentAccountId;
+ const selectedAccount = accounts.find((a) => a.id === selectedAccountId);
+ const currentUserEmail = selectedAccount?.email;
+ const composeAccountId =
+ currentAccountId ??
+ selectedEmail?.accountId ??
+ accounts.find((account) => account.isPrimary)?.id ??
+ accounts[0]?.id ??
+ null;
// State to hold full thread emails fetched from Gmail (includes sent replies)
const [fullThreadEmails, setFullThreadEmails] = useState([]);
@@ -2350,7 +2339,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
// Fetch full thread when thread changes
useEffect(() => {
- if (!selectedEmail || !currentAccountId) {
+ if (!selectedEmail || !selectedAccountId) {
setFullThreadEmails([]);
return;
}
@@ -2360,7 +2349,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
try {
const response = await window.api.emails.getThread(
selectedEmail.threadId,
- currentAccountId,
+ selectedAccountId,
);
if (response.success && response.data) {
setFullThreadEmails(response.data);
@@ -2376,7 +2365,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
};
fetchThread();
- }, [selectedEmail?.threadId, currentAccountId]);
+ }, [selectedEmail?.threadId, selectedAccountId]);
// Mark-as-read is handled imperatively in the Enter/click handlers
// (store.markThreadAsRead) — not here — so it fires instantly before render.
@@ -2387,7 +2376,9 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
if (!selectedEmail) return [];
// Start with emails from the store
- const storeEmails = emails.filter((e) => e.threadId === selectedEmail.threadId);
+ const storeEmails = emails.filter(
+ (e) => e.threadId === selectedEmail.threadId && e.accountId === selectedEmail.accountId,
+ );
// Merge with full thread emails. Store versions have analysis/draft info,
// but may have empty bodies (bulk queries exclude body for performance).
@@ -2731,7 +2722,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
// send time — they don't affect the visible UI.
const composeRequestIdRef = useRef(0);
useEffect(() => {
- if (isFullView && composeState?.isOpen && composeState.replyToEmailId && currentAccountId) {
+ if (isFullView && composeState?.isOpen && composeState.replyToEmailId && selectedAccountId) {
const mode = composeState.mode;
if (mode === "reply" || mode === "reply-all" || mode === "forward") {
const requestId = ++composeRequestIdRef.current;
@@ -2740,7 +2731,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
// by composeState, not reactive to email/account changes).
const storeState = useAppStore.getState();
const storeEmails = storeState.emails;
- const acct = storeState.accounts.find((a) => a.id === currentAccountId);
+ const acct = storeState.accounts.find((a) => a.id === selectedAccountId);
const userEmail = acct?.email;
// Find the email in the thread that has a draft (may not be the latest)
const threadId = storeEmails.find((e) => e.id === composeState.replyToEmailId)?.threadId;
@@ -2778,7 +2769,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
// These only matter at send time for Gmail threading — the UI is
// already fully interactive without them.
window.api.compose
- .getReplyInfo(composeState.replyToEmailId, mode, currentAccountId)
+ .getReplyInfo(composeState.replyToEmailId, mode, selectedAccountId)
.then((response: IpcResponse) => {
if (requestId !== composeRequestIdRef.current) return;
if (response.success && response.data) {
@@ -2802,7 +2793,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
// Fall back to the IPC call.
setIsLoadingReplyInfo(true);
window.api.compose
- .getReplyInfo(composeState.replyToEmailId, mode, currentAccountId)
+ .getReplyInfo(composeState.replyToEmailId, mode, selectedAccountId)
.then((response: IpcResponse) => {
if (requestId !== composeRequestIdRef.current) return;
if (!response.success || !response.data) {
@@ -2821,7 +2812,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
}
}
}
- }, [isFullView, composeState, currentAccountId, closeCompose, setInlineReplyOpen]);
+ }, [isFullView, composeState, selectedAccountId, closeCompose, setInlineReplyOpen]);
// Safety net: if we're in full view with no valid email and no compose open,
// fall back to split view so the email list becomes visible. This catches edge
@@ -2865,11 +2856,11 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
// Add the sent email to the store optimistically.
// Always use the current thread's threadId so forwards appear in the
// thread view alongside the original email, just like replies do.
- if (currentAccountId && currentUserEmail) {
+ if (selectedAccountId && currentUserEmail) {
const sentEmail: DashboardEmail = {
id: sentInfo.id,
threadId: selectedEmail?.threadId ?? sentInfo.threadId,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
from: currentUserEmail,
to: sentInfo.to.join(", "),
cc: sentInfo.cc?.join(", "),
@@ -2917,8 +2908,8 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
setRestoredDraft(null);
setInlineReplyOpen(false);
// Also trigger sync to ensure we have the canonical version
- if (currentAccountId) {
- window.api.sync.now(currentAccountId);
+ if (selectedAccountId) {
+ window.api.sync.now(selectedAccountId);
}
};
@@ -2963,8 +2954,8 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
closeCompose();
setViewMode("split");
// Trigger sync to get the sent message
- if (currentAccountId) {
- window.api.sync.now(currentAccountId);
+ if (composeAccountId) {
+ window.api.sync.now(composeAccountId);
}
};
@@ -2983,7 +2974,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
formState.bodyHtml.replace(/<[^>]*>/g, "").trim();
const existingDraftId = composeState?.restoredDraft?.localDraftId;
- if (hasContent && currentAccountId) {
+ if (hasContent && composeAccountId) {
if (existingDraftId) {
// Update existing draft with current form state
await window.api.compose.updateLocalDraft(existingDraftId, {
@@ -3007,7 +2998,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
} else {
// Save new draft
const result = (await window.api.compose.saveLocalDraft({
- accountId: currentAccountId,
+ accountId: composeAccountId,
to: formState.to,
cc: formState.cc.length > 0 ? formState.cc : undefined,
bcc: formState.bcc.length > 0 ? formState.bcc : undefined,
@@ -3036,10 +3027,10 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
};
// Show new email compose view when in "new" compose mode
- if (composeState?.isOpen && composeState.mode === "new" && currentAccountId) {
+ if (composeState?.isOpen && composeState.mode === "new" && composeAccountId) {
return (
e.labelIds?.includes("STARRED"));
const handleArchive = () => {
- if (!currentAccountId || !selectedThreadId) return;
+ if (!selectedAccountId || !selectedThreadId) return;
const emailIds = threadEmails.map((e) => e.id);
// Find next thread before removing
@@ -3124,7 +3115,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
id: `archive-${selectedThreadId}-${Date.now()}`,
type: "archive",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: [...threadEmails],
scheduledAt: Date.now(),
delayMs: 5000,
@@ -3132,7 +3123,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
};
const handleTrash = () => {
- if (!currentAccountId || !selectedThreadId) return;
+ if (!selectedAccountId || !selectedThreadId) return;
const emailIds = threadEmails.map((e) => e.id);
// Find next thread before removing (same auto-advance as archive)
@@ -3159,7 +3150,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
id: `trash-${selectedThreadId}-${Date.now()}`,
type: "trash",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: [...threadEmails],
scheduledAt: Date.now(),
delayMs: 5000,
@@ -3167,7 +3158,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
};
const handleMarkUnread = () => {
- if (!currentAccountId || !latestEmail) return;
+ if (!selectedAccountId || !latestEmail) return;
const currentLabels = latestEmail.labelIds || ["INBOX"];
// Optimistic update + undo — only if email was actually modified
@@ -3178,7 +3169,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
id: `mark-unread-${selectedThreadId}-${Date.now()}`,
type: "mark-unread",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: [latestEmail],
scheduledAt: Date.now(),
delayMs: 5000,
@@ -3190,7 +3181,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
};
const handleToggleStar = () => {
- if (!currentAccountId || !latestEmail) return;
+ if (!selectedAccountId || !latestEmail) return;
const newStarred = !isStarred;
const changedEmails: typeof threadEmails = [];
const previousLabels: Record = {};
@@ -3220,7 +3211,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
id: `${newStarred ? "star" : "unstar"}-${selectedThreadId}-${Date.now()}`,
type: newStarred ? "star" : "unstar",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: changedEmails,
scheduledAt: Date.now(),
delayMs: 5000,
@@ -3406,7 +3397,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
{/* Snooze banner */}
{snoozedThreads.has(latestEmail.threadId) &&
- currentAccountId &&
+ selectedAccountId &&
(() => {
const snoozeInfo = snoozedThreads.get(latestEmail.threadId);
return snoozeInfo ? (
@@ -3431,7 +3422,7 @@ export function EmailDetail({ isFullView = false }: EmailDetailProps) {
@@ -745,6 +820,11 @@ export function EmailList() {
isChecked={isChecked}
isMultiSelectActive={isMultiSelectActive}
density={inboxDensity}
+ accountLabel={
+ showUnifiedAccountLabels
+ ? accountLabels.get(thread.latestEmail.accountId)
+ : undefined
+ }
onClick={(e) => handleThreadClick(thread, e)}
onCheckboxChange={() => handleCheckboxToggle(thread.threadId)}
snoozeInfo={isSnoozedView ? snoozedThreads.get(thread.threadId) : undefined}
diff --git a/src/renderer/components/EmailPreviewSidebar.tsx b/src/renderer/components/EmailPreviewSidebar.tsx
index f3738674..19df07b4 100644
--- a/src/renderer/components/EmailPreviewSidebar.tsx
+++ b/src/renderer/components/EmailPreviewSidebar.tsx
@@ -263,11 +263,19 @@ export const EmailPreviewSidebar = memo(function EmailPreviewSidebar() {
const email = useAppStore.getState().emails.find((e) => e.id === emailIdSnapshot);
if (!email) return;
+ const providerIds = Array.from(
+ new Set(
+ result.data.events
+ .map((event) => event.providerId)
+ .filter((providerId): providerId is string => typeof providerId === "string"),
+ ),
+ );
+
// Replay entire trace in a single store update (avoids O(n²) from N appendAgentEvent calls)
replayAgentTrace(
taskId,
email.id,
- ["claude"],
+ providerIds.length > 0 ? providerIds : ["claude"],
"",
{
accountId: email.accountId || "",
diff --git a/src/renderer/components/EmailRow.tsx b/src/renderer/components/EmailRow.tsx
index b6343e8f..97b00adf 100644
--- a/src/renderer/components/EmailRow.tsx
+++ b/src/renderer/components/EmailRow.tsx
@@ -9,6 +9,7 @@ interface EmailRowProps {
isChecked: boolean;
isMultiSelectActive: boolean;
density: InboxDensity;
+ accountLabel?: string;
onClick: (e: React.MouseEvent) => void;
onCheckboxChange: () => void;
snoozeInfo?: SnoozedEmail;
@@ -120,6 +121,7 @@ export const EmailRow = memo(
isChecked,
isMultiSelectActive,
density,
+ accountLabel,
onClick,
onCheckboxChange,
snoozeInfo,
@@ -205,6 +207,17 @@ export const EmailRow = memo(
{senderName}
+ {accountLabel && (
+
+ {accountLabel}
+
+ )}
+
{/* Priority label */}
{priorityLabel && (
s.viewMode);
+ const composeState = useAppStore((s) => s.composeState);
+ const isSearchOpen = useAppStore((s) => s.isSearchOpen);
+ const isCommandPaletteOpen = useAppStore((s) => s.isCommandPaletteOpen);
+ const activeSearchQuery = useAppStore((s) => s.activeSearchQuery);
+ const selectedThreadIds = useAppStore((s) => s.selectedThreadIds);
// Don't show hints when search or command palette is open
if (isSearchOpen || isCommandPaletteOpen) {
diff --git a/src/renderer/components/OfflineBanner.tsx b/src/renderer/components/OfflineBanner.tsx
index fd71a262..2a983625 100644
--- a/src/renderer/components/OfflineBanner.tsx
+++ b/src/renderer/components/OfflineBanner.tsx
@@ -1,7 +1,8 @@
import { useAppStore } from "../store";
export function OfflineBanner() {
- const { isOnline, outboxStats } = useAppStore();
+ const isOnline = useAppStore((s) => s.isOnline);
+ const outboxStats = useAppStore((s) => s.outboxStats);
// Don't show if online
if (isOnline) {
diff --git a/src/renderer/components/SearchBar.tsx b/src/renderer/components/SearchBar.tsx
index 1a7079d8..1fce42a2 100644
--- a/src/renderer/components/SearchBar.tsx
+++ b/src/renderer/components/SearchBar.tsx
@@ -28,7 +28,7 @@ declare global {
emails: {
search: (
query: string,
- accountId: string,
+ accountId?: string,
maxResults?: number,
) => Promise
+
{accounts.map((account) => (
+ {accountLabel && (
+
+ {accountLabel}
+
+ )}
+
{/* Draft badge */}
{
- if (!iframeSrcDoc) return;
- const srcRegex = /AI Models
- Choose which Claude model to use for each feature. Haiku is fastest and - cheapest, Opus is most capable. + {llmProvider === "codex" + ? "Choose the model passed to the local Codex CLI for built-in analysis, drafts, sender lookup, archive-ready checks, and agents." + : "Choose which Claude model to use for each feature. Haiku is fastest and cheapest, Opus is most capable."}
- {[
- {
- key: "analysis" as const,
- label: "Email Analysis",
- description: "Triaging which emails need replies",
- },
- {
- key: "drafts" as const,
- label: "Draft Generation",
- description: "Writing reply drafts",
- },
- {
- key: "refinement" as const,
- label: "Draft Refinement",
- description: "Improving drafts based on feedback",
- },
- {
- key: "calendaring" as const,
- label: "Scheduling Detection",
- description: "Identifying calendar-related emails",
- },
- {
- key: "archiveReady" as const,
- label: "Archive-Ready Analysis",
- description: "Detecting completed conversations",
- },
- {
- key: "senderLookup" as const,
- label: "Sender Lookup",
- description: "Web search for sender info",
- },
- {
- key: "agentDrafter" as const,
- label: "Agent Drafter",
- description: "Background auto-draft generation",
- },
- {
- key: "agentChat" as const,
- label: "Agent Chat",
- description: "Interactive agent sidebar conversations",
- },
- ].map(({ key, label, description }) => (
-
{/* Updates */}
@@ -1363,7 +1468,10 @@ export function SettingsPanel({ onClose, initialTab }: SettingsPanelProps) {
+ {llmProvider === "codex" ? (
+
+ ) : (
+
+
- ))}
-
+ {!codexModelIsPreset && (
+ - {label} + Codex Model +
++ Spark remains the fallback when no compatible model is configured.
-{description}
+ setCodexModel(e.target.value)}
+ placeholder={CODEX_DEFAULT_MODEL}
+ className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-500 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 placeholder-gray-400 dark:placeholder-gray-400 focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+ />
+
+ )}
+ + Use any model ID accepted by your installed Codex CLI. Blank saves the + Spark fallback. +
+
+ {[
+ {
+ key: "analysis" as const,
+ label: "Email Analysis",
+ description: "Triaging which emails need replies",
+ },
+ {
+ key: "drafts" as const,
+ label: "Draft Generation",
+ description: "Writing reply drafts",
+ },
+ {
+ key: "refinement" as const,
+ label: "Draft Refinement",
+ description: "Improving drafts based on feedback",
+ },
+ {
+ key: "calendaring" as const,
+ label: "Scheduling Detection",
+ description: "Identifying calendar-related emails",
+ },
+ {
+ key: "archiveReady" as const,
+ label: "Archive-Ready Analysis",
+ description: "Detecting completed conversations",
+ },
+ {
+ key: "senderLookup" as const,
+ label: "Sender Lookup",
+ description: "Web search for sender info",
+ },
+ {
+ key: "agentDrafter" as const,
+ label: "Agent Drafter",
+ description: "Background auto-draft generation",
+ },
+ {
+ key: "agentChat" as const,
+ label: "Agent Chat",
+ description: "Interactive agent sidebar conversations",
+ },
+ ].map(({ key, label, description }) => (
+
+ )}
+
+ ))}
+
+
+
+ + {label} +
+{description}
+How it works:
-
-
- Uses Claude's web search to find information about the sender +
- + Uses the configured AI provider to search for public information about the + sender +
- Results are cached for the session to avoid repeated lookups
- Includes professional background and context in the draft prompt
+
+
+ + Built-in AI Provider +
++ Choose which backend Exo should use for built-in analysis and draft generation. +
+ +
+
+
+
+
+
+
+
+
{/* Anthropic API Key */}
Codex
++ Uses the local Codex CLI login tied to your ChatGPT plan. +
+ +
+ {codexAuthStatus === "checking" && (
+ Checking...
+ )}
+ {codexAuthStatus === "authenticated" && (
+ Logged in
+ )}
+ {codexAuthStatus === "not_authenticated" && (
+
+ {codexCliAvailable ? "Not logged in" : "Codex CLI not detected"}
+
+ )}
+
+
+
+
+
+ {!codexModelIsPreset && (
+ setCodexModel(e.target.value)}
+ placeholder={CODEX_DEFAULT_MODEL}
+ className="mt-2 w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 placeholder-gray-400 dark:placeholder-gray-400"
+ />
+ )}
+
+
+
+ Run{" "}
+
+ codex login
+ {" "}
+ on this machine if needed, then reopen this panel or save Codex once the status
+ turns green.
+
Anthropic API Key
- Required for email analysis, draft generation, and sender lookup. + Used when Anthropic API is selected as the built-in AI provider.
("loading");
const [error, setError] = useState(null);
@@ -29,6 +39,9 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
// API key input
const [apiKey, setApiKey] = useState("");
+ const [llmProvider, setLlmProvider] = useState("codex");
+ const [codexCliAvailable, setCodexCliAvailable] = useState(false);
+ const [codexAuthenticated, setCodexAuthenticated] = useState(false);
// Extension auth state
const [extensionAuths, setExtensionAuths] = useState([]);
@@ -39,18 +52,24 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
// Check what's already configured and skip to the right step.
useEffect(() => {
- (
- window.api.gmail.checkAuth() as Promise<
- IpcResponse<{ hasCredentials: boolean; hasTokens: boolean; hasAnthropicKey: boolean }>
- >
- )
+ (window.api.gmail.checkAuth() as Promise>)
.then((authResult) => {
if (authResult.success) {
- const { hasCredentials, hasAnthropicKey, hasTokens } = authResult.data;
+ const {
+ hasCredentials,
+ hasTokens,
+ hasLlmAuth,
+ codexCliAvailable,
+ hasCodexAuth,
+ llmProvider: configuredProvider,
+ } = authResult.data;
+ setLlmProvider(configuredProvider);
+ setCodexCliAvailable(codexCliAvailable);
+ setCodexAuthenticated(hasCodexAuth);
const flow: Step[] = [];
if (!hasCredentials) flow.push("credentials");
- if (!hasAnthropicKey) flow.push("apikey");
+ if (!hasLlmAuth) flow.push("apikey");
if (!hasTokens) flow.push("oauth");
flow.push("extensions");
flow.push("analytics");
@@ -58,7 +77,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
if (!hasCredentials) {
setStep("credentials");
- } else if (!hasAnthropicKey) {
+ } else if (!hasLlmAuth) {
setStep("apikey");
} else if (!hasTokens) {
setStep("oauth");
@@ -126,14 +145,11 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
}
const result = (await window.api.settings.set({
+ llmProvider: "anthropic",
anthropicApiKey: apiKey.trim(),
})) as IpcResponse;
if (result.success) {
- const authResult = (await window.api.gmail.checkAuth()) as IpcResponse<{
- hasCredentials: boolean;
- hasTokens: boolean;
- hasAnthropicKey: boolean;
- }>;
+ const authResult = (await window.api.gmail.checkAuth()) as IpcResponse;
if (authResult.success && authResult.data.hasTokens) {
await enterExtensionsStep();
} else {
@@ -147,6 +163,51 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
}
};
+ const refreshCodexStatus = useCallback(async () => {
+ const result = (await window.api.agent.codexAuthStatus()) as IpcResponse<{
+ cliAvailable: boolean;
+ authenticated: boolean;
+ }>;
+ if (result.success) {
+ setCodexCliAvailable(result.data.cliAvailable);
+ setCodexAuthenticated(result.data.authenticated);
+ if (result.data.authenticated) {
+ setError(null);
+ }
+ } else {
+ setError(result.error ?? "Failed to check Codex login status");
+ }
+ }, []);
+
+ const handleUseCodex = async () => {
+ if (!codexAuthenticated) {
+ setError("Codex is not logged in on this machine yet. Run `codex login`, then refresh.");
+ return;
+ }
+
+ setIsLoading(true);
+ setError(null);
+
+ try {
+ const result = (await window.api.settings.set({
+ llmProvider: "codex",
+ })) as IpcResponse;
+ if (!result.success) {
+ setError(result.error ?? "Failed to save Codex as the AI provider");
+ return;
+ }
+
+ const authResult = (await window.api.gmail.checkAuth()) as IpcResponse;
+ if (authResult.success && authResult.data.hasTokens) {
+ await enterExtensionsStep();
+ } else {
+ setStep("oauth");
+ }
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
const handleStartOAuth = async () => {
setIsLoading(true);
setError(null);
@@ -352,49 +413,116 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
{step === "apikey" && (
<>
- Anthropic API Key + AI Provider
- Exo uses Claude to analyze your emails, generate drafts, and look up sender - information. You'll need an Anthropic API key to enable these features. + Choose how Exo should run email analysis and draft generation.
-
-
- Get your API key: -
--
-
- - Go to{" "} - - console.anthropic.com - - -
- Create a new API key (or use an existing one) -
- Paste it below -
+
+
-
- 
';
+ const output = replaceRemoteImageSources(input, false);
+
+ expect(output).toBe(input);
+ });
+});
diff --git a/tests/unit/shared-types.spec.ts b/tests/unit/shared-types.spec.ts
index 0425f09c..a3d73d08 100644
--- a/tests/unit/shared-types.spec.ts
+++ b/tests/unit/shared-types.spec.ts
@@ -14,6 +14,9 @@ import {
resolveModelId,
MODEL_TIER_IDS,
DEFAULT_MODEL_CONFIG,
+ CODEX_DEFAULT_MODEL,
+ CODEX_MODEL_OPTIONS,
+ resolveCodexModelId,
DEFAULT_ANALYSIS_PROMPT,
DEFAULT_DRAFT_PROMPT,
type ModelTier,
@@ -217,6 +220,22 @@ test.describe("resolveModelId", () => {
});
});
+test.describe("resolveCodexModelId", () => {
+ test("uses Spark as the default fallback", () => {
+ expect(resolveCodexModelId()).toBe(CODEX_DEFAULT_MODEL);
+ expect(resolveCodexModelId("")).toBe(CODEX_DEFAULT_MODEL);
+ });
+
+ test("preserves configured Codex model IDs", () => {
+ expect(resolveCodexModelId("gpt-5.3-codex")).toBe("gpt-5.3-codex");
+ });
+
+ test("ships known preset options", () => {
+ expect(CODEX_MODEL_OPTIONS.map((option) => option.id)).toContain(CODEX_DEFAULT_MODEL);
+ expect(CODEX_MODEL_OPTIONS.map((option) => option.id)).toContain("gpt-5.3-codex");
+ });
+});
+
// ============================================================
// EAConfig validation
// ============================================================
@@ -265,6 +284,7 @@ test.describe("ConfigSchema", () => {
theme: "dark",
undoSendDelay: 10,
inboxDensity: "default",
+ selectedAccountId: null,
enableSenderLookup: false,
modelConfig: {
analysis: "haiku",
@@ -294,6 +314,12 @@ test.describe("ConfigSchema", () => {
});
expect(result.success).toBe(false);
});
+
+ test("validates persisted account selection", () => {
+ expect(ConfigSchema.safeParse({ selectedAccountId: null }).success).toBe(true);
+ expect(ConfigSchema.safeParse({ selectedAccountId: "default" }).success).toBe(true);
+ expect(ConfigSchema.safeParse({ selectedAccountId: 123 }).success).toBe(false);
+ });
});
// ============================================================
diff --git a/vite.worker.config.ts b/vite.worker.config.ts
index ffe5ee49..1ea2cb03 100644
--- a/vite.worker.config.ts
+++ b/vite.worker.config.ts
@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-import { defineConfig } from 'vite'
+import { resolve } from "path";
+import { defineConfig } from "vite";
/**
* Separate build config for the agent-worker utility process.
@@ -14,26 +14,32 @@ import { defineConfig } from 'vite'
*/
export default defineConfig({
build: {
- outDir: 'out/worker',
+ outDir: "out/worker",
emptyOutDir: false,
lib: {
- entry: resolve(__dirname, 'src/main/agents/agent-worker.ts'),
- formats: ['cjs'],
- fileName: () => 'agent-worker.cjs',
+ entry: resolve(__dirname, "src/main/agents/agent-worker.ts"),
+ formats: ["cjs"],
+ fileName: () => "agent-worker.cjs",
},
rollupOptions: {
- external: [
- 'electron',
- 'better-sqlite3',
- // Externalize all bare imports (node_modules)
- /^[^./]/,
- ],
+ external: (id) => {
+ if (id === "@openai/codex-sdk" || id.startsWith("@openai/codex-sdk/")) {
+ return false;
+ }
+
+ if (id === "electron" || id === "better-sqlite3") {
+ return true;
+ }
+
+ // Externalize all other bare imports from node_modules.
+ return /^[^./]/.test(id);
+ },
},
- target: 'node20',
+ target: "node20",
minify: false,
sourcemap: true,
},
resolve: {
- conditions: ['node'],
+ conditions: ["node"],
},
-})
+});
-
- setApiKey(e.target.value)}
- onKeyDown={(e) => e.key === "Enter" && !isLoading && handleSaveApiKey()}
- placeholder="sk-ant-api03-..."
- className="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-100 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
- />
+ {llmProvider === "codex" ? (
+
+ ) : (
+ <>
+
+
-
+
+
+ + Use your ChatGPT-backed Codex login +
++ Exo will use the local Codex CLI login already configured on this machine. +
+
+
+
+ {!codexAuthenticated && (
+
+
+
+ Codex CLI
+
+ {codexCliAvailable
+ ? codexAuthenticated
+ ? "Authenticated"
+ : "Installed, but not logged in"
+ : "Not detected"}
+
+
+ Run{" "}
+
+ codex login
+ {" "}
+ on this machine, then refresh and continue.
+
+
+
+ + Get your API key: +
+-
+
- + Go to{" "} + + console.anthropic.com + + +
- Create a new API key (or use an existing one) +
- Paste it below +
+
+
+ )}
{error && (
+
+ setApiKey(e.target.value)}
+ onKeyDown={(e) => e.key === "Enter" && !isLoading && handleSaveApiKey()}
+ placeholder="sk-ant-api03-..."
+ className="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-100 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+ />
+
+
@@ -403,11 +531,15 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
)}
)}
diff --git a/src/renderer/components/SnippetsEditor.tsx b/src/renderer/components/SnippetsEditor.tsx
index 22357c05..52a17bf8 100644
--- a/src/renderer/components/SnippetsEditor.tsx
+++ b/src/renderer/components/SnippetsEditor.tsx
@@ -6,7 +6,10 @@ type SuperhumanAccount = { email: string; snippetCount: number };
type ImportResult = { imported: number; warnings: string[] };
export function SnippetsEditor() {
- const { snippets: allSnippets, setSnippets, currentAccountId, accounts } = useAppStore();
+ const allSnippets = useAppStore((s) => s.snippets);
+ const setSnippets = useAppStore((s) => s.setSnippets);
+ const currentAccountId = useAppStore((s) => s.currentAccountId);
+ const accounts = useAppStore((s) => s.accounts);
const [editingSnippet, setEditingSnippet] = useState(null);
const [isCreating, setIsCreating] = useState(false);
const [isLoading, setIsLoading] = useState(true);
diff --git a/src/renderer/components/SplitConfigEditor.tsx b/src/renderer/components/SplitConfigEditor.tsx
index d8d4650b..fb44cd11 100644
--- a/src/renderer/components/SplitConfigEditor.tsx
+++ b/src/renderer/components/SplitConfigEditor.tsx
@@ -235,7 +235,10 @@ type SuperhumanAccount = { email: string; splitCount: number };
type ImportResult = { imported: number; warnings: string[] };
export function SplitConfigEditor() {
- const { splits: allSplits, setSplits, currentAccountId, accounts } = useAppStore();
+ const allSplits = useAppStore((s) => s.splits);
+ const setSplits = useAppStore((s) => s.setSplits);
+ const currentAccountId = useAppStore((s) => s.currentAccountId);
+ const accounts = useAppStore((s) => s.accounts);
const [editingSplit, setEditingSplit] = useState(null);
const [isCreating, setIsCreating] = useState(false);
const [isLoading, setIsLoading] = useState(true);
diff --git a/src/renderer/hooks/useBatchActions.ts b/src/renderer/hooks/useBatchActions.ts
index 220c704a..ef09c2b4 100644
--- a/src/renderer/hooks/useBatchActions.ts
+++ b/src/renderer/hooks/useBatchActions.ts
@@ -7,104 +7,100 @@ import { trackEvent } from "../services/posthog";
* Safe to call from event handlers, useCallback bodies, or keyboard shortcuts.
*/
-export function batchArchive() {
- const {
- selectedThreadIds,
- emails,
- removeEmails,
- clearSelectedThreads,
- addUndoAction,
- currentAccountId,
- } = useAppStore.getState();
- if (!currentAccountId || selectedThreadIds.size === 0) return;
+function groupSelectedThreadsByAccount(
+ threadIds: Iterable,
+ emails: DashboardEmail[],
+): Map {
+ const grouped = new Map();
- const threadIds = Array.from(selectedThreadIds);
- const allEmailIds: string[] = [];
- const emailsByThread = new Map();
for (const threadId of threadIds) {
- const threadEmails = emails.filter((e) => e.threadId === threadId);
- emailsByThread.set(threadId, threadEmails);
- for (const email of threadEmails) {
- allEmailIds.push(email.id);
- }
+ const threadEmails = emails.filter((email) => email.threadId === threadId);
+ if (threadEmails.length === 0) continue;
+
+ const accountId = threadEmails[0].accountId;
+ const existing = grouped.get(accountId) ?? { threadIds: [], emails: [] };
+ existing.threadIds.push(threadId);
+ existing.emails.push(...threadEmails);
+ grouped.set(accountId, existing);
}
+ return grouped;
+}
+
+export function batchArchive() {
+ const { selectedThreadIds, emails, removeEmails, clearSelectedThreads, addUndoAction } =
+ useAppStore.getState();
+ if (selectedThreadIds.size === 0) return;
+
+ const threadIds = Array.from(selectedThreadIds);
+ const groupedByAccount = groupSelectedThreadsByAccount(threadIds, emails);
+ const allEmailIds = Array.from(groupedByAccount.values()).flatMap((group) =>
+ group.emails.map((email) => email.id),
+ );
+
// Optimistic UI: remove all emails from selected threads
- const allEmails = threadIds.flatMap((tid) => emailsByThread.get(tid) || []);
removeEmails(allEmailIds);
clearSelectedThreads();
- // Queue a single undo action for all threads
- addUndoAction({
- id: `archive-batch-${Date.now()}`,
- type: "archive",
- threadCount: threadIds.length,
- accountId: currentAccountId,
- emails: [...allEmails],
- scheduledAt: Date.now(),
- delayMs: 5000,
- });
+ for (const [accountId, group] of groupedByAccount) {
+ addUndoAction({
+ id: `archive-batch-${accountId}-${Date.now()}`,
+ type: "archive",
+ threadCount: group.threadIds.length,
+ accountId,
+ emails: [...group.emails],
+ scheduledAt: Date.now(),
+ delayMs: 5000,
+ });
+ }
// Tracks intent — user may still undo within 5 s
trackEvent("email_archived", { thread_count: threadIds.length, source: "batch" });
}
export function batchTrash() {
- const {
- selectedThreadIds,
- emails,
- removeEmails,
- clearSelectedThreads,
- addUndoAction,
- currentAccountId,
- } = useAppStore.getState();
- if (!currentAccountId || selectedThreadIds.size === 0) return;
+ const { selectedThreadIds, emails, removeEmails, clearSelectedThreads, addUndoAction } =
+ useAppStore.getState();
+ if (selectedThreadIds.size === 0) return;
const threadIds = Array.from(selectedThreadIds);
- const allEmailIds: string[] = [];
- const emailsByThread = new Map();
- for (const threadId of threadIds) {
- const threadEmails = emails.filter((e) => e.threadId === threadId);
- emailsByThread.set(threadId, threadEmails);
- for (const email of threadEmails) {
- allEmailIds.push(email.id);
- }
- }
+ const groupedByAccount = groupSelectedThreadsByAccount(threadIds, emails);
+ const allEmailIds = Array.from(groupedByAccount.values()).flatMap((group) =>
+ group.emails.map((email) => email.id),
+ );
- const allEmails = threadIds.flatMap((tid) => emailsByThread.get(tid) || []);
removeEmails(allEmailIds);
clearSelectedThreads();
- // Queue a single undo action for all threads
- addUndoAction({
- id: `trash-batch-${Date.now()}`,
- type: "trash",
- threadCount: threadIds.length,
- accountId: currentAccountId,
- emails: [...allEmails],
- scheduledAt: Date.now(),
- delayMs: 5000,
- });
+ for (const [accountId, group] of groupedByAccount) {
+ addUndoAction({
+ id: `trash-batch-${accountId}-${Date.now()}`,
+ type: "trash",
+ threadCount: group.threadIds.length,
+ accountId,
+ emails: [...group.emails],
+ scheduledAt: Date.now(),
+ delayMs: 5000,
+ });
+ }
// Tracks intent — user may still undo within 5 s
trackEvent("email_trashed", { thread_count: threadIds.length, source: "batch" });
}
export function batchToggleStar() {
- const {
- selectedThreadIds,
- emails,
- clearSelectedThreads,
- updateEmail,
- addUndoAction,
- currentAccountId,
- } = useAppStore.getState();
- if (!currentAccountId || selectedThreadIds.size === 0) return;
+ const { selectedThreadIds, emails, clearSelectedThreads, updateEmail, addUndoAction } =
+ useAppStore.getState();
+ if (selectedThreadIds.size === 0) return;
// Group emails by thread for the selected threads
- const selectedThreadEmails: Array<{ threadId: string; emails: typeof emails }> = [];
- for (const threadId of selectedThreadIds) {
- const threadEmails = emails.filter((e) => e.threadId === threadId);
- selectedThreadEmails.push({ threadId, emails: threadEmails });
- }
+ const selectedThreadEmails = Array.from(
+ groupSelectedThreadsByAccount(selectedThreadIds, emails),
+ ).flatMap(([accountId, group]) =>
+ group.threadIds.map((threadId) => ({
+ threadId,
+ accountId,
+ emails: group.emails.filter((email) => email.threadId === threadId),
+ })),
+ );
// If any thread is unstarred, star all; otherwise unstar all
const anyUnstarred = selectedThreadEmails.some(
@@ -140,16 +136,33 @@ export function batchToggleStar() {
if (changedEmails.length > 0) {
const actionType = anyUnstarred ? "star" : "unstar";
- addUndoAction({
- id: `${actionType}-batch-${Date.now()}`,
- type: actionType,
- threadCount: selectedThreadIds.size,
- accountId: currentAccountId,
- emails: changedEmails,
- scheduledAt: Date.now(),
- delayMs: 5000,
- previousLabels,
- });
+ const changedByAccount = new Map();
+ for (const email of changedEmails) {
+ const existing = changedByAccount.get(email.accountId) ?? [];
+ existing.push(email);
+ changedByAccount.set(email.accountId, existing);
+ }
+
+ for (const [accountId, accountEmails] of changedByAccount) {
+ const accountPreviousLabels = Object.fromEntries(
+ accountEmails
+ .map((email) => {
+ const labels = previousLabels[email.id];
+ return labels ? ([email.id, labels] as const) : null;
+ })
+ .filter((entry): entry is readonly [string, string[]] => entry !== null),
+ );
+ addUndoAction({
+ id: `${actionType}-batch-${accountId}-${Date.now()}`,
+ type: actionType,
+ threadCount: new Set(accountEmails.map((email) => email.threadId)).size,
+ accountId,
+ emails: accountEmails,
+ scheduledAt: Date.now(),
+ delayMs: 5000,
+ previousLabels: accountPreviousLabels,
+ });
+ }
const changedThreadCount = new Set(changedEmails.map((e) => e.threadId)).size;
trackEvent(anyUnstarred ? "email_starred" : "email_unstarred", {
thread_count: changedThreadCount,
@@ -158,15 +171,9 @@ export function batchToggleStar() {
}
export function batchMarkUnread() {
- const {
- selectedThreadIds,
- emails,
- clearSelectedThreads,
- updateEmail,
- addUndoAction,
- currentAccountId,
- } = useAppStore.getState();
- if (!currentAccountId || selectedThreadIds.size === 0) return;
+ const { selectedThreadIds, emails, clearSelectedThreads, updateEmail, addUndoAction } =
+ useAppStore.getState();
+ if (selectedThreadIds.size === 0) return;
const changedEmails: DashboardEmail[] = [];
const previousLabels: Record = {};
@@ -189,16 +196,33 @@ export function batchMarkUnread() {
clearSelectedThreads();
if (changedEmails.length > 0) {
- addUndoAction({
- id: `mark-unread-batch-${Date.now()}`,
- type: "mark-unread",
- threadCount: changedEmails.length,
- accountId: currentAccountId,
- emails: changedEmails,
- scheduledAt: Date.now(),
- delayMs: 5000,
- previousLabels,
- });
+ const changedByAccount = new Map();
+ for (const email of changedEmails) {
+ const existing = changedByAccount.get(email.accountId) ?? [];
+ existing.push(email);
+ changedByAccount.set(email.accountId, existing);
+ }
+
+ for (const [accountId, accountEmails] of changedByAccount) {
+ const accountPreviousLabels = Object.fromEntries(
+ accountEmails
+ .map((email) => {
+ const labels = previousLabels[email.id];
+ return labels ? ([email.id, labels] as const) : null;
+ })
+ .filter((entry): entry is readonly [string, string[]] => entry !== null),
+ );
+ addUndoAction({
+ id: `mark-unread-batch-${accountId}-${Date.now()}`,
+ type: "mark-unread",
+ threadCount: accountEmails.length,
+ accountId,
+ emails: accountEmails,
+ scheduledAt: Date.now(),
+ delayMs: 5000,
+ previousLabels: accountPreviousLabels,
+ });
+ }
trackEvent("email_marked_unread", {
thread_count: new Set(changedEmails.map((e) => e.threadId)).size,
});
diff --git a/src/renderer/hooks/useEmails.ts b/src/renderer/hooks/useEmails.ts
index 8a7c6a83..92e0009b 100644
--- a/src/renderer/hooks/useEmails.ts
+++ b/src/renderer/hooks/useEmails.ts
@@ -3,13 +3,9 @@ import { useAppStore } from "../store";
export function useEmails() {
const _queryClient = useQueryClient();
- const {
- setEmails,
- setLoading: _setLoading,
- setError: _setError,
- updateEmail,
- currentAccountId,
- } = useAppStore();
+ const setEmails = useAppStore((s) => s.setEmails);
+ const updateEmail = useAppStore((s) => s.updateEmail);
+ const currentAccountId = useAppStore((s) => s.currentAccountId);
const fetchEmailsQuery = useQuery({
queryKey: ["emails", currentAccountId],
diff --git a/src/renderer/hooks/useKeyboardShortcuts.ts b/src/renderer/hooks/useKeyboardShortcuts.ts
index 913f6bec..8d9cc0fd 100644
--- a/src/renderer/hooks/useKeyboardShortcuts.ts
+++ b/src/renderer/hooks/useKeyboardShortcuts.ts
@@ -144,6 +144,15 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
state.currentSplitId === "__drafts__"
? currentThreads.filter((t) => t.draft && t.draft.body)
: currentThreads;
+ const selectedEmail = emails.find((email) => email.id === selectedEmailId);
+ const selectedAccountId = selectedEmail?.accountId ?? currentAccountId;
+ const currentUserEmailLookup = currentAccountId
+ ? accounts.find((account) => account.id === currentAccountId)?.email
+ : new Map(
+ accounts
+ .map((account) => [account.id, account.email] as const)
+ .filter((entry) => entry[1].length > 0),
+ );
// Always allow Escape to close modals or go back in view modes
if (e.key === "Escape") {
@@ -445,11 +454,12 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
};
// --- Helper: merge+dedup+thread search results (same order as rendered list) ---
- const currentUserEmail = accounts.find(
- (a: { id: string }) => a.id === currentAccountId,
- )?.email;
const getSearchThreads = () =>
- mergeAndThreadSearchResults(activeSearchResults, remoteSearchResults, currentUserEmail);
+ mergeAndThreadSearchResults(
+ activeSearchResults,
+ remoteSearchResults,
+ currentUserEmailLookup,
+ );
// --- Helper: navigate search results up/down (by thread) ---
const navigateSearchResults = (direction: "up" | "down") => {
@@ -473,16 +483,24 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
// --- Helper: get thread emails, falling back to search results if not in global store ---
const getThreadEmails = (threadId: string) => {
- const storeEmails = emails.filter((item) => item.threadId === threadId);
+ const storeEmails = emails.filter(
+ (item) =>
+ item.threadId === threadId &&
+ (selectedAccountId ? item.accountId === selectedAccountId : true),
+ );
if (storeEmails.length > 0) return storeEmails;
// Fallback: thread may only exist in search results, not yet in the global store
- const searchThread = getSearchThreads().find((t) => t.threadId === threadId);
+ const searchThread = getSearchThreads().find(
+ (t) =>
+ t.threadId === threadId &&
+ (selectedAccountId ? t.latestEmail.accountId === selectedAccountId : true),
+ );
return searchThread?.emails ?? [];
};
// --- Helper: archive selected thread (all messages) ---
const archiveSelected = () => {
- if (!selectedEmailId || !selectedThreadId || !currentAccountId) return;
+ if (!selectedEmailId || !selectedThreadId || !selectedAccountId) return;
// Collect ALL emails in the thread for optimistic removal
const threadEmails = getThreadEmails(selectedThreadId);
@@ -536,7 +554,7 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
id: `archive-${selectedThreadId}-${Date.now()}`,
type: "archive",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: [...threadEmails],
scheduledAt: Date.now(),
delayMs: 5000,
@@ -549,7 +567,7 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
// --- Helper: trash selected thread ---
const trashSelected = () => {
- if (!selectedEmailId || !selectedThreadId || !currentAccountId) return;
+ if (!selectedEmailId || !selectedThreadId || !selectedAccountId) return;
const threadEmails = getThreadEmails(selectedThreadId);
const threadEmailIds = threadEmails.map((item) => item.id);
@@ -600,7 +618,7 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
id: `trash-${selectedThreadId}-${Date.now()}`,
type: "trash",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: [...threadEmails],
scheduledAt: Date.now(),
delayMs: 5000,
@@ -611,9 +629,11 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
// --- Helper: mark selected thread as unread ---
const markSelectedUnread = () => {
- if (!selectedThreadId || !currentAccountId) return;
+ if (!selectedThreadId || !selectedAccountId) return;
- const threadEmails = emails.filter((item) => item.threadId === selectedThreadId);
+ const threadEmails = emails.filter(
+ (item) => item.threadId === selectedThreadId && item.accountId === selectedAccountId,
+ );
if (threadEmails.length === 0) return;
const latestEmail = threadEmails.reduce((a, b) =>
@@ -630,7 +650,7 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
id: `mark-unread-${selectedThreadId}-${Date.now()}`,
type: "mark-unread",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: [latestEmail],
scheduledAt: Date.now(),
delayMs: 5000,
@@ -959,7 +979,7 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
// Shift+I: mark as read and return to list (Gmail only)
case "I":
if (isGmail && e.shiftKey) {
- if (selectedThreadId && currentAccountId) {
+ if (selectedThreadId) {
e.preventDefault();
markThreadAsRead(selectedThreadId);
if (viewMode === "full") {
@@ -974,9 +994,9 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
if (isMultiSelect) {
e.preventDefault();
batchToggleStar();
- } else if (isGmail && selectedThreadId && currentAccountId) {
+ } else if (isGmail && selectedThreadId && selectedAccountId) {
e.preventDefault();
- const threadEmails = emails.filter((item) => item.threadId === selectedThreadId);
+ const threadEmails = getThreadEmails(selectedThreadId);
if (threadEmails.length === 0) break;
const latestEmail = threadEmails.reduce((a, b) =>
new Date(a.date).getTime() >= new Date(b.date).getTime() ? a : b,
@@ -1000,7 +1020,7 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
id: `unstar-${selectedThreadId}-${Date.now()}`,
type: "unstar",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: starredEmails,
scheduledAt: Date.now(),
delayMs: 5000,
@@ -1016,7 +1036,7 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
id: `star-${selectedThreadId}-${Date.now()}`,
type: "star",
threadCount: 1,
- accountId: currentAccountId,
+ accountId: selectedAccountId,
emails: [latestEmail],
scheduledAt: Date.now(),
delayMs: 5000,
@@ -1077,9 +1097,15 @@ export function useKeyboardShortcuts(options: UseKeyboardShortcutsOptions = {})
// Shift+N: force refresh/sync current account (Gmail only)
case "N":
- if (isGmail && e.shiftKey && currentAccountId) {
+ if (isGmail && e.shiftKey) {
e.preventDefault();
- window.api.sync.now(currentAccountId).catch(console.error);
+ if (currentAccountId) {
+ window.api.sync.now(currentAccountId).catch(console.error);
+ } else {
+ accounts.forEach((account) => {
+ window.api.sync.now(account.id).catch(console.error);
+ });
+ }
}
break;
diff --git a/src/renderer/hooks/useSyncBuffer.ts b/src/renderer/hooks/useSyncBuffer.ts
index 36e05986..1b099975 100644
--- a/src/renderer/hooks/useSyncBuffer.ts
+++ b/src/renderer/hooks/useSyncBuffer.ts
@@ -130,6 +130,28 @@ function hasPending(): boolean {
return pendingAdds.length > 0 || pendingRemoveIds.length > 0 || pendingUpdates.size > 0;
}
+function applySparseUpdates(
+ emails: DashboardEmail[],
+ updates: ReadonlyMap>,
+): DashboardEmail[] {
+ if (updates.size === 0) return emails;
+
+ let nextEmails: DashboardEmail[] | null = null;
+
+ for (let index = 0; index < emails.length; index += 1) {
+ const changes = updates.get(emails[index].id);
+ if (!changes) continue;
+
+ if (nextEmails === null) {
+ nextEmails = emails.slice();
+ }
+
+ nextEmails[index] = { ...emails[index], ...changes };
+ }
+
+ return nextEmails ?? emails;
+}
+
function flush(): void {
flushHandle = null;
@@ -168,10 +190,7 @@ function flush(): void {
// 2. In-place updates (label changes, analysis, etc.)
if (updates.size > 0) {
- emails = emails.map((email) => {
- const changes = updates.get(email.id);
- return changes ? { ...email, ...changes } : email;
- });
+ emails = applySparseUpdates(emails, updates);
}
// 3. Additions — deduplicate against current store AND pending removals
@@ -232,10 +251,7 @@ function flush(): void {
// Apply in-place merges for re-emitted emails
if (reEmitUpdates.size > 0) {
- emails = emails.map((email) => {
- const changes = reEmitUpdates.get(email.id);
- return changes ? { ...email, ...changes } : email;
- });
+ emails = applySparseUpdates(emails, reEmitUpdates);
}
if (brandNew.length > 0) {
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 91f14ab1..a2dbf5d1 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
If you use a custom/self-hosted PostHog host, update these domains too. -->
Exo
diff --git a/src/renderer/services/email-body-cache.ts b/src/renderer/services/email-body-cache.ts
index 979a82ca..76a6a874 100644
--- a/src/renderer/services/email-body-cache.ts
+++ b/src/renderer/services/email-body-cache.ts
@@ -1,4 +1,5 @@
import DOMPurify from "dompurify";
+import { replaceRemoteImageSources } from "../../shared/email-image-privacy";
/**
* Checks if content appears to be HTML.
@@ -356,7 +357,8 @@ class EmailBodyCache {
const needsPreLine = isPlainTextInHtml(stripped);
const clean = DOMPurify.sanitize(stripped, SANITIZE_CONFIG);
- const htmlContent = buildIframeHtml(clean, useLightMode, needsPreLine);
+ const privacySafe = replaceRemoteImageSources(clean, useLightMode);
+ const htmlContent = buildIframeHtml(privacySafe, useLightMode, needsPreLine);
return { isHtml: true, htmlContent };
}
diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts
index 7096cec1..437715c3 100644
--- a/src/renderer/store/index.ts
+++ b/src/renderer/store/index.ts
@@ -1,5 +1,6 @@
import { useMemo } from "react";
import { create } from "zustand";
+import { useStoreWithEqualityFn } from "zustand/traditional";
import { clearPendingLabelUpdates } from "../hooks-bridge";
import { applyOptimisticReads, addOptimisticReads } from "../optimistic-reads";
import type {
@@ -81,6 +82,44 @@ export type EmailThread = {
displaySender: string;
};
+type CurrentUserEmailLookup = string | ReadonlyMap | undefined;
+
+function areThreadingEmailsEqual(prev: DashboardEmail[], next: DashboardEmail[]): boolean {
+ if (prev === next) return true;
+ if (prev.length !== next.length) return false;
+
+ for (let index = 0; index < prev.length; index += 1) {
+ const previousEmail = prev[index];
+ const nextEmail = next[index];
+
+ if (previousEmail === nextEmail) continue;
+
+ if (
+ previousEmail.id !== nextEmail.id ||
+ previousEmail.threadId !== nextEmail.threadId ||
+ previousEmail.accountId !== nextEmail.accountId ||
+ previousEmail.subject !== nextEmail.subject ||
+ previousEmail.from !== nextEmail.from ||
+ previousEmail.to !== nextEmail.to ||
+ previousEmail.cc !== nextEmail.cc ||
+ previousEmail.bcc !== nextEmail.bcc ||
+ previousEmail.date !== nextEmail.date ||
+ previousEmail.snippet !== nextEmail.snippet ||
+ previousEmail.labelIds !== nextEmail.labelIds ||
+ previousEmail.isUnread !== nextEmail.isUnread ||
+ previousEmail.attachments !== nextEmail.attachments ||
+ previousEmail.messageId !== nextEmail.messageId ||
+ previousEmail.inReplyTo !== nextEmail.inReplyTo ||
+ previousEmail.analysis !== nextEmail.analysis ||
+ previousEmail.draft !== nextEmail.draft
+ ) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
// Account representation
export type Account = {
id: string;
@@ -346,7 +385,7 @@ interface AppState {
setShowSettings: (show: boolean, initialTab?: SettingsTab) => void;
updateEmail: (id: string, updates: Partial) => void;
// Multi-account actions
- setAccounts: (accounts: Account[]) => void;
+ setAccounts: (accounts: Account[], currentAccountId?: string | null) => void;
addAccount: (account: Account) => void;
removeAccount: (accountId: string) => void;
setCurrentAccountId: (accountId: string | null) => void;
@@ -805,19 +844,37 @@ export const useAppStore = create((set, get) => ({
highlightMemoryIds: show ? get().highlightMemoryIds : [],
}),
updateEmail: (id, updates) =>
- set((state) => ({
- emails: state.emails.map((email) => (email.id === id ? { ...email, ...updates } : email)),
- sentEmails: state.sentEmails.map((email) =>
- email.id === id ? { ...email, ...updates } : email,
- ),
- })),
+ set((state) => {
+ const nextState: Partial = {};
+
+ const emailIndex = state.emails.findIndex((email) => email.id === id);
+ if (emailIndex !== -1) {
+ const emails = state.emails.slice();
+ emails[emailIndex] = { ...emails[emailIndex], ...updates };
+ nextState.emails = emails;
+ }
+
+ const sentEmailIndex = state.sentEmails.findIndex((email) => email.id === id);
+ if (sentEmailIndex !== -1) {
+ const sentEmails = state.sentEmails.slice();
+ sentEmails[sentEmailIndex] = { ...sentEmails[sentEmailIndex], ...updates };
+ nextState.sentEmails = sentEmails;
+ }
+
+ return Object.keys(nextState).length > 0 ? nextState : state;
+ }),
// Multi-account actions
- setAccounts: (accounts) =>
- set({
- accounts,
- // Set current to primary or first account if not set
- currentAccountId:
- get().currentAccountId || accounts.find((a) => a.isPrimary)?.id || accounts[0]?.id || null,
+ setAccounts: (accounts, currentAccountId) =>
+ set((state) => {
+ let nextCurrentAccountId =
+ currentAccountId !== undefined ? currentAccountId : state.currentAccountId;
+ if (
+ nextCurrentAccountId !== null &&
+ !accounts.some((account) => account.id === nextCurrentAccountId)
+ ) {
+ nextCurrentAccountId = accounts.find((a) => a.isPrimary)?.id || accounts[0]?.id || null;
+ }
+ return { accounts, currentAccountId: nextCurrentAccountId };
}),
addAccount: (account) =>
set((state) => {
@@ -1586,10 +1643,9 @@ export const useAppStore = create((set, get) => ({
markThreadAsRead: (threadId) => {
const state = get();
- const accountId = state.currentAccountId;
- if (!accountId) return;
-
const threadEmails = state.emails.filter((e) => e.threadId === threadId);
+ const accountId = threadEmails[0]?.accountId ?? state.currentAccountId;
+ if (!accountId) return;
const unreadEmails = threadEmails.filter((e) => e.labelIds?.includes("UNREAD"));
if (unreadEmails.length === 0) return;
@@ -1684,16 +1740,27 @@ export function getAppStateSnapshot(): Record {
}
// Check if an email is sent by the user (not received)
-function isSentEmail(email: DashboardEmail, currentUserEmail?: string): boolean {
+function resolveCurrentUserEmail(
+ email: DashboardEmail,
+ currentUserEmail: CurrentUserEmailLookup,
+): string | undefined {
+ if (typeof currentUserEmail === "string") {
+ return currentUserEmail;
+ }
+ return currentUserEmail?.get(email.accountId);
+}
+
+function isSentEmail(email: DashboardEmail, currentUserEmail?: CurrentUserEmailLookup): boolean {
// Check labelIds first (most reliable)
if (email.labelIds?.includes("SENT")) {
return true;
}
// Fall back to checking the from field
- if (!currentUserEmail) return false;
+ const resolvedCurrentUserEmail = resolveCurrentUserEmail(email, currentUserEmail);
+ if (!resolvedCurrentUserEmail) return false;
const fromLower = email.from.toLowerCase();
- const userEmailLower = currentUserEmail.toLowerCase();
+ const userEmailLower = resolvedCurrentUserEmail.toLowerCase();
// Extract email from "Name " format if present
const emailMatch = fromLower.match(/<([^>]+)>/) || [null, fromLower];
const fromEmail = emailMatch[1] || fromLower;
@@ -1701,7 +1768,10 @@ function isSentEmail(email: DashboardEmail, currentUserEmail?: string): boolean
}
// Helper to group emails by thread
-export function groupByThread(emails: DashboardEmail[], currentUserEmail?: string): EmailThread[] {
+export function groupByThread(
+ emails: DashboardEmail[],
+ currentUserEmail?: CurrentUserEmailLookup,
+): EmailThread[] {
const threadMap = new Map();
// Pre-compute timestamps once to avoid creating Date objects in every sort
@@ -1795,7 +1865,11 @@ const REPLY_GRACE_PERIOD_MS = 3 * 60 * 1000; // 3 minutes
// Selector for threaded and filtered emails
export function useThreadedEmails() {
- const emails = useAppStore((state) => state.emails);
+ const emails = useStoreWithEqualityFn(
+ useAppStore,
+ (state) => state.emails,
+ areThreadingEmailsEqual,
+ );
const currentAccountId = useAppStore((state) => state.currentAccountId);
const accounts = useAppStore((state) => state.accounts);
const snoozedThreadIds = useAppStore((state) => state.snoozedThreadIds);
@@ -1804,6 +1878,15 @@ export function useThreadedEmails() {
// Get current user's email for sent detection
const currentAccount = accounts.find((a) => a.id === currentAccountId);
const currentUserEmail = currentAccount?.email;
+ const currentUserEmailsByAccount = useMemo(
+ () =>
+ new Map(
+ accounts
+ .map((account) => [account.id, account.email] as const)
+ .filter((entry) => entry[1].length > 0),
+ ),
+ [accounts],
+ );
// Memoize the expensive thread computation. j/k navigation only changes
// selectedEmailId — none of these deps change, so the memo short-circuits
@@ -1828,7 +1911,8 @@ export function useThreadedEmails() {
// Then filter out sent-only threads — threads where no email has the INBOX label.
// Sent emails within inbox threads are kept (for conversation context), but threads
// consisting solely of sent emails belong in the Sent view, not the inbox.
- const allThreads = groupByThread(accountEmails, currentUserEmail).filter((t) =>
+ const userEmailLookup = currentAccountId ? currentUserEmail : currentUserEmailsByAccount;
+ const allThreads = groupByThread(accountEmails, userEmailLookup).filter((t) =>
t.emails.some((e) => !e.labelIds || e.labelIds.includes("INBOX")),
);
@@ -1886,7 +1970,14 @@ export function useThreadedEmails() {
snoozed,
snoozedCount: snoozed.length,
};
- }, [emails, currentAccountId, currentUserEmail, snoozedThreadIds, recentlyRepliedThreadIds]);
+ }, [
+ emails,
+ currentAccountId,
+ currentUserEmail,
+ currentUserEmailsByAccount,
+ snoozedThreadIds,
+ recentlyRepliedThreadIds,
+ ]);
}
function threadMatchesSplit(thread: EmailThread, split: InboxSplit): boolean {
@@ -1905,6 +1996,15 @@ export function useSplitFilteredThreads() {
const recentlyUnsnoozedThreadIds = useAppStore((state) => state.recentlyUnsnoozedThreadIds);
const unsnoozedReturnTimes = useAppStore((state) => state.unsnoozedReturnTimes);
const sentEmails = useAppStore((state) => state.sentEmails);
+ const currentUserEmailsByAccount = useMemo(
+ () =>
+ new Map(
+ accounts
+ .map((account) => [account.id, account.email] as const)
+ .filter((entry) => entry[1].length > 0),
+ ),
+ [accounts],
+ );
return useMemo(() => {
// Filter splits for current account
@@ -1942,7 +2042,8 @@ export function useSplitFilteredThreads() {
const sentAccountEmails = currentAccountId
? sentEmails.filter((e) => e.accountId === currentAccountId)
: sentEmails;
- const sentThreads = groupByThread(sentAccountEmails, currentUserEmail).sort(
+ const userEmailLookup = currentAccountId ? currentUserEmail : currentUserEmailsByAccount;
+ const sentThreads = groupByThread(sentAccountEmails, userEmailLookup).sort(
(a, b) => new Date(b.latestEmail.date).getTime() - new Date(a.latestEmail.date).getTime(),
);
diff --git a/src/renderer/utils/searchResults.ts b/src/renderer/utils/searchResults.ts
index b6a1d8b8..2fc02520 100644
--- a/src/renderer/utils/searchResults.ts
+++ b/src/renderer/utils/searchResults.ts
@@ -39,7 +39,7 @@ export function mergeAndSortSearchResults(
export function mergeAndThreadSearchResults(
localResults: readonly DashboardEmail[],
remoteResults: readonly DashboardEmail[],
- currentUserEmail?: string,
+ currentUserEmail?: string | ReadonlyMap,
): EmailThread[] {
const merged = mergeAndSortSearchResults(localResults, remoteResults);
const threads = groupByThread(merged, currentUserEmail);
diff --git a/src/shared/email-image-privacy.ts b/src/shared/email-image-privacy.ts
new file mode 100644
index 00000000..3ae39762
--- /dev/null
+++ b/src/shared/email-image-privacy.ts
@@ -0,0 +1,99 @@
+const TRACKING_PIXEL_MAX_SIZE = 4;
+const DEFAULT_PLACEHOLDER_WIDTH = 320;
+const DEFAULT_PLACEHOLDER_HEIGHT = 72;
+const MAX_PLACEHOLDER_WIDTH = 640;
+const MAX_PLACEHOLDER_HEIGHT = 240;
+
+function extractNumericAttribute(tag: string, attr: "width" | "height"): number | null {
+ const attrMatch = tag.match(new RegExp(`\\b${attr}\\s*=\\s*["']?(\\d+)(?:px)?["']?`, "i"));
+ if (attrMatch) return Number(attrMatch[1]);
+
+ const styleMatch = tag.match(/\bstyle\s*=\s*["']([^"']+)["']/i);
+ if (!styleMatch) return null;
+
+ const styleValue = styleMatch[1];
+ const cssMatch = styleValue.match(new RegExp(`${attr}\\s*:\\s*(\\d+)(?:px)?`, "i"));
+ return cssMatch ? Number(cssMatch[1]) : null;
+}
+
+function clampDimension(value: number | null, fallback: number, max: number): number {
+ if (!value || Number.isNaN(value) || value <= 0) return fallback;
+ return Math.min(value, max);
+}
+
+function isLikelyTrackingPixel(tag: string): boolean {
+ const width = extractNumericAttribute(tag, "width");
+ const height = extractNumericAttribute(tag, "height");
+ return (
+ width !== null &&
+ height !== null &&
+ width <= TRACKING_PIXEL_MAX_SIZE &&
+ height <= TRACKING_PIXEL_MAX_SIZE
+ );
+}
+
+function buildPrivacyPlaceholderDataUri(
+ width: number,
+ height: number,
+ useLightMode: boolean,
+): string {
+ const fill = useLightMode ? "#f9fafb" : "#1f2937";
+ const stroke = useLightMode ? "#d1d5db" : "#4b5563";
+ const text = useLightMode ? "#6b7280" : "#9ca3af";
+ const safeWidth = Math.max(width, 160);
+ const safeHeight = Math.max(height, 48);
+ const svg =
+ ``;
+ return `data:image/svg+xml,${encodeURIComponent(svg)}`;
+}
+
+/**
+ * Replace remote 
loads with a local placeholder.
+ * Tiny tracking pixels are removed outright.
+ */
+export function replaceRemoteImageSources(html: string, useLightMode: boolean): string {
+ if (!html.includes("]*\bsrc\s*=\s*(["'])(https?:\/\/[^"']+)\1[^>]*>/gi,
+ (fullTag: string) => {
+ if (isLikelyTrackingPixel(fullTag)) {
+ return "";
+ }
+
+ const width = clampDimension(
+ extractNumericAttribute(fullTag, "width"),
+ DEFAULT_PLACEHOLDER_WIDTH,
+ MAX_PLACEHOLDER_WIDTH,
+ );
+ const height = clampDimension(
+ extractNumericAttribute(fullTag, "height"),
+ DEFAULT_PLACEHOLDER_HEIGHT,
+ MAX_PLACEHOLDER_HEIGHT,
+ );
+ const placeholderSrc = buildPrivacyPlaceholderDataUri(width, height, useLightMode);
+
+ let replaced = fullTag.replace(
+ /(\bsrc\s*=\s*["'])https?:\/\/[^"']+(["'])/i,
+ `$1${placeholderSrc}$2`,
+ );
+
+ const missingAttrs: string[] = [];
+ if (!/\balt\s*=/.test(replaced)) {
+ missingAttrs.push('alt="Remote image blocked for privacy"');
+ }
+ if (!/\btitle\s*=/.test(replaced)) {
+ missingAttrs.push('title="Remote image blocked for privacy"');
+ }
+ if (missingAttrs.length > 0) {
+ replaced = replaced.replace(/;
+
+/**
+ * Resolve which LLM backend should be used for built-in Exo features.
+ *
+ * Existing installs may not have an explicit provider set yet, so we infer one:
+ * prefer Anthropic when an API key is configured, otherwise fall back to Codex.
+ */
+export function resolveConfiguredLlmProvider(config: {
+ llmProvider?: LlmProvider;
+ anthropicApiKey?: string;
+}): LlmProvider {
+ if (config.llmProvider) return config.llmProvider;
+ return config.anthropicApiKey ? "anthropic" : "codex";
+}
+
+/**
+ * Map the configured built-in LLM backend to the matching built-in interactive agent provider.
+ *
+ * Anthropic-backed agent tasks run through the Claude provider, while Codex-backed
+ * agent tasks run through the Codex provider.
+ */
+export function resolveDefaultBuiltInAgentProviderId(config: {
+ llmProvider?: LlmProvider;
+ anthropicApiKey?: string;
+}): "claude" | "codex" {
+ return resolveConfiguredLlmProvider(config) === "codex" ? "codex" : "claude";
+}
+
// Config schema
export const ConfigSchema = z.object({
maxEmails: z.number().default(50),
@@ -365,7 +442,9 @@ export const ConfigSchema = z.object({
// via getModelIdForFeature(). Kept in the schema so existing config files parse without error.
model: z.string().default("claude-sonnet-4-20250514"),
modelConfig: ModelConfigSchema.optional(),
+ codexModel: z.string().trim().min(1).optional(),
dryRun: z.boolean().default(false),
+ llmProvider: LlmProviderSchema.optional(),
anthropicApiKey: z.string().optional(),
analysisPrompt: z.string().default(DEFAULT_ANALYSIS_PROMPT),
draftPrompt: z.string().default(DEFAULT_DRAFT_PROMPT),
@@ -378,6 +457,7 @@ export const ConfigSchema = z.object({
theme: z.enum(["light", "dark", "system"]).default("system"),
inboxDensity: z.enum(["default", "compact"]).default("compact"),
undoSendDelay: z.number().min(0).max(30).default(5), // seconds; 0 = disabled
+ selectedAccountId: z.string().nullable().optional(), // null = unified "All accounts" view
signatures: z.array(SignatureSchema).optional(),
showExoBranding: z.boolean().default(true),
stylePrompt: z.string().optional(),
diff --git a/tests/e2e/inline-images.spec.ts b/tests/e2e/inline-images.spec.ts
index 7c6fce02..d95adddc 100644
--- a/tests/e2e/inline-images.spec.ts
+++ b/tests/e2e/inline-images.spec.ts
@@ -2,7 +2,7 @@ import { test, expect, Page, ElectronApplication } from "@playwright/test";
import path from "path";
import fs from "fs";
import { fileURLToPath } from "url";
-import { launchElectronApp, takeScreenshot , closeApp } from "./launch-helpers";
+import { launchElectronApp, takeScreenshot, closeApp } from "./launch-helpers";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -88,12 +88,12 @@ test.describe("Inline Images - Reading", () => {
);
});
- test("rich HTML email with external image also displays", async () => {
+ test("rich HTML email replaces external images with privacy placeholders", async () => {
// Navigate back to inbox (press Escape to deselect current email)
await page.keyboard.press("Escape");
await page.waitForTimeout(500);
- // Click the Q3 report email which has an external image (https://via.placeholder.com)
+ // Click the Q3 report email which contains a remote image in the HTML body
const emailItem = page
.locator("button")
.filter({ hasText: /Garry|Q3 Quarterly/i })
@@ -108,17 +108,24 @@ test.describe("Inline Images - Reading", () => {
const frame = iframe.contentFrame();
expect(frame).not.toBeNull();
- // This email has the TechCorp logo image
+ // The remote image should be replaced with a local placeholder
const images = frame!.locator("img");
const imgCount = await images.count();
console.log(`Found ${imgCount} images in the Q3 report email`);
expect(imgCount).toBeGreaterThanOrEqual(1);
+ const src = await images.first().getAttribute("src");
+ expect(src).toBeTruthy();
+ expect(src!.startsWith("data:image/")).toBe(true);
+
+ const title = await images.first().getAttribute("title");
+ expect(title).toContain("Remote image blocked for privacy");
+
await takeScreenshot(
electronApp,
page,
- "inline-images-external",
- "Email with external image (TechCorp logo)",
+ "inline-images-external-blocked",
+ "Email with external image replaced by a privacy placeholder",
);
});
});
diff --git a/tests/unit/codex-cli.spec.ts b/tests/unit/codex-cli.spec.ts
new file mode 100644
index 00000000..6d441d84
--- /dev/null
+++ b/tests/unit/codex-cli.spec.ts
@@ -0,0 +1,81 @@
+import { expect, test } from "@playwright/test";
+import {
+ buildCodexPrompt,
+ buildCodexThreadOptions,
+ resolveCodexModel,
+} from "../../src/main/services/codex-cli";
+import type { LlmRequest } from "../../src/main/services/llm-types";
+import {
+ resolveConfiguredLlmProvider,
+ resolveDefaultBuiltInAgentProviderId,
+} from "../../src/shared/types";
+
+test.describe("Codex SDK adapter", () => {
+ test("buildCodexPrompt preserves system and conversation structure", () => {
+ const request: LlmRequest = {
+ model: "claude-sonnet-4-5-20250929",
+ max_tokens: 256,
+ system: [{ type: "text", text: "Return only JSON." }],
+ messages: [
+ { role: "user", content: "Analyze this email." },
+ { role: "assistant", content: [{ type: "text", text: "Previous answer." }] },
+ { role: "user", content: [{ type: "text", text: "Refine it." }] },
+ ],
+ };
+
+ const prompt = buildCodexPrompt(request);
+
+ expect(prompt).toContain("");
+ expect(prompt).toContain("Return only JSON.");
+ expect(prompt).toContain("\nAnalyze this email.\n ");
+ expect(prompt).toContain("\nPrevious answer.\n ");
+ expect(prompt).toContain("\nRefine it.\n ");
+ });
+
+ test("buildCodexPrompt allows web search when requested", () => {
+ const request: LlmRequest = {
+ model: "claude-sonnet-4-5-20250929",
+ max_tokens: 256,
+ tools: [{ type: "web_search_20250305", name: "web_search", max_uses: 1 }],
+ messages: [{ role: "user", content: "Look up this sender." }],
+ };
+
+ const prompt = buildCodexPrompt(request);
+
+ expect(prompt).toContain("You may use built-in web search when it helps answer accurately.");
+ expect(prompt).toContain("Do not inspect local files, do not run shell commands");
+ expect(prompt).toContain("do not use any tool other than web search");
+ });
+
+ test("buildCodexThreadOptions keeps the sandbox tight and strips Claude model ids", () => {
+ const options = buildCodexThreadOptions({
+ model: "claude-sonnet-4-5-20250929",
+ webSearchEnabled: true,
+ });
+
+ expect(options.model).toBe("gpt-5.3-codex-spark");
+ expect(options.sandboxMode).toBe("read-only");
+ expect(options.approvalPolicy).toBe("never");
+ expect(options.webSearchMode).toBe("live");
+ expect(options.skipGitRepoCheck).toBe(true);
+ });
+
+ test("resolveCodexModel preserves OpenAI models and falls back from Claude-specific ones", () => {
+ expect(resolveCodexModel("claude-opus-4-6")).toBe("gpt-5.3-codex-spark");
+ expect(resolveCodexModel("gpt-5.3-codex")).toBe("gpt-5.3-codex");
+ });
+
+ test("resolveConfiguredLlmProvider prefers Anthropic when a key exists", () => {
+ expect(resolveConfiguredLlmProvider({ anthropicApiKey: "sk-ant-123" })).toBe("anthropic");
+ expect(resolveConfiguredLlmProvider({})).toBe("codex");
+ expect(
+ resolveConfiguredLlmProvider({ llmProvider: "codex", anthropicApiKey: "sk-ant-123" }),
+ ).toBe("codex");
+ });
+
+ test("resolveDefaultBuiltInAgentProviderId follows the configured LLM backend", () => {
+ expect(resolveDefaultBuiltInAgentProviderId({})).toBe("codex");
+ expect(resolveDefaultBuiltInAgentProviderId({ anthropicApiKey: "sk-ant-123" })).toBe("claude");
+ expect(resolveDefaultBuiltInAgentProviderId({ llmProvider: "codex" })).toBe("codex");
+ });
+});
diff --git a/tests/unit/email-image-privacy.spec.ts b/tests/unit/email-image-privacy.spec.ts
new file mode 100644
index 00000000..cd615f0f
--- /dev/null
+++ b/tests/unit/email-image-privacy.spec.ts
@@ -0,0 +1,32 @@
+import { test, expect } from "@playwright/test";
+import { replaceRemoteImageSources } from "../../src/shared/email-image-privacy";
+
+test.describe("replaceRemoteImageSources", () => {
+ test("replaces remote image URLs with local privacy placeholders", () => {
+ const input =
+ '
';
+ const output = replaceRemoteImageSources(input, true);
+
+ expect(output).not.toContain("https://tracker.example.com/logo.png");
+ expect(output).toContain("data:image/svg+xml,");
+ expect(output).toContain('alt="Remote image blocked for privacy"');
+ expect(output).toContain('title="Remote image blocked for privacy"');
+ });
+
+ test("removes likely tracking pixels entirely", () => {
+ const input =
+ '
';
+ const output = replaceRemoteImageSources(input, true);
+
+ expect(output).not.toContain("Hello
");
+ });
+
+ test("leaves local and inline image sources untouched", () => {
+ const input =
+ 'Hello
';
+ const output = replaceRemoteImageSources(input, true);
+
+ expect(output).not.toContain("';
+ const output = replaceRemoteImageSources(input, false);
+
+ expect(output).toBe(input);
+ });
+});
diff --git a/tests/unit/shared-types.spec.ts b/tests/unit/shared-types.spec.ts
index 0425f09c..a3d73d08 100644
--- a/tests/unit/shared-types.spec.ts
+++ b/tests/unit/shared-types.spec.ts
@@ -14,6 +14,9 @@ import {
resolveModelId,
MODEL_TIER_IDS,
DEFAULT_MODEL_CONFIG,
+ CODEX_DEFAULT_MODEL,
+ CODEX_MODEL_OPTIONS,
+ resolveCodexModelId,
DEFAULT_ANALYSIS_PROMPT,
DEFAULT_DRAFT_PROMPT,
type ModelTier,
@@ -217,6 +220,22 @@ test.describe("resolveModelId", () => {
});
});
+test.describe("resolveCodexModelId", () => {
+ test("uses Spark as the default fallback", () => {
+ expect(resolveCodexModelId()).toBe(CODEX_DEFAULT_MODEL);
+ expect(resolveCodexModelId("")).toBe(CODEX_DEFAULT_MODEL);
+ });
+
+ test("preserves configured Codex model IDs", () => {
+ expect(resolveCodexModelId("gpt-5.3-codex")).toBe("gpt-5.3-codex");
+ });
+
+ test("ships known preset options", () => {
+ expect(CODEX_MODEL_OPTIONS.map((option) => option.id)).toContain(CODEX_DEFAULT_MODEL);
+ expect(CODEX_MODEL_OPTIONS.map((option) => option.id)).toContain("gpt-5.3-codex");
+ });
+});
+
// ============================================================
// EAConfig validation
// ============================================================
@@ -265,6 +284,7 @@ test.describe("ConfigSchema", () => {
theme: "dark",
undoSendDelay: 10,
inboxDensity: "default",
+ selectedAccountId: null,
enableSenderLookup: false,
modelConfig: {
analysis: "haiku",
@@ -294,6 +314,12 @@ test.describe("ConfigSchema", () => {
});
expect(result.success).toBe(false);
});
+
+ test("validates persisted account selection", () => {
+ expect(ConfigSchema.safeParse({ selectedAccountId: null }).success).toBe(true);
+ expect(ConfigSchema.safeParse({ selectedAccountId: "default" }).success).toBe(true);
+ expect(ConfigSchema.safeParse({ selectedAccountId: 123 }).success).toBe(false);
+ });
});
// ============================================================
diff --git a/vite.worker.config.ts b/vite.worker.config.ts
index ffe5ee49..1ea2cb03 100644
--- a/vite.worker.config.ts
+++ b/vite.worker.config.ts
@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-import { defineConfig } from 'vite'
+import { resolve } from "path";
+import { defineConfig } from "vite";
/**
* Separate build config for the agent-worker utility process.
@@ -14,26 +14,32 @@ import { defineConfig } from 'vite'
*/
export default defineConfig({
build: {
- outDir: 'out/worker',
+ outDir: "out/worker",
emptyOutDir: false,
lib: {
- entry: resolve(__dirname, 'src/main/agents/agent-worker.ts'),
- formats: ['cjs'],
- fileName: () => 'agent-worker.cjs',
+ entry: resolve(__dirname, "src/main/agents/agent-worker.ts"),
+ formats: ["cjs"],
+ fileName: () => "agent-worker.cjs",
},
rollupOptions: {
- external: [
- 'electron',
- 'better-sqlite3',
- // Externalize all bare imports (node_modules)
- /^[^./]/,
- ],
+ external: (id) => {
+ if (id === "@openai/codex-sdk" || id.startsWith("@openai/codex-sdk/")) {
+ return false;
+ }
+
+ if (id === "electron" || id === "better-sqlite3") {
+ return true;
+ }
+
+ // Externalize all other bare imports from node_modules.
+ return /^[^./]/.test(id);
+ },
},
- target: 'node20',
+ target: "node20",
minify: false,
sourcemap: true,
},
resolve: {
- conditions: ['node'],
+ conditions: ["node"],
},
-})
+});