@bobfrankston/rmfmail 1.0.670 → 1.0.672

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -20,6 +20,11 @@ const SHOW_RECURRING_PREF = "mailx-cal-show-recurring";
20
20
  const SHOW_DONE_PREF = "mailx-task-show-done";
21
21
  const HORIZON_DAYS_PREF = "mailx-cal-horizon-days";
22
22
  const HORIZON_DEFAULT_DAYS = 30;
23
+ /** Show holidays and recurring events only within this lookahead window
24
+ * regardless of the user's overall horizon. Past 2 weeks they crowd the
25
+ * list without adding much (the user can extend by opening Google
26
+ * Calendar directly). Tuned conservatively — easy to revisit. */
27
+ const HOLIDAY_RECUR_HORIZON_MS = 14 * 86400_000;
23
28
  let viewYear = new Date().getFullYear();
24
29
  let viewMonth = new Date().getMonth();
25
30
  let viewDay = new Date().getDate();
@@ -91,6 +96,7 @@ async function fetchUpcoming(from) {
91
96
  recurringEventId: r.recurringEventId,
92
97
  htmlLink: r.htmlLink,
93
98
  isHoliday: !!r.isHoliday,
99
+ calendarId: r.calendarId,
94
100
  }));
95
101
  }
96
102
  function formatDayHeader(d, today, tomorrow) {
@@ -180,10 +186,18 @@ function renderEvents(events) {
180
186
  }
181
187
  }
182
188
  let lastDayKey = "";
189
+ const nowMs = Date.now();
190
+ const recurHolidayCutoff = nowMs + HOLIDAY_RECUR_HORIZON_MS;
183
191
  for (const e of events) {
184
192
  // Filter out daily-grouped instances — they're shown once at top.
185
193
  if (e.recurringEventId && dailyKeys.has(e.recurringEventId))
186
194
  continue;
195
+ // Holidays and recurring events cut off at the 2-week horizon —
196
+ // even when the user has a longer overall horizon, these two
197
+ // categories crowd the list without much daily value. The user
198
+ // can always extend by jumping to Google Calendar.
199
+ if ((e.isHoliday || e.recurringEventId) && e.start > recurHolidayCutoff)
200
+ continue;
187
201
  const d = new Date(e.start);
188
202
  const dayKey = `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
189
203
  if (dayKey !== lastDayKey) {
@@ -192,17 +206,43 @@ function renderEvents(events) {
192
206
  }
193
207
  const recurMark = e.recurringEventId ? `<span class="cal-side-event-recur" title="Recurring event">↻</span>` : "";
194
208
  const link = e.htmlLink || "";
195
- const holidayAttr = e.isHoliday ? ' data-holiday="1"' : "";
209
+ // Distinguish holiday sources for coloring: US (en.usa) → light
210
+ // green; Jewish (en.jewish) → light blue. Anything else falls
211
+ // through to a generic "h" class so a future calendar still gets
212
+ // marked-as-holiday styling even if it isn't specifically themed.
213
+ let holidayKind;
214
+ if (e.isHoliday) {
215
+ const cid = (e.calendarId || "").toLowerCase();
216
+ if (cid.includes("usa"))
217
+ holidayKind = "us";
218
+ else if (cid.includes("jewish"))
219
+ holidayKind = "jewish";
220
+ else
221
+ holidayKind = "other";
222
+ }
223
+ const holidayAttr = e.isHoliday ? ` data-holiday="1" data-holiday-kind="${holidayKind}"` : "";
224
+ const recurAttr = e.recurringEventId ? ' data-recurring="1"' : "";
196
225
  // Holidays don't get the Google Calendar deep-link (it's read-only) —
197
226
  // suppress data-link and the "Click to open" hint for those rows.
198
227
  const clickable = !e.isHoliday;
199
228
  const titleAttr = clickable && link ? 'title="Click to open in Google Calendar"' : "";
200
229
  const dataLink = clickable ? `data-link="${escapeHtml(link)}"` : "";
201
- html += `<div class="cal-side-event" data-id="${e.id}"${holidayAttr} ${dataLink} ${titleAttr}>
202
- <span class="cal-side-event-dot ${e.isHoliday ? "h" : (e.source === "google" ? "g" : "l")}"></span>
203
- <span class="cal-side-event-time">${escapeHtml(formatTime(e))}</span>
204
- <span class="cal-side-event-title">${escapeHtml(e.title)}${recurMark}</span>
205
- </div>`;
230
+ // Holidays render as a single full-width row (no time / dot
231
+ // columns the day header already gives the date, and there's
232
+ // typically no useful clock time). Regular events keep the
233
+ // existing dot/time/title columns.
234
+ if (e.isHoliday) {
235
+ html += `<div class="cal-side-event"${holidayAttr} data-id="${e.id}">
236
+ <span class="cal-side-event-title cal-side-event-holiday-title">${escapeHtml(e.title)}</span>
237
+ </div>`;
238
+ }
239
+ else {
240
+ html += `<div class="cal-side-event" data-id="${e.id}"${recurAttr} ${dataLink} ${titleAttr}>
241
+ <span class="cal-side-event-dot ${e.source === "google" ? "g" : "l"}"></span>
242
+ <span class="cal-side-event-time">${escapeHtml(formatTime(e))}</span>
243
+ <span class="cal-side-event-title">${escapeHtml(e.title)}${recurMark}</span>
244
+ </div>`;
245
+ }
206
246
  }
207
247
  body.innerHTML = html;
208
248
  // Click-to-open — interim per user 2026-04-23: route to Google Calendar's
@@ -1 +1 @@
1
- {"version":3,"file":"calendar-sidebar.js","sourceRoot":"","sources":["calendar-sidebar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calendar-sidebar.js","sourceRoot":"","sources":["calendar-sidebar.ts"],"names":[],"mappings":"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"}
@@ -41,8 +41,18 @@ interface CalEvent {
41
41
  recurringEventId?: string | null;
42
42
  htmlLink?: string | null;
43
43
  isHoliday?: boolean;
44
+ /** Google calendar id this row was fetched from. Distinguishes
45
+ * holiday sources (en.usa#holiday vs en.jewish#holiday) so the
46
+ * sidebar can color them differently. */
47
+ calendarId?: string;
44
48
  }
45
49
 
50
+ /** Show holidays and recurring events only within this lookahead window
51
+ * regardless of the user's overall horizon. Past 2 weeks they crowd the
52
+ * list without adding much (the user can extend by opening Google
53
+ * Calendar directly). Tuned conservatively — easy to revisit. */
54
+ const HOLIDAY_RECUR_HORIZON_MS = 14 * 86400_000;
55
+
46
56
  let viewYear = new Date().getFullYear();
47
57
  let viewMonth = new Date().getMonth();
48
58
  let viewDay = new Date().getDate();
@@ -109,6 +119,7 @@ async function fetchUpcoming(from: Date): Promise<CalEvent[]> {
109
119
  recurringEventId: r.recurringEventId,
110
120
  htmlLink: r.htmlLink,
111
121
  isHoliday: !!r.isHoliday,
122
+ calendarId: r.calendarId,
112
123
  }));
113
124
  }
114
125
 
@@ -194,9 +205,16 @@ function renderEvents(events: CalEvent[]): void {
194
205
  }
195
206
 
196
207
  let lastDayKey = "";
208
+ const nowMs = Date.now();
209
+ const recurHolidayCutoff = nowMs + HOLIDAY_RECUR_HORIZON_MS;
197
210
  for (const e of events) {
198
211
  // Filter out daily-grouped instances — they're shown once at top.
199
212
  if (e.recurringEventId && dailyKeys.has(e.recurringEventId)) continue;
213
+ // Holidays and recurring events cut off at the 2-week horizon —
214
+ // even when the user has a longer overall horizon, these two
215
+ // categories crowd the list without much daily value. The user
216
+ // can always extend by jumping to Google Calendar.
217
+ if ((e.isHoliday || e.recurringEventId) && e.start > recurHolidayCutoff) continue;
200
218
  const d = new Date(e.start);
201
219
  const dayKey = `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
202
220
  if (dayKey !== lastDayKey) {
@@ -205,17 +223,39 @@ function renderEvents(events: CalEvent[]): void {
205
223
  }
206
224
  const recurMark = e.recurringEventId ? `<span class="cal-side-event-recur" title="Recurring event">↻</span>` : "";
207
225
  const link = e.htmlLink || "";
208
- const holidayAttr = e.isHoliday ? ' data-holiday="1"' : "";
226
+ // Distinguish holiday sources for coloring: US (en.usa) → light
227
+ // green; Jewish (en.jewish) → light blue. Anything else falls
228
+ // through to a generic "h" class so a future calendar still gets
229
+ // marked-as-holiday styling even if it isn't specifically themed.
230
+ let holidayKind: string | undefined;
231
+ if (e.isHoliday) {
232
+ const cid = (e.calendarId || "").toLowerCase();
233
+ if (cid.includes("usa")) holidayKind = "us";
234
+ else if (cid.includes("jewish")) holidayKind = "jewish";
235
+ else holidayKind = "other";
236
+ }
237
+ const holidayAttr = e.isHoliday ? ` data-holiday="1" data-holiday-kind="${holidayKind}"` : "";
238
+ const recurAttr = e.recurringEventId ? ' data-recurring="1"' : "";
209
239
  // Holidays don't get the Google Calendar deep-link (it's read-only) —
210
240
  // suppress data-link and the "Click to open" hint for those rows.
211
241
  const clickable = !e.isHoliday;
212
242
  const titleAttr = clickable && link ? 'title="Click to open in Google Calendar"' : "";
213
243
  const dataLink = clickable ? `data-link="${escapeHtml(link)}"` : "";
214
- html += `<div class="cal-side-event" data-id="${e.id}"${holidayAttr} ${dataLink} ${titleAttr}>
215
- <span class="cal-side-event-dot ${e.isHoliday ? "h" : (e.source === "google" ? "g" : "l")}"></span>
216
- <span class="cal-side-event-time">${escapeHtml(formatTime(e))}</span>
217
- <span class="cal-side-event-title">${escapeHtml(e.title)}${recurMark}</span>
218
- </div>`;
244
+ // Holidays render as a single full-width row (no time / dot
245
+ // columns the day header already gives the date, and there's
246
+ // typically no useful clock time). Regular events keep the
247
+ // existing dot/time/title columns.
248
+ if (e.isHoliday) {
249
+ html += `<div class="cal-side-event"${holidayAttr} data-id="${e.id}">
250
+ <span class="cal-side-event-title cal-side-event-holiday-title">${escapeHtml(e.title)}</span>
251
+ </div>`;
252
+ } else {
253
+ html += `<div class="cal-side-event" data-id="${e.id}"${recurAttr} ${dataLink} ${titleAttr}>
254
+ <span class="cal-side-event-dot ${e.source === "google" ? "g" : "l"}"></span>
255
+ <span class="cal-side-event-time">${escapeHtml(formatTime(e))}</span>
256
+ <span class="cal-side-event-title">${escapeHtml(e.title)}${recurMark}</span>
257
+ </div>`;
258
+ }
219
259
  }
220
260
  body.innerHTML = html;
221
261
 
@@ -1302,10 +1302,33 @@ body.calendar-sidebar-on .calendar-sidebar { display: flex; }
1302
1302
  }
1303
1303
  .cal-side-event-dot.l { background: oklch(0.70 0.18 70); } /* local — amber */
1304
1304
  .cal-side-event-dot.g { background: oklch(0.65 0.20 250); } /* google — blue */
1305
- .cal-side-event-dot.h { background: oklch(0.65 0.18 350); } /* holiday muted magenta */
1306
- .cal-side-event[data-holiday="1"] { color: var(--color-text-muted); cursor: default; }
1307
- .cal-side-event[data-holiday="1"] .cal-side-event-title { font-style: italic; }
1308
- .cal-side-event[data-holiday="1"]:hover { background: transparent; }
1305
+ /* Scheduled (non-recurring) events render in bold; recurring events
1306
+ * in regular weight so the eye picks out one-off appointments first. */
1307
+ .cal-side-event .cal-side-event-title { font-weight: 600; }
1308
+ .cal-side-event[data-recurring="1"] .cal-side-event-title { font-weight: 400; }
1309
+ /* Holiday rows render as a single full-width tinted band, no
1310
+ * dot / time columns. Distinct background per source:
1311
+ * US federal (en.usa#holiday) → light green
1312
+ * Jewish (en.jewish#holiday) → light blue
1313
+ * anything else → muted neutral */
1314
+ .cal-side-event[data-holiday="1"] {
1315
+ display: block;
1316
+ cursor: default;
1317
+ padding: 4px 10px;
1318
+ margin: 1px 0;
1319
+ border-radius: 4px;
1320
+ color: var(--color-text);
1321
+ }
1322
+ .cal-side-event[data-holiday="1"]:hover { background: inherit; }
1323
+ .cal-side-event[data-holiday="1"][data-holiday-kind="us"] { background: oklch(0.95 0.05 145); } /* light green */
1324
+ .cal-side-event[data-holiday="1"][data-holiday-kind="jewish"] { background: oklch(0.94 0.04 230); } /* light blue */
1325
+ .cal-side-event[data-holiday="1"][data-holiday-kind="other"] { background: oklch(0.94 0.02 280); }
1326
+ .cal-side-event-holiday-title {
1327
+ display: block;
1328
+ width: 100%;
1329
+ font-weight: 500;
1330
+ font-size: 0.9em;
1331
+ }
1309
1332
  .cal-side-event-time { color: var(--color-text); min-width: 44px; font-variant-numeric: tabular-nums; }
1310
1333
  .cal-side-event-title { flex: 1; }
1311
1334
  .cal-side-event-recur {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bobfrankston/rmfmail",
3
- "version": "1.0.670",
3
+ "version": "1.0.672",
4
4
  "description": "Local-first email client with IMAP sync and standalone native app",
5
5
  "type": "module",
6
6
  "main": "bin/mailx.js",
@@ -1229,11 +1229,18 @@ export class MailxService {
1229
1229
  // GDrive read of accounts.jsonc here was a major contributor to
1230
1230
  // the daemon-event-loop wedge that broke preview rendering.
1231
1231
  const settings = this.getCachedSettings() as any;
1232
+ // `en.usa#holiday` is Google's "Holidays in United States" calendar
1233
+ // which is *mixed*: federal (MLK, Memorial Day, July 4, Thanksgiving,
1234
+ // …) PLUS Christian (Ascension Day, Pentecost, Catholic/Protestant
1235
+ // /Orthodox/Armenian variants), Jewish observances, Ethiopian Jewish,
1236
+ // etc. `en.usa.official#holiday` is the federal-secular-only variant.
1237
+ // Per Bob 2026-05-11: "is there one for just secular holidays?" —
1238
+ // yes, this is it.
1232
1239
  const HOLIDAY_SOURCES: Array<{ enabled: boolean; calId: string; label: string }> = [
1233
1240
  {
1234
1241
  enabled: !!settings?.calendar?.showHolidays,
1235
- calId: "en.usa#holiday@group.v.calendar.google.com",
1236
- label: "US",
1242
+ calId: "en.usa.official#holiday@group.v.calendar.google.com",
1243
+ label: "US-official",
1237
1244
  },
1238
1245
  {
1239
1246
  enabled: !!settings?.calendar?.showJewishHolidays,
@@ -155,12 +155,6 @@ export declare function loadAllowlist(): typeof DEFAULT_ALLOWLIST;
155
155
  export declare function saveAllowlist(list: typeof DEFAULT_ALLOWLIST): Promise<void>;
156
156
  /** Load settings — unified view combining all files (backward compatible) */
157
157
  export declare function loadSettings(): MailxSettings;
158
- /** Save settings — writes to split files.
159
- * Preserves arbitrary extra keys (calendar.showHolidays, checkDomainReputation,
160
- * externalEditor, …) by round-tripping the prior preferences file and
161
- * merging the new payload over it. Without this, only `ui` and `sync`
162
- * survived a save → toggling calendar.showHolidays in the UI looked like
163
- * it worked but the next load reverted to undefined. */
164
158
  export declare function saveSettings(settings: MailxSettings): Promise<void>;
165
159
  /** Get the local store base path */
166
160
  export declare function getStorePath(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAyG5G,QAAA,MAAM,SAAS,QAA4E,CAAC;AAiE5F,qFAAqF;AACrF,KAAK,kBAAkB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE;IAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,CAAC;AAE/G,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAM/D;AAOD,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,IAAI,CAA2B;AAU7E,iBAAS,YAAY,IAAI,MAAM,CAgB9B;AAOD,sEAAsE;AACtE,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoCxE;AAED;;qCAEqC;AACrC,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BjF;AAyBD,2CAA2C;AAC3C,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED,4CAA4C;AAC5C,wBAAgB,cAAc,IAAI;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,GAAG,KAAK,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CA+B3L;AAuID;;qDAEqD;AACrD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,aAAa,CA4D9E;AAMD,QAAA,MAAM,mBAAmB;;eAEE,QAAQ,GAAG,MAAM,GAAG,OAAO;gBAC3B,OAAO,GAAG,QAAQ;;;;;;;;;;;;;;;;;;;;CAoB5C,CAAC;AAEF,QAAA,MAAM,oBAAoB,EAAE,oBAS3B,CAAC;AAEF,QAAA,MAAM,iBAAiB;aACJ,MAAM,EAAE;aACR,MAAM,EAAE;gBACL,MAAM,EAAE;oBAOJ,MAAM,EAAE;oBACR,MAAM,EAAE;CACjC,CAAC;AAIF,2BAA2B;AAC3B,wBAAgB,YAAY,IAAI,aAAa,EAAE,CA0C9C;AAoCD;;;;0CAI0C;AAC1C,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAqBlE;AAED;;;;;;;;;;;;;;;iDAeiD;AACjD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,GAAG,CA+ChF;AAED,2BAA2B;AAC3B;;;oEAGoE;AACpE,wBAAsB,YAAY,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC3E;AAED;;;wEAGwE;AACxE,wBAAgB,QAAQ,IAAI,MAAM,CAWjC;AAED;;4DAE4D;AAC5D,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB1D;AAED;;;;;uEAKuE;AACvE,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC,CAmB7D;AAED;;;;;;kCAMkC;AAClC,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAa9D;AAED;;;;;0CAK0C;AAC1C,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC,CAYlE;AAED,wEAAwE;AACxE,wBAAgB,eAAe,IAAI,OAAO,mBAAmB,CAoB5D;AAED,uBAAuB;AACvB,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAEhD;AAED,iCAAiC;AACjC,wBAAgB,gBAAgB,IAAI,oBAAoB,CAGvD;AAED,iCAAiC;AACjC,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAIrE;AAED,qCAAqC;AACrC,wBAAgB,aAAa,IAAI,OAAO,iBAAiB,CAExD;AAED,4EAA4E;AAC5E,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBjF;AAcD,6EAA6E;AAC7E,wBAAgB,YAAY,IAAI,aAAa,CA0B5C;AAED;;;;;yDAKyD;AACzD,wBAAsB,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CASzE;AAED,oCAAoC;AACpC,wBAAgB,YAAY,IAAI,MAAM,CAGrC;AAED,qDAAqD;AACrD,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,wCAAwC;AACxC,OAAO,EAAE,YAAY,EAAE,CAAC;AAKxB,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAkB5E;AAED;;;mFAGmF;AACnF,wBAAsB,eAAe,CAAC,QAAQ,GAAE,QAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAclF;AAED,QAAA,MAAM,gBAAgB,EAAE,aAMvB,CAAC;AAEF,8FAA8F;AAC9F,wBAAgB,cAAc,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAQzD;AAED,uEAAuE;AACvE,wBAAgB,WAAW,IAAI,OAAO,CAGrC;AAED,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,SAAS,EAAE,CAAC;AAErG;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ClE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
@@ -982,10 +982,24 @@ export function loadPreferences() {
982
982
  if (localConfig.historyDays !== undefined) {
983
983
  shared.sync.historyDays = localConfig.historyDays;
984
984
  }
985
+ // Pass through any non-typed keys (calendar.showHolidays /
986
+ // showJewishHolidays, checkDomainReputation, externalEditor, …) so
987
+ // loadSettings's extras pickup sees them. Earlier this return shape
988
+ // was hard-restricted to {ui, sync, autocomplete} and silently
989
+ // dropped every other key the file contained — which is why
990
+ // toggling holidays looked persisted in the file but didn't take
991
+ // effect: loadSettings only saw ui/sync/autocomplete back.
992
+ const extras = {};
993
+ for (const k of Object.keys(shared)) {
994
+ if (k === "ui" || k === "sync" || k === "autocomplete")
995
+ continue;
996
+ extras[k] = shared[k];
997
+ }
985
998
  return {
986
999
  ui: { ...DEFAULT_PREFERENCES.ui, ...shared.ui },
987
1000
  sync: { ...DEFAULT_PREFERENCES.sync, ...shared.sync },
988
1001
  autocomplete: { ...DEFAULT_AUTOCOMPLETE, ...shared.autocomplete },
1002
+ ...extras,
989
1003
  };
990
1004
  }
991
1005
  /** Save preferences */
@@ -1072,17 +1086,50 @@ export function loadSettings() {
1072
1086
  /** Save settings — writes to split files.
1073
1087
  * Preserves arbitrary extra keys (calendar.showHolidays, checkDomainReputation,
1074
1088
  * externalEditor, …) by round-tripping the prior preferences file and
1075
- * merging the new payload over it. Without this, only `ui` and `sync`
1076
- * survived a save toggling calendar.showHolidays in the UI looked like
1077
- * it worked but the next load reverted to undefined. */
1089
+ * *deep-merging* the new payload over it. A shallow merge would let one
1090
+ * partial save (e.g. `calendar.showJewishHolidays:true`) wholesale-replace
1091
+ * the prior `calendar` object and clobber sibling keys (showHolidays).
1092
+ *
1093
+ * Also: skip re-writing accounts.jsonc when accounts haven't actually
1094
+ * changed. Every saveSettings call previously paid the sync GDrive write
1095
+ * cost (~34 s observed in the daemon log) even for a single checkbox
1096
+ * toggle, because the client sends the full settings object back.
1097
+ * Identity comparison via JSON.stringify is good enough — JS object
1098
+ * identity is meaningless across an IPC round-trip. */
1099
+ function deepMerge(target, source) {
1100
+ if (source === null || source === undefined)
1101
+ return target;
1102
+ if (typeof source !== "object" || Array.isArray(source))
1103
+ return source;
1104
+ const out = (typeof target === "object" && target !== null && !Array.isArray(target)) ? { ...target } : {};
1105
+ for (const k of Object.keys(source)) {
1106
+ out[k] = deepMerge(out[k], source[k]);
1107
+ }
1108
+ return out;
1109
+ }
1110
+ let _lastAccountsJson = null;
1078
1111
  export async function saveSettings(settings) {
1079
- await saveAccounts(settings.accounts);
1112
+ // Skip the slow accounts write when nothing changed. Initialize the
1113
+ // baseline lazily from the current on-disk file on first call so a
1114
+ // restart picks up the right "did this change?" reference.
1115
+ if (_lastAccountsJson === null) {
1116
+ try {
1117
+ _lastAccountsJson = JSON.stringify(loadAccounts());
1118
+ }
1119
+ catch {
1120
+ _lastAccountsJson = "";
1121
+ }
1122
+ }
1123
+ const incomingJson = JSON.stringify(settings.accounts);
1124
+ if (incomingJson !== _lastAccountsJson) {
1125
+ await saveAccounts(settings.accounts);
1126
+ _lastAccountsJson = incomingJson;
1127
+ }
1080
1128
  const prior = loadPreferences();
1081
- const next = { ...prior, ...settings };
1082
- // Strip keys that don't belong in preferences.jsonc (accounts has its
1083
- // own file; store is derived from config.jsonc).
1084
- delete next.accounts;
1085
- delete next.store;
1129
+ const incoming = { ...settings };
1130
+ delete incoming.accounts;
1131
+ delete incoming.store;
1132
+ const next = deepMerge(prior, incoming);
1086
1133
  savePreferences(next);
1087
1134
  }
1088
1135
  /** Get the local store base path */