Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix: avoid false poster sync and draft recovery conflicts

tianma-if70ebc791faf6
diff --git a/apps/web/src/components/PosterEditorPane.tsx b/apps/web/src/components/PosterEditorPane.tsx
index 0c6ac060..4f576e10 100644
--- a/apps/web/src/components/PosterEditorPane.tsx
+++ b/apps/web/src/components/PosterEditorPane.tsx
@@ -75,7 +75,7 @@ import {
posterPrimitiveFromObject,
platformFor,
} from "@/lib/poster-design/templates";
-import { savePosterMemo } from "@/lib/poster-save";
+import { canRestorePosterDraft, classifyPosterUpdate, posterMemoContent, savePosterMemo } from "@/lib/poster-save";
import { copyImageBlobToClipboard } from "@/lib/clipboard";
import { compressImageForUpload } from "@/lib/image-compression";
import {
@@ -199,6 +199,7 @@ export default function PosterEditorPane({
title: string;
document: PosterDocument;
baseHash: string;
+ baseContent?: string;
tagsText?: string;
} | null>(null);
const [, setHistoryVersion] = useState(0);
@@ -211,6 +212,7 @@ export default function PosterEditorPane({
const selectionSync = useRef(false);
const session = useRef<MemoEditSession | null>(null),
currentMemo = useRef(memo);
+ const previousSaveBase = useRef<MemoDetail | null>(null);
const current = useRef({ title, document, tagsText });
current.current = { title, document, tagsText };
const selected = useRef(selectedIds);
@@ -609,8 +611,14 @@ export default function PosterEditorPane({
}, [memo.id, readOnly]);
useEffect(() => {
- if (memo.contentHash === currentMemo.current.contentHash) return;
- if (dirty || saveLock.current) {
+ const update = classifyPosterUpdate(memo, currentMemo.current, dirty, Boolean(saveLock.current), previousSaveBase.current);
+ if (update === "defer" || update === "ignore") return;
+ if (update === "rebase") {
+ // Advance optimistic checks while retaining any newer local edits.
+ currentMemo.current = memo;
+ return;
+ }
+ if (update === "conflict") {
setError(t("poster.remoteChanged"));
return;
}
@@ -640,7 +648,7 @@ export default function PosterEditorPane({
undo.current = [];
redo.current = [];
setHistoryVersion((version) => version + 1);
- }, [memo.contentHash]);
+ }, [memo.contentHash, memo.revision, saving]);
useEffect(() => {
const host = workbenchHost.current;
@@ -945,15 +953,17 @@ export default function PosterEditorPane({
!data.document.previewResourceId
? await renderPosterBlob(data.document, readResource, "png", true)
: undefined;
+ const saveBase = currentMemo.current;
const result = await savePosterMemo(
repository,
- currentMemo.current,
+ saveBase,
data.document,
data.title,
session.current!.id,
preview,
parseTagsText(data.tagsText),
);
+ previousSaveBase.current = saveBase;
currentMemo.current = result.memo;
loadedArt.current = artwork(data.document);
setSaved(captured);
@@ -994,6 +1004,7 @@ export default function PosterEditorPane({
document,
tagsText,
baseHash: currentMemo.current.contentHash,
+ baseContent: posterMemoContent(currentMemo.current),
}),
);
} catch {
@@ -1488,7 +1499,7 @@ export default function PosterEditorPane({
<Button
size="sm"
onClick={() => {
- if (recovery.baseHash !== currentMemo.current.contentHash) {
+ if (!canRestorePosterDraft(recovery, currentMemo.current)) {
setError(t("poster.remoteChanged"));
return;
}
diff --git a/apps/web/src/lib/poster-save.test.mjs b/apps/web/src/lib/poster-save.test.mjs
index c5f70bce..825219d4 100644
--- a/apps/web/src/lib/poster-save.test.mjs
+++ b/apps/web/src/lib/poster-save.test.mjs
@@ -1,6 +1,6 @@
-import { test, expect } from "bun:test";
-import { createPosterDocument, parsePosterDocument } from "@edgeever/shared";
-import { savePosterMemo } from "./poster-save";
+import { describe, test, expect } from "bun:test";
+import { createPosterDocument, parsePosterDocument, serializePosterDocument } from "@edgeever/shared";
+import { canRestorePosterDraft, classifyPosterUpdate, posterMemoContent, savePosterMemo } from "./poster-save";
const memo = { id: "memo", title: "Poster", revision: 3, contentHash: "old", tags: ["design"] };
test("saves source with optimistic revision/hash checks and immutable preview", async () => {
let payload;
@@ -49,3 +49,44 @@ test("an uncertain storage failure retains a preview already referenced by sourc
await expect(savePosterMemo(repository, memo, document, "Poster", "session", new Blob(["png"]))).rejects.toThrow("acknowledgement lost");
expect(deleted).toBe(false);
});
+
+describe("poster sync updates", () => {
+ const document = { ...createPosterDocument("Hello"), previewResourceId: "preview-old" };
+ const base = { ...memo, contentMarkdown: serializePosterDocument(document) };
+ const acknowledged = { ...base, revision: 4, contentHash: "acknowledged", contentMarkdown: serializePosterDocument({ ...document, previewResourceId: "preview-new" }) };
+
+ test("a sync acknowledgement advances the baseline without losing unsaved edits", () => {
+ expect(classifyPosterUpdate(acknowledged, base, true, false)).toBe("rebase");
+ });
+ test("a local save notification waits until the save result establishes its baseline", () => {
+ expect(classifyPosterUpdate(acknowledged, base, true, true)).toBe("defer");
+ expect(classifyPosterUpdate(acknowledged, acknowledged, true, false, base)).toBe("ignore");
+ });
+ test("stale parent props after a save do not roll back the saved baseline", () => {
+ expect(classifyPosterUpdate(base, acknowledged, false, false, base)).toBe("ignore");
+ });
+ test("a genuine artwork change conflicts with a dirty draft", () => {
+ const remote = { ...acknowledged, contentMarkdown: serializePosterDocument({ ...document, width: document.width + 100 }) };
+ expect(classifyPosterUpdate(remote, base, true, false)).toBe("conflict");
+ expect(classifyPosterUpdate(remote, base, false, false)).toBe("replace");
+ });
+ test("remote title and tag edits still conflict with a dirty draft", () => {
+ expect(classifyPosterUpdate({ ...acknowledged, title: "Remote title" }, base, true, false)).toBe("conflict");
+ expect(classifyPosterUpdate({ ...acknowledged, tags: ["other"] }, base, true, false)).toBe("conflict");
+ });
+ test("a remote update during saving is checked once saving finishes", () => {
+ const remote = { ...acknowledged, revision: 5, contentHash: "remote", title: "Another device" };
+ expect(classifyPosterUpdate(remote, base, true, true)).toBe("defer");
+ expect(classifyPosterUpdate(remote, acknowledged, true, false, base)).toBe("conflict");
+ });
+ test("draft recovery tolerates acknowledgement hashes but protects actual remote edits", () => {
+ const draft = { baseHash: base.contentHash, baseContent: posterMemoContent(base) };
+ expect(canRestorePosterDraft(draft, acknowledged)).toBe(true);
+ expect(canRestorePosterDraft(draft, { ...acknowledged, title: "Changed remotely" })).toBe(false);
+ expect(canRestorePosterDraft({ baseHash: base.contentHash }, acknowledged)).toBe(false);
+ expect(canRestorePosterDraft({ baseHash: base.contentHash }, base)).toBe(true);
+ });
+ test("invalid remote source cannot silently rebase a dirty draft", () => {
+ expect(classifyPosterUpdate({ ...acknowledged, contentMarkdown: "invalid" }, base, true, false)).toBe("conflict");
+ });
+});
diff --git a/apps/web/src/lib/poster-save.ts b/apps/web/src/lib/poster-save.ts
index 1205f407..9e2c2845 100644
--- a/apps/web/src/lib/poster-save.ts
+++ b/apps/web/src/lib/poster-save.ts
@@ -30,3 +30,23 @@ export const savePosterMemo = async (repository: EdgeEverRepository, memo: MemoD
}
}
};
+
+// Sync acknowledgements can change hashes/previews without changing the artwork.
+export const posterMemoContent = (memo: MemoDetail) => {
+ const document = parsePosterDocument(memo.contentMarkdown);
+ if (!document) return null;
+ return JSON.stringify([memo.title ?? "", [...memo.tags].sort(), { ...document, previewResourceId: undefined }]);
+};
+
+export const classifyPosterUpdate = (incoming: MemoDetail, base: MemoDetail, dirty: boolean, saving: boolean, previousSaveBase?: MemoDetail | null) => {
+ if (saving) return "defer";
+ if (incoming.contentHash === base.contentHash && incoming.revision === base.revision) return "ignore";
+ // Parent props may still show the pre-save memo after the save has completed.
+ if (previousSaveBase && incoming.contentHash === previousSaveBase.contentHash && incoming.revision === previousSaveBase.revision) return "ignore";
+ const content = posterMemoContent(incoming);
+ if (content !== null && content === posterMemoContent(base)) return "rebase";
+ return dirty ? "conflict" : "replace";
+};
+
+export const canRestorePosterDraft = (draft: { baseHash: string; baseContent?: string }, memo: MemoDetail) =>
+ draft.baseHash === memo.contentHash || (typeof draft.baseContent === "string" && draft.baseContent === posterMemoContent(memo));