Merge remote-tracking branch 'origin/main' into feat/all-mail-cross-account-views

# Conflicts:
#	stores/settings-store.ts

stores/__tests__/settings-store-all-mail.test.ts

@@ -0,0 +1,55 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { useSettingsStore } from '../settings-store';
+
+describe('settings-store per-account allMailFolderIds', () => {
+  beforeEach(() => {
+    useSettingsStore.setState({ allMailFolderIds: {} });
+  });
+
+  it('defaults to an empty record (every account "not configured")', () => {
+    expect(useSettingsStore.getState().allMailFolderIds).toEqual({});
+  });
+
+  it('keeps each account selection independent', () => {
+    useSettingsStore.setState({
+      allMailFolderIds: { 'acct-1': ['inbox', 'archive'], 'acct-2': ['sent'] },
+    });
+    const map = useSettingsStore.getState().allMailFolderIds;
+    expect(map['acct-1']).toEqual(['inbox', 'archive']);
+    expect(map['acct-2']).toEqual(['sent']);
+    // A third account remains unconfigured (no entry).
+    expect(map['acct-3']).toBeUndefined();
+  });
+
+  it('distinguishes explicit-empty ([] = no folders) from not-configured (undefined)', () => {
+    useSettingsStore.setState({ allMailFolderIds: { 'acct-1': [] } });
+    const map = useSettingsStore.getState().allMailFolderIds;
+    expect(map['acct-1']).toEqual([]);          // explicit "no folders"
+    expect(map['acct-2']).toBeUndefined();      // never configured
+  });
+
+  describe('importSettings legacy-shape guard', () => {
+    it('ignores a legacy global array shape', () => {
+      useSettingsStore.setState({ allMailFolderIds: { 'acct-1': ['inbox'] } });
+      const ok = useSettingsStore.getState().importSettings(
+        JSON.stringify({ allMailFolderIds: ['inbox', 'sent'] }),
+      );
+      expect(ok).toBe(true);
+      // unchanged - the array shape was rejected
+      expect(useSettingsStore.getState().allMailFolderIds).toEqual({ 'acct-1': ['inbox'] });
+    });
+
+    it('ignores a null legacy value', () => {
+      useSettingsStore.setState({ allMailFolderIds: { 'acct-1': ['inbox'] } });
+      useSettingsStore.getState().importSettings(JSON.stringify({ allMailFolderIds: null }));
+      expect(useSettingsStore.getState().allMailFolderIds).toEqual({ 'acct-1': ['inbox'] });
+    });
+
+    it('accepts a proper per-account record', () => {
+      useSettingsStore.getState().importSettings(
+        JSON.stringify({ allMailFolderIds: { 'acct-9': ['inbox', 'spam'] } }),
+      );
+      expect(useSettingsStore.getState().allMailFolderIds).toEqual({ 'acct-9': ['inbox', 'spam'] });
+    });
+  });
+});

stores/email-store.ts

@@ -331,15 +331,19 @@ function resolveActionMailboxes(): Mailbox[] {
 
 /**
  * Resolves the JMAP mailbox ids that make up the gated "All Mail" view for the
- * active/viewing account. Honors the per-user `allMailFolderIds` setting; when
- * unset (null) it defaults to every non-special (no-role) folder. Shared
+ * active/viewing account. Honors that account's `allMailFolderIds` entry; when
+ * not configured it defaults to every non-special (no-role) folder. Shared
  * folders are excluded - All Mail is scoped to a single account. Returns
  * JMAP-side ids (originalId for namespaced mailboxes).
  */
 function resolveAllMailJmapIds(): string[] {
   const mailboxes = resolveActionMailboxes().filter((mb) => !mb.isShared);
-  const configured = useSettingsStore.getState().allMailFolderIds;
-  const selected = configured === null
+  // Per-account selection: read the entry for the account the view is scoped to
+  // (the Pro viewing override, else the global active account). A missing entry
+  // = "not configured" -> all no-role folders; an explicit [] = no folders.
+  const accountId = useEmailStore.getState().viewingAccountId ?? useAuthStore.getState().activeAccountId;
+  const configured = accountId ? useSettingsStore.getState().allMailFolderIds[accountId] : undefined;
+  const selected = configured === undefined
     ? mailboxes.filter((mb) => !mb.role)
     : mailboxes.filter((mb) => configured.includes(mb.id));
   return selected.map((mb) => mb.originalId || mb.id);

stores/settings-store.ts

@@ -15,6 +15,11 @@ const syncLog = (...args: unknown[]) => console.log('[SETTINGS_SYNC]', ...args);
 const syncWarn = (...args: unknown[]) => console.warn('[SETTINGS_SYNC]', ...args);
 const syncError = (...args: unknown[]) => console.error('[SETTINGS_SYNC]', ...args);
 
+/** True for a non-null, non-array plain object (the allMailFolderIds map shape). */
+function isPlainRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
 // Settings sync state (module-level, not persisted)
 let syncEnabled = false;
 let syncUsername: string | null = null;
@@ -137,6 +142,7 @@ interface SettingsState {
   markAsReadDelay: number; // milliseconds (0 = instant, -1 = never)
   deleteAction: DeleteAction;
   permanentlyDeleteJunk: boolean; // Permanently delete emails from junk/spam instead of moving to trash
+  returnToListAfterAction: boolean; // After delete / mark-unread in an open message, return to the list instead of opening the next message
   showPreview: boolean;
   mailLayout: MailLayout;
   emailsPerPage: number;
@@ -226,10 +232,10 @@ interface SettingsState {
   enableCrossStarredView: boolean;
   enableCrossAllView: boolean;
 
-  // Folder ids merged into the virtual "All Mail" mailbox. `null` = never
-  // configured, in which case the view defaults to all non-special (no-role)
-  // folders of the active account.
-  allMailFolderIds: string[] | null;
+  // Per-account "All Mail" folder selection, keyed by AccountEntry.id. A
+  // missing entry = "not configured" -> defaults to every no-role folder; an
+  // explicit [] = "no folders". (Replaced the legacy global string[] | null.)
+  allMailFolderIds: Record<string, string[]>;
 
   // Email Display
   disableThreading: boolean; // Show emails as individual messages instead of grouped by conversation
@@ -339,6 +345,7 @@ const DEFAULT_SETTINGS = {
   markAsReadDelay: 0, // Instant
   deleteAction: 'trash' as DeleteAction,
   permanentlyDeleteJunk: false,
+  returnToListAfterAction: true,
   showPreview: true,
   mailLayout: 'split' as MailLayout,
   emailsPerPage: 50,
@@ -416,7 +423,7 @@ const DEFAULT_SETTINGS = {
 
   // All Mail view (gated)
   enableAllMailView: false,
-  allMailFolderIds: null as string[] | null,
+  allMailFolderIds: {} as Record<string, string[]>,
 
   enableCrossUnreadView: false,
   enableCrossStarredView: false,
@@ -546,6 +553,7 @@ export const useSettingsStore = create<SettingsState>()(
           firstDayOfWeek: state.firstDayOfWeek,
           markAsReadDelay: state.markAsReadDelay,
           deleteAction: state.deleteAction,
+          returnToListAfterAction: state.returnToListAfterAction,
           showPreview: state.showPreview,
           mailLayout: state.mailLayout,
           emailsPerPage: state.emailsPerPage,
@@ -646,6 +654,11 @@ export const useSettingsStore = create<SettingsState>()(
                 set({ sendDelaySeconds: 0 });
                 return;
               }
+              // Ignore a legacy global allMailFolderIds (string[] | null) or any
+              // non-record value - this build keys it per account.
+              if (key === 'allMailFolderIds' && !isPlainRecord(settings[key])) {
+                return;
+              }
               if (DEVICE_LOCAL_SETTING_KEYS.has(key)) {
                 return;
               }
@@ -836,7 +849,7 @@ export const useSettingsStore = create<SettingsState>()(
     }),
     {
       name: 'settings-storage',
-      version: 4,
+      version: 5,
       migrate: (persisted, version) => {
         const state = persisted as Record<string, unknown>;
         if (version < 2 && state.listDensity) {
@@ -856,11 +869,25 @@ export const useSettingsStore = create<SettingsState>()(
         if (version < 4) {
           state.dateFormat = 'smart';
         }
+        // v5: allMailFolderIds went from a global `string[] | null` to a
+        // per-account `Record<accountId, string[]>`. The legacy global list
+        // can't be attributed to a specific account here (the active account
+        // isn't known at migrate time), so it's dropped - each account starts
+        // "not configured" (defaults to all no-role folders).
+        if (version < 5 || !isPlainRecord(state.allMailFolderIds)) {
+          state.allMailFolderIds = {};
+        }
         return state as unknown as SettingsState;
       },
       onRehydrateStorage: () => {
         return (state) => {
           if (state) {
+            // Defensive: a legacy global array or any non-record value (e.g.
+            // synced from an older client) is coerced to an empty map so
+            // per-account consumers never see a non-record.
+            if (!isPlainRecord(state.allMailFolderIds)) {
+              state.allMailFolderIds = {};
+            }
             applyFontSize(state.fontSize);
             applyDensity(state.density);
             applyAnimations(state.animationsEnabled);