@liveblocks/core 2.25.0-aiprivatebeta5 → 2.25.0-aiprivatebeta7

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.25.0-aiprivatebeta5";
+var PKG_VERSION = "2.25.0-aiprivatebeta7";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -3781,7 +3781,8 @@ function createStore_forChatMessages() {
         role,
         parentId,
         createdAt,
-        content
+        content,
+        _optimistic: true
       });
     } else {
       upsert({
@@ -3791,7 +3792,8 @@ function createStore_forChatMessages() {
         parentId,
         createdAt,
         status: "pending",
-        contentSoFar: []
+        contentSoFar: [],
+        _optimistic: true
       });
     }
     return id;
@@ -3846,7 +3848,7 @@ function createStore_forChatMessages() {
   function* iterPendingMessages() {
     for (const chatMsgs\u03A3 of messagePoolByChatId\u03A3.values()) {
       for (const m of chatMsgs\u03A3.get()) {
-        if (m.role === "assistant" && m.status === "pending") {
+        if (m.role === "assistant" && m.status === "pending" && !m._optimistic) {
           yield m;
         }
       }
@@ -3854,7 +3856,16 @@ function createStore_forChatMessages() {
   }
   function failAllPending() {
     batch(() => {
-      pendingMessages\u03A3.mutate((lut) => lut.clear());
+      pendingMessages\u03A3.mutate((lut) => {
+        let deleted = false;
+        for (const [k, v] of lut) {
+          if (!v._optimistic) {
+            lut.delete(k);
+            deleted = true;
+          }
+        }
+        return deleted;
+      });
       upsertMany(
         Array.from(iterPendingMessages()).map(
           (message) => ({
@@ -3988,7 +3999,7 @@ function createStore_forUserAiChats() {
     SortedList.with((x, y) => y.createdAt < x.createdAt)
   );
   const chats\u03A3 = DerivedSignal.from(
-    () => Array.from(mutable\u03A3.get()).filter((c) => !c.ephemeral && !c.deletedAt)
+    () => Array.from(mutable\u03A3.get()).filter((c) => !c.deletedAt)
   );
   function upsertMany(chats) {
     mutable\u03A3.mutate((list) => {
@@ -4030,7 +4041,7 @@ function createAi(config) {
     chatsStore,
     messagesStore,
     toolsStore,
-    contextByChatId: /* @__PURE__ */ new Map()
+    knowledgeByChatId: /* @__PURE__ */ new Map()
   };
   let lastTokenKey;
   function onStatusDidChange(_newStatus) {
@@ -4132,7 +4143,7 @@ function createAi(config) {
         case "get-chats":
           context.chatsStore.upsertMany(msg.chats);
           break;
-        case "create-chat":
+        case "get-or-create-chat":
           context.chatsStore.upsert(msg.chat);
           break;
         case "delete-chat":
@@ -4143,20 +4154,17 @@ function createAi(config) {
           context.chatsStore.upsert(msg.chat);
           context.messagesStore.upsertMany(msg.messages);
           break;
-        case "add-user-message":
-          context.messagesStore.upsert(msg.message);
-          break;
         case "delete-message":
           context.messagesStore.remove(msg.chatId, msg.messageId);
           break;
         case "clear-chat":
           context.messagesStore.removeByChatId(msg.chatId);
           break;
-        case "ask-ai":
-          if (msg.message) {
-            context.messagesStore.upsert(msg.message);
-          } else {
+        case "ask-in-chat":
+          if (msg.sourceMessage) {
+            context.messagesStore.upsert(msg.sourceMessage);
           }
+          context.messagesStore.upsert(msg.targetMessage);
           break;
         case "abort-ai":
           break;
@@ -4210,13 +4218,14 @@ function createAi(config) {
       cursor: options.cursor
     });
   }
-  function createChat(id, name, options) {
+  function getOrCreateChat(id, title, options) {
     return sendClientMsgWithResponse({
-      cmd: "create-chat",
+      cmd: "get-or-create-chat",
       id,
-      name,
-      ephemeral: options?.ephemeral ?? false,
-      metadata: options?.metadata ?? {}
+      options: {
+        title,
+        metadata: options?.metadata
+      }
     });
   }
   function getMessageTree(chatId) {
@@ -4225,19 +4234,19 @@ function createAi(config) {
       chatId
     });
   }
-  function registerChatContext(chatId, data) {
-    const chatContext = context.contextByChatId.get(chatId);
-    if (chatContext === void 0) {
-      context.contextByChatId.set(chatId, /* @__PURE__ */ new Set([data]));
+  function registerKnowledgeSource(chatId, data) {
+    const knowledge = context.knowledgeByChatId.get(chatId);
+    if (knowledge === void 0) {
+      context.knowledgeByChatId.set(chatId, /* @__PURE__ */ new Set([data]));
     } else {
-      chatContext.add(data);
+      knowledge.add(data);
     }
     return () => {
-      const chatContext2 = context.contextByChatId.get(chatId);
-      if (chatContext2 !== void 0) {
-        chatContext2.delete(data);
-        if (chatContext2.size === 0) {
-          context.contextByChatId.delete(chatId);
+      const knowledge2 = context.knowledgeByChatId.get(chatId);
+      if (knowledge2 !== void 0) {
+        knowledge2.delete(data);
+        if (knowledge2.size === 0) {
+          context.knowledgeByChatId.delete(chatId);
         }
       }
     };
@@ -4251,22 +4260,24 @@ function createAi(config) {
     const copilotId = options?.copilotId;
     const stream = options?.stream ?? false;
     const timeout = options?.timeout ?? DEFAULT_AI_TIMEOUT;
-    const chatContext = context.contextByChatId.get(chatId);
+    const knowledge = context.knowledgeByChatId.get(chatId);
     return sendClientMsgWithResponse({
-      cmd: "ask-ai",
+      cmd: "ask-in-chat",
       chatId,
-      sourceMessageId: messageId,
+      sourceMessage: messageId,
       targetMessageId,
-      copilotId,
       clientId,
-      stream,
-      tools: context.toolsStore.getToolsForChat(chatId).map((tool) => ({
-        name: tool.name,
-        description: tool.definition.description,
-        parameters: tool.definition.parameters
-      })),
-      timeout,
-      context: chatContext ? Array.from(chatContext.values()) : void 0
+      generationOptions: {
+        copilotId,
+        stream,
+        knowledge: knowledge ? Array.from(knowledge) : void 0,
+        tools: context.toolsStore.getToolsForChat(chatId).map((tool) => ({
+          name: tool.name,
+          description: tool.definition.description,
+          parameters: tool.definition.parameters
+        })),
+        timeout
+      }
     });
   }
   return Object.defineProperty(
@@ -4278,7 +4289,7 @@ function createAi(config) {
       reconnect: () => managedSocket.reconnect(),
       disconnect: () => managedSocket.disconnect(),
       getChats,
-      createChat,
+      getOrCreateChat,
       deleteChat: (chatId) => {
         return sendClientMsgWithResponse({
           cmd: "delete-chat",
@@ -4288,23 +4299,6 @@ function createAi(config) {
       getMessageTree,
       deleteMessage: (chatId, messageId) => sendClientMsgWithResponse({ cmd: "delete-message", chatId, messageId }),
       clearChat: (chatId) => sendClientMsgWithResponse({ cmd: "clear-chat", chatId }),
-      addUserMessage: (chatId, parentMessageId, message) => {
-        const content = [{ type: "text", text: message }];
-        const newMessageId = context.messagesStore.createOptimistically(
-          chatId,
-          "user",
-          parentMessageId,
-          content
-        );
-        return sendClientMsgWithResponse({
-          cmd: "add-user-message",
-          id: newMessageId,
-          chatId,
-          parentMessageId,
-          content
-        });
-      },
-      ask,
       regenerateMessage: (chatId, messageId, options) => {
         const parentUserMessageId = context.messagesStore.getLatestUserMessageAncestor(chatId, messageId);
         if (parentUserMessageId === null) {
@@ -4327,32 +4321,27 @@ function createAi(config) {
           "assistant",
           newMessageId
         );
-        await sendClientMsgWithResponse({
-          cmd: "add-user-message",
-          id: newMessageId,
-          chatId,
-          parentMessageId,
-          content
-        });
         const copilotId = options?.copilotId;
         const stream = options?.stream ?? false;
         const timeout = options?.timeout ?? DEFAULT_AI_TIMEOUT;
-        const chatContext = context.contextByChatId.get(chatId);
+        const knowledge = context.knowledgeByChatId.get(chatId);
         return sendClientMsgWithResponse({
-          cmd: "ask-ai",
+          cmd: "ask-in-chat",
           chatId,
-          sourceMessageId: newMessageId,
+          sourceMessage: { id: newMessageId, parentMessageId, content },
           targetMessageId,
-          copilotId,
           clientId,
-          stream,
-          tools: context.toolsStore.getToolsForChat(chatId).map((tool) => ({
-            name: tool.name,
-            description: tool.definition.description,
-            parameters: tool.definition.parameters
-          })),
-          timeout,
-          context: chatContext ? Array.from(chatContext.values()) : void 0
+          generationOptions: {
+            copilotId,
+            stream,
+            knowledge: knowledge ? Array.from(knowledge) : void 0,
+            tools: context.toolsStore.getToolsForChat(chatId).map((tool) => ({
+              name: tool.name,
+              description: tool.definition.description,
+              parameters: tool.definition.parameters
+            })),
+            timeout
+          }
         });
       },
       abort: (messageId) => sendClientMsgWithResponse({ cmd: "abort-ai", messageId }),
@@ -4363,7 +4352,7 @@ function createAi(config) {
         getToolDefinition\u03A3: context.toolsStore.getToolCallByName\u03A3,
         getMessagesForChat\u03A3: context.messagesStore.getMessagesForChat\u03A3
       },
-      registerChatContext,
+      registerKnowledgeSource,
       registerChatTool: context.toolsStore.addToolDefinition,
       unregisterChatTool: context.toolsStore.removeToolDefinition
     },