Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
fix: refresh open calendars after configuration changes (#11019)
Adam Eivyb961f38af599
diff --git a/client/src/components/calendar/AgendaTab.jsx b/client/src/components/calendar/AgendaTab.jsxindex 1a384509f3..cbf06b3b49 100644--- a/client/src/components/calendar/AgendaTab.jsx+++ b/client/src/components/calendar/AgendaTab.jsx@@ -1,6 +1,7 @@import { useState, useEffect, useCallback, useRef } from 'react';import { RefreshCw, Search, MapPin, Users, Clock } from 'lucide-react';import * as api from '../../services/api';+import socket from '../../services/socket';import { useAccountSyncStatus } from '../../hooks/useAccountSyncStatus';import EventDetail from './EventDetail';import { formatCount, formatTimeOfDay as formatTime, formatWeekdayDate, localDateKey } from '../../utils/formatters';@@ -62,7 +63,7 @@ export default function AgendaTab({ accounts }) {const nextOffset = useRef(0);const pending = useRef(false);- const fetchEvents = useCallback(async (append = false) => {+ const fetchEvents = useCallback(async (append = false, reconcile = false) => {if (append && pending.current) return;const generation = ++requestGeneration.current;pending.current = true;@@ -70,9 +71,11 @@ export default function AgendaTab({ accounts }) {setLoadingMore(append);if (!append) {nextOffset.current = 0;- setEvents([]);- setTotal(0);- setLoading(true);+ if (!reconcile) {+ setEvents([]);+ setTotal(0);+ setLoading(true);+ }}const offset = nextOffset.current;const params = {@@ -109,6 +112,16 @@ export default function AgendaTab({ accounts }) {};}, [fetchEvents]);+ useEffect(() => {+ const reconcile = () => fetchEvents(false, true);+ socket.on('calendar:changed', reconcile);+ socket.on('connect', reconcile);+ return () => {+ socket.off('calendar:changed', reconcile);+ socket.off('connect', reconcile);+ };+ }, [fetchEvents]);+const { sync } = useAccountSyncStatus({eventPrefix: 'calendar',label: 'Calendar sync',diff --git a/client/src/components/calendar/AgendaTab.test.jsx b/client/src/components/calendar/AgendaTab.test.jsxindex a9ad28a1e2..b05b31af8b 100644--- a/client/src/components/calendar/AgendaTab.test.jsx+++ b/client/src/components/calendar/AgendaTab.test.jsx@@ -292,3 +292,23 @@ describe('Agenda provider sync', () => {expect(api.getCalendarEvents).toHaveBeenCalledTimes(1);});});+++it('reconciles configuration and reconnect without resurrecting a superseded event page', async () => {+ vi.clearAllMocks();+ const oldEvent = event('old', new Date().toISOString(), undefined, { title: 'Old meeting' });+ api.getCalendarEvents.mockResolvedValueOnce({ events: [oldEvent], total: 1 });+ await renderAgenda(accounts);+ expect(screen.getByText('Old meeting')).toBeTruthy();+ let resolveOld;+ api.getCalendarEvents.mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve; }))+ .mockResolvedValueOnce({ events: [], total: 0 });+ const changed = socketMock.on.mock.calls.find(([name]) => name === 'calendar:changed')[1];+ const reconnect = socketMock.on.mock.calls.find(([name]) => name === 'connect')[1];+ await act(async () => { changed(); });+ expect(screen.getByText('Old meeting')).toBeTruthy();+ await act(async () => { reconnect(); });+ expect(screen.queryByText('Old meeting')).toBeNull();+ await act(async () => resolveOld({ events: [oldEvent], total: 1 }));+ expect(screen.queryByText('Old meeting')).toBeNull();+});diff --git a/client/src/components/calendar/calendarEventChips.test.jsx b/client/src/components/calendar/calendarEventChips.test.jsxindex 1eda787d4e..a8681c0ad5 100644--- a/client/src/components/calendar/calendarEventChips.test.jsx+++ b/client/src/components/calendar/calendarEventChips.test.jsx@@ -334,10 +334,10 @@ describe.each([expect(chipFor('Example current event')).toBeInTheDocument();});- it('keeps the latest socket refresh and disposes its listener with pending work', async () => {+ it.each(['calendar:sync:completed', 'calendar:changed', 'connect'])('keeps the latest %s refresh and disposes its listener with pending work', async (socketEvent) => {const mounted = render(<MemoryRouter><View accounts={ACCOUNTS} /></MemoryRouter>);await resolveEvents(requests[0], 'Example initial event');- const refresh = socketMock.on.mock.calls.find(([event]) => event === 'calendar:sync:completed')[1];+ const refresh = socketMock.on.mock.calls.find(([event]) => event === socketEvent)[1];act(() => { refresh(); refresh(); });expect(requests).toHaveLength(3);@@ -348,7 +348,7 @@ describe.each([act(() => { refresh(); });mounted.unmount();- expect(socketMock.off).toHaveBeenCalledWith('calendar:sync:completed', refresh);+ expect(socketMock.off).toHaveBeenCalledWith(socketEvent, refresh);await resolveEvents(requests[3], 'Example late event');expect(screen.queryByRole('button', { name: /Example late event/ })).not.toBeInTheDocument();});diff --git a/client/src/hooks/useCalendarWindowEvents.js b/client/src/hooks/useCalendarWindowEvents.jsindex f996971fef..efd5550f1b 100644--- a/client/src/hooks/useCalendarWindowEvents.js+++ b/client/src/hooks/useCalendarWindowEvents.js@@ -31,8 +31,9 @@ export function useCalendarWindowEvents(startDate, endDate) {}, [loaded, hasMore, loading, error, loadMore]);useEffect(() => {- socket.on('calendar:sync:completed', reload);- return () => socket.off('calendar:sync:completed', reload);+ const events = ['calendar:sync:completed', 'calendar:changed', 'connect'];+ for (const event of events) socket.on(event, reload);+ return () => { for (const event of events) socket.off(event, reload); };}, [reload]);return {diff --git a/client/src/hooks/useSocketResource.js b/client/src/hooks/useSocketResource.jsindex dc92d488b0..960986ff58 100644--- a/client/src/hooks/useSocketResource.js+++ b/client/src/hooks/useSocketResource.js@@ -45,6 +45,9 @@ export function useSocketResource(fetchFn, { namespace, events, resourceKey = nuif (invalidation) invalidations.push(invalidation);else reconcile = true;if (disposed) return Promise.resolve();+ // A newer invalidation makes the active read obsolete, even while its+ // trailing reconciliation waits for that request to settle.+ revision += 1;if (pending) {dirty = true;return pending;diff --git a/client/src/pages/Ambient.jsx b/client/src/pages/Ambient.jsxindex 434c394675..a4fdbd39da 100644--- a/client/src/pages/Ambient.jsx+++ b/client/src/pages/Ambient.jsx@@ -8,7 +8,7 @@ import { formatClockTime, formatDateFull, formatTimeOfDay } from '../utils/formaimport DeathClockCountdown from '../components/DeathClockCountdown';import { shouldIgnoreGlobalKey } from '../lib/a11yKeyboard';-const CALENDAR_EVENTS = ['calendar:sync:completed'];+const CALENDAR_EVENTS = ['calendar:sync:completed', 'calendar:changed'];const DEATH_CLOCK_EVENTS = ['meatspace:death-clock:changed'];const GOAL_EVENTS = ['cos:goals:changed'];const SUMMARY_EVENTS = ['cos:status', 'cos:status:paused', 'cos:status:resumed', 'cos:agent:spawned', 'cos:agent:updated', 'cos:agent:completed'];@@ -55,7 +55,7 @@ export default function Ambient() {const { data: goals } = useSocketResource(() => api.getCosGoalProgressSummary({ silent: true }), {namespace: 'cos', events: GOAL_EVENTS});- const { data: calendarEvents, refetch: refreshCalendar } = useSocketResource(async () => {+ const { data: calendarEvents, error: calendarError, refetch: refreshCalendar } = useSocketResource(async () => {const now = new Date();reconciledDays.current.calendar = now.toDateString();const params = {@@ -66,7 +66,7 @@ export default function Ambient() {const events = [];let page;do {- page = await api.getCalendarEvents({ ...params, offset: events.length });+ page = await api.getCalendarEvents({ ...params, offset: events.length }, { silent: true });events.push(...page.events);} while (page.events.length && events.length < page.total);return events;@@ -183,8 +183,14 @@ export default function Ambient() {<div className="w-full max-w-5xl grid grid-cols-1 md:grid-cols-3 gap-6 mt-4"><AmbientPanel title="Today" count={upcomingEvents.length}>+ {calendarError && (+ <div role="alert" className="text-sm text-port-error mb-2">+ Calendar unavailable; last loaded events may be stale.{' '}+ <button onClick={refreshCalendar} className="underline">Retry calendar</button>+ </div>+ )}{upcomingEvents.length === 0 ? (- <div className="text-gray-600 text-sm">No upcoming events</div>+ <div className="text-gray-600 text-sm">{calendarError ? 'Calendar unavailable' : 'No upcoming events'}</div>) : (<div className="space-y-2">{upcomingEvents.map((event, i) => (diff --git a/client/src/pages/Ambient.test.jsx b/client/src/pages/Ambient.test.jsxindex 6a0e6c0078..6a9885f6e8 100644--- a/client/src/pages/Ambient.test.jsx+++ b/client/src/pages/Ambient.test.jsx@@ -1,4 +1,4 @@-import { act, cleanup, render, screen } from '@testing-library/react';+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react';import { MemoryRouter } from 'react-router';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import Ambient from './Ambient';@@ -104,7 +104,7 @@ describe('Ambient resource updates', () => {expect(api.getCalendarEvents).toHaveBeenLastCalledWith({startDate: new Date(2026, 0, 16).toISOString(),endDate: new Date(2026, 0, 17).toISOString(), limit: 200, offset: 0- });+ }, { silent: true });expect(screen.getByText(formatDateFull(new Date()))).toBeTruthy();});@@ -147,3 +147,24 @@ describe('Ambient idle controls', () => {expect(header().className).not.toMatch(/(^|\s)opacity-0/);});});+++it('invalidates pending calendar reads, preserves stale content on failure, and retries', async () => {+ await mount();+ let resolveOld;+ let rejectCurrent;+ api.getCalendarEvents.mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve; }))+ .mockImplementationOnce(() => new Promise((_resolve, reject) => { rejectCurrent = reject; }));+ await event('calendar:changed');+ await event('calendar:changed');+ await flush(() => resolveOld({ events: [{ id: 'obsolete', title: 'Obsolete event', startTime: new Date(2026, 0, 15, 13).toISOString() }], total: 1 }));+ expect(screen.queryByText('Obsolete event')).toBeNull();+ expect(screen.getByText('Example meeting')).toBeTruthy();+ await flush(() => rejectCurrent(new Error('Read unavailable')));+ expect(screen.getByRole('alert')).toHaveTextContent('stale');+ api.getCalendarEvents.mockResolvedValue({ events: [], total: 0 });+ await flush(() => fireEvent.click(screen.getByRole('button', { name: 'Retry calendar' })));+ expect(screen.queryByText('Example meeting')).toBeNull();+ expect(screen.queryByRole('alert')).toBeNull();+ expect(reads()).toEqual([1, 1, 1, 4]);+});diff --git a/client/src/pages/Calendar.jsx b/client/src/pages/Calendar.jsxindex e28b0d0d4c..0919785ed6 100644--- a/client/src/pages/Calendar.jsx+++ b/client/src/pages/Calendar.jsx@@ -2,6 +2,7 @@ import { useNavigate } from 'react-router';import { CalendarDays, Calendar as CalendarIcon, ClipboardList, Clock, Columns, LayoutGrid, RefreshCw, Settings } from 'lucide-react';import { useState, useEffect, useCallback, useRef } from 'react';import * as api from '../services/api';+import socket from '../services/socket';import PageSkeleton from '../components/ui/PageSkeleton';import PageHeader from '../components/PageHeader';import TabPills from '../components/ui/TabPills';@@ -68,6 +69,22 @@ export default function Calendar() {return () => { requestGeneration.current += 1; };}, [fetchAccounts]);+ // Mutation responses supersede any older configuration read.+ const updateAccounts = useCallback(updater => {+ requestGeneration.current += 1;+ setLoading(false);+ setAccounts(updater);+ }, []);++ useEffect(() => {+ socket.on('calendar:changed', fetchAccounts);+ socket.on('connect', fetchAccounts);+ return () => {+ socket.off('calendar:changed', fetchAccounts);+ socket.off('connect', fetchAccounts);+ };+ }, [fetchAccounts]);+const accountsReady = accounts !== null && !accountsError;const handleTabChange = (tabId) => {@@ -90,7 +107,7 @@ export default function Calendar() {case 'review':return <ReviewTab accounts={accounts} />;case 'config':- return <ConfigTab accounts={accounts} setAccounts={setAccounts} />;+ return <ConfigTab accounts={accounts} setAccounts={updateAccounts} />;case 'sync':return <SyncTab accounts={accounts} onRefresh={fetchAccounts} />;default:diff --git a/client/src/pages/Calendar.test.jsx b/client/src/pages/Calendar.test.jsxindex 45179399ee..8f4ae15d99 100644--- a/client/src/pages/Calendar.test.jsx+++ b/client/src/pages/Calendar.test.jsx@@ -3,6 +3,7 @@ import { StrictMode } from 'react';import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react';import { MemoryRouter, Route, Routes, useLocation } from 'react-router';import Calendar, { TABS } from './Calendar';+import socket from '../services/socket';const api = vi.hoisted(() => ({getCalendarAccounts: vi.fn(),@@ -174,3 +175,51 @@ describe('Calendar account availability', () => {expect(screen.getByText('1 account')).toBeVisible();});});+++it('reconciles configuration without replacing an edited form and ignores obsolete reads', async () => {+ let resolveOld;+ api.getCalendarAccounts.mockResolvedValueOnce([account])+ .mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve; }))+ .mockResolvedValueOnce([{ ...account, name: 'Current calendar' }]);+ const mounted = renderCalendar();+ await screen.findByText(account.name);+ fireEvent.click(screen.getByRole('button', { name: 'Add Account' }));+ const input = screen.getByPlaceholderText('e.g. Work Calendar');+ fireEvent.change(input, { target: { value: 'Unsaved calendar' } });+ const changed = socket.on.mock.calls.find(([name]) => name === 'calendar:changed')[1];+ const reconnect = socket.on.mock.calls.find(([name]) => name === 'connect')[1];+ await act(async () => { changed(); });+ expect(input).toHaveValue('Unsaved calendar');+ await act(async () => { reconnect(); });+ expect(await screen.findByText('Current calendar')).toBeVisible();+ await act(async () => resolveOld([account]));+ expect(screen.queryByText(account.name)).toBeNull();+ expect(input).toHaveValue('Unsaved calendar');+ mounted.unmount();+ expect(socket.off).toHaveBeenCalledWith('calendar:changed', changed);+ expect(socket.off).toHaveBeenCalledWith('connect', reconnect);+});+++it('updates a mounted day grid color and removes events after configuration changes', async () => {+ const configured = { ...account, subcalendars: [{ calendarId: 'example-subcalendar', color: '#ff0000' }] };+ const now = new Date();+ now.setHours(10, 0, 0, 0);+ const meeting = { id: 'example-meeting', accountId: account.id, subcalendarId: 'example-subcalendar',+ title: 'Configured meeting', startTime: now.toISOString(), endTime: new Date(now.getTime() + 3600000).toISOString(), isAllDay: false };+ api.getCalendarAccounts.mockResolvedValue([configured]);+ api.getCalendarEvents.mockResolvedValue({ events: [meeting], total: 1 });+ renderCalendar('/calendar/day');+ const chip = await screen.findByRole('button', { name: /Configured meeting/ });+ const originalStyle = chip.getAttribute('style');+ const handlers = socket.on.mock.calls.filter(([name]) => name === 'calendar:changed').map(([, fn]) => fn);+ api.getCalendarAccounts.mockResolvedValue([{ ...configured, subcalendars: [{ calendarId: 'example-subcalendar', color: '#00ff00' }] }]);+ await act(async () => { handlers.forEach(fn => fn()); });+ expect(screen.getByRole('button', { name: /Configured meeting/ }).getAttribute('style')).not.toBe(originalStyle);+ api.getCalendarAccounts.mockResolvedValue([]);+ api.getCalendarEvents.mockResolvedValue({ events: [], total: 0 });+ await act(async () => { handlers.forEach(fn => fn()); });+ expect(screen.queryByRole('button', { name: /Configured meeting/ })).toBeNull();+ expect(screen.getByText('0 accounts')).toBeVisible();+});