From fb841bd406f18c9aae205cb088845929fcedacff Mon Sep 17 00:00:00 2001
From: Vincent Driessen <me@nvie.com>
Date: Thu, 9 Apr 2026 15:04:04 +0200
Subject: [PATCH 1/2] Upgrade to latest @liveblocks/core (PR 1688)

Co-authored-by: Jonathan Rowny <jrowny@gmail.com>

Original commit: 6561bb1e1a6cfd85d126bded477651a3108e241a
---
 packages/liveblocks-server/package.json | 2 +-
 packages/liveblocks-server/src/Room.ts  | 5 +----
 tools/liveblocks-cli/package.json       | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/liveblocks-server/package.json b/packages/liveblocks-server/package.json
index ed335e3df27..98b59451295 100644
--- a/packages/liveblocks-server/package.json
+++ b/packages/liveblocks-server/package.json
@@ -72,7 +72,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@liveblocks/core": "3.14.0",
+    "@liveblocks/core": "3.18.0",
     "async-mutex": "^0.4.0",
     "decoders": "^2.9.0",
     "itertools": "^2.3.2",
diff --git a/packages/liveblocks-server/src/Room.ts b/packages/liveblocks-server/src/Room.ts
index 72c0a94922a..6081a99206c 100644
--- a/packages/liveblocks-server/src/Room.ts
+++ b/packages/liveblocks-server/src/Room.ts
@@ -1844,7 +1844,6 @@ export class Room<RM, SM, CM extends JsonObject, C = undefined> {
           this.createFeed({
             feedId: addMsg.feedId,
             metadata: (addMsg.metadata as Json) ?? {},
-            timestamp: addMsg.timestamp,
           })
         );
         if (err) {
@@ -1910,7 +1909,6 @@ export class Room<RM, SM, CM extends JsonObject, C = undefined> {
           this.addFeedMessage(addMsg.feedId, {
             data: addMsg.data as Json,
             id: addMsg.id,
-            timestamp: addMsg.timestamp,
           })
         );
         if (err) {
@@ -1933,8 +1931,7 @@ export class Room<RM, SM, CM extends JsonObject, C = undefined> {
           this.updateFeedMessage(
             updateMsg.feedId,
             updateMsg.messageId,
-            updateMsg.data as Json,
-            updateMsg.timestamp
+            updateMsg.data as Json
           )
         );
         if (err) {
diff --git a/tools/liveblocks-cli/package.json b/tools/liveblocks-cli/package.json
index 73ed5f51176..72a2f44713c 100644
--- a/tools/liveblocks-cli/package.json
+++ b/tools/liveblocks-cli/package.json
@@ -48,7 +48,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@liveblocks/core": "3.14.0",
+    "@liveblocks/core": "3.18.0",
     "@liveblocks/query-parser": "workspace:^",
     "@liveblocks/server": "workspace:^",
     "@liveblocks/zenrouter": "^1.0.17",

From 54882e8402f9862bcf1691610110dd65e8967590 Mon Sep 17 00:00:00 2001
From: Chris Nicholas <ctnicholasdev@gmail.com>
Date: Thu, 9 Apr 2026 18:27:42 +0100
Subject: [PATCH 2/2] Docs: `updateFeedMessage` `updatedAt` field (#3332)

---
 docs/pages/api-reference/liveblocks-node.mdx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/pages/api-reference/liveblocks-node.mdx b/docs/pages/api-reference/liveblocks-node.mdx
index 46e36e24df2..6449fac1601 100644
--- a/docs/pages/api-reference/liveblocks-node.mdx
+++ b/docs/pages/api-reference/liveblocks-node.mdx
@@ -2855,10 +2855,16 @@ await liveblocks.updateFeedMessage({
   roomId: "my-room-id",
   feedId: "my-feed-id",
   messageId: "my-message-id",
+
+  // The message data
   data: {
     role: "user",
     content: "Updated content",
   },
+
+  // Optional, timestamp in milliseconds. Helps prevents race conditions,
+  // messages that arrive after a newer message are ignored
+  updatedAt: Date.now(),
 });
 ```