Updated message reactions

apps/chat/components/ui/multiplayer-actions.tsx

@@ -183,6 +183,7 @@ export function MultiplayerActionsProvider({ children }: MultiplayerActionsProvi
 
         const timestamp = new Date();
         const message: ActionMessage = {
+          id: crypto.randomUUID(),
           method,
           userId,
           name,

packages/usdk/packages/upstreet-agent/packages/react-agents/classes/chats-manager.ts

@@ -21,7 +21,7 @@ import {
 import {
   bindConversationToAgent,
 } from '../runtime';
-// import { Player } from 'react-agents-client/util/player.mjs';
+import { Player } from 'react-agents-client/util/player.mjs';
 import { ReactAgentsMultiplayerConnection } from 'react-agents-client/react-agents-client.mjs';
 import {
   ExtendableMessageEvent,
@@ -35,7 +35,7 @@ import {
 import {
   TranscribedVoiceInput,
 } from 'react-agents/devices/audio-transcriber.mjs';
-import { formatConversationMessage } from '../util/message-utils';
+import { createMessageCache, formatConversationMessage } from '../util/message-utils';
 
 //
 
@@ -91,14 +91,23 @@ export class ChatsManager {
         agent,
       } = this;
 
+      const agentPlayer = new Player(agent.id, {
+        name: agent.name,
+        bio: agent.bio,
+      });
       const conversation = new ConversationObject({
-        agent,
+        agentPlayer,
         getHash: () => {
           return getChatKey({
             room,
             endpointUrl,
           });
         },
+        messageCache: createMessageCache({
+          agent,
+          conversationId: key,
+          agentId: agent.id,
+        }),
       });
       this.agent.conversationManager.addConversation(conversation);
 

packages/usdk/packages/upstreet-agent/packages/react-agents/classes/conversation-object.ts

@@ -12,13 +12,10 @@ import {
 import { SceneObject } from '../classes/scene-object';
 import { Player } from 'react-agents-client/util/player.mjs';
 import { ExtendableMessageEvent } from '../util/extendable-message-event';
-import { MessageCache as MessageCacheConstructor, CACHED_MESSAGES_LIMIT } from './message-cache';
-import { loadMessagesFromDatabase } from '../util/loadMessagesFromDatabase';
 
 //
 
 export class ConversationObject extends EventTarget {
-  agent: ActiveAgentObject; // the current agent
   agentsMap: Map<string, Player>; // note: agents does not include the current agent
   scene: SceneObject | null;
   getHash: GetHashFn; // XXX this can be a string, since conversation hashes do not change (?)
@@ -27,37 +24,30 @@ export class ConversationObject extends EventTarget {
   mentionsRegex: RegExp | null = null;
 
   constructor({
-    agent,
     agentsMap = new Map(),
+    agentPlayer,
     scene = null,
     getHash = () => '',
     mentionsRegex = null,
+    messageCache,
   }: {
-    agent: ActiveAgentObject | null;
     agentsMap?: Map<string, Player>;
+    agentPlayer: Player;
     scene?: SceneObject | null;
     getHash?: GetHashFn;
     mentionsRegex?: RegExp | null;
+    messageCache: MessageCache;
   }) {
     super();
 
-    this.agent = agent;
     this.agentsMap = agentsMap;
     this.scene = scene;
     this.getHash = getHash;
     this.mentionsRegex = mentionsRegex;
-    this.messageCache = new MessageCacheConstructor({
-      loader: async () => {
-        const supabase = this.agent.appContextValue.useSupabase();
-        const messages = await loadMessagesFromDatabase({
-          supabase,
-          conversationId: this.getKey(),
-          agentId: this.agent.id,
-          limit: CACHED_MESSAGES_LIMIT,
-        });
-        return messages;
-      },
-    });
+    this.messageCache = messageCache;
+
+    // add the agent player to the agents map
+    this.agentsMap.set(agentPlayer.playerId, agentPlayer);
   }
 
   //
@@ -94,9 +84,6 @@ export class ConversationObject extends EventTarget {
     this.scene = scene;
   }
 
-  getAgent() {
-    return this.agent;
-  }
   // setAgent(agent: ActiveAgentObject) {
   //   this.agent = agent;
   // }
@@ -127,7 +114,6 @@ export class ConversationObject extends EventTarget {
     const allAgents: object[] = [
       ...Array.from(this.agentsMap.values()).map(player => player.playerSpec),
     ];
-    this.agent && allAgents.push(this.agent.agentJson);
     return allAgents;
   }
   getEmbeddingString() {

packages/usdk/packages/upstreet-agent/packages/react-agents/classes/discord-manager.ts

@@ -13,7 +13,7 @@ import {
 } from './conversation-object';
 import { Player } from 'react-agents-client/util/player.mjs';
 import { DiscordBotClient } from '../lib/discord/discord-client';
-import { formatConversationMessage } from '../util/message-utils';
+import { createMessageCache, formatConversationMessage } from '../util/message-utils';
 import {
   bindConversationToAgent,
 } from '../runtime';
@@ -97,6 +97,45 @@ const bindOutgoing = ({
         channelId,
         userId,
       });
+    } else if (method === 'messageReaction') {
+      const {
+        reaction,
+        id,
+      } = args as {
+        reaction: string,
+        id: string,
+      };
+
+
+      // get message from conversation by messageId
+      const message = conversation.getCachedMessages().find(m => m.args.id === id);
+
+      const getDiscordIdForUserId = (userId: string) => {
+        const agents = conversation.getAgents();
+        const agent = agents.find(
+          agent => agent.playerId === userId
+        );
+
+        const discordId = agent?.playerSpec?.mentionId;
+        return discordId;
+      };
+
+      // get userId from message
+      const userId = message?.userId;
+      const discordMessageId = message?.metadata?.discordMessageId;
+
+      const discordId = getDiscordIdForUserId(userId);
+      console.log('discord manager message reaction', {
+        reaction,
+        discordMessageId,
+        userId,
+        channelId,
+        discordId,
+      });
+      discordBotClient.input.reactToMessage(reaction, discordMessageId, {
+        channelId,
+        userId: discordId,
+      });
     } else {
       // ignore
     }
@@ -126,6 +165,7 @@ const bindOutgoing = ({
 
 export class DiscordBot extends EventTarget {
   token: string;
+  appId: string;
   channels: DiscordRoomSpec[];
   dms: DiscordRoomSpec[];
   userWhitelist: string[];
@@ -139,6 +179,7 @@ export class DiscordBot extends EventTarget {
     // arguments
     const {
       token,
+      appId,
       channels,
       dms,
       userWhitelist,
@@ -147,6 +188,7 @@ export class DiscordBot extends EventTarget {
       jwt,
     } = args;
     this.token = token;
+    this.appId = appId;
     this.channels = channels;
     this.dms = dms;
     this.userWhitelist = userWhitelist;
@@ -164,6 +206,7 @@ export class DiscordBot extends EventTarget {
     // initialize discord bot client
     const discordBotClient = new DiscordBotClient({
       token,
+      appId,
       codecs,
       jwt,
       name,
@@ -247,12 +290,23 @@ export class DiscordBot extends EventTarget {
             return
           }
 
+          const conversationId = `discord:channel:${channelId}`;
+          const agentPlayer = new Player(agent.id, {
+            name: agent.name,
+            bio: agent.bio,
+            mentionId: appId,
+          });
           const conversation = new ConversationObject({
-            agent,
+            agentPlayer,
             getHash: () => {
-              return `discord:channel:${channelId}`;
+              return conversationId;
             },
             mentionsRegex: discordMentionRegex,
+            messageCache: createMessageCache({
+              agent,
+              conversationId,
+              agentId: agent.id,
+            }),
           });
 
           this.agent.conversationManager.addConversation(conversation);
@@ -293,15 +347,26 @@ export class DiscordBot extends EventTarget {
           console.log('dm conversation already exists for this user, skipping', userId);
           return
         }
-
+
+        const conversationId = `discord:dm:${userId}`;
+        const agentPlayer = new Player(agent.id, {
+          name: agent.name,
+          bio: agent.bio,
+          mentionId: appId,
+        });
         const conversation = new ConversationObject({
-          agent,
+          agentPlayer,
           getHash: () => {
-            return `discord:dm:${userId}`;
+            return conversationId;
           },
           mentionsRegex: discordMentionRegex,
+          messageCache: createMessageCache({
+            agent,
+            conversationId,
+            agentId: agent.id,
+          }),
         });
-
+        
         this.agent.conversationManager.addConversation(conversation);
         this.dmConversations.set(userId, conversation);
 
@@ -370,6 +435,7 @@ export class DiscordBot extends EventTarget {
           text,
           channelId, // if there is no channelId, it's a DM
           // XXX discord channel/dm distinction can be made more explicit with a type: string field...
+          messageId,
         } = e.data;
 
         // look up conversation
@@ -391,6 +457,9 @@ export class DiscordBot extends EventTarget {
             args: {
               text: formattedMessage,
             },
+            metadata: {
+              discordMessageId: messageId,
+            },
           };
           const id = getIdFromUserId(userId);
           const agent = {
@@ -411,11 +480,71 @@ export class DiscordBot extends EventTarget {
       });
     };
 
+    // message reactions
+    const _bindIncomingMessageReactions = () => {
+      const handleReaction = (e: MessageEvent, eventType: string) => {
+        const {
+          userId,
+          messageId,
+          emoji,
+          channelId,
+          userDisplayName,
+          guildId,
+        } = e.data;
+
+        console.log(eventType, {
+          userId,
+          userDisplayName,
+          messageId,
+          emoji,
+          channelId,
+          guildId,
+        });
+
+        // look up conversation
+        const conversation = guildId
+          ? this.channelConversations.get(channelId) ?? null
+          : this.dmConversations.get(userId) ?? null;
+
+        if (!conversation) return;
+
+        const rawMessageReaction = {
+          userId,
+          name: userDisplayName,
+          method: 'messageReaction',
+          args: {
+            text: `${eventType === 'messagereactionadd' ? 'Added' : 'Removed'} reaction '${emoji}' ${eventType === 'messagereactionadd' ? 'to' : 'from'} message ${messageId}`,
+          },
+          metadata: {
+            discordMessageId: messageId,
+          },
+        };
+
+        const newMessageReaction = formatConversationMessage(rawMessageReaction, {
+          agent: {
+            id: getIdFromUserId(userId),
+            name: userDisplayName,
+          },
+        });
+
+        conversation.addLocalMessage(newMessageReaction);
+      };
+
+      discordBotClient.output.addEventListener('messagereactionadd', 
+        (e) => handleReaction(e, 'messagereactionadd')
+      );
+
+      discordBotClient.output.addEventListener('messagereactionremove', 
+        (e) => handleReaction(e, 'messagereactionremove')
+      );
+    };
+
     (async () => {
       _bindChannels();
       _bindGuildMemberAdd();
       _bindGuildMemberRemove();
       _bindIncoming();
+      _bindIncomingMessageReactions();
       await _connect();
     })().catch(err => {
       console.warn('discord bot error', err);

packages/usdk/packages/upstreet-agent/packages/react-agents/classes/generative-agent-object.ts

@@ -11,6 +11,7 @@ import type {
   ActionStep,
   Evaluator,
   DebugOptions,
+  EvaluateOpts,
 } from '../types';
 import {
   ConversationObject,
@@ -110,7 +111,7 @@ export class GenerativeAgentObject {
       });
     // });
   }
-  async evaluate(evaluator: Evaluator) {
+  async evaluate(evaluator: Evaluator, opts?: EvaluateOpts) {
     return await this.conversation.typing(async () => {
       const step = await evaluator.evaluate({
         generativeAgent: this,