From d02af48b50ddd18796e264e62f16a2528acc2b9a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Mar 2026 19:11:32 +0000
Subject: [PATCH] fix: snapshot pre-update state to enable 3-way merge on
 concurrent PATCH

Co-authored-by: fredicious <1580688+fredicious@users.noreply.github.com>
---
 src/lib/server/notes-service.ts | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/lib/server/notes-service.ts b/src/lib/server/notes-service.ts
index a864786..260c113 100644
--- a/src/lib/server/notes-service.ts
+++ b/src/lib/server/notes-service.ts
@@ -330,16 +330,13 @@ export function updateNote(db: Db, userId: number, id: string, input: UpdateNote
 		(input.checklistMode !== undefined && input.checklistMode !== existing.checklistMode);
 
 	if (hasActualContentChange) {
-		const saved = db.select().from(notes).where(eq(notes.id, id)).get();
-		if (saved) {
-			createSnapshot(db, id, {
-				version: saved.version,
-				title: saved.title,
-				content: saved.content,
-				checklistMode: saved.checklistMode,
-				color: saved.color
-			});
-		}
+		createSnapshot(db, id, {
+			version: existing.version,
+			title: existing.title,
+			content: existing.content,
+			checklistMode: existing.checklistMode,
+			color: existing.color
+		});
 	}
 
 	return getNote(db, userId, id);