@liveblocks/core 2.25.0-aiprivatebeta8 → 3.0.0

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.25.0-aiprivatebeta8";
+var PKG_VERSION = "3.0.0";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -3715,6 +3715,11 @@ function appendDelta(content, delta) {
 
 // src/ai.ts
 var DEFAULT_REQUEST_TIMEOUT = 4e3;
+function defineAiTool() {
+  return (def) => {
+    return def;
+  };
+}
 var KnowledgeStack = class {
   #_layers;
   #stack;
@@ -3775,50 +3780,66 @@ var KnowledgeStack = class {
 function now() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
+var kWILDCARD = Symbol("*");
 function createStore_forTools() {
-  const toolsByChatId\u03A3 = new DefaultMap((_chatId) => {
-    return new DefaultMap((_toolName) => {
-      return new Signal(void 0);
+  const toolsByChatId\u03A3 = new DefaultMap(
+    (_chatId) => {
+      return new DefaultMap((_name) => {
+        return new Signal(void 0);
+      });
+    }
+  );
+  const globalOrScopedTool\u03A3 = new DefaultMap((nameAndChat) => {
+    const [name, chatId] = tryParseJson(nameAndChat);
+    return DerivedSignal.from(() => {
+      return (
+        // A tool that's registered and scoped to a specific chat ID...
+        _nullishCoalesce(_optionalChain([(chatId !== void 0 ? _optionalChain([toolsByChatId\u03A3, 'access', _57 => _57.get, 'call', _58 => _58(chatId), 'optionalAccess', _59 => _59.get, 'call', _60 => _60(name)]) : void 0), 'optionalAccess', _61 => _61.get, 'call', _62 => _62()]), () => ( // ...or a globally registered tool
+        _optionalChain([toolsByChatId\u03A3, 'access', _63 => _63.getOrCreate, 'call', _64 => _64(kWILDCARD), 'access', _65 => _65.get, 'call', _66 => _66(name), 'optionalAccess', _67 => _67.get, 'call', _68 => _68()])))
+      );
     });
   });
-  function getToolDefinition\u03A3(chatId, toolName) {
-    return toolsByChatId\u03A3.getOrCreate(chatId).getOrCreate(toolName);
+  function getTool\u03A3(name, chatId) {
+    const key = JSON.stringify(chatId !== void 0 ? [name, chatId] : [name]);
+    return globalOrScopedTool\u03A3.getOrCreate(key);
   }
-  function addToolDefinition(chatId, name, definition) {
-    if (!definition.execute && !definition.render) {
+  function registerTool(name, tool, chatId) {
+    if (!tool.execute && !tool.render) {
       throw new Error(
-        "A tool definition must have an execute() function, a render property, or both."
+        "A tool definition must have an execute() function, a render() function, or both."
       );
     }
-    toolsByChatId\u03A3.getOrCreate(chatId).getOrCreate(name).set(definition);
+    const key = _nullishCoalesce(chatId, () => ( kWILDCARD));
+    toolsByChatId\u03A3.getOrCreate(key).getOrCreate(name).set(tool);
+    return () => unregisterTool(key, name);
   }
-  function removeToolDefinition(chatId, toolName) {
+  function unregisterTool(chatId, name) {
     const tools = toolsByChatId\u03A3.get(chatId);
     if (tools === void 0) return;
-    const tool = tools.get(toolName);
+    const tool = tools.get(name);
     if (tool === void 0) return;
     tool.set(void 0);
   }
-  function getToolsForChat(chatId) {
-    const tools = toolsByChatId\u03A3.get(chatId);
-    if (tools === void 0) return [];
-    return Array.from(tools.entries()).map(([name, tool]) => {
-      if (tool.get() === void 0) return null;
-      return {
-        name,
-        definition: tool.get()
-      };
-    }).filter((tool) => tool !== null);
+  function getToolDescriptions(chatId) {
+    const globalTools\u03A3 = toolsByChatId\u03A3.get(kWILDCARD);
+    const scopedTools\u03A3 = toolsByChatId\u03A3.get(chatId);
+    return Array.from([
+      ..._nullishCoalesce(_optionalChain([globalTools\u03A3, 'optionalAccess', _69 => _69.entries, 'call', _70 => _70()]), () => ( [])),
+      ..._nullishCoalesce(_optionalChain([scopedTools\u03A3, 'optionalAccess', _71 => _71.entries, 'call', _72 => _72()]), () => ( []))
+    ]).flatMap(([name, tool\u03A3]) => {
+      const tool = tool\u03A3.get();
+      return tool ? [{ name, description: tool.description, parameters: tool.parameters }] : [];
+    });
   }
   return {
-    getToolDefinition\u03A3,
-    getToolsForChat,
-    addToolDefinition,
-    removeToolDefinition
+    getToolDescriptions,
+    getTool\u03A3,
+    registerTool
   };
 }
-function createStore_forChatMessages(toolsStore, setToolResult) {
-  const seenToolCallIds = /* @__PURE__ */ new Set();
+function createStore_forChatMessages(toolsStore, setToolResultFn) {
+  const myMessages = /* @__PURE__ */ new Set();
+  const handledInvocations = /* @__PURE__ */ new Set();
   const messagePoolByChatId\u03A3 = new DefaultMap(
     (_chatId) => new MutableSignal(
       new TreePool(
@@ -3896,39 +3917,39 @@ function createStore_forChatMessages(toolsStore, setToolResult) {
         });
       }
       if (message.role === "assistant" && message.status === "awaiting-tool") {
-        for (const toolCall of message.contentSoFar.filter(
-          (part) => part.type === "tool-invocation" && part.status === "executing"
-        )) {
-          if (seenToolCallIds.has(toolCall.toolCallId)) {
-            continue;
-          }
-          seenToolCallIds.add(toolCall.toolCallId);
-          const toolDef = toolsStore.getToolDefinition\u03A3(message.chatId, toolCall.toolName).get();
-          const respondSync = (result) => {
-            setToolResult(
-              message.chatId,
-              message.id,
-              toolCall.toolCallId,
-              result
-              // TODO Pass in AiGenerationOptions here, or make the backend use the same options
-            ).catch((err) => {
-              error2(
-                `Error trying to respond to tool-call: ${String(err)} (in respond())`
-              );
-            });
-          };
-          const executeFn = _optionalChain([toolDef, 'optionalAccess', _57 => _57.execute]);
-          if (executeFn) {
-            (async () => {
-              const result = await executeFn(toolCall.args);
-              respondSync(result);
-            })().catch((err) => {
-              error2(
-                `Error trying to respond to tool-call: ${String(err)} (in execute())`
-              );
-            });
+        if (myMessages.has(message.id)) {
+          for (const toolInvocation of message.contentSoFar.filter(
+            (part) => part.type === "tool-invocation" && part.stage === "executing"
+          )) {
+            if (!handledInvocations.has(toolInvocation.invocationId)) {
+              handledInvocations.add(toolInvocation.invocationId);
+            } else {
+              continue;
+            }
+            const executeFn = _optionalChain([toolsStore, 'access', _73 => _73.getTool\u03A3, 'call', _74 => _74(toolInvocation.name, message.chatId), 'access', _75 => _75.get, 'call', _76 => _76(), 'optionalAccess', _77 => _77.execute]);
+            if (executeFn) {
+              (async () => {
+                const result = await executeFn(toolInvocation.args, {
+                  name: toolInvocation.name,
+                  invocationId: toolInvocation.invocationId
+                });
+                return await setToolResultFn(
+                  message.chatId,
+                  message.id,
+                  toolInvocation.invocationId,
+                  _nullishCoalesce(result, () => ( { data: {} }))
+                  // TODO Pass in AiGenerationOptions here, or make the backend use the same options
+                );
+              })().catch((err) => {
+                error2(
+                  `Error trying to respond to tool-call: ${String(err)} (in execute())`
+                );
+              });
+            }
           }
         }
+      } else {
+        myMessages.delete(message.id);
       }
     });
   }
@@ -4000,8 +4021,8 @@ function createStore_forChatMessages(toolsStore, setToolResult) {
       const spine = [];
       let lastVisitedMessage = null;
       for (const message2 of pool.walkUp(leaf.id)) {
-        const prev = _nullishCoalesce(_optionalChain([first, 'call', _58 => _58(pool.walkLeft(message2.id, isAlive)), 'optionalAccess', _59 => _59.id]), () => ( null));
-        const next = _nullishCoalesce(_optionalChain([first, 'call', _60 => _60(pool.walkRight(message2.id, isAlive)), 'optionalAccess', _61 => _61.id]), () => ( null));
+        const prev = _nullishCoalesce(_optionalChain([first, 'call', _78 => _78(pool.walkLeft(message2.id, isAlive)), 'optionalAccess', _79 => _79.id]), () => ( null));
+        const next = _nullishCoalesce(_optionalChain([first, 'call', _80 => _80(pool.walkRight(message2.id, isAlive)), 'optionalAccess', _81 => _81.id]), () => ( null));
         if (!message2.deletedAt || prev || next) {
           const node = {
             ...message2,
@@ -4073,20 +4094,23 @@ function createStore_forChatMessages(toolsStore, setToolResult) {
     remove,
     removeByChatId,
     addDelta,
-    failAllPending
+    failAllPending,
+    markMine(messageId) {
+      myMessages.add(messageId);
+    }
   };
 }
 function createStore_forUserAiChats() {
-  const mutable\u03A3 = new MutableSignal(
+  const allChatsInclDeleted\u03A3 = new MutableSignal(
     SortedList.with((x, y) => y.createdAt < x.createdAt)
   );
-  const chats\u03A3 = DerivedSignal.from(
-    () => Array.from(mutable\u03A3.get()).filter((c) => !c.deletedAt)
+  const nonDeletedChats\u03A3 = DerivedSignal.from(
+    () => Array.from(allChatsInclDeleted\u03A3.get()).filter((c) => !c.deletedAt)
   );
   function upsertMany(chats) {
-    mutable\u03A3.mutate((list) => {
+    allChatsInclDeleted\u03A3.mutate((list) => {
       for (const chat of chats) {
-        remove(chat.id);
+        list.removeBy((c) => c.id === chat.id, 1);
         list.add(chat);
       }
     });
@@ -4094,19 +4118,26 @@ function createStore_forUserAiChats() {
   function upsert(chat) {
     upsertMany([chat]);
   }
-  function remove(chatId) {
-    mutable\u03A3.mutate((list) => list.removeBy((c) => c.id === chatId, 1));
+  function markDeleted(chatId) {
+    allChatsInclDeleted\u03A3.mutate((list) => {
+      const chat = list.find((c) => c.id === chatId);
+      if (!chat) return false;
+      upsert({ ...chat, deletedAt: now() });
+      return void 0;
+    });
   }
   function getChatById(chatId) {
-    return Array.from(mutable\u03A3.get()).find((chat) => chat.id === chatId);
+    return Array.from(allChatsInclDeleted\u03A3.get()).find(
+      (chat) => chat.id === chatId
+    );
   }
   return {
-    chats\u03A3,
+    chats\u03A3: nonDeletedChats\u03A3,
     getChatById,
     // Mutations
     upsert,
     upsertMany,
-    remove
+    markDeleted
   };
 }
 function createAi(config) {
@@ -4116,7 +4147,6 @@ function createAi(config) {
     false
     // AI doesn't have actors (yet, but it will)
   );
-  const clientId = nanoid(7);
   const chatsStore = createStore_forUserAiChats();
   const toolsStore = createStore_forTools();
   const messagesStore = createStore_forChatMessages(toolsStore, setToolResult);
@@ -4185,7 +4215,7 @@ function createAi(config) {
     if ("event" in msg) {
       switch (msg.event) {
         case "cmd-failed":
-          _optionalChain([pendingCmd, 'optionalAccess', _62 => _62.reject, 'call', _63 => _63(new Error(msg.error))]);
+          _optionalChain([pendingCmd, 'optionalAccess', _82 => _82.reject, 'call', _83 => _83(new Error(msg.error))]);
           break;
         case "delta": {
           const { id, delta } = msg;
@@ -4196,7 +4226,11 @@ function createAi(config) {
           context.messagesStore.upsert(msg.message);
           break;
         }
+        case "warning":
+          warn(msg.message);
+          break;
         case "error":
+          error2(msg.error);
           break;
         case "rebooted":
           context.messagesStore.failAllPending();
@@ -4207,7 +4241,7 @@ function createAi(config) {
               context.messagesStore.remove(m.chatId, m.id);
             }
             for (const chatId of _nullishCoalesce(msg["-chats"], () => ( []))) {
-              context.chatsStore.remove(chatId);
+              context.chatsStore.markDeleted(chatId);
               context.messagesStore.removeByChatId(chatId);
             }
             for (const chatId of _nullishCoalesce(msg.clear, () => ( []))) {
@@ -4233,7 +4267,7 @@ function createAi(config) {
           context.chatsStore.upsert(msg.chat);
           break;
         case "delete-chat":
-          context.chatsStore.remove(msg.chatId);
+          context.chatsStore.markDeleted(msg.chatId);
           context.messagesStore.removeByChatId(msg.chatId);
           break;
         case "get-message-tree":
@@ -4263,7 +4297,7 @@ function createAi(config) {
           return assertNever(msg, "Unhandled case");
       }
     }
-    _optionalChain([pendingCmd, 'optionalAccess', _64 => _64.resolve, 'call', _65 => _65(msg)]);
+    _optionalChain([pendingCmd, 'optionalAccess', _84 => _84.resolve, 'call', _85 => _85(msg)]);
   }
   managedSocket.events.onMessage.subscribe(handleServerMessage);
   managedSocket.events.statusDidChange.subscribe(onStatusDidChange);
@@ -4277,7 +4311,13 @@ function createAi(config) {
       );
     }
   });
+  function connectInitially() {
+    if (managedSocket.getStatus() === "initial") {
+      managedSocket.connect();
+    }
+  }
   async function sendClientMsgWithResponse(msg) {
+    connectInitially();
     if (managedSocket.getStatus() !== "connected") {
       await managedSocket.events.didConnect.waitUntil();
     }
@@ -4331,70 +4371,65 @@ function createAi(config) {
   function updateKnowledge(layerKey, data, key = nanoid()) {
     context.knowledge.updateKnowledge(layerKey, key, data);
   }
-  function debug_getAllKnowledge() {
-    return context.knowledge.get();
-  }
-  async function setToolResult(chatId, messageId, toolCallId, result, options) {
+  async function setToolResult(chatId, messageId, invocationId, result, options) {
     const knowledge = context.knowledge.get();
-    return sendClientMsgWithResponse({
+    const tools = context.toolsStore.getToolDescriptions(chatId);
+    const resp = await sendClientMsgWithResponse({
       cmd: "set-tool-result",
       chatId,
       messageId,
-      toolCallId,
-      clientId,
+      invocationId,
       result,
       generationOptions: {
-        copilotId: _optionalChain([options, 'optionalAccess', _66 => _66.copilotId]),
-        stream: _optionalChain([options, 'optionalAccess', _67 => _67.stream]),
-        timeout: _optionalChain([options, 'optionalAccess', _68 => _68.timeout]),
+        copilotId: _optionalChain([options, 'optionalAccess', _86 => _86.copilotId]),
+        stream: _optionalChain([options, 'optionalAccess', _87 => _87.stream]),
+        timeout: _optionalChain([options, 'optionalAccess', _88 => _88.timeout]),
+        // Knowledge and tools aren't coming from the options, but retrieved
+        // from the global context
         knowledge: knowledge.length > 0 ? knowledge : void 0,
-        tools: context.toolsStore.getToolsForChat(chatId).map((tool) => ({
-          name: tool.name,
-          description: tool.definition.description,
-          parameters: tool.definition.parameters
-        }))
+        tools: tools.length > 0 ? tools : void 0
       }
     });
+    if (resp.ok) {
+      messagesStore.markMine(resp.message.id);
+    }
   }
   return Object.defineProperty(
     {
       [kInternal]: {
         context
       },
-      connect: () => managedSocket.connect(),
-      reconnect: () => managedSocket.reconnect(),
+      connectInitially,
+      // reconnect: () => managedSocket.reconnect(),
       disconnect: () => managedSocket.disconnect(),
       getChats,
       getOrCreateChat,
       deleteChat: (chatId) => {
-        return sendClientMsgWithResponse({
-          cmd: "delete-chat",
-          chatId
-        });
+        return sendClientMsgWithResponse({ cmd: "delete-chat", chatId });
       },
       getMessageTree,
       deleteMessage: (chatId, messageId) => sendClientMsgWithResponse({ cmd: "delete-message", chatId, messageId }),
       clearChat: (chatId) => sendClientMsgWithResponse({ cmd: "clear-chat", chatId }),
       askUserMessageInChat: async (chatId, userMessage, targetMessageId, options) => {
         const knowledge = context.knowledge.get();
-        return sendClientMsgWithResponse({
+        const tools = context.toolsStore.getToolDescriptions(chatId);
+        const resp = await sendClientMsgWithResponse({
           cmd: "ask-in-chat",
           chatId,
           sourceMessage: userMessage,
           targetMessageId,
-          clientId,
           generationOptions: {
-            copilotId: _optionalChain([options, 'optionalAccess', _69 => _69.copilotId]),
-            stream: _optionalChain([options, 'optionalAccess', _70 => _70.stream]),
-            timeout: _optionalChain([options, 'optionalAccess', _71 => _71.timeout]),
+            copilotId: _optionalChain([options, 'optionalAccess', _89 => _89.copilotId]),
+            stream: _optionalChain([options, 'optionalAccess', _90 => _90.stream]),
+            timeout: _optionalChain([options, 'optionalAccess', _91 => _91.timeout]),
+            // Knowledge and tools aren't coming from the options, but retrieved
+            // from the global context
             knowledge: knowledge.length > 0 ? knowledge : void 0,
-            tools: context.toolsStore.getToolsForChat(chatId).map((tool) => ({
-              name: tool.name,
-              description: tool.definition.description,
-              parameters: tool.definition.parameters
-            }))
+            tools: tools.length > 0 ? tools : void 0
           }
         });
+        messagesStore.markMine(resp.targetMessage.id);
+        return resp;
       },
       abort: (messageId) => sendClientMsgWithResponse({ cmd: "abort-ai", messageId }),
       setToolResult,
@@ -4402,15 +4437,13 @@ function createAi(config) {
       signals: {
         chats\u03A3: context.chatsStore.chats\u03A3,
         getChatMessagesForBranch\u03A3: context.messagesStore.getChatMessagesForBranch\u03A3,
-        getChatById: context.chatsStore.getChatById,
-        getToolDefinition\u03A3: context.toolsStore.getToolDefinition\u03A3
+        getTool\u03A3: context.toolsStore.getTool\u03A3
       },
+      getChatById: context.chatsStore.getChatById,
       registerKnowledgeLayer,
       deregisterKnowledgeLayer,
       updateKnowledge,
-      debug_getAllKnowledge,
-      registerChatTool: context.toolsStore.addToolDefinition,
-      unregisterChatTool: context.toolsStore.removeToolDefinition
+      registerTool: context.toolsStore.registerTool
     },
     kInternal,
     { enumerable: false }
@@ -4426,7 +4459,7 @@ function makeCreateSocketDelegateForAi(baseUrl, WebSocketPolyfill) {
     }
     const url2 = new URL(baseUrl);
     url2.protocol = url2.protocol === "http:" ? "ws" : "wss";
-    url2.pathname = "/ai/v1";
+    url2.pathname = "/ai/v4";
     if (authValue.type === "secret") {
       url2.searchParams.set("tok", authValue.token.raw);
     } else if (authValue.type === "public") {
@@ -4490,7 +4523,7 @@ function createAuthManager(authOptions, onAuthenticate) {
     return void 0;
   }
   async function makeAuthRequest(options) {
-    const fetcher = _nullishCoalesce(_optionalChain([authOptions, 'access', _72 => _72.polyfills, 'optionalAccess', _73 => _73.fetch]), () => ( (typeof window === "undefined" ? void 0 : window.fetch)));
+    const fetcher = _nullishCoalesce(_optionalChain([authOptions, 'access', _92 => _92.polyfills, 'optionalAccess', _93 => _93.fetch]), () => ( (typeof window === "undefined" ? void 0 : window.fetch)));
     if (authentication.type === "private") {
       if (fetcher === void 0) {
         throw new StopRetrying(
@@ -4506,7 +4539,7 @@ function createAuthManager(authOptions, onAuthenticate) {
           "The same Liveblocks auth token was issued from the backend before. Caching Liveblocks tokens is not supported."
         );
       }
-      _optionalChain([onAuthenticate, 'optionalCall', _74 => _74(parsed.parsed)]);
+      _optionalChain([onAuthenticate, 'optionalCall', _94 => _94(parsed.parsed)]);
       return parsed;
     }
     if (authentication.type === "custom") {
@@ -4514,7 +4547,7 @@ function createAuthManager(authOptions, onAuthenticate) {
       if (response && typeof response === "object") {
         if (typeof response.token === "string") {
           const parsed = parseAuthToken(response.token);
-          _optionalChain([onAuthenticate, 'optionalCall', _75 => _75(parsed.parsed)]);
+          _optionalChain([onAuthenticate, 'optionalCall', _95 => _95(parsed.parsed)]);
           return parsed;
         } else if (typeof response.error === "string") {
           const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
@@ -4672,7 +4705,7 @@ function sendToPanel(message, options) {
     ...message,
     source: "liveblocks-devtools-client"
   };
-  if (!(_optionalChain([options, 'optionalAccess', _76 => _76.force]) || _bridgeActive)) {
+  if (!(_optionalChain([options, 'optionalAccess', _96 => _96.force]) || _bridgeActive)) {
     return;
   }
   window.postMessage(fullMsg, "*");
@@ -4680,7 +4713,7 @@ function sendToPanel(message, options) {
 var eventSource = makeEventSource();
 if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
   window.addEventListener("message", (event) => {
-    if (event.source === window && _optionalChain([event, 'access', _77 => _77.data, 'optionalAccess', _78 => _78.source]) === "liveblocks-devtools-panel") {
+    if (event.source === window && _optionalChain([event, 'access', _97 => _97.data, 'optionalAccess', _98 => _98.source]) === "liveblocks-devtools-panel") {
       eventSource.notify(event.data);
     } else {
     }
@@ -4822,7 +4855,7 @@ function fullSync(room) {
     msg: "room::sync::full",
     roomId: room.id,
     status: room.getStatus(),
-    storage: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _79 => _79.toTreeNode, 'call', _80 => _80("root"), 'access', _81 => _81.payload]), () => ( null)),
+    storage: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _99 => _99.toTreeNode, 'call', _100 => _100("root"), 'access', _101 => _101.payload]), () => ( null)),
     me,
     others
   });
@@ -5113,7 +5146,7 @@ function createManagedPool(roomId, options) {
     generateId: () => `${getCurrentConnectionId()}:${clock++}`,
     generateOpId: () => `${getCurrentConnectionId()}:${opClock++}`,
     dispatch(ops, reverse, storageUpdates) {
-      _optionalChain([onDispatch, 'optionalCall', _82 => _82(ops, reverse, storageUpdates)]);
+      _optionalChain([onDispatch, 'optionalCall', _102 => _102(ops, reverse, storageUpdates)]);
     },
     assertStorageIsWritable: () => {
       if (!isStorageWritable()) {
@@ -5340,7 +5373,7 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     return [
       {
         type: 8 /* CREATE_REGISTER */,
-        opId: _optionalChain([pool, 'optionalAccess', _83 => _83.generateOpId, 'call', _84 => _84()]),
+        opId: _optionalChain([pool, 'optionalAccess', _103 => _103.generateOpId, 'call', _104 => _104()]),
         id: this._id,
         parentId,
         parentKey,
@@ -5446,7 +5479,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _85 => _85.generateOpId, 'call', _86 => _86()]),
+      opId: _optionalChain([pool, 'optionalAccess', _105 => _105.generateOpId, 'call', _106 => _106()]),
       type: 2 /* CREATE_LIST */,
       parentId,
       parentKey
@@ -5717,7 +5750,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   #applyInsertUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _87 => _87._pool, 'optionalAccess', _88 => _88.getNode, 'call', _89 => _89(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _107 => _107._pool, 'optionalAccess', _108 => _108.getNode, 'call', _109 => _109(id)]) !== void 0) {
       return { modified: false };
     }
     child._attach(id, nn(this._pool));
@@ -5725,8 +5758,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const existingItemIndex = this._indexOfPosition(key);
     let newKey = key;
     if (existingItemIndex !== -1) {
-      const before2 = _optionalChain([this, 'access', _90 => _90.#items, 'access', _91 => _91[existingItemIndex], 'optionalAccess', _92 => _92._parentPos]);
-      const after2 = _optionalChain([this, 'access', _93 => _93.#items, 'access', _94 => _94[existingItemIndex + 1], 'optionalAccess', _95 => _95._parentPos]);
+      const before2 = _optionalChain([this, 'access', _110 => _110.#items, 'access', _111 => _111[existingItemIndex], 'optionalAccess', _112 => _112._parentPos]);
+      const after2 = _optionalChain([this, 'access', _113 => _113.#items, 'access', _114 => _114[existingItemIndex + 1], 'optionalAccess', _115 => _115._parentPos]);
       newKey = makePosition(before2, after2);
       child._setParentLink(this, newKey);
     }
@@ -5740,7 +5773,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   #applySetUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _96 => _96._pool, 'optionalAccess', _97 => _97.getNode, 'call', _98 => _98(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _116 => _116._pool, 'optionalAccess', _117 => _117.getNode, 'call', _118 => _118(id)]) !== void 0) {
       return { modified: false };
     }
     this.#unacknowledgedSets.set(key, nn(op.opId));
@@ -5861,7 +5894,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     } else {
       this.#items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _99 => _99.#items, 'access', _100 => _100[existingItemIndex + 1], 'optionalAccess', _101 => _101._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _119 => _119.#items, 'access', _120 => _120[existingItemIndex + 1], 'optionalAccess', _121 => _121._parentPos]))
       );
       const previousIndex = this.#items.indexOf(child);
       child._setParentLink(this, newKey);
@@ -5886,7 +5919,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this.#items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _102 => _102.#items, 'access', _103 => _103[existingItemIndex + 1], 'optionalAccess', _104 => _104._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _122 => _122.#items, 'access', _123 => _123[existingItemIndex + 1], 'optionalAccess', _124 => _124._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -5905,7 +5938,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this.#items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _105 => _105.#items, 'access', _106 => _106[existingItemIndex + 1], 'optionalAccess', _107 => _107._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _125 => _125.#items, 'access', _126 => _126[existingItemIndex + 1], 'optionalAccess', _127 => _127._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -5932,7 +5965,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (existingItemIndex !== -1) {
       this.#items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _108 => _108.#items, 'access', _109 => _109[existingItemIndex + 1], 'optionalAccess', _110 => _110._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _128 => _128.#items, 'access', _129 => _129[existingItemIndex + 1], 'optionalAccess', _130 => _130._parentPos]))
       );
     }
     child._setParentLink(this, newKey);
@@ -5990,7 +6023,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param element The element to add to the end of the LiveList.
    */
   push(element) {
-    _optionalChain([this, 'access', _111 => _111._pool, 'optionalAccess', _112 => _112.assertStorageIsWritable, 'call', _113 => _113()]);
+    _optionalChain([this, 'access', _131 => _131._pool, 'optionalAccess', _132 => _132.assertStorageIsWritable, 'call', _133 => _133()]);
     return this.insert(element, this.length);
   }
   /**
@@ -5999,7 +6032,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index at which you want to insert the element.
    */
   insert(element, index) {
-    _optionalChain([this, 'access', _114 => _114._pool, 'optionalAccess', _115 => _115.assertStorageIsWritable, 'call', _116 => _116()]);
+    _optionalChain([this, 'access', _134 => _134._pool, 'optionalAccess', _135 => _135.assertStorageIsWritable, 'call', _136 => _136()]);
     if (index < 0 || index > this.#items.length) {
       throw new Error(
         `Cannot insert list item at index "${index}". index should be between 0 and ${this.#items.length}`
@@ -6029,7 +6062,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param targetIndex The index where the element should be after moving.
    */
   move(index, targetIndex) {
-    _optionalChain([this, 'access', _117 => _117._pool, 'optionalAccess', _118 => _118.assertStorageIsWritable, 'call', _119 => _119()]);
+    _optionalChain([this, 'access', _137 => _137._pool, 'optionalAccess', _138 => _138.assertStorageIsWritable, 'call', _139 => _139()]);
     if (targetIndex < 0) {
       throw new Error("targetIndex cannot be less than 0");
     }
@@ -6087,7 +6120,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index of the element to delete
    */
   delete(index) {
-    _optionalChain([this, 'access', _120 => _120._pool, 'optionalAccess', _121 => _121.assertStorageIsWritable, 'call', _122 => _122()]);
+    _optionalChain([this, 'access', _140 => _140._pool, 'optionalAccess', _141 => _141.assertStorageIsWritable, 'call', _142 => _142()]);
     if (index < 0 || index >= this.#items.length) {
       throw new Error(
         `Cannot delete list item at index "${index}". index should be between 0 and ${this.#items.length - 1}`
@@ -6120,7 +6153,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   clear() {
-    _optionalChain([this, 'access', _123 => _123._pool, 'optionalAccess', _124 => _124.assertStorageIsWritable, 'call', _125 => _125()]);
+    _optionalChain([this, 'access', _143 => _143._pool, 'optionalAccess', _144 => _144.assertStorageIsWritable, 'call', _145 => _145()]);
     if (this._pool) {
       const ops = [];
       const reverseOps = [];
@@ -6154,7 +6187,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   set(index, item) {
-    _optionalChain([this, 'access', _126 => _126._pool, 'optionalAccess', _127 => _127.assertStorageIsWritable, 'call', _128 => _128()]);
+    _optionalChain([this, 'access', _146 => _146._pool, 'optionalAccess', _147 => _147.assertStorageIsWritable, 'call', _148 => _148()]);
     if (index < 0 || index >= this.#items.length) {
       throw new Error(
         `Cannot set list item at index "${index}". index should be between 0 and ${this.#items.length - 1}`
@@ -6300,7 +6333,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   #shiftItemPosition(index, key) {
     const shiftedPosition = makePosition(
       key,
-      this.#items.length > index + 1 ? _optionalChain([this, 'access', _129 => _129.#items, 'access', _130 => _130[index + 1], 'optionalAccess', _131 => _131._parentPos]) : void 0
+      this.#items.length > index + 1 ? _optionalChain([this, 'access', _149 => _149.#items, 'access', _150 => _150[index + 1], 'optionalAccess', _151 => _151._parentPos]) : void 0
     );
     this.#items[index]._setParentLink(this, shiftedPosition);
   }
@@ -6425,7 +6458,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _132 => _132.generateOpId, 'call', _133 => _133()]),
+      opId: _optionalChain([pool, 'optionalAccess', _152 => _152.generateOpId, 'call', _153 => _153()]),
       type: 7 /* CREATE_MAP */,
       parentId,
       parentKey
@@ -6560,7 +6593,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @param value The value of the element to add. Should be serializable to JSON.
    */
   set(key, value) {
-    _optionalChain([this, 'access', _134 => _134._pool, 'optionalAccess', _135 => _135.assertStorageIsWritable, 'call', _136 => _136()]);
+    _optionalChain([this, 'access', _154 => _154._pool, 'optionalAccess', _155 => _155.assertStorageIsWritable, 'call', _156 => _156()]);
     const oldValue = this.#map.get(key);
     if (oldValue) {
       oldValue._detach();
@@ -6606,7 +6639,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @returns true if an element existed and has been removed, or false if the element does not exist.
    */
   delete(key) {
-    _optionalChain([this, 'access', _137 => _137._pool, 'optionalAccess', _138 => _138.assertStorageIsWritable, 'call', _139 => _139()]);
+    _optionalChain([this, 'access', _157 => _157._pool, 'optionalAccess', _158 => _158.assertStorageIsWritable, 'call', _159 => _159()]);
     const item = this.#map.get(key);
     if (item === void 0) {
       return false;
@@ -6785,7 +6818,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
-    const opId = _optionalChain([pool, 'optionalAccess', _140 => _140.generateOpId, 'call', _141 => _141()]);
+    const opId = _optionalChain([pool, 'optionalAccess', _160 => _160.generateOpId, 'call', _161 => _161()]);
     const ops = [];
     const op = {
       type: 4 /* CREATE_OBJECT */,
@@ -7057,7 +7090,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param value The value of the property to add
    */
   set(key, value) {
-    _optionalChain([this, 'access', _142 => _142._pool, 'optionalAccess', _143 => _143.assertStorageIsWritable, 'call', _144 => _144()]);
+    _optionalChain([this, 'access', _162 => _162._pool, 'optionalAccess', _163 => _163.assertStorageIsWritable, 'call', _164 => _164()]);
     this.update({ [key]: value });
   }
   /**
@@ -7072,7 +7105,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param key The key of the property to delete
    */
   delete(key) {
-    _optionalChain([this, 'access', _145 => _145._pool, 'optionalAccess', _146 => _146.assertStorageIsWritable, 'call', _147 => _147()]);
+    _optionalChain([this, 'access', _165 => _165._pool, 'optionalAccess', _166 => _166.assertStorageIsWritable, 'call', _167 => _167()]);
     const keyAsString = key;
     const oldValue = this.#map.get(keyAsString);
     if (oldValue === void 0) {
@@ -7125,7 +7158,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param patch The object used to overrides properties
    */
   update(patch) {
-    _optionalChain([this, 'access', _148 => _148._pool, 'optionalAccess', _149 => _149.assertStorageIsWritable, 'call', _150 => _150()]);
+    _optionalChain([this, 'access', _168 => _168._pool, 'optionalAccess', _169 => _169.assertStorageIsWritable, 'call', _170 => _170()]);
     if (this._pool === void 0 || this._id === void 0) {
       for (const key in patch) {
         const newValue = patch[key];
@@ -7743,7 +7776,7 @@ var LiveblocksError = class _LiveblocksError extends Error {
   get roomId() {
     return this.context.roomId;
   }
-  /** @deprecated Prefer using `context.code` instead, to enable type narrowing */
+  /** @internal Use `context.code` instead, to enable type narrowing */
   get code() {
     return this.context.code;
   }
@@ -7813,11 +7846,9 @@ function defaultMessageFromContext(context) {
       return "Could not mark all inbox notifications as read";
     case "DELETE_ALL_INBOX_NOTIFICATIONS_ERROR":
       return "Could not delete all inbox notifications";
-    case "UPDATE_NOTIFICATION_SETTINGS_ERROR":
-      return "Could not update notification settings";
     case "UPDATE_ROOM_SUBSCRIPTION_SETTINGS_ERROR":
       return "Could not update room subscription settings";
-    case "UPDATE_USER_NOTIFICATION_SETTINGS_ERROR":
+    case "UPDATE_NOTIFICATION_SETTINGS_ERROR":
       return "Could not update notification settings";
     default:
       return assertNever(context, "Unhandled case");
@@ -7848,15 +7879,15 @@ function installBackgroundTabSpy() {
   const doc = typeof document !== "undefined" ? document : void 0;
   const inBackgroundSince = { current: null };
   function onVisibilityChange() {
-    if (_optionalChain([doc, 'optionalAccess', _151 => _151.visibilityState]) === "hidden") {
+    if (_optionalChain([doc, 'optionalAccess', _171 => _171.visibilityState]) === "hidden") {
       inBackgroundSince.current = _nullishCoalesce(inBackgroundSince.current, () => ( Date.now()));
     } else {
       inBackgroundSince.current = null;
     }
   }
-  _optionalChain([doc, 'optionalAccess', _152 => _152.addEventListener, 'call', _153 => _153("visibilitychange", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _172 => _172.addEventListener, 'call', _173 => _173("visibilitychange", onVisibilityChange)]);
   const unsub = () => {
-    _optionalChain([doc, 'optionalAccess', _154 => _154.removeEventListener, 'call', _155 => _155("visibilitychange", onVisibilityChange)]);
+    _optionalChain([doc, 'optionalAccess', _174 => _174.removeEventListener, 'call', _175 => _175("visibilitychange", onVisibilityChange)]);
   };
   return [inBackgroundSince, unsub];
 }
@@ -8036,7 +8067,7 @@ function createRoom(options, config) {
     }
   }
   function isStorageWritable() {
-    const scopes = _optionalChain([context, 'access', _156 => _156.dynamicSessionInfoSig, 'access', _157 => _157.get, 'call', _158 => _158(), 'optionalAccess', _159 => _159.scopes]);
+    const scopes = _optionalChain([context, 'access', _176 => _176.dynamicSessionInfoSig, 'access', _177 => _177.get, 'call', _178 => _178(), 'optionalAccess', _179 => _179.scopes]);
     return scopes !== void 0 ? canWriteStorage(scopes) : true;
   }
   const eventHub = {
@@ -8153,7 +8184,7 @@ function createRoom(options, config) {
       }
       case "experimental-fallback-to-http": {
         warn("Message is too large for websockets, so sending over HTTP instead");
-        const nonce = _nullishCoalesce(_optionalChain([context, 'access', _160 => _160.dynamicSessionInfoSig, 'access', _161 => _161.get, 'call', _162 => _162(), 'optionalAccess', _163 => _163.nonce]), () => ( raise("Session is not authorized to send message over HTTP")));
+        const nonce = _nullishCoalesce(_optionalChain([context, 'access', _180 => _180.dynamicSessionInfoSig, 'access', _181 => _181.get, 'call', _182 => _182(), 'optionalAccess', _183 => _183.nonce]), () => ( raise("Session is not authorized to send message over HTTP")));
         void httpClient.sendMessages({ roomId, nonce, messages }).then((resp) => {
           if (!resp.ok && resp.status === 403) {
             managedSocket.reconnect();
@@ -8204,7 +8235,7 @@ function createRoom(options, config) {
     } else {
       context.root = LiveObject._fromItems(message.items, context.pool);
     }
-    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _164 => _164.get, 'call', _165 => _165(), 'optionalAccess', _166 => _166.canWrite]), () => ( true));
+    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _184 => _184.get, 'call', _185 => _185(), 'optionalAccess', _186 => _186.canWrite]), () => ( true));
     const stackSizeBefore = context.undoStack.length;
     for (const key in context.initialStorage) {
       if (context.root.get(key) === void 0) {
@@ -8407,7 +8438,7 @@ function createRoom(options, config) {
     }
     context.myPresence.patch(patch);
     if (context.activeBatch) {
-      if (_optionalChain([options2, 'optionalAccess', _167 => _167.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _187 => _187.addToHistory])) {
         context.activeBatch.reverseOps.pushLeft({
           type: "presence",
           data: oldValues
@@ -8416,7 +8447,7 @@ function createRoom(options, config) {
       context.activeBatch.updates.presence = true;
     } else {
       flushNowOrSoon();
-      if (_optionalChain([options2, 'optionalAccess', _168 => _168.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _188 => _188.addToHistory])) {
         addToUndoStack([{ type: "presence", data: oldValues }]);
       }
       notify({ presence: true });
@@ -8613,7 +8644,7 @@ function createRoom(options, config) {
           if (process.env.NODE_ENV !== "production") {
             const traces = /* @__PURE__ */ new Set();
             for (const opId of message.opIds) {
-              const trace = _optionalChain([context, 'access', _169 => _169.opStackTraces, 'optionalAccess', _170 => _170.get, 'call', _171 => _171(opId)]);
+              const trace = _optionalChain([context, 'access', _189 => _189.opStackTraces, 'optionalAccess', _190 => _190.get, 'call', _191 => _191(opId)]);
               if (trace) {
                 traces.add(trace);
               }
@@ -8747,7 +8778,7 @@ ${Array.from(traces).join("\n\n")}`
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
     createOrUpdateRootFromMessage(message);
     applyAndSendOps(unacknowledgedOps);
-    _optionalChain([_resolveStoragePromise, 'optionalCall', _172 => _172()]);
+    _optionalChain([_resolveStoragePromise, 'optionalCall', _192 => _192()]);
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
   }
@@ -8950,8 +8981,6 @@ ${Array.from(traces).join("\n\n")}`
     others: eventHub.others.observable,
     self: eventHub.self.observable,
     myPresence: eventHub.myPresence.observable,
-    /** @deprecated */
-    storage: eventHub.storageBatch.observable,
     storageBatch: eventHub.storageBatch.observable,
     history: eventHub.history.observable,
     storageDidLoad: eventHub.storageDidLoad.observable,
@@ -8970,8 +8999,8 @@ ${Array.from(traces).join("\n\n")}`
   async function getThreads(options2) {
     return httpClient.getThreads({
       roomId,
-      query: _optionalChain([options2, 'optionalAccess', _173 => _173.query]),
-      cursor: _optionalChain([options2, 'optionalAccess', _174 => _174.cursor])
+      query: _optionalChain([options2, 'optionalAccess', _193 => _193.query]),
+      cursor: _optionalChain([options2, 'optionalAccess', _194 => _194.cursor])
     });
   }
   async function getThread(threadId) {
@@ -9078,7 +9107,7 @@ ${Array.from(traces).join("\n\n")}`
   function getSubscriptionSettings(options2) {
     return httpClient.getSubscriptionSettings({
       roomId,
-      signal: _optionalChain([options2, 'optionalAccess', _175 => _175.signal])
+      signal: _optionalChain([options2, 'optionalAccess', _195 => _195.signal])
     });
   }
   function updateSubscriptionSettings(settings) {
@@ -9100,7 +9129,7 @@ ${Array.from(traces).join("\n\n")}`
     {
       [kInternal]: {
         get presenceBuffer() {
-          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _176 => _176.buffer, 'access', _177 => _177.presenceUpdates, 'optionalAccess', _178 => _178.data]), () => ( null)));
+          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _196 => _196.buffer, 'access', _197 => _197.presenceUpdates, 'optionalAccess', _198 => _198.data]), () => ( null)));
         },
         // prettier-ignore
         get undoStack() {
@@ -9115,9 +9144,9 @@ ${Array.from(traces).join("\n\n")}`
           return context.yjsProvider;
         },
         setYjsProvider(newProvider) {
-          _optionalChain([context, 'access', _179 => _179.yjsProvider, 'optionalAccess', _180 => _180.off, 'call', _181 => _181("status", yjsStatusDidChange)]);
+          _optionalChain([context, 'access', _199 => _199.yjsProvider, 'optionalAccess', _200 => _200.off, 'call', _201 => _201("status", yjsStatusDidChange)]);
           context.yjsProvider = newProvider;
-          _optionalChain([newProvider, 'optionalAccess', _182 => _182.on, 'call', _183 => _183("status", yjsStatusDidChange)]);
+          _optionalChain([newProvider, 'optionalAccess', _202 => _202.on, 'call', _203 => _203("status", yjsStatusDidChange)]);
           context.yjsProviderDidChange.notify();
         },
         yjsProviderDidChange: context.yjsProviderDidChange.observable,
@@ -9163,7 +9192,7 @@ ${Array.from(traces).join("\n\n")}`
           source.dispose();
         }
         eventHub.roomWillDestroy.notify();
-        _optionalChain([context, 'access', _184 => _184.yjsProvider, 'optionalAccess', _185 => _185.off, 'call', _186 => _186("status", yjsStatusDidChange)]);
+        _optionalChain([context, 'access', _204 => _204.yjsProvider, 'optionalAccess', _205 => _205.off, 'call', _206 => _206("status", yjsStatusDidChange)]);
         syncSourceForStorage.destroy();
         syncSourceForYjs.destroy();
         uninstallBgTabSpy();
@@ -9313,7 +9342,7 @@ function makeClassicSubscribeFn(roomId, events, errorEvents) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _187 => _187.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _207 => _207.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -9392,8 +9421,8 @@ function createClient(options) {
     const userId = token.k === "sec-legacy" /* SECRET_LEGACY */ ? token.id : token.uid;
     currentUserId.set(() => userId);
   });
-  const fetchPolyfill = _optionalChain([clientOptions, 'access', _188 => _188.polyfills, 'optionalAccess', _189 => _189.fetch]) || /* istanbul ignore next */
-  _optionalChain([globalThis, 'access', _190 => _190.fetch, 'optionalAccess', _191 => _191.bind, 'call', _192 => _192(globalThis)]);
+  const fetchPolyfill = _optionalChain([clientOptions, 'access', _208 => _208.polyfills, 'optionalAccess', _209 => _209.fetch]) || /* istanbul ignore next */
+  _optionalChain([globalThis, 'access', _210 => _210.fetch, 'optionalAccess', _211 => _211.bind, 'call', _212 => _212(globalThis)]);
   const httpClient = createApiClient({
     baseUrl,
     fetchPolyfill,
@@ -9411,10 +9440,28 @@ function createClient(options) {
     delegates: {
       createSocket: makeCreateSocketDelegateForAi(
         baseUrl,
-        _optionalChain([clientOptions, 'access', _193 => _193.polyfills, 'optionalAccess', _194 => _194.WebSocket])
+        _optionalChain([clientOptions, 'access', _213 => _213.polyfills, 'optionalAccess', _214 => _214.WebSocket])
       ),
-      authenticate: makeAuthDelegateForRoom("default", authManager),
-      canZombie: () => true
+      authenticate: async () => {
+        const resp = await authManager.getAuthValue({
+          requestedScope: "room:read"
+        });
+        if (resp.type === "public") {
+          throw new StopRetrying(
+            "Cannot use AI Copilots with a public API key"
+          );
+        } else if (resp.token.parsed.k === "sec-legacy" /* SECRET_LEGACY */) {
+          throw new StopRetrying("AI Copilots requires an ID or Access token");
+        } else {
+          if (!resp.token.parsed.ai) {
+            throw new StopRetrying(
+              "AI Copilots is not yet enabled for this account. To get started, see https://liveblocks.io/docs/get-started/ai-copilots#Quickstart"
+            );
+          }
+        }
+        return resp;
+      },
+      canZombie: () => false
     }
   });
   function teardownRoom(room) {
@@ -9461,14 +9508,14 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _195 => _195.polyfills, 'optionalAccess', _196 => _196.WebSocket])
+            _optionalChain([clientOptions, 'access', _215 => _215.polyfills, 'optionalAccess', _216 => _216.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
         enableDebugLogging: clientOptions.enableDebugLogging,
         baseUrl,
         errorEventSource: liveblocksErrorSource,
-        largeMessageStrategy: _nullishCoalesce(clientOptions.largeMessageStrategy, () => ( (clientOptions.unstable_fallbackToHTTP ? "experimental-fallback-to-http" : void 0))),
+        largeMessageStrategy: clientOptions.largeMessageStrategy,
         unstable_streamData: !!clientOptions.unstable_streamData,
         roomHttpClient: httpClient,
         createSyncSource
@@ -9484,7 +9531,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.autoConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _197 => _197.polyfills, 'optionalAccess', _198 => _198.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _217 => _217.polyfills, 'optionalAccess', _218 => _218.atob]) === void 0) {
           throw new Error(
             "You need to polyfill atob to use the client in your environment. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/atob-polyfill"
           );
@@ -9496,7 +9543,7 @@ function createClient(options) {
     return leaseRoom(newRoomDetails);
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _199 => _199.get, 'call', _200 => _200(roomId), 'optionalAccess', _201 => _201.room]);
+    const room = _optionalChain([roomsById, 'access', _219 => _219.get, 'call', _220 => _220(roomId), 'optionalAccess', _221 => _221.room]);
     return room ? room : null;
   }
   function logout() {
@@ -9516,7 +9563,7 @@ function createClient(options) {
   const batchedResolveUsers = new Batch(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _202 => _202({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _222 => _222({ userIds })]);
       warnIfNoResolveUsers();
       return _nullishCoalesce(users, () => ( userIds.map(() => void 0)));
     },
@@ -9534,7 +9581,7 @@ function createClient(options) {
   const batchedResolveRoomsInfo = new Batch(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _203 => _203({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _223 => _223({ roomIds })]);
       warnIfNoResolveRoomsInfo();
       return _nullishCoalesce(roomsInfo, () => ( roomIds.map(() => void 0)));
     },
@@ -9587,7 +9634,7 @@ function createClient(options) {
       }
     };
     const win = typeof window !== "undefined" ? window : void 0;
-    _optionalChain([win, 'optionalAccess', _204 => _204.addEventListener, 'call', _205 => _205("beforeunload", maybePreventClose)]);
+    _optionalChain([win, 'optionalAccess', _224 => _224.addEventListener, 'call', _225 => _225("beforeunload", maybePreventClose)]);
   }
   async function getNotificationSettings(options2) {
     const plainSettings = await httpClient.getNotificationSettings(options2);
@@ -9726,7 +9773,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _206 => _206.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _226 => _226.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -9736,38 +9783,47 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _207 => _207(block)]);
+        _optionalChain([visitor, 'optionalCall', _227 => _227(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _208 => _208(inline)]);
+          _optionalChain([visitor, 'optionalCall', _228 => _228(inline)]);
         }
       }
     }
   }
 }
-function getMentionedIdsFromCommentBody(body) {
-  const mentionedIds = /* @__PURE__ */ new Set();
-  traverseCommentBody(
-    body,
-    "mention",
-    (mention) => mentionedIds.add(mention.id)
-  );
-  return Array.from(mentionedIds);
+function getMentionsFromCommentBody(body, predicate) {
+  const mentionIds = /* @__PURE__ */ new Set();
+  const mentions = [];
+  traverseCommentBody(body, "mention", (mention) => {
+    if (
+      // If this mention isn't already in the list
+      !mentionIds.has(mention.id) && // And the provided predicate is true
+      (predicate ? predicate(mention) : true)
+    ) {
+      mentionIds.add(mention.id);
+      mentions.push(mention);
+    }
+  });
+  return mentions;
 }
 async function resolveUsersInCommentBody(body, resolveUsers) {
   const resolvedUsers = /* @__PURE__ */ new Map();
   if (!resolveUsers) {
     return resolvedUsers;
   }
-  const userIds = getMentionedIdsFromCommentBody(body);
+  const userIds = getMentionsFromCommentBody(
+    body,
+    (mention) => mention.kind === "user"
+  ).map((mention) => mention.id);
   const users = await resolveUsers({
     userIds
   });
   for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _209 => _209[index]]);
+    const user = _optionalChain([users, 'optionalAccess', _229 => _229[index]]);
     if (user) {
       resolvedUsers.set(userId, user);
     }
@@ -9894,7 +9950,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => _nullishCoalesce(element.text, () => ( element.url)),
   mention: ({ element, user }) => {
-    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _210 => _210.name]), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _230 => _230.name]), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -9924,7 +9980,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${element.text ? html`${element.text}` : element.url}</a>`;
   },
   mention: ({ element, user }) => {
-    return html`<span data-mention>@${_optionalChain([user, 'optionalAccess', _211 => _211.name]) ? html`${_optionalChain([user, 'optionalAccess', _212 => _212.name])}` : element.id}</span>`;
+    return html`<span data-mention>@${_optionalChain([user, 'optionalAccess', _231 => _231.name]) ? html`${_optionalChain([user, 'optionalAccess', _232 => _232.name])}` : element.id}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -9954,19 +10010,19 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${_nullishCoalesce(element.text, () => ( element.url))}](${href})`;
   },
   mention: ({ element, user }) => {
-    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _213 => _213.name]), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _233 => _233.name]), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _214 => _214.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _215 => _215.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _234 => _234.format]), () => ( "plain"));
+  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _235 => _235.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
   const elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _216 => _216.elements])
+    ..._optionalChain([options, 'optionalAccess', _236 => _236.elements])
   };
   const resolvedUsers = await resolveUsersInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _217 => _217.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _237 => _237.resolveUsers])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -10257,12 +10313,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _218 => _218.updates, 'access', _219 => _219[key], 'optionalAccess', _220 => _220.type]) === "update") {
+          if (_optionalChain([update, 'access', _238 => _238.updates, 'access', _239 => _239[key], 'optionalAccess', _240 => _240.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _221 => _221.updates, 'access', _222 => _222[key], 'optionalAccess', _223 => _223.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _241 => _241.updates, 'access', _242 => _242[key], 'optionalAccess', _243 => _243.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -10323,12 +10379,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _224 => _224.updates, 'access', _225 => _225[key], 'optionalAccess', _226 => _226.type]) === "update") {
+          if (_optionalChain([update, 'access', _244 => _244.updates, 'access', _245 => _245[key], 'optionalAccess', _246 => _246.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _227 => _227.updates, 'access', _228 => _228[key], 'optionalAccess', _229 => _229.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _247 => _247.updates, 'access', _248 => _248[key], 'optionalAccess', _249 => _249.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -10408,9 +10464,9 @@ function makePoller(callback, intervalMs, options) {
   const startTime = performance.now();
   const doc = typeof document !== "undefined" ? document : void 0;
   const win = typeof window !== "undefined" ? window : void 0;
-  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _230 => _230.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
+  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _250 => _250.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
   const context = {
-    inForeground: _optionalChain([doc, 'optionalAccess', _231 => _231.visibilityState]) !== "hidden",
+    inForeground: _optionalChain([doc, 'optionalAccess', _251 => _251.visibilityState]) !== "hidden",
     lastSuccessfulPollAt: startTime,
     count: 0,
     backoff: 0
@@ -10491,11 +10547,11 @@ function makePoller(callback, intervalMs, options) {
     pollNowIfStale();
   }
   function onVisibilityChange() {
-    setInForeground(_optionalChain([doc, 'optionalAccess', _232 => _232.visibilityState]) !== "hidden");
+    setInForeground(_optionalChain([doc, 'optionalAccess', _252 => _252.visibilityState]) !== "hidden");
   }
-  _optionalChain([doc, 'optionalAccess', _233 => _233.addEventListener, 'call', _234 => _234("visibilitychange", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _235 => _235.addEventListener, 'call', _236 => _236("online", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _237 => _237.addEventListener, 'call', _238 => _238("focus", pollNowIfStale)]);
+  _optionalChain([doc, 'optionalAccess', _253 => _253.addEventListener, 'call', _254 => _254("visibilitychange", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _255 => _255.addEventListener, 'call', _256 => _256("online", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _257 => _257.addEventListener, 'call', _258 => _258("focus", pollNowIfStale)]);
   fsm.start();
   return {
     inc,
@@ -10525,9 +10581,6 @@ var TextEditorType = /* @__PURE__ */ ((TextEditorType2) => {
 
 // src/index.ts
 detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
-var CommentsApiError = HttpError;
-var NotificationsApiError = HttpError;
-
 
 
 
@@ -10626,5 +10679,5 @@ var NotificationsApiError = HttpError;
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MutableSignal = MutableSignal; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateCommentUrl = generateCommentUrl; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.isStartsWithOperator = isStartsWithOperator; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toAbsoluteUrl = toAbsoluteUrl; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateCommentUrl = generateCommentUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.isStartsWithOperator = isStartsWithOperator; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toAbsoluteUrl = toAbsoluteUrl; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.cjs.map