latest WIP - BUG endless loop

Author: leomercier

core/src/actions/cashtags.ts

@@ -27,6 +27,7 @@ interface TokenPair {
         name: string;
         symbol: string;
     };
+    marketCap: number;
     priceNative: string;
     priceUsd: string;
     txns: {
@@ -147,10 +148,10 @@ export const searchCashTags = async (
 };
 
 export const cashtags: Action = {
-    name: "FIND_BEST_MATCH",
+    name: "FIND_BEST_CASHTAG_MATCH",
     similes: ["FIND_TOKEN", "SEARCH_TOKEN", "GET_TOKEN", "FIND_PAIR"],
     description:
-        "Searches for the best matching token pair based on age, liquidity, volume, and transaction count",
+        "Searches for the best matching token pair (ca) or $cashtag ($SOL) based on age, liquidity, volume, and transaction count",
     validate: async (runtime: IAgentRuntime, message: Memory, state: State) => {
         return true
     },
@@ -163,50 +164,62 @@ export const cashtags: Action = {
     ) => {
         const userId = runtime.agentId;
         const { roomId } = message;
-        const datestr = new Date().toUTCString().replace(/:/g, "-");
 
+       
         // Extract cashtag from message
         const cashtag = message.content.text
             .match(/\$[A-Za-z]+/)?.[0]
             ?.replace("$", "");
 
-        if (!cashtag) {
-            callback({
-                text: "No cashtag found in the message. Please include a cashtag (e.g. $PNUT)",
-                action: "FIND_BEST_MATCH_RESPONSE",
-                source: "DexScreener",
-            });
-            return;
-        }
-
         const callbackData: Content = {
             text: undefined,
             action: "FIND_BEST_MATCH_RESPONSE",
             source: "DexScreener",
             attachments: [],
         };
 
+        if (!cashtag) {
+            // callback({
+            //     text: "No cashtag found in the message. Please include a cashtag (e.g. $PNUT)",
+            //     action: "FIND_BEST_MATCH_RESPONSE",
+            //     source: "DexScreener",
+            // });
+            callbackData.text= "No cashtag found in the message. Please include a cashtag (e.g. $PNUT)";
+               
+            return;
+        }
+
+        console.log(`[${roomId}] Processing FIND_BEST_MATCH request... $`, cashtag);
+
         try {
             const { data: bestMatch, error } = await searchCashTags(cashtag);
 
             if (error) {
                 callbackData.text = error;
-                callback(callbackData);
+                // callback(callbackData);
                 return;
             }
+            console.log(bestMatch);
 
             // Format response
-            const responseText = `Best match for $${cashtag}:
-Token: ${bestMatch.baseToken.name} (${bestMatch.baseToken.symbol})
-Age: ${Math.floor((Date.now() - bestMatch.pairCreatedAt) / (1000 * 60 * 60 * 24))} days
-Liquidity: $${bestMatch.liquidity.usd.toLocaleString()}
-24h Volume: $${bestMatch.volume.h24.toLocaleString()}
-24h Transactions: ${(bestMatch.txns.h24.buys + bestMatch.txns.h24.sells).toLocaleString()}
-Price: $${bestMatch.priceUsd}
-DEX: ${bestMatch.dexId}
-Pair Address: ${bestMatch.pairAddress}`;
-
-            callbackData.text = responseText;
+            const responseText = `
+            Best match for $${cashtag}:
+            Token: ${bestMatch.baseToken.name} (${bestMatch.baseToken.symbol})
+            MCAP: $${(bestMatch.marketCap).toFixed(2)}M
+            Age: ${Math.floor((Date.now() - bestMatch.pairCreatedAt) / (1000 * 60 * 60 * 24))} days
+            Liquidity: $${bestMatch.liquidity.usd.toLocaleString()}
+            24h Volume: $${bestMatch.volume.h24.toLocaleString()}
+            24h Transactions: ${(bestMatch.txns.h24.buys + bestMatch.txns.h24.sells).toLocaleString()}
+            Price: $${bestMatch.priceUsd}
+            DEX: ${bestMatch.dexId}
+            Pair Address: ${bestMatch.pairAddress}
+
+            URL: ${bestMatch.url}`;
+
+            callbackData.text =  `Create a reply with the token information for $${cashtag}.
+                Message from user - ${message.content.text}
+                Token information - ${responseText}
+                `;
 
             // Store the full response as an attachment
             const attachmentId =
@@ -219,10 +232,10 @@ Pair Address: ${bestMatch.pairAddress}`;
                 title: `Best Match for $${cashtag}`,
                 source: "DexScreener",
                 description: `Token analysis for ${bestMatch.baseToken.symbol}`,
-                text: JSON.stringify(bestMatch, null, 2),
-            });
+                text: JSON.stringify(bestMatch, null, 2)
+            })
 
-            callback(callbackData);
+            // callback(callbackData);
 
             // Log to database
             runtime.databaseAdapter.log({
@@ -240,15 +253,21 @@ Pair Address: ${bestMatch.pairAddress}`;
                 roomId,
                 embedding: embeddingZeroVector,
             };
+            
 
             await runtime.messageManager.createMemory(memory);
-            await runtime.evaluate(message, state);
+            const response = await runtime.evaluate(message, state);
+
+
         } catch (error) {
             console.error("Error in findBestMatch:", error);
             callbackData.text = `Error processing request: ${error.message}`;
             callback(callbackData);
         }
 
+        console.log(callbackData);
+        typeof callback === "function" && callback(callbackData);
+
         return callbackData;
     },
     examples: [
@@ -263,7 +282,7 @@ Pair Address: ${bestMatch.pairAddress}`;
                 user: "{{user2}}",
                 content: {
                     text: "Let me search for the best matching pair...",
-                    action: "FIND_BEST_MATCH",
+                    action: "FIND_BEST_CASHTAG_MATCH",
                 },
             },
         ],
@@ -278,7 +297,7 @@ Pair Address: ${bestMatch.pairAddress}`;
                 user: "{{user2}}",
                 content: {
                     text: "I'll look up the token information...",
-                    action: "FIND_BEST_MATCH",
+                    action: "FIND_BEST_CASHTAG_MATCH",
                 },
             },
         ],
@@ -293,7 +312,7 @@ Pair Address: ${bestMatch.pairAddress}`;
                 user: "{{user2}}",
                 content: {
                     text: "Searching for the best BTC pair...",
-                    action: "FIND_BEST_MATCH",
+                    action: "FIND_BEST_CASHTAG_MATCH",
                 },
             },
         ],

core/src/adapters/postgres.ts

@@ -93,7 +93,7 @@ export class PostgresDatabaseAdapter extends DatabaseAdapter {
         const client = await this.pool.connect();
         try {
             const { rows } = await client.query(
-                `SELECT userState FROM participants WHERE "roomId" = $1 AND userId = $2`,
+                `SELECT "userState" FROM participants WHERE "roomId" = $1 AND "userId" = $2`,
                 [roomId, userId]
             );
             return rows.length > 0 ? rows[0].userState : null;
@@ -372,23 +372,23 @@ export class PostgresDatabaseAdapter extends DatabaseAdapter {
             if (params.start) {
                 paramCount++;
                 sql += ` AND "createdAt" >= to_timestamp($${paramCount})`;
-                values.push(params.start / 1000);
+                values.push(Math.round(params.start / 1000));
             }
 
             if (params.end) {
                 paramCount++;
                 sql += ` AND "createdAt" <= to_timestamp($${paramCount})`;
-                values.push(params.end / 1000);
+                values.push(Math.round(params.end / 1000));
             }
 
             if (params.unique) {
                 sql += ` AND "unique" = true`;
             }
 
             if (params.agentId) {
-                sql += ` AND "agentId" = $3`;
-                values.push(params.agentId);
                 paramCount++;
+                sql += ` AND "agentId" = $${paramCount}`;
+                values.push(params.agentId);
             }
 
             sql += ' ORDER BY "createdAt" DESC';
@@ -661,7 +661,8 @@ export class PostgresDatabaseAdapter extends DatabaseAdapter {
             }
 
             if (params.agentId) {
-                sql += ` AND "agentId" = $3`;
+                paramCount++;
+                sql += ` AND "agentId" = $${paramCount}`;
                 values.push(params.agentId);
             }
 

core/src/clients/direct/index.ts

@@ -40,7 +40,7 @@ Note that {{agentName}} is capable of reading/seeing/hearing various forms of me
 
 {{actions}}
 
-# Instructions: Write the next message for {{agentName}}. Ignore "action".
+# Instructions: Write the next message for {{agentName}}.
 ` + messageCompletionFooter;
 
 export interface SimliClientConfig {
@@ -162,7 +162,12 @@ class DirectClient {
                     inReplyTo: undefined,
                 };
 
-                const userMessage = { content, userId, roomId, agentId: runtime.agentId };
+                const userMessage = {
+                    content,
+                    userId,
+                    roomId,
+                    agentId: runtime.agentId,
+                };
 
                 const memory: Memory = {
                     id: messageId,
@@ -199,6 +204,52 @@ class DirectClient {
 
                 await runtime.messageManager.createMemory(responseMessage);
 
+                // TODO: Improve action loop
+                if (response?.action) {
+                    const actions = [];
+                    await runtime.processActions(
+                        memory,
+                        [responseMessage],
+                        state,
+                        // @ts-ignore
+                        async (response) => {
+                            actions.push(response);
+                        }
+                    );
+
+                    // TODO: duplicate compose to get latest state, refactor to add in runtime.getState
+
+                    const actionState = (await runtime.composeState(
+                        userMessage,
+                        {
+                            agentName: runtime.character.name,
+                        }
+                    )) as State;
+
+                    const context = composeContext({
+                        state: actionState,
+                        template: `
+                        About {{agentName}}:
+                        {{bio}}
+                        {{lore}}
+                      
+                                                    
+                        Recent Messages
+                        {{recentMessages}}
+                        
+        
+                        [SYSTEM] Actions completed, now respond to user given the actions outputs.
+                        # Instructions: Write the next message for {{agentName}}.`,
+                    });
+                    const _response = await generateMessageResponse({
+                        runtime: runtime,
+                        context: context,
+                        modelClass: ModelClass.SMALL,
+                    });
+                    res.json(_response);
+                    return;
+                }
+
                 if (!response) {
                     res.status(500).send(
                         "No response from generateMessageResponse"

core/src/clients/twitter/interactions.ts

@@ -48,6 +48,7 @@ Recent interactions between {{agentName}} and other users:
 # Task: Generate a post in the voice, style and perspective of {{agentName}} (@{{twitterUserName}}):
 {{currentPost}}
 
+{{actions}}
 ` + messageCompletionFooter;
 
 export const shouldRespondTemplate =
@@ -117,7 +118,8 @@ export class TwitterInteractionClient extends ClientBase {
                     !this.lastCheckedTweetId ||
                     parseInt(tweet.id) > this.lastCheckedTweetId
                 ) {
-                    const conversationId = tweet.conversationId + "-" + this.runtime.agentId;
+                    const conversationId =
+                        tweet.conversationId + "-" + this.runtime.agentId;
 
                     const roomId = stringToUuid(conversationId);
 
@@ -254,7 +256,11 @@ export class TwitterInteractionClient extends ClientBase {
                     text: tweet.text,
                     url: tweet.permanentUrl,
                     inReplyTo: tweet.inReplyToStatusId
-                        ? stringToUuid(tweet.inReplyToStatusId + "-" + this.runtime.agentId)
+                        ? stringToUuid(
+                              tweet.inReplyToStatusId +
+                                  "-" +
+                                  this.runtime.agentId
+                          )
                         : undefined,
                 },
                 userId: userIdUUID,