AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix(desktop): collect diagnostics before issue report
tianma-ifac7f953c947f
diff --git a/apps/web/src/components/DesktopSyncIssuesDialog.test.mjs b/apps/web/src/components/DesktopSyncIssuesDialog.test.mjsnew file mode 100644index 00000000..16b45c29--- /dev/null+++ b/apps/web/src/components/DesktopSyncIssuesDialog.test.mjs@@ -0,0 +1,18 @@+import { readFileSync } from "node:fs";+import { describe, expect, test } from "bun:test";++const source = readFileSync(new URL("./DesktopSyncIssuesDialog.tsx", import.meta.url), "utf8");++describe("desktop sync issue reporting", () => {+ test("collects connected-instance and desktop runtime diagnostics before opening GitHub", () => {+ expect(source).toContain('queryKey: ["instance-health", instanceUrl]');+ expect(source).toContain('queryKey: ["instance-release", instanceUrl]');+ expect(source).toContain('queryKey: ["system-info-client-runtime"]');+ expect(source).toContain("queryFn: getClientRuntimeDiagnostics");+ expect(source).toContain("clientRuntime: clientRuntimeQuery.data");+ expect(source).toContain("instance: healthQuery.data?.health");+ expect(source).toContain("instanceVersion: releaseQuery.data?.version");+ expect(source).toContain("&& !collectingSystemInfo");+ expect(source).toContain("asChild={canReportIssue}");+ });+});diff --git a/apps/web/src/components/DesktopSyncIssuesDialog.tsx b/apps/web/src/components/DesktopSyncIssuesDialog.tsxindex efc5bf0d..8fc17035 100644--- a/apps/web/src/components/DesktopSyncIssuesDialog.tsx+++ b/apps/web/src/components/DesktopSyncIssuesDialog.tsx@@ -1,5 +1,6 @@import { useCallback, useEffect, useMemo, useState } from "react";-import { AlertTriangle, ExternalLink, RefreshCw, RotateCcw, Trash2 } from "lucide-react";+import { useQuery } from "@tanstack/react-query";+import { AlertTriangle, ExternalLink, LoaderCircle, RefreshCw, RotateCcw, Trash2 } from "lucide-react";import { buildGitHubFeedbackUrl, type DesktopOutboxItem, type Notebook } from "@edgeever/shared";import { useTranslation } from "react-i18next";import { Button } from "@/components/ui/button";@@ -7,6 +8,7 @@ import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, Dimport { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";import { AppConfirmDialog } from "@/components/dialogs/ConfirmDialogs";import { getWebSystemInfoItems } from "@/components/settings/SystemInfoCard";+import { api, getConfiguredDesktopApiBaseUrl } from "@/lib/api";import {createDesktopSyncDiagnosticText,discardDesktopSyncIssue,@@ -15,6 +17,7 @@ import {retryDesktopSyncIssue,type DesktopGlobalSyncIssue,} from "@/lib/desktop-sync";+import { getClientRuntimeDiagnostics } from "@/lib/system-diagnostics";const isRecoverableMissingMemo = (item: DesktopOutboxItem) => item.kind === "memo.update"&& item.status === "error"@@ -43,6 +46,32 @@ export const DesktopSyncIssuesDialog = ({const [recovering, setRecovering] = useState<DesktopOutboxItem | null>(null);const [discarding, setDiscarding] = useState<DesktopOutboxItem | null>(null);const [recoveryNotebookId, setRecoveryNotebookId] = useState("");+ const instanceUrl = getConfiguredDesktopApiBaseUrl();+ const healthQuery = useQuery({+ queryKey: ["instance-health", instanceUrl],+ queryFn: async () => {+ const startedAt = performance.now();+ const health = await api.getInstanceHealth();+ return { health, latencyMs: Math.max(0, Math.round(performance.now() - startedAt)) };+ },+ enabled: open && Boolean(instanceUrl),+ staleTime: 60 * 1000,+ retry: 1,+ });+ const clientRuntimeQuery = useQuery({+ queryKey: ["system-info-client-runtime"],+ queryFn: getClientRuntimeDiagnostics,+ enabled: open,+ staleTime: Number.POSITIVE_INFINITY,+ retry: 1,+ });+ const releaseQuery = useQuery({+ queryKey: ["instance-release", instanceUrl],+ queryFn: () => api.getInstanceRelease(),+ enabled: open && Boolean(instanceUrl),+ staleTime: 5 * 60 * 1000,+ retry: 1,+ });const availableNotebooks = notebooks;const dateTimeFormatter = useMemo(@@ -58,11 +87,17 @@ export const DesktopSyncIssuesDialog = ({text: createDesktopSyncDiagnosticText(items, globalIssue),},privacyNotice: t("feedback.privacyNotice"),- systemInfo: getWebSystemInfoItems(t, i18n.language),+ systemInfo: getWebSystemInfoItems(t, i18n.language, {+ clientRuntime: clientRuntimeQuery.data,+ instance: healthQuery.data?.health,+ instanceVersion: releaseQuery.data?.version,+ }),systemInfoHeading: t("feedback.systemInfoHeading"),systemInfoNotice: t("feedback.systemInfoNotice"),titlePrefix: t("notebookPane.syncDetails.reportTitlePrefix"),- }), [globalIssue, i18n.language, items, t]);+ }), [clientRuntimeQuery.data, globalIssue, healthQuery.data, i18n.language, items, releaseQuery.data, t]);+ const collectingSystemInfo = clientRuntimeQuery.isFetching || healthQuery.isFetching || releaseQuery.isFetching;+ const canReportIssue = (items.length > 0 || Boolean(globalIssue)) && !collectingSystemInfo;const formatTime = (value: string | null | undefined) => {if (!value) return null;const time = new Date(value);@@ -207,15 +242,17 @@ export const DesktopSyncIssuesDialog = ({</div><DialogFooter className="gap-2 sm:justify-between">- <Button variant="outline" disabled={items.length === 0 && !globalIssue} asChild={items.length > 0 || Boolean(globalIssue)}>- {items.length > 0 || globalIssue ? (+ <Button variant="outline" disabled={!canReportIssue} asChild={canReportIssue}>+ {canReportIssue ? (<a href={reportIssueUrl} target="_blank" rel="noopener noreferrer"><ExternalLink className="mr-1.5 h-4 w-4" />{t("notebookPane.syncDetails.reportIssue")}</a>) : (<span>- <ExternalLink className="mr-1.5 h-4 w-4" />+ {collectingSystemInfo+ ? <LoaderCircle className="mr-1.5 h-4 w-4 animate-spin" />+ : <ExternalLink className="mr-1.5 h-4 w-4" />}{t("notebookPane.syncDetails.reportIssue")}</span>)}diff --git a/apps/web/src/components/settings/SystemInfoPanel.tsx b/apps/web/src/components/settings/SystemInfoPanel.tsxindex bb37d400..62067fd9 100644--- a/apps/web/src/components/settings/SystemInfoPanel.tsx+++ b/apps/web/src/components/settings/SystemInfoPanel.tsx@@ -31,6 +31,12 @@ type InstanceSystemDiagnostics = Pick<InstanceHealth, "build" | "containerImageSruntime?: string | null;};+export type SystemInfoDiagnostics = {+ clientRuntime?: ClientRuntimeDiagnostics | null;+ instance?: Partial<InstanceSystemDiagnostics> | null;+ instanceVersion?: string | null;+};+type SystemInfoGroup = {id: "cloud" | "client" | "connection";title: string;@@ -82,11 +88,7 @@ const getColSpanClass = (colSpan?: SystemInfoItem["colSpan"]) => {const getWebSystemInfoGroups = (t: (key: string) => string,language: string,- diagnostics: {- clientRuntime?: ClientRuntimeDiagnostics | null;- instance?: Partial<InstanceSystemDiagnostics> | null;- instanceVersion?: string | null;- } = {},+ diagnostics: SystemInfoDiagnostics = {},): SystemInfoGroup[] => {const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone || t("systemInfo.unknown");const userAgent = navigator.userAgent;@@ -200,12 +202,8 @@ const getWebSystemInfoGroups = (export const getWebSystemInfoItems = (t: (key: string) => string,language: string,- instanceRuntime?: string | null,- instanceVersion?: string | null,-): SystemInfoItem[] => getWebSystemInfoGroups(t, language, {- instance: { runtime: instanceRuntime },- instanceVersion,-})+ diagnostics: SystemInfoDiagnostics = {},+): SystemInfoItem[] => getWebSystemInfoGroups(t, language, diagnostics).flatMap((group) => group.items);export const SystemInfoPanel = ({ active = true }: { active?: boolean }) => {