Skip to content

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

[issue-11674] Distinguish failed UI loads from empty data (#11721)

[._.]/83c8d6d0d686
diff --git a/client/src/components/brain/tabs/FeedsTab.jsx b/client/src/components/brain/tabs/FeedsTab.jsx
index 226a167c20..5bf0413d9e 100644
--- a/client/src/components/brain/tabs/FeedsTab.jsx
+++ b/client/src/components/brain/tabs/FeedsTab.jsx
@@ -13,6 +13,7 @@ import BrailleSpinner from '../../BrailleSpinner';
import toast from '../../ui/Toast';
import { timeAgo } from '../../../utils/formatters';
import { normalizeUrl } from '../../../utils/urlNormalize';
+import LoadFailedState from '../../ui/LoadFailedState';
export default function FeedsTab({ onRefresh }) {
const [inputUrl, setInputUrl] = useState('');
@@ -20,6 +21,7 @@ export default function FeedsTab({ onRefresh }) {
const [feeds, setFeeds] = useState([]);
const [items, setItems] = useState([]);
const [loading, setLoading] = useState(true);
+ const [feedsFailed, setFeedsFailed] = useState(false);
const [refreshing, setRefreshing] = useState(false);
const [selectedFeedId, setSelectedFeedId] = useState(null);
const [unreadOnly, setUnreadOnly] = useState(false);
@@ -27,8 +29,15 @@ export default function FeedsTab({ onRefresh }) {
const inputRef = useRef(null);
const fetchFeeds = useCallback(async () => {
- const data = await api.getFeeds().catch(() => []);
- setFeeds(data);
+ try {
+ const data = await api.getFeeds();
+ setFeedsFailed(false);
+ setFeeds(data || []);
+ return true;
+ } catch {
+ setFeedsFailed(true);
+ return false;
+ }
}, []);
const fetchItems = useCallback(async () => {
@@ -218,7 +227,9 @@ export default function FeedsTab({ onRefresh }) {
</div>
</div>
- {feeds.length === 0 ? (
+ {feedsFailed ? (
+ <LoadFailedState title="Could not load feeds." hint="Your subscriptions may still be available." onRetry={async () => { setLoading(true); await fetchFeeds(); setLoading(false); }} />
+ ) : feeds.length === 0 ? (
<div className="text-center py-12 text-gray-500">
<Rss className="w-12 h-12 mx-auto mb-3 opacity-30" />
<p>No feeds subscribed yet.</p>
diff --git a/client/src/components/brain/tabs/FeedsTab.test.jsx b/client/src/components/brain/tabs/FeedsTab.test.jsx
new file mode 100644
index 0000000000..2dfdd44564
--- /dev/null
+++ b/client/src/components/brain/tabs/FeedsTab.test.jsx
@@ -0,0 +1,33 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { fireEvent, render, screen } from '@testing-library/react';
+
+const api = vi.hoisted(() => ({ getFeeds: vi.fn(), getFeedItems: vi.fn() }));
+vi.mock('../../../services/api', () => api);
+vi.mock('../../ui/Toast', () => ({ default: Object.assign(vi.fn(), { success: vi.fn(), error: vi.fn() }) }));
+
+import FeedsTab from './FeedsTab';
+
+describe('FeedsTab loading', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ api.getFeedItems.mockResolvedValue([]);
+ });
+
+ it('shows a retryable failure instead of the first-run prompt, while retaining empty success', async () => {
+ api.getFeeds.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ render(<FeedsTab />);
+
+ expect(await screen.findByText('Could not load feeds.')).toBeInTheDocument();
+ expect(screen.queryByText('No feeds subscribed yet.')).not.toBeInTheDocument();
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText('No feeds subscribed yet.')).toBeInTheDocument();
+ });
+
+ it('treats a falsy rejection as a failed primary load', async () => {
+ api.getFeeds.mockRejectedValueOnce(undefined);
+ render(<FeedsTab />);
+
+ expect(await screen.findByText('Could not load feeds.')).toBeInTheDocument();
+ expect(screen.queryByText('No feeds subscribed yet.')).not.toBeInTheDocument();
+ });
+});
diff --git a/client/src/components/cos/tabs/DigestTab.jsx b/client/src/components/cos/tabs/DigestTab.jsx
index c168cfe146..c908b4157f 100644
--- a/client/src/components/cos/tabs/DigestTab.jsx
+++ b/client/src/components/cos/tabs/DigestTab.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
import {
Calendar,
RefreshCw,
@@ -20,14 +20,18 @@ import BrailleSpinner from '../../BrailleSpinner';
import Banner from '../../ui/Banner';
import { formatDateNumeric } from '../../../utils/formatters';
import { pluralize } from '../../../lib/textUtils';
+import LoadFailedState from '../../ui/LoadFailedState';
export default function DigestTab() {
const [currentDigest, setCurrentDigest] = useState(null);
const [weekProgress, setWeekProgress] = useState(null);
const [digestList, setDigestList] = useState([]);
const [loading, setLoading] = useState(true);
+ const [loadFailed, setLoadFailed] = useState(false);
const [generating, setGenerating] = useState(false);
const [selectedWeek, setSelectedWeek] = useState(null);
+ const selectedWeekRef = useRef(null);
+ const loadVersion = useRef(0);
const [expandedSections, setExpandedSections] = useState({
accomplishments: true,
byTaskType: false,
@@ -35,37 +39,62 @@ export default function DigestTab() {
insights: true
});
- useEffect(() => {
- loadData();
- }, []);
+ useEffect(() => { loadData(); }, []);
const loadData = async () => {
+ const version = ++loadVersion.current;
setLoading(true);
- const [digest, progress, list] = await Promise.all([
- api.getCosWeeklyDigest().catch(() => null),
- api.getCosWeekProgress().catch(() => null),
- api.listCosWeeklyDigests().catch(() => ({ digests: [] }))
+ const [digestResult, progressResult, listResult] = await Promise.allSettled([
+ api.getCosWeeklyDigest(), api.getCosWeekProgress(), api.listCosWeeklyDigests()
]);
- setCurrentDigest(digest);
- setWeekProgress(progress);
- setDigestList(list.digests || []);
+ if (loadVersion.current !== version) return false;
+ setLoadFailed(digestResult.status === 'rejected');
+ if (digestResult.status === 'fulfilled') setCurrentDigest(digestResult.value);
+ if (progressResult.status === 'fulfilled') setWeekProgress(progressResult.value);
+ if (listResult.status === 'fulfilled') setDigestList(listResult.value?.digests || []);
setLoading(false);
+ return digestResult.status === 'fulfilled';
};
const loadWeek = async (weekId) => {
+ const version = ++loadVersion.current;
setLoading(true);
+ selectedWeekRef.current = weekId;
setSelectedWeek(weekId);
- const digest = await api.getCosWeeklyDigest(weekId).catch(() => null);
- setCurrentDigest(digest);
- setLoading(false);
+ setLoadFailed(false);
+ try {
+ const digest = await api.getCosWeeklyDigest(weekId);
+ if (loadVersion.current !== version) return false;
+ setCurrentDigest(digest);
+ setLoadFailed(false);
+ return true;
+ } catch {
+ if (loadVersion.current !== version) return false;
+ setLoadFailed(true);
+ return false;
+ } finally {
+ if (loadVersion.current === version) setLoading(false);
+ }
+ };
+
+ const retryLoad = () => {
+ if (selectedWeek) loadWeek(selectedWeek);
+ else loadData();
};
const handleGenerate = async () => {
+ const selectionAtStart = selectedWeekRef.current;
setGenerating(true);
const digest = await api.generateCosDigest().catch(() => null);
if (digest) {
- setCurrentDigest(digest);
- await loadData();
+ if (selectedWeekRef.current === selectionAtStart) {
+ selectedWeekRef.current = null;
+ setSelectedWeek(null);
+ setCurrentDigest(digest);
+ await loadData();
+ } else {
+ await loadWeek(selectedWeekRef.current);
+ }
}
setGenerating(false);
};
@@ -116,6 +145,8 @@ export default function DigestTab() {
return (
<div className="space-y-6">
+ {loadFailed && <LoadFailedState title="Could not load weekly digest data." hint="Retry the weekly digest load." onRetry={retryLoad} />}
+ {loading && currentDigest && <div className="flex justify-center py-6"><BrailleSpinner text="Loading digest" /></div>}
{/* Header with Week Selector */}
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
<div className="flex items-center gap-3">
@@ -192,13 +223,7 @@ export default function DigestTab() {
</div>
)}
- {!currentDigest ? (
- <div className="bg-port-card border border-port-border rounded-lg p-8 text-center">
- <Calendar className="w-12 h-12 text-gray-600 mx-auto mb-3" />
- <p className="text-gray-400">No digest data available yet.</p>
- <p className="text-gray-500 text-sm mt-1">Complete some tasks and generate a digest to see your weekly summary.</p>
- </div>
- ) : (
+ {currentDigest && !loadFailed && !loading ? (
<>
{/* Summary Stats */}
<div className="grid grid-cols-2 sm:grid-cols-4 gap-3">
@@ -414,7 +439,13 @@ export default function DigestTab() {
)}
</div>
</>
- )}
+ ) : !loadFailed && !loading ? (
+ <div className="bg-port-card border border-port-border rounded-lg p-8 text-center">
+ <Calendar className="w-12 h-12 text-gray-600 mx-auto mb-3" />
+ <p className="text-gray-400">No digest data available yet.</p>
+ <p className="text-gray-500 text-sm mt-1">Complete some tasks and generate a digest to see your weekly summary.</p>
+ </div>
+ ) : null}
</div>
);
}
diff --git a/client/src/components/cos/tabs/DigestTab.test.jsx b/client/src/components/cos/tabs/DigestTab.test.jsx
new file mode 100644
index 0000000000..6ac26960d5
--- /dev/null
+++ b/client/src/components/cos/tabs/DigestTab.test.jsx
@@ -0,0 +1,130 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+
+const api = vi.hoisted(() => ({
+ getCosWeeklyDigest: vi.fn(), getCosWeekProgress: vi.fn(), listCosWeeklyDigests: vi.fn(), generateCosDigest: vi.fn(),
+}));
+vi.mock('../../../services/api', () => api);
+
+import DigestTab from './DigestTab';
+
+describe('CoS DigestTab loading', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ api.getCosWeekProgress.mockResolvedValue(null);
+ api.listCosWeeklyDigests.mockResolvedValue({ digests: [] });
+ });
+
+ it('shows a retryable failure after a rejected primary load, then keeps empty success distinct', async () => {
+ api.getCosWeeklyDigest.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce(null);
+ render(<DigestTab />);
+
+ expect(await screen.findByText('Could not load weekly digest data.')).toBeInTheDocument();
+ expect(screen.queryByText(/Complete some tasks and generate a digest/)).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText('No digest data available yet.')).toBeInTheDocument();
+ });
+
+ it('keeps the chosen week selected and offers retry when that week fails to load', async () => {
+ api.getCosWeeklyDigest.mockResolvedValueOnce({
+ weekId: '2026-W40', summary: { totalTasks: 41 }, weekOverWeek: {},
+ });
+ api.listCosWeeklyDigests.mockResolvedValue({ digests: [
+ { weekId: '2026-W40', totalTasks: 1 }, { weekId: '2026-W39', totalTasks: 2 },
+ ] });
+ render(<DigestTab />);
+ const week = await screen.findByRole('combobox', { name: 'Week' });
+ api.getCosWeeklyDigest.mockRejectedValueOnce(new Error('offline'));
+ fireEvent.change(week, { target: { value: '2026-W39' } });
+
+ expect(await screen.findByText('Could not load weekly digest data.')).toBeInTheDocument();
+ expect(week).toHaveValue('2026-W39');
+ expect(screen.queryByText('41')).not.toBeInTheDocument();
+
+ api.getCosWeeklyDigest.mockResolvedValueOnce(null);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText('No digest data available yet.')).toBeInTheDocument();
+ expect(api.getCosWeeklyDigest).toHaveBeenLastCalledWith('2026-W39');
+ });
+
+ it('keeps the latest selected week when earlier requests resolve out of order', async () => {
+ let resolveFirst;
+ let resolveSecond;
+ api.getCosWeeklyDigest.mockResolvedValueOnce({ weekId: '2026-W40', summary: {}, weekOverWeek: {} });
+ api.listCosWeeklyDigests.mockResolvedValue({ digests: [
+ { weekId: '2026-W40', totalTasks: 1 }, { weekId: '2026-W39', totalTasks: 2 },
+ ] });
+ render(<DigestTab />);
+ const week = await screen.findByRole('combobox', { name: 'Week' });
+ api.getCosWeeklyDigest
+ .mockImplementationOnce(() => new Promise(resolve => { resolveFirst = resolve; }))
+ .mockImplementationOnce(() => new Promise(resolve => { resolveSecond = resolve; }));
+
+ fireEvent.change(week, { target: { value: '2026-W39' } });
+ fireEvent.change(week, { target: { value: '2026-W40' } });
+ await act(async () => {
+ resolveSecond({ weekId: '2026-W40', summary: { totalTasks: 40 }, weekOverWeek: {} });
+ });
+ expect(await screen.findByText('40')).toBeInTheDocument();
+ await act(async () => {
+ resolveFirst({ weekId: '2026-W39', summary: { totalTasks: 39 }, weekOverWeek: {} });
+ });
+
+ expect(await screen.findByText('40')).toBeInTheDocument();
+ expect(screen.queryByText('39')).not.toBeInTheDocument();
+ expect(week).toHaveValue('2026-W40');
+ });
+
+ it('returns to the refreshed current week after generation when selection has not changed', async () => {
+ api.getCosWeeklyDigest
+ .mockResolvedValueOnce({ weekId: '2026-W40', summary: { totalTasks: 40 }, weekOverWeek: {} })
+ .mockResolvedValueOnce({ weekId: '2026-W39', summary: { totalTasks: 39 }, weekOverWeek: {} })
+ .mockResolvedValueOnce({ weekId: '2026-W41', summary: { totalTasks: 41 }, weekOverWeek: {} });
+ api.listCosWeeklyDigests
+ .mockResolvedValueOnce({ digests: [
+ { weekId: '2026-W40', totalTasks: 40 }, { weekId: '2026-W39', totalTasks: 39 },
+ ] })
+ .mockResolvedValueOnce({ digests: [
+ { weekId: '2026-W41', totalTasks: 41 }, { weekId: '2026-W40', totalTasks: 40 },
+ ] });
+ api.generateCosDigest.mockResolvedValue({ weekId: '2026-W41', summary: { totalTasks: 41 }, weekOverWeek: {} });
+ render(<DigestTab />);
+ const week = await screen.findByRole('combobox', { name: 'Week' });
+ fireEvent.change(week, { target: { value: '2026-W39' } });
+ expect(await screen.findByText('39')).toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Refresh Digest' }));
+
+ expect(await screen.findByText('41')).toBeInTheDocument();
+ expect(week).toHaveValue('2026-W41');
+ expect(api.getCosWeeklyDigest).toHaveBeenLastCalledWith();
+ });
+
+ it('keeps a week selected by the user while generation is in flight', async () => {
+ let finishGeneration;
+ api.getCosWeeklyDigest
+ .mockResolvedValueOnce({ weekId: '2026-W40', summary: {}, weekOverWeek: {} })
+ .mockResolvedValueOnce({ weekId: '2026-W39', summary: { totalTasks: 39 }, weekOverWeek: {} })
+ .mockResolvedValueOnce({ weekId: '2026-W39', summary: { totalTasks: 390 }, weekOverWeek: {} });
+ api.listCosWeeklyDigests.mockResolvedValue({ digests: [
+ { weekId: '2026-W40', totalTasks: 40 }, { weekId: '2026-W39', totalTasks: 39 },
+ ] });
+ api.generateCosDigest.mockImplementationOnce(() => new Promise(resolve => { finishGeneration = resolve; }));
+ render(<DigestTab />);
+ const week = await screen.findByRole('combobox', { name: 'Week' });
+ fireEvent.click(screen.getByRole('button', { name: 'Refresh Digest' }));
+ fireEvent.change(week, { target: { value: '2026-W39' } });
+ await waitFor(() => expect(week).toHaveValue('2026-W39'));
+ await waitFor(() => expect(api.getCosWeeklyDigest).toHaveBeenLastCalledWith('2026-W39'));
+ expect(screen.getByText('39')).toBeInTheDocument();
+
+ await act(async () => {
+ finishGeneration({ weekId: '2026-W41', summary: { totalTasks: 41 }, weekOverWeek: {} });
+ });
+
+ expect(api.getCosWeeklyDigest).toHaveBeenLastCalledWith('2026-W39');
+ expect(week).toHaveValue('2026-W39');
+ expect(screen.getByText('390')).toBeInTheDocument();
+ });
+});
diff --git a/client/src/components/cos/tabs/GsdTab.jsx b/client/src/components/cos/tabs/GsdTab.jsx
index 000eb42b73..78d1d2b713 100644
--- a/client/src/components/cos/tabs/GsdTab.jsx
+++ b/client/src/components/cos/tabs/GsdTab.jsx
@@ -13,9 +13,11 @@ export default function GsdTab() {
const fetchData = useCallback(async () => {
const projectsData = await api.getGsdProjects().catch(() => null);
- setFailed(projectsData === null);
+ const succeeded = projectsData !== null;
+ setFailed(!succeeded);
if (projectsData) setProjects(projectsData.projects || projectsData || []);
setLoading(false);
+ return succeeded;
}, []);
useEffect(() => {
@@ -24,9 +26,9 @@ export default function GsdTab() {
const handleRefresh = async () => {
setRefreshing(true);
- await fetchData();
+ const succeeded = await fetchData();
setRefreshing(false);
- toast.success('GSD data refreshed');
+ if (succeeded) toast.success('GSD data refreshed');
};
if (loading) {
diff --git a/client/src/components/cos/tabs/GsdTab.test.jsx b/client/src/components/cos/tabs/GsdTab.test.jsx
index 8e121688dc..b98488874d 100644
--- a/client/src/components/cos/tabs/GsdTab.test.jsx
+++ b/client/src/components/cos/tabs/GsdTab.test.jsx
@@ -2,8 +2,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
import { fireEvent, render, screen } from '@testing-library/react';
const api = vi.hoisted(() => ({ getGsdProjects: vi.fn() }));
+const toast = vi.hoisted(() => ({ success: vi.fn(), error: vi.fn() }));
vi.mock('../../../services/api', () => api);
-vi.mock('../../ui/Toast', () => ({ default: Object.assign(vi.fn(), { success: vi.fn(), error: vi.fn() }) }));
+vi.mock('../../ui/Toast', () => ({ default: Object.assign(vi.fn(), toast) }));
vi.mock('./GsdProjectCard', () => ({ default: ({ project }) => <div>{project.appId}</div> }));
const GsdTab = (await import('./GsdTab')).default;
@@ -23,4 +24,13 @@ describe('GsdTab load failure (#10279)', () => {
expect(await screen.findByText('No Get Stuff Done projects found')).toBeInTheDocument();
expect(screen.getByRole('heading', { name: 'Get Stuff Done projects' })).toBeInTheDocument();
});
+
+ it('does not report a successful refresh when the reload fails', async () => {
+ api.getGsdProjects.mockResolvedValueOnce({ projects: [] }).mockRejectedValueOnce(new Error('offline'));
+ render(<GsdTab />);
+ fireEvent.click(await screen.findByRole('button', { name: 'Refresh' }));
+
+ expect(await screen.findByText('Could not load Get Stuff Done projects.')).toBeInTheDocument();
+ expect(toast.success).not.toHaveBeenCalledWith('GSD data refreshed');
+ });
});
diff --git a/client/src/components/digital-twin/tabs/GoalsTab.jsx b/client/src/components/digital-twin/tabs/GoalsTab.jsx
index c43b249437..d8b766da7c 100644
--- a/client/src/components/digital-twin/tabs/GoalsTab.jsx
+++ b/client/src/components/digital-twin/tabs/GoalsTab.jsx
@@ -8,6 +8,7 @@ import { FormField } from '../../ui/FormField';
import * as api from '../../../services/api';
import { useConfirmDelete } from '../../../hooks/useConfirmDelete';
import { formatDateNumeric } from '../../../utils/formatters';
+import LoadFailedState from '../../ui/LoadFailedState';
const CATEGORY_CONFIG = {
creative: { label: 'Creative', icon: Lightbulb, color: 'text-purple-400', bg: 'bg-purple-500/20' },
@@ -45,6 +46,7 @@ export default function GoalsTab({ onRefresh }) {
const [goalsData, setGoalsData] = useState(null);
const [longevity, setLongevity] = useState(null);
const [loading, setLoading] = useState(true);
+ const [loadFailed, setLoadFailed] = useState(false);
const [expandedGoal, setExpandedGoal] = useState(null);
const [showNewGoal, setShowNewGoal] = useState(false);
const [showBirthDate, setShowBirthDate] = useState(false);
@@ -55,13 +57,15 @@ export default function GoalsTab({ onRefresh }) {
const { isConfirming, requestDelete, cancelDelete, confirmDelete } = useConfirmDelete();
const loadData = useCallback(async () => {
- const [goals, longevityData] = await Promise.all([
- api.getGoals().catch(() => null),
- api.getLongevity().catch(() => null)
+ const [goalsResult, longevityResult] = await Promise.allSettled([
+ api.getGoals(), api.getLongevity()
]);
- setGoalsData(goals);
- setLongevity(longevityData);
- if (goals?.birthDate) setBirthDateInput(goals.birthDate);
+ setLoadFailed(goalsResult.status === 'rejected');
+ if (goalsResult.status === 'fulfilled') {
+ setGoalsData(goalsResult.value);
+ if (goalsResult.value?.birthDate) setBirthDateInput(goalsResult.value.birthDate);
+ }
+ if (longevityResult.status === 'fulfilled') setLongevity(longevityResult.value);
setLoading(false);
}, []);
@@ -131,6 +135,10 @@ export default function GoalsTab({ onRefresh }) {
);
}
+ if (loadFailed) {
+ return <LoadFailedState title="Could not load goals." hint="Your existing goals may still be available." onRetry={() => { setLoading(true); loadData(); }} />;
+ }
+
const activeGoals = goalsData?.goals?.filter(g => g.status === 'active') || [];
const completedGoals = goalsData?.goals?.filter(g => g.status === 'completed') || [];
const hasBirthDate = !!goalsData?.birthDate;
diff --git a/client/src/components/digital-twin/tabs/GoalsTab.test.jsx b/client/src/components/digital-twin/tabs/GoalsTab.test.jsx
index c9c7b73616..76928471c2 100644
--- a/client/src/components/digital-twin/tabs/GoalsTab.test.jsx
+++ b/client/src/components/digital-twin/tabs/GoalsTab.test.jsx
@@ -28,4 +28,15 @@ describe('GoalsTab', () => {
expect(derive).toBeEnabled();
expect(derive).toHaveTextContent('Re-derive');
});
+
+ it('distinguishes a failed goals read from a successful empty response', async () => {
+ api.getGoals.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce({ goals: [] });
+ render(<GoalsTab />);
+
+ expect(await screen.findByText('Could not load goals.')).toBeInTheDocument();
+ expect(screen.queryByText(/No goals yet/)).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText(/No goals yet/)).toBeInTheDocument();
+ });
});
diff --git a/client/src/pages/GitHub.jsx b/client/src/pages/GitHub.jsx
index 4426859f43..92028f9f23 100644
--- a/client/src/pages/GitHub.jsx
+++ b/client/src/pages/GitHub.jsx
@@ -16,6 +16,7 @@ import { timeAgo } from '../utils/formatters';
import PageSkeleton from '../components/ui/PageSkeleton';
import Modal from '../components/ui/Modal';
import { FormField } from '../components/ui/FormField';
+import LoadFailedState from '../components/ui/LoadFailedState';
const FILTERS = ['all', 'npm', 'secrets', 'archived'];
const GITHUB_LOGIN_COMMAND = 'gh auth login --hostname github.com --web --clipboard';
@@ -32,6 +33,7 @@ export default function GitHub() {
const [repos, setRepos] = useState({});
const [secrets, setSecrets] = useState({});
const [loading, setLoading] = useState(true);
+ const [reposFailed, setReposFailed] = useState(false);
const [syncing, setSyncing] = useState(false);
const [lastSync, setLastSync] = useState(null);
const [repoListTruncated, setRepoListTruncated] = useState(false);
@@ -54,13 +56,15 @@ export default function GitHub() {
const loadData = async () => {
setLoading(true);
- const [reposData, secretsData, statusData] = await Promise.all([
- getGitHubRepos({ silent: true }).catch(() => ({})),
- getGitHubSecrets({ silent: true }).catch(() => ({})),
- getGitHubStatus({ silent: true }).catch(() => UNAVAILABLE_AUTH_STATUS)
+ const [reposResult, secretsResult, statusResult] = await Promise.allSettled([
+ getGitHubRepos({ silent: true }),
+ getGitHubSecrets({ silent: true }),
+ getGitHubStatus({ silent: true })
]);
- setRepos(reposData || {});
- setSecrets(secretsData || {});
+ setReposFailed(reposResult.status === 'rejected');
+ if (reposResult.status === 'fulfilled') setRepos(reposResult.value || {});
+ if (secretsResult.status === 'fulfilled') setSecrets(secretsResult.value || {});
+ const statusData = statusResult.status === 'fulfilled' ? statusResult.value : UNAVAILABLE_AUTH_STATUS;
setAuthStatus(statusData);
setLastSync(statusData?.lastRepoSync || null);
setRepoListTruncated(statusData?.lastRepoSyncTruncated === true);
@@ -404,7 +408,9 @@ export default function GitHub() {
</p>
)}
- {Object.keys(repos).length === 0 ? (
+ {reposFailed ? (
+ <LoadFailedState title="Could not load GitHub repositories." hint="Retry the local repository read." onRetry={loadData} />
+ ) : Object.keys(repos).length === 0 ? (
<div className="text-center py-8">
<p className="text-gray-400">No repos loaded yet.</p>
<p className="text-gray-500 text-sm mt-1">Click "Sync Repos" to fetch from GitHub.</p>
diff --git a/client/src/pages/GitHub.test.jsx b/client/src/pages/GitHub.test.jsx
index 48d69e14e3..910c52b76c 100644
--- a/client/src/pages/GitHub.test.jsx
+++ b/client/src/pages/GitHub.test.jsx
@@ -33,6 +33,21 @@ describe('GitHub account setup', () => {
});
});
+ it('distinguishes a failed repository read from a successful empty response', async () => {
+ mock.getGitHubRepos.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce({});
+ render(
+ <MemoryRouter initialEntries={['/devtools/github']}>
+ <GitHub />
+ </MemoryRouter>,
+ );
+
+ expect(await screen.findByText('Could not load GitHub repositories.')).toBeInTheDocument();
+ expect(screen.queryByText('No repos loaded yet.')).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText('No repos loaded yet.')).toBeInTheDocument();
+ });
+
it('offers an in-app GitHub login flow and prevents an anonymous repo sync', async () => {
render(
<MemoryRouter initialEntries={['/devtools/github']}>