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
feat(web): explain note save conflicts with concrete reasons
tianma-if4d95d834f3c6
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsxindex edfdb225..20f45bec 100644--- a/apps/web/src/components/EditorPane.tsx+++ b/apps/web/src/components/EditorPane.tsx@@ -110,6 +110,12 @@ import { codeBlockLowlight, EdgeEverCodeBlock } from "@/lib/code-block";import { compressImageForUpload } from "@/lib/image-compression";import { localDb, type MemoUpdateSyncPayload } from "@/lib/local-db";import { getMemoUpdateQueueId, isMemoUpdateAlreadyApplied, queueMemoUpdate, shouldQueueMemoSaveError } from "@/lib/sync-queue";+import {+ formatMemoSaveConflictReason,+ getMemoSaveConflictInfo,+ getMemoSaveConflictInfoFromQueueItem,+ type MemoSaveConflictInfo,+} from "@/lib/memo-save-conflict";import { isLocalMemoId } from "@/lib/local-mirror";import { shouldAcceptRemoteMemoDetail } from "@/lib/memo-detail-freshness";import type { EdgeEverRepository } from "@/lib/repository";@@ -857,6 +863,7 @@ const RichEditorPane = ({const [title, setTitle] = useState("");const [tagsText, setTagsText] = useState("");const [saveState, setSaveState] = useState<"idle" | "saving" | "saved" | "queued" | "error" | "conflict">("idle");+ const [saveConflictInfo, setSaveConflictInfo] = useState<MemoSaveConflictInfo | null>(null);const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);const [hydratedEditorMemoId, setHydratedEditorMemoId] = useState<string | null>(null);const [dirtyVersion, setDirtyVersion] = useState(0);@@ -1973,7 +1980,9 @@ const RichEditorPane = ({editingMemoIdRef.current = memo.id;appliedEditorSourceKeyRef.current = sourceKey;if (queuedUpdate) {- setSaveState(syncStatusToSaveState(queuedUpdate.status));+ const nextState = syncStatusToSaveState(queuedUpdate.status);+ setSaveState(nextState);+ setSaveConflictInfo(nextState === "conflict" ? getMemoSaveConflictInfoFromQueueItem(queuedUpdate) : null);}if (requiresLocalEditSession(memo)) {editSessionRef.current = editSessionRef.current ?? createLocalEditSession(memo);@@ -1999,7 +2008,14 @@ const RichEditorPane = ({editingMemoIdRef.current = memo.id;hasUnsavedChangesRef.current = nextHasUnsavedChanges;setHasUnsavedChanges(nextHasUnsavedChanges);- setSaveState(queuedUpdate ? syncStatusToSaveState(queuedUpdate.status) : "idle");+ if (queuedUpdate) {+ const nextState = syncStatusToSaveState(queuedUpdate.status);+ setSaveState(nextState);+ setSaveConflictInfo(nextState === "conflict" ? getMemoSaveConflictInfoFromQueueItem(queuedUpdate) : null);+ } else {+ setSaveState("idle");+ setSaveConflictInfo(null);+ }setTitle(nextTitle);setTagsText(nextTagsText);setMobilePlainText(nextMarkdown);@@ -2101,11 +2117,30 @@ const RichEditorPane = ({useEffect(() => {const handleSyncCompleted = (event: Event) => {const result = (event as CustomEvent<{ failed?: number; conflicted?: number }>).detail;- if ((result?.failed ?? 0) > 0 || (result?.conflicted ?? 0) > 0 || hasUnsavedChangesRef.current) {+ const memoId = memoRef.current?.id;++ if (memoId && (result?.conflicted ?? 0) > 0) {+ void localDb.syncQueue.get(getMemoUpdateQueueId(memoId)).then((item) => {+ if (!item || item.status !== "conflict" || memoRef.current?.id !== memoId) {+ return;+ }+ setSaveState("conflict");+ setSaveConflictInfo(getMemoSaveConflictInfoFromQueueItem(item));+ });+ return;+ }++ if ((result?.failed ?? 0) > 0 || hasUnsavedChangesRef.current) {return;}- setSaveState((current) => current === "queued" ? "saved" : current);+ setSaveState((current) => {+ if (current !== "queued") {+ return current;+ }+ setSaveConflictInfo(null);+ return "saved";+ });};window.addEventListener("edgeever:sync-completed", handleSyncCompleted);@@ -2387,6 +2422,7 @@ const RichEditorPane = ({hasUnsavedChangesRef.current = false;setHasUnsavedChanges(false);await localDb.drafts.delete(savedMemo.id);+ setSaveConflictInfo(null);setSaveState(queued ? "queued" : "saved");if (!queued) {window.setTimeout(() => setSaveState("idle"), 1400);@@ -2397,16 +2433,15 @@ const RichEditorPane = ({persistCurrentDraft();hasUnsavedChangesRef.current = true;setHasUnsavedChanges(true);+ setSaveConflictInfo(null);setSaveState("idle");},onError: async (error) => {const sourceError = error instanceof MemoSaveRequestError ? error.originalError : error;- const code =- sourceError && typeof sourceError === "object" && "code" in sourceError- ? String(sourceError.code)- : null;+ const conflictInfo = getMemoSaveConflictInfo(sourceError);- if (code === "revision_conflict") {+ if (conflictInfo) {+ setSaveConflictInfo(conflictInfo);setSaveState("conflict");return;}@@ -2423,10 +2458,12 @@ const RichEditorPane = ({hasUnsavedChangesRef.current = false;setHasUnsavedChanges(false);+ setSaveConflictInfo(null);setSaveState("queued");return;}+ setSaveConflictInfo(null);setSaveState("error");},});@@ -2711,6 +2748,12 @@ const RichEditorPane = ({return () => window.clearTimeout(timer);}, [dirtyVersion, editor, hasUnsavedChanges, memo, saveMutation, saveState, useMobilePlainTextEditor]);+ // Must stay above early returns so hook order never changes across loading/empty/editor states.+ const saveConflictReason = useMemo(+ () => (saveState === "conflict" ? formatMemoSaveConflictReason(t, saveConflictInfo) : null),+ [saveConflictInfo, saveState, t],+ );+if (isSelectionMode) {return (<div className="flex h-full min-w-0 flex-col bg-white">@@ -3120,6 +3163,8 @@ const RichEditorPane = ({className={cn("hidden items-center gap-1.5 rounded-md px-2 py-1 text-xs font-medium sm:inline-flex", saveStateClassName)}role="status"aria-live="polite"+ title={saveConflictReason ?? undefined}+ aria-label={saveState === "conflict" && saveConflictReason ? `${saveLabel}. ${saveConflictReason}` : undefined}{...statusSettleMotion}>{saveState === "saving" ? (@@ -3138,6 +3183,8 @@ const RichEditorPane = ({className={cn("inline-flex max-w-[5.5rem] truncate rounded-full px-2 py-1 text-[11px] font-medium sm:hidden", mobileStatusClassName)}role="status"aria-live="polite"+ title={saveConflictReason ?? undefined}+ aria-label={saveState === "conflict" && saveConflictReason ? `${saveLabel}. ${saveConflictReason}` : undefined}{...statusSettleMotion}>{mobileStatusLabel}@@ -3516,6 +3563,15 @@ const RichEditorPane = ({onPickNoteLink={() => setNoteLinkPickerOpen(true)}/>)}+ {saveState === "conflict" && saveConflictReason ? (+ <div+ className="flex items-start gap-2 border-t border-rose-100 bg-rose-50 px-3 py-2 text-xs leading-relaxed text-rose-800 sm:px-5"+ role="alert"+ >+ <CircleAlert className="mt-0.5 h-3.5 w-3.5 shrink-0" aria-hidden="true" />+ <span>{saveConflictReason}</span>+ </div>+ ) : null}</header><divdiff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.tsindex d0b9896a..77c7d6b5 100644--- a/apps/web/src/lib/api.ts+++ b/apps/web/src/lib/api.ts@@ -236,12 +236,14 @@ export type JsonBackupPage = MarkdownExportPage & {export class ApiRequestError extends Error {status: number;code?: string;+ details?: unknown;- constructor(message: string, status: number, code?: string) {+ constructor(message: string, status: number, code?: string, details?: unknown) {super(message);this.name = "ApiRequestError";this.status = status;this.code = code;+ this.details = details;}}@@ -276,7 +278,9 @@ const request = async <T>(path: string, init?: RequestInit): Promise<T> => {if (!response.ok) {const body = await response.json().catch(() => null);- const error = body && typeof body === "object" && "error" in body ? (body as { error?: { code?: string; message?: string } }).error : undefined;+ const error = body && typeof body === "object" && "error" in body+ ? (body as { error?: { code?: string; message?: string; details?: unknown } }).error+ : undefined;const message =body && typeof body === "object" && "error" in body? error?.message@@ -294,7 +298,7 @@ const request = async <T>(path: string, init?: RequestInit): Promise<T> => {}}- throw new ApiRequestError(message || "Request failed", response.status, error?.code);+ throw new ApiRequestError(message || "Request failed", response.status, error?.code, error?.details);}const body = await response.json() as T;diff --git a/apps/web/src/lib/desktop-sync.ts b/apps/web/src/lib/desktop-sync.tsindex 512cadc1..9243c247 100644--- a/apps/web/src/lib/desktop-sync.ts+++ b/apps/web/src/lib/desktop-sync.ts@@ -188,7 +188,13 @@ const syncOutboxItem = async (item: DesktopOutboxItem, stagedRewrites: StagedResconst editSessionResponse = await api.createMemoEditSession(memoId);const editSession = editSessionResponse.editSession;if (editSession.baseRevision !== Number(payload.expectedRevision) || editSession.baseContentHash !== String(payload.expectedContentHash ?? "")) {- throw new ApiRequestError("Note changed before the offline draft could sync.", 409, "revision_conflict");+ throw new ApiRequestError("Note changed before the offline draft could sync.", 409, "revision_conflict", {+ expectedRevision: Number(payload.expectedRevision),+ currentRevision: editSession.baseRevision,+ expectedContentHash: String(payload.expectedContentHash ?? ""),+ currentContentHash: editSession.baseContentHash,+ source: "offline_sync",+ });}const data = await api.updateMemo(memoId, {expectedRevision: Number(payload.expectedRevision),@@ -344,7 +350,8 @@ const syncOutbox = async (stagedRewrites: StagedResourceRewrite[], onlyKinds?: S}synced += 1;} catch (error) {- const conflict = error instanceof ApiRequestError && error.code === "revision_conflict";+ const conflict = error instanceof ApiRequestError+ && (error.code === "revision_conflict" || error.code === "content_conflict" || error.code === "edit_session_conflict");await request("sync.outbox.fail", { id: item.id, error: error instanceof Error ? error.message : String(error), conflict });if (conflict) conflicted += 1;else failed += 1;diff --git a/apps/web/src/lib/local-db.ts b/apps/web/src/lib/local-db.tsindex 82c5c7a9..2115c757 100644--- a/apps/web/src/lib/local-db.ts+++ b/apps/web/src/lib/local-db.ts@@ -54,6 +54,8 @@ export type SyncQueueItem = {payload: MemoUpdateSyncPayload | MemoCreateSyncPayload | MemoDeleteSyncPayload | MemoRestoreSyncPayload | LocalActionPayload;attemptCount: number;lastError: string | null;+ lastErrorCode?: string | null;+ lastErrorDetails?: Record<string, unknown> | null;nextAttemptAt: string | null;claimId: string | null;createdAt: string;diff --git a/apps/web/src/lib/memo-save-conflict.test.mjs b/apps/web/src/lib/memo-save-conflict.test.mjsnew file mode 100644index 00000000..e3e8a349--- /dev/null+++ b/apps/web/src/lib/memo-save-conflict.test.mjs@@ -0,0 +1,68 @@+import { describe, expect, test } from "bun:test";+import { ApiRequestError } from "./api.ts";+import {+ formatMemoSaveConflictReason,+ getMemoSaveConflictInfo,+ getMemoSaveConflictInfoFromQueueItem,+ parseMemoSaveConflictDetails,+} from "./memo-save-conflict.ts";++const t = (key, options = {}) => {+ if (key === "editor.saveState.conflictReason.revisionWithVersions") {+ return `rev ${options.expected} -> ${options.current}`;+ }+ if (key === "editor.saveState.conflictReason.revision") return "revision";+ if (key === "editor.saveState.conflictReason.content") return "content";+ if (key === "editor.saveState.conflictReason.editSession") return "edit-session";+ if (key === "editor.saveState.conflictReason.offlineStale") return "offline-stale";+ if (key === "editor.saveState.conflictReason.generic") return "generic";+ return key;+};++describe("memo save conflict helpers", () => {+ test("parses revision details from API errors", () => {+ const error = new ApiRequestError("conflict", 409, "revision_conflict", {+ expectedRevision: 3,+ currentRevision: 5,+ });++ expect(getMemoSaveConflictInfo(error)).toEqual({+ code: "revision_conflict",+ details: {+ expectedRevision: 3,+ currentRevision: 5,+ expectedContentHash: undefined,+ currentContentHash: undefined,+ source: undefined,+ },+ });+ expect(formatMemoSaveConflictReason(t, getMemoSaveConflictInfo(error))).toBe("rev 3 -> 5");+ });++ test("maps content and edit-session conflict codes", () => {+ expect(formatMemoSaveConflictReason(t, { code: "content_conflict" })).toBe("content");+ expect(formatMemoSaveConflictReason(t, { code: "edit_session_conflict" })).toBe("edit-session");+ });++ test("maps offline sync conflicts from queue items", () => {+ const info = getMemoSaveConflictInfoFromQueueItem({+ status: "conflict",+ lastError: "stale",+ lastErrorCode: "revision_conflict",+ lastErrorDetails: {+ expectedRevision: 2,+ currentRevision: 2,+ source: "offline_sync",+ },+ });++ expect(info?.code).toBe("revision_conflict");+ expect(formatMemoSaveConflictReason(t, info)).toBe("offline-stale");+ });++ test("ignores non-conflict queue items and empty details", () => {+ expect(getMemoSaveConflictInfoFromQueueItem({ status: "pending", lastError: null })).toBeNull();+ expect(parseMemoSaveConflictDetails({ foo: "bar" })).toBeNull();+ expect(formatMemoSaveConflictReason(t, null)).toBe("generic");+ });+});diff --git a/apps/web/src/lib/memo-save-conflict.ts b/apps/web/src/lib/memo-save-conflict.tsnew file mode 100644index 00000000..99761bc6--- /dev/null+++ b/apps/web/src/lib/memo-save-conflict.ts@@ -0,0 +1,118 @@+import { ApiRequestError } from "@/lib/api";+import type { SyncQueueItem } from "@/lib/local-db";++export type MemoSaveConflictCode =+ | "revision_conflict"+ | "content_conflict"+ | "edit_session_conflict";++export type MemoSaveConflictDetails = {+ expectedRevision?: number;+ currentRevision?: number;+ expectedContentHash?: string;+ currentContentHash?: string;+ source?: string;+};++export type MemoSaveConflictInfo = {+ code: MemoSaveConflictCode | string;+ details?: MemoSaveConflictDetails | null;+};++const isRecord = (value: unknown): value is Record<string, unknown> =>+ Boolean(value) && typeof value === "object" && !Array.isArray(value);++const readOptionalNumber = (value: unknown) =>+ typeof value === "number" && Number.isFinite(value) ? value : undefined;++const readOptionalString = (value: unknown) =>+ typeof value === "string" && value.trim() ? value : undefined;++export const parseMemoSaveConflictDetails = (value: unknown): MemoSaveConflictDetails | null => {+ if (!isRecord(value)) {+ return null;+ }++ const details: MemoSaveConflictDetails = {+ expectedRevision: readOptionalNumber(value.expectedRevision),+ currentRevision: readOptionalNumber(value.currentRevision),+ expectedContentHash: readOptionalString(value.expectedContentHash),+ currentContentHash: readOptionalString(value.currentContentHash),+ source: readOptionalString(value.source),+ };++ if (+ details.expectedRevision === undefined &&+ details.currentRevision === undefined &&+ details.expectedContentHash === undefined &&+ details.currentContentHash === undefined &&+ details.source === undefined+ ) {+ return null;+ }++ return details;+};++export const isMemoSaveConflictCode = (code: string | null | undefined): code is MemoSaveConflictCode =>+ code === "revision_conflict" || code === "content_conflict" || code === "edit_session_conflict";++export const isMemoSaveConflictError = (error: unknown): error is ApiRequestError =>+ error instanceof ApiRequestError && isMemoSaveConflictCode(error.code);++export const getMemoSaveConflictInfo = (error: unknown): MemoSaveConflictInfo | null => {+ if (!(error instanceof ApiRequestError) || !isMemoSaveConflictCode(error.code)) {+ return null;+ }++ return {+ code: error.code,+ details: parseMemoSaveConflictDetails(error.details),+ };+};++export const getMemoSaveConflictInfoFromQueueItem = (item: Pick<SyncQueueItem, "status" | "lastError" | "lastErrorCode" | "lastErrorDetails"> | null | undefined): MemoSaveConflictInfo | null => {+ if (!item || item.status !== "conflict") {+ return null;+ }++ const code = item.lastErrorCode && isMemoSaveConflictCode(item.lastErrorCode)+ ? item.lastErrorCode+ : "revision_conflict";++ return {+ code,+ details: parseMemoSaveConflictDetails(item.lastErrorDetails) ?? null,+ };+};++type Translate = (key: string, options?: Record<string, unknown>) => string;++export const formatMemoSaveConflictReason = (t: Translate, info: MemoSaveConflictInfo | null | undefined) => {+ if (!info) {+ return t("editor.saveState.conflictReason.generic");+ }++ if (info.code === "content_conflict") {+ return t("editor.saveState.conflictReason.content");+ }++ if (info.code === "edit_session_conflict") {+ return t("editor.saveState.conflictReason.editSession");+ }++ const expected = info.details?.expectedRevision;+ const current = info.details?.currentRevision;+ if (typeof expected === "number" && typeof current === "number" && expected !== current) {+ return t("editor.saveState.conflictReason.revisionWithVersions", {+ expected,+ current,+ });+ }++ if (info.details?.source === "offline_sync") {+ return t("editor.saveState.conflictReason.offlineStale");+ }++ return t("editor.saveState.conflictReason.revision");+};diff --git a/apps/web/src/lib/sync-queue.ts b/apps/web/src/lib/sync-queue.tsindex 39a798fa..4390b94b 100644--- a/apps/web/src/lib/sync-queue.ts+++ b/apps/web/src/lib/sync-queue.ts@@ -23,6 +23,7 @@ import {type MemoUpdateSyncPayload,type SyncQueueItem,} from "@/lib/local-db";+import { getMemoSaveConflictInfo, parseMemoSaveConflictDetails } from "@/lib/memo-save-conflict";import { getCachedLocalResourceBytes, removeCachedLocalResourceBytes } from "@/lib/local-resource-cache";import { isBrowserOffline } from "@/lib/network-status";@@ -50,6 +51,8 @@ export const queueLocalAction = async (scope: string, kind: LocalActionKind, entpayload,attemptCount: 0,lastError: null,+ lastErrorCode: null,+ lastErrorDetails: null,nextAttemptAt: null,claimId: null,createdAt: now,@@ -72,6 +75,8 @@ export const queueMemoUpdate = async (payload: MemoUpdateSyncPayload, scope?: stpayload,attemptCount: existing?.attemptCount ?? 0,lastError: null,+ lastErrorCode: null,+ lastErrorDetails: null,nextAttemptAt: null,claimId: null,createdAt: existing?.createdAt ?? now,@@ -294,13 +299,19 @@ const runQueuedChanges = async (options: {result.synced += 1;}} catch (error) {- const status = isRevisionConflict(error) ? "conflict" : "error";+ const conflictInfo = getMemoSaveConflictInfo(error);+ const status = conflictInfo ? "conflict" : "error";const attemptCount = item.attemptCount + 1;+ const errorDetails = parseMemoSaveConflictDetails(+ error instanceof ApiRequestError ? error.details : null,+ );const updated = await updateClaimedQueueItem(item, {status,attemptCount,lastError: getErrorMessage(error),+ lastErrorCode: error instanceof ApiRequestError ? error.code ?? null : null,+ lastErrorDetails: errorDetails ? { ...errorDetails } : null,nextAttemptAt: status === "error" ? getSyncRetryAt(attemptCount) : null,claimId: null,updatedAt: new Date().toISOString(),@@ -567,7 +578,13 @@ const syncQueueItem = async (item: SyncQueueItem): Promise<SyncQueueResult> => {editSession.baseRevision !== payload.expectedRevision ||editSession.baseContentHash !== payload.expectedContentHash) {- throw new ApiRequestError("Note changed before the offline draft could sync.", 409, "revision_conflict");+ throw new ApiRequestError("Note changed before the offline draft could sync.", 409, "revision_conflict", {+ expectedRevision: payload.expectedRevision,+ currentRevision: editSession.baseRevision,+ expectedContentHash: payload.expectedContentHash,+ currentContentHash: editSession.baseContentHash,+ source: "offline_sync",+ });}const data = await api.updateMemo(item.memoId, {@@ -583,9 +600,6 @@ const syncQueueItem = async (item: SyncQueueItem): Promise<SyncQueueResult> => {return data.memo;};-const isRevisionConflict = (error: unknown) =>- error instanceof ApiRequestError && error.code === "revision_conflict";-const getErrorMessage = (error: unknown) => {if (error instanceof Error) {return error.message;diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsxindex 89f353fd..36f395b4 100644--- a/apps/web/src/main.tsx+++ b/apps/web/src/main.tsx@@ -14,29 +14,36 @@ const DEVELOPMENT_PWA_RELOAD_KEY = "edgeever.dev-pwa-reset";const clearDevelopmentPwaState = async () => {if (!("serviceWorker" in navigator)) {- return;+ return false;}- const registrations = await navigator.serviceWorker.getRegistrations();- await Promise.all(registrations.map((registration) => registration.unregister()));+ const hadController = Boolean(navigator.serviceWorker.controller);- if ("caches" in window) {- const cacheNames = await window.caches.keys();- await Promise.all(cacheNames.map((cacheName) => window.caches.delete(cacheName)));+ try {+ const registrations = await navigator.serviceWorker.getRegistrations();+ await Promise.all(registrations.map((registration) => registration.unregister()));++ if ("caches" in window) {+ const cacheNames = await window.caches.keys();+ await Promise.all(cacheNames.map((cacheName) => window.caches.delete(cacheName)));+ }+ } catch (error) {+ console.warn("Failed to clear development service worker state", error);}- if (navigator.serviceWorker.controller && window.sessionStorage.getItem(DEVELOPMENT_PWA_RELOAD_KEY) !== "1") {+ // A still-controlling worker can keep serving a broken HMR shell after a+ // runtime crash. Force one clean reload once the worker is unregistered.+ if (hadController && window.sessionStorage.getItem(DEVELOPMENT_PWA_RELOAD_KEY) !== "1") {window.sessionStorage.setItem(DEVELOPMENT_PWA_RELOAD_KEY, "1");window.location.reload();- return;+ return true;}window.sessionStorage.removeItem(DEVELOPMENT_PWA_RELOAD_KEY);+ return false;};-if (import.meta.env.DEV) {- void clearDevelopmentPwaState();-} else {+const registerProductionServiceWorker = () => {let updateServiceWorker: ReturnType<typeof registerSW>;updateServiceWorker = registerSW({@@ -68,34 +75,51 @@ if (import.meta.env.DEV) {console.warn("PWA service worker registration failed", error);},});-}--const queryClient = new QueryClient({- defaultOptions: {- queries: {- refetchOnWindowFocus: false,- retry: 1,- staleTime: 15_000,+};++const mountApp = () => {+ const queryClient = new QueryClient({+ defaultOptions: {+ queries: {+ refetchOnWindowFocus: false,+ retry: 1,+ staleTime: 15_000,+ },},- },-});--const root = document.getElementById("root");--if (!root) {- throw new Error("Root element not found");-}--initializeTheme();--createRoot(root).render(- <React.StrictMode>- <QueryClientProvider client={queryClient}>- <ThemeProvider>- <BrowserRouter>- <App />- </BrowserRouter>- </ThemeProvider>- </QueryClientProvider>- </React.StrictMode>-);+ });++ const root = document.getElementById("root");++ if (!root) {+ throw new Error("Root element not found");+ }++ initializeTheme();++ createRoot(root).render(+ <React.StrictMode>+ <QueryClientProvider client={queryClient}>+ <ThemeProvider>+ <BrowserRouter>+ <App />+ </BrowserRouter>+ </ThemeProvider>+ </QueryClientProvider>+ </React.StrictMode>+ );+};++const bootstrap = async () => {+ if (import.meta.env.DEV) {+ const reloading = await clearDevelopmentPwaState();+ if (reloading) {+ return;+ }+ } else {+ registerProductionServiceWorker();+ }++ mountApp();+};++void bootstrap();diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex ca7e5e12..9dc391e4 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -652,6 +652,14 @@ export const enUS = {conflict: "Conflict",error: "Save failed",unsaved: "Unsaved",+ conflictReason: {+ revisionWithVersions: "The cloud note was updated (local base revision {{expected}}, cloud is {{current}}). Common causes: another tab/device, or someone else editing the same note on Demo. Reload before editing again.",+ revision: "The cloud note was updated elsewhere. Common causes: another tab/device, or concurrent editing. Reload before editing again.",+ content: "The cloud content changed after this note was opened. Reload before saving.",+ editSession: "This edit session is stale or expired. Reopen the note before saving.",+ offlineStale: "While offline or queued, the cloud note was updated, so the local draft cannot overwrite it. Copy local content, then reload—or use the cloud version.",+ generic: "A version conflict was detected while saving. Reload the note, or use the cloud version before editing again.",+ },},uploadState: {failed: "Upload failed",diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex fead6972..2e568ad3 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -652,6 +652,14 @@ export const zhCN = {conflict: "有冲突",error: "保存失败",unsaved: "未保存",+ conflictReason: {+ revisionWithVersions: "云端笔记已更新(本地基于版本 {{expected}},云端已是 {{current}})。常见原因:其他标签页/设备,或 Demo 上其他人修改了同一条笔记。请重新加载后再编辑。",+ revision: "云端笔记已在其他位置被更新。常见原因:其他标签页/设备,或多人同时编辑。请重新加载后再编辑。",+ content: "打开笔记后,云端内容已变化。请重新加载后再保存。",+ editSession: "当前编辑会话已失效或过期。请重新打开笔记后再保存。",+ offlineStale: "离线或待同步期间,云端笔记已被更新,本地草稿无法直接覆盖。可复制本地内容后重新加载,或采用云端版本。",+ generic: "保存时版本不一致。请重新加载笔记,或采用云端版本后再编辑。",+ },},uploadState: {failed: "上传失败",