create-message-kit 1.0.20 → 1.1.5-beta.1

package/index.js

@@ -9,27 +9,21 @@ import pc from "picocolors";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-// Read package.json to get the version
-const packageJson = JSON.parse(
-  fs.readFileSync(resolve(__dirname, "package.json"), "utf8"),
-);
-const version = packageJson.version;
-
 program
   .name("byob")
   .description("CLI to initialize projects")
   .action(async () => {
-    log.info(pc.cyan(`Welcome to MessageKit v${version}!`));
+    log.info(pc.cyan(`Welcome to MessageKit!`));
     const coolLogo = `
-    ███╗   ███╗███████╗███████╗███████╗ █████╗  ██████╗ ███████╗██╗  ██╗██╗████████╗
-    ████╗ ████║██╔════╝██╔════╝██╔════╝██╔══██╗██╔════╝ ██╔════╝██║ ██╔╝██║╚══██╔══╝
-    ██╔████╔██║█████╗  ███████╗███████╗███████║██║  ███╗█████╗  █████╔╝ ██║   ██║   
-    ██║╚██╔╝██║██╔══╝  ╚════██║╚════██║██╔══██║██║   ██║██╔══╝  ██╔═██╗ ██║   ██║   
-    ██║ ╚═╝ ██║███████╗███████║███████║██║  ██║╚██████╔╝███████╗██║  ██╗██║   ██║   
-    ╚═╝     ╚═╝╚══════╝╚══════╝╚══════╝╚═╝  ╚═╝ ╚═════╝ ╚══════╝╚═╝  ╚═╝╚═╝   ╚═╝   
-    Powered by XMTP`;
+███╗   ███╗███████╗███████╗███████╗ █████╗  ██████╗ ███████╗██╗  ██╗██╗████████╗
+████╗ ████║██╔════╝██╔════╝██╔════╝██╔══██╗██╔════╝ ██╔════╝██║ ██╔╝██║╚══██╔══╝
+██╔████╔██║█████╗  ███████╗███████╗███████║██║  ███╗█████╗  █████╔╝ ██║   ██║   
+██║╚██╔╝██║██╔══╝  ╚════██║╚════██║██╔══██║██║   ██║██╔══╝  ██╔═██╗ ██║   ██║   
+██║ ╚═╝ ██║███████╗███████║███████║██║  ██║╚██████╔╝███████╗██║  ██╗██║   ██║   
+╚═╝     ╚═╝╚══════╝╚══════╝╚══════╝╚═╝  ╚═╝ ╚═════╝ ╚══════╝╚═╝  ╚═╝╚═╝   ╚═╝   
+Powered by XMTP`;
 
-    log.info(pc.cyan(coolLogo));
+    log.info(pc.red(coolLogo));
 
     const { templateType, displayName, destDir } = await gatherProjectInfo();
 
@@ -54,7 +48,7 @@ program
     const pkgManager = detectPackageManager();
 
     // Create README.md file
-    createReadme(destDir, templateType, displayName, pkgManager);
+    createReadme(destDir, displayName, pkgManager);
 
     // Log next steps
     logNextSteps(displayName);
@@ -163,12 +157,21 @@ function replaceDotfiles(destDir) {
 }
 
 function updatePackageJson(destDir, name) {
-  const pkgJson = fs.readJsonSync(resolve(destDir, "package.json"));
-  pkgJson.name = name;
-  updateDependenciesToLatest(pkgJson);
-  fs.writeJsonSync(resolve(destDir, "package.json"), pkgJson, { spaces: 2 });
-}
+  try {
+    const pkgJsonPath = resolve(destDir, "package.json");
+    if (!fs.existsSync(pkgJsonPath)) {
+      log.error(`package.json not found in ${pkgJsonPath}`);
+      return;
+    }
 
+    const pkgJson = fs.readJsonSync(pkgJsonPath);
+    pkgJson.name = name;
+    updateDependenciesToLatest(pkgJson);
+    fs.writeJsonSync(pkgJsonPath, pkgJson, { spaces: 2 });
+  } catch (error) {
+    log.error(`Error updating package.json: ${error.message}`);
+  }
+}
 function logNextSteps(name) {
   log.message("Next steps:");
   log.step(`1. ${pc.red(`cd ./${name}`)} - Navigate to project`);
@@ -226,7 +229,7 @@ function createEnvFile(destDir) {
 }
 
 // Create README.md file
-function createReadme(destDir, templateType, projectName, packageManager) {
+function createReadme(destDir, projectName, packageManager) {
   const envExampleContent = fs.readFileSync(
     resolve(destDir, ".env.example"),
     "utf8",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-message-kit",
-  "version": "1.0.20",
+  "version": "1.1.5-beta.1",
   "license": "MIT",
   "type": "module",
   "main": "index.js",

package/templates/agent/src/handler/ens.ts

@@ -1,10 +1,7 @@
 import { HandlerContext } from "@xmtp/message-kit";
 import { getUserInfo, clearInfoCache, isOnXMTP } from "../lib/resolver.js";
-import { textGeneration } from "../lib/openai.js";
-import { processResponseWithSkill } from "../lib/openai.js";
 import { isAddress } from "viem";
-import { ens_agent_prompt } from "../prompt.js";
-import { clearChatHistories } from "../lib/openai.js";
+import { clearMemory } from "../lib/openai.js";
 
 export const frameUrl = "https://ens.steer.fun/";
 export const ensUrl = "https://app.ens.domains/";
@@ -17,7 +14,7 @@ export async function handleEns(context: HandlerContext) {
     },
   } = context;
   if (command == "reset") {
-    clear();
+    clearMemory();
     return { code: 200, message: "Conversation reset." };
   } else if (command == "renew") {
     // Destructure and validate parameters for the ens command
@@ -32,7 +29,7 @@ export async function handleEns(context: HandlerContext) {
 
     const data = await getUserInfo(domain);
 
-    if (!data || data?.address !== sender?.address) {
+    if (!data?.address || data?.address !== sender?.address) {
       return {
         code: 403,
         message:
@@ -60,7 +57,7 @@ export async function handleEns(context: HandlerContext) {
     const { domain } = params;
 
     const data = await getUserInfo(domain);
-    if (!data) {
+    if (!data?.ensDomain) {
       return {
         code: 404,
         message: "Domain not found.",
@@ -151,39 +148,6 @@ export async function handleEns(context: HandlerContext) {
   }
 }
 
-export async function ensAgent(context: HandlerContext) {
-  if (!process?.env?.OPEN_AI_API_KEY) {
-    console.warn("No OPEN_AI_API_KEY found in .env");
-    return;
-  }
-
-  const {
-    message: {
-      content: { content, params },
-      sender,
-    },
-    group,
-  } = context;
-
-  try {
-    let userPrompt = params?.prompt ?? content;
-    const userInfo = await getUserInfo(sender.address);
-    if (!userInfo) {
-      console.log("User info not found");
-      return;
-    }
-    const { reply } = await textGeneration(
-      sender.address,
-      userPrompt,
-      await ens_agent_prompt(userInfo),
-    );
-    await processResponseWithSkill(sender.address, reply, context);
-  } catch (error) {
-    console.error("Error during OpenAI call:", error);
-    await context.send("An error occurred while processing your request.");
-  }
-}
-
 export const generateCoolAlternatives = (domain: string) => {
   const suffixes = ["lfg", "cool", "degen", "moon", "base", "gm"];
   const alternatives = [];
@@ -206,6 +170,6 @@ export const generateCoolAlternatives = (domain: string) => {
 };
 
 export async function clear() {
-  clearChatHistories();
+  clearMemory();
   clearInfoCache();
 }

package/templates/agent/src/index.ts

@@ -1,10 +1,39 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
-import { ensAgent } from "./handler/ens.js";
+import { textGeneration, processResponseWithSkill } from "./lib/openai.js";
+import { agent_prompt } from "./prompt.js";
+import { getUserInfo } from "./lib/resolver.js";
 
 run(async (context: HandlerContext) => {
   /*All the commands are handled through the commands file*/
   /* If its just text, it will be handled by the ensAgent*/
   /* If its a group message, it will be handled by the groupAgent*/
+  if (!process?.env?.OPEN_AI_API_KEY) {
+    console.warn("No OPEN_AI_API_KEY found in .env");
+    return;
+  }
 
-  ensAgent(context);
+  const {
+    message: {
+      content: { content, params },
+      sender,
+    },
+  } = context;
+
+  try {
+    let userPrompt = params?.prompt ?? content;
+    const userInfo = await getUserInfo(sender.address);
+    if (!userInfo) {
+      console.log("User info not found");
+      return;
+    }
+    const { reply } = await textGeneration(
+      sender.address,
+      userPrompt,
+      await agent_prompt(userInfo),
+    );
+    await processResponseWithSkill(sender.address, reply, context);
+  } catch (error) {
+    console.error("Error during OpenAI call:", error);
+    await context.send("An error occurred while processing your request.");
+  }
 });

package/templates/agent/src/lib/openai.ts

@@ -1,6 +1,6 @@
 import dotenv from "dotenv";
 dotenv.config();
-
+import type { SkillGroup } from "@xmtp/message-kit";
 import OpenAI from "openai";
 const openai = new OpenAI({
   apiKey: process.env.OPEN_AI_API_KEY,
@@ -9,13 +9,91 @@ const openai = new OpenAI({
 export type ChatHistoryEntry = { role: string; content: string };
 export type ChatHistories = Record<string, ChatHistoryEntry[]>;
 
+// New ChatMemory class
+class ChatMemory {
+  private histories: ChatHistories = {};
+
+  getHistory(address: string): ChatHistoryEntry[] {
+    return this.histories[address] || [];
+  }
+
+  addEntry(address: string, entry: ChatHistoryEntry) {
+    if (!this.histories[address]) {
+      this.histories[address] = [];
+    }
+    this.histories[address].push(entry);
+  }
+
+  initializeWithSystem(address: string, systemPrompt: string) {
+    if (this.getHistory(address).length === 0) {
+      this.addEntry(address, {
+        role: "system",
+        content: systemPrompt,
+      });
+    }
+  }
+
+  clear() {
+    this.histories = {};
+  }
+}
+
+export const clearMemory = () => {
+  chatHistories = {};
+};
+
+// Create singleton instance
+export const chatMemory = new ChatMemory();
+
 let chatHistories: ChatHistories = {};
+export const PROMPT_RULES = `You are a helpful and playful agent called {NAME} that lives inside a web3 messaging app called Converse.
+- You can respond with multiple messages if needed. Each message should be separated by a newline character.
+- You can trigger commands by only sending the command in a newline message.
+- Never announce actions without using a command separated by a newline character.
+- Dont answer in markdown format, just answer in plaintext.
+- Do not make guesses or assumptions
+- Only answer if the verified information is in the prompt.
+- Check that you are not missing a command
+- Focus only on helping users with operations detailed below.
+`;
+
+export const PROMPT_SKILLS_AND_EXAMPLES = (skills: SkillGroup[]) => `
+Commands:
+${skills
+  .map((skill) => skill.skills.map((s) => s.command).join("\n"))
+  .join("\n")}
+
+Examples:
+${skills
+  .map((skill) => skill.skills.map((s) => s.examples).join("\n"))
+  .join("\n")}
+  `;
+
+export async function agentResponse(
+  sender: { address: string },
+  userPrompt: string,
+  systemPrompt: string,
+  context: any,
+) {
+  try {
+    const { reply } = await textGeneration(
+      sender.address,
+      userPrompt,
+      systemPrompt,
+    );
+    await processResponseWithSkill(sender.address, reply, context);
+  } catch (error) {
+    console.error("Error during OpenAI call:", error);
+    await context.reply("An error occurred while processing your request.");
+  }
+}
 export async function textGeneration(
   address: string,
   userPrompt: string,
   systemPrompt: string,
 ) {
-  let messages = chatHistories[address] || [];
+  let messages = chatMemory.getHistory(address);
+  chatMemory.initializeWithSystem(address, systemPrompt);
   if (messages.length === 0) {
     messages.push({
       role: "system",
@@ -36,9 +114,11 @@ export async function textGeneration(
       role: "assistant",
       content: reply || "No response from OpenAI.",
     });
-    const cleanedReply = responseParser(reply as string);
-    chatHistories[address] = messages;
-    console.log("messages.length", messages.length);
+    const cleanedReply = parseMarkdown(reply as string);
+    chatMemory.addEntry(address, {
+      role: "assistant",
+      content: cleanedReply,
+    });
     return { reply: cleanedReply, history: messages };
   } catch (error) {
     console.error("Failed to fetch from OpenAI:", error);
@@ -46,43 +126,6 @@ export async function textGeneration(
   }
 }
 
-// New method to interpret an image
-export async function vision(imageData: Uint8Array, systemPrompt: string) {
-  const base64Image = Buffer.from(imageData).toString("base64");
-  const dataUrl = `data:image/jpeg;base64,${base64Image}`;
-
-  // Create a new thread for each vision request
-  const visionMessages = [
-    {
-      role: "system",
-      content: systemPrompt,
-    },
-    {
-      role: "user",
-      content: [
-        { type: "text", text: systemPrompt },
-        {
-          type: "image_url",
-          image_url: {
-            url: dataUrl,
-          },
-        },
-      ],
-    },
-  ];
-
-  try {
-    const response = await openai.chat.completions.create({
-      model: "gpt-4o",
-      messages: visionMessages as any,
-    });
-    return response.choices[0].message.content;
-  } catch (error) {
-    console.error("Failed to interpret image with OpenAI:", error);
-    throw error;
-  }
-}
-
 export async function processResponseWithSkill(
   address: string,
   reply: string,
@@ -90,24 +133,19 @@ export async function processResponseWithSkill(
 ) {
   let messages = reply
     .split("\n")
-    .map((message: string) => responseParser(message))
+    .map((message: string) => parseMarkdown(message))
     .filter((message): message is string => message.length > 0);
 
   console.log(messages);
   for (const message of messages) {
     if (message.startsWith("/")) {
       const response = await context.skill(message);
-      if (response && response.message) {
-        let msg = responseParser(response.message);
-
-        if (!chatHistories[address]) {
-          chatHistories[address] = [];
-        }
-        chatHistories[address].push({
+      if (response && typeof response.message === "string") {
+        let msg = parseMarkdown(response.message);
+        chatMemory.addEntry(address, {
           role: "system",
           content: msg,
         });
-
         await context.send(response.message);
       }
     } else {
@@ -115,7 +153,7 @@ export async function processResponseWithSkill(
     }
   }
 }
-export function responseParser(message: string) {
+export function parseMarkdown(message: string) {
   let trimmedMessage = message;
   // Remove bold and underline markdown
   trimmedMessage = trimmedMessage?.replace(/(\*\*|__)(.*?)\1/g, "$2");
@@ -134,7 +172,3 @@ export function responseParser(message: string) {
 
   return trimmedMessage;
 }
-
-export const clearChatHistories = () => {
-  chatHistories = {};
-};

package/templates/agent/src/lib/resolver.ts

@@ -17,6 +17,7 @@ export type UserInfo = {
   ensDomain?: string | undefined;
   address?: string | undefined;
   converseUsername?: string | undefined;
+  preferredName?: string | undefined;
   ensInfo?: EnsData | undefined;
   avatar?: string | undefined;
 };
@@ -54,12 +55,11 @@ export const getUserInfo = async (
     converseUsername: undefined,
     ensInfo: undefined,
   };
-  //console.log("Getting user info", key, clientAddress);
   if (isAddress(clientAddress || "")) {
     data.address = clientAddress;
   } else if (isAddress(key || "")) {
     data.address = key;
-  } else if (key.includes(".eth")) {
+  } else if (key?.includes(".eth")) {
     data.ensDomain = key;
   } else if (key == "@user" || key == "@me" || key == "@bot") {
     data.address = clientAddress;
@@ -77,12 +77,8 @@ export const getUserInfo = async (
 
   let keyToUse = data.address || data.ensDomain || data.converseUsername;
   let cacheData = keyToUse && infoCache.get(keyToUse);
-  if (cacheData) {
-    //console.log("Getting user info", keyToUse, cacheData);
-    return cacheData;
-  } else {
-    //console.log("Getting user info", keyToUse, data);
-  }
+  console.log("Getting user info", { cacheData, keyToUse, data });
+  if (cacheData) return cacheData;
 
   if (keyToUse?.includes(".eth")) {
     const response = await fetch(`https://ensdata.net/${keyToUse}`);
@@ -124,3 +120,17 @@ export const isOnXMTP = async (
   if (domain == "fabri.eth") return false;
   if (address) return (await client.canMessage([address])).length > 0;
 };
+
+export const PROMPT_USER_CONTENT = (userInfo: UserInfo) => {
+  let { address, ensDomain, converseUsername, preferredName } = userInfo;
+  let prompt = `User context: 
+- Start by fetch their domain from or Convese username
+- Call the user by their name or domain, in case they have one
+- Ask for a name (if they don't have one) so you can suggest domains.
+- Users address is: ${address}`;
+  if (preferredName) prompt += `\n- Users name is: ${preferredName}`;
+  if (ensDomain) prompt += `\n- User ENS domain is: ${ensDomain}`;
+  if (converseUsername)
+    prompt += `\n- Converse username is: ${converseUsername}`;
+  return prompt;
+};

package/templates/agent/src/prompt.ts

@@ -1,42 +1,28 @@
 import { skills } from "./skills.js";
-import type { UserInfo } from "./lib/resolver.js";
+import { UserInfo, PROMPT_USER_CONTENT } from "./lib/resolver.js";
+import { PROMPT_RULES, PROMPT_SKILLS_AND_EXAMPLES } from "./lib/openai.js";
 
-export async function ens_agent_prompt(userInfo: UserInfo) {
-  let { address, ensDomain, converseUsername } = userInfo;
+export async function agent_prompt(userInfo: UserInfo) {
+  let { address, ensDomain, converseUsername, preferredName } = userInfo;
 
-  const systemPrompt = `You are a helpful and playful agent called @ens that lives inside a web3 messaging app called Converse.
-- You can respond with multiple messages if needed. Each message should be separated by a newline character.
-- You can trigger commands by only sending the command in a newline message.
-- Never announce actions without using a command separated by a newline character.
-- Only provide answers based on verified information.
-- Dont answer in markdown format, just answer in plaintext.
-- Do not make guesses or assumptions
-- CHECK that you are not missing a command
+  //Update the name of the agent with predefined prompt
+  let systemPrompt = PROMPT_RULES.replace("{NAME}", skills?.[0]?.tag ?? "@ens");
 
-User context: 
-- Users address is: ${address}
-${ensDomain != undefined ? `- User ENS domain is: ${ensDomain}` : ""}
-${converseUsername != undefined ? `- Converse username is: ${converseUsername}` : ""}
+  //Add user context to the prompt
+  systemPrompt += PROMPT_USER_CONTENT(userInfo);
 
-## Task
-- Start by fetch their domain from or Convese username
-- Call the user by their name or domain, in case they have one
-- Ask for a name (if they don't have one) so you can suggest domains.
-
-Commands:
-${skills.map((skill) => skill.skills.map((s) => s.command).join("\n")).join("\n")}
-
-Examples:
-${skills.map((skill) => skill.skills.map((s) => s.example).join("\n")).join("\n")}
+  //Add skills and examples to the prompt
+  systemPrompt += PROMPT_SKILLS_AND_EXAMPLES(skills);
 
+  systemPrompt += `
 
 ## Example responses:
 
 1. Check if the user does not have a ENS domain
-  Hey ${converseUsername}! it looks like you don't have a ENS domain yet! \n\Let me start by checking your Converse username with the .eth suffix\n/check ${converseUsername}.eth
+  Hey ${preferredName}! it looks like you don't have a ENS domain yet! \n\Let me start by checking your Converse username with the .eth suffix\n/check ${converseUsername}.eth
 
 2. If the user has a ENS domain
-  Hello ${ensDomain} ! I'll help you get your ENS domain.\n Let's start by checking your ENS domain ${ensDomain}. Give me a moment.\n/check ${ensDomain}
+  Hello ${preferredName} ! I'll help you get your ENS domain.\n Let's start by checking your ENS domain ${ensDomain}. Give me a moment.\n/check ${ensDomain}
 
 3. Check if the ENS domain is available
   Hello! I'll help you get your domain.\n Let's start by checking your ENS domain ${ensDomain}. Give me a moment.\n/check ${ensDomain}
@@ -62,8 +48,9 @@ ${skills.map((skill) => skill.skills.map((s) => s.example).join("\n")).join("\n"
 10. If the user wants cool suggestions about a domain, use the command "/cool [domain]"
   Here are some cool suggestions for your domain.\n/cool ${ensDomain}
 
-## Most common bug
-  Some times you will say something like: "Looks like vitalik.eth is registered! What about these cool alternatives?"
+## Most common bugs
+
+1. Some times you will say something like: "Looks like vitalik.eth is registered! What about these cool alternatives?"
   But you forgot to add the command at the end of the message.
   You should have said something like: "Looks like vitalik.eth is registered! What about these cool alternatives?\n/cool vitalik.eth
 `;

package/templates/agent/src/skills.ts

@@ -1,11 +1,10 @@
-import { handleEns, ensAgent } from "./handler/ens.js";
+import { handleEns } from "./handler/ens.js";
 import type { SkillGroup } from "@xmtp/message-kit";
 
 export const skills: SkillGroup[] = [
   {
     name: "Ens Domain Bot",
     tag: "@ens",
-    tagHandler: ensAgent,
     description: "Register ENS domains.",
     skills: [
       {
@@ -14,7 +13,7 @@ export const skills: SkillGroup[] = [
         handler: handleEns,
         description:
           "Register a new ENS domain. Returns a URL to complete the registration process.",
-        example: "/register vitalik.eth",
+        examples: ["/register vitalik.eth"],
         params: {
           domain: {
             type: "string",
@@ -27,7 +26,7 @@ export const skills: SkillGroup[] = [
         handler: handleEns,
         description:
           "Get detailed information about an ENS domain including owner, expiry date, and resolver.",
-        example: "/info nick.eth",
+        examples: ["/info nick.eth"],
         params: {
           domain: {
             type: "string",
@@ -40,7 +39,7 @@ export const skills: SkillGroup[] = [
         handler: handleEns,
         description:
           "Extend the registration period of your ENS domain. Returns a URL to complete the renewal.",
-        example: "/renew fabri.base.eth",
+        examples: ["/renew fabri.base.eth"],
         params: {
           domain: {
             type: "string",
@@ -48,22 +47,21 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/check [domain] [cool_alternatives]",
+        command: "/check [domain]",
         triggers: ["/check"],
         handler: handleEns,
+        examples: ["/check vitalik.eth", "/check fabri.base.eth"],
         description: "Check if a domain is available.",
         params: {
           domain: {
             type: "string",
           },
-          cool_alternatives: {
-            type: "quoted",
-          },
         },
       },
       {
         command: "/cool [domain]",
         triggers: ["/cool"],
+        examples: ["/cool vitalik.eth"],
         handler: handleEns,
         description: "Get cool alternatives for a .eth domain.",
         params: {
@@ -75,6 +73,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/reset",
         triggers: ["/reset"],
+        examples: ["/reset"],
         handler: handleEns,
         description: "Reset the conversation.",
         params: {},
@@ -84,6 +83,7 @@ export const skills: SkillGroup[] = [
         description: "Show a URL for tipping a domain owner.",
         triggers: ["/tip"],
         handler: handleEns,
+        examples: ["/tip 0x1234567890123456789012345678901234567890"],
         params: {
           address: {
             type: "string",

package/templates/group/src/handler/splitpayment.ts

@@ -1,5 +1,6 @@
 import { HandlerContext } from "@xmtp/message-kit";
-import { vision, textGeneration } from "../lib/openai.js";
+import { textGeneration } from "../lib/openai.js";
+import { vision } from "../lib/vision.js";
 import { getUserInfo } from "../lib/resolver.js";
 
 export async function handler(context: HandlerContext) {
@@ -52,12 +53,7 @@ export async function handler(context: HandlerContext) {
       `;
 
       //I want the reply to be an array of messages so the bot feels like is sending multuple ones
-      const { reply } = await textGeneration(
-        sender.address,
-        response,
-        prompt,
-        true,
-      );
+      const { reply } = await textGeneration(sender.address, response, prompt);
       let splitMessages = JSON.parse(reply);
       for (const message of splitMessages) {
         let msg = message as string;

package/templates/group/src/lib/openai.ts

@@ -1,6 +1,6 @@
 import dotenv from "dotenv";
 dotenv.config();
-
+import type { SkillGroup } from "@xmtp/message-kit";
 import OpenAI from "openai";
 const openai = new OpenAI({
   apiKey: process.env.OPEN_AI_API_KEY,
@@ -9,13 +9,91 @@ const openai = new OpenAI({
 export type ChatHistoryEntry = { role: string; content: string };
 export type ChatHistories = Record<string, ChatHistoryEntry[]>;
 
+// New ChatMemory class
+class ChatMemory {
+  private histories: ChatHistories = {};
+
+  getHistory(address: string): ChatHistoryEntry[] {
+    return this.histories[address] || [];
+  }
+
+  addEntry(address: string, entry: ChatHistoryEntry) {
+    if (!this.histories[address]) {
+      this.histories[address] = [];
+    }
+    this.histories[address].push(entry);
+  }
+
+  initializeWithSystem(address: string, systemPrompt: string) {
+    if (this.getHistory(address).length === 0) {
+      this.addEntry(address, {
+        role: "system",
+        content: systemPrompt,
+      });
+    }
+  }
+
+  clear() {
+    this.histories = {};
+  }
+}
+
+export const clearMemory = () => {
+  chatHistories = {};
+};
+
+// Create singleton instance
+export const chatMemory = new ChatMemory();
+
 let chatHistories: ChatHistories = {};
+export const PROMPT_RULES = `You are a helpful and playful agent called {NAME} that lives inside a web3 messaging app called Converse.
+- You can respond with multiple messages if needed. Each message should be separated by a newline character.
+- You can trigger commands by only sending the command in a newline message.
+- Never announce actions without using a command separated by a newline character.
+- Dont answer in markdown format, just answer in plaintext.
+- Do not make guesses or assumptions
+- Only answer if the verified information is in the prompt.
+- Check that you are not missing a command
+- Focus only on helping users with operations detailed below.
+`;
+
+export const PROMPT_SKILLS_AND_EXAMPLES = (skills: SkillGroup[]) => `
+Commands:
+${skills
+  .map((skill) => skill.skills.map((s) => s.command).join("\n"))
+  .join("\n")}
+
+Examples:
+${skills
+  .map((skill) => skill.skills.map((s) => s.examples).join("\n"))
+  .join("\n")}
+  `;
+
+export async function agentResponse(
+  sender: { address: string },
+  userPrompt: string,
+  systemPrompt: string,
+  context: any,
+) {
+  try {
+    const { reply } = await textGeneration(
+      sender.address,
+      userPrompt,
+      systemPrompt,
+    );
+    await processResponseWithSkill(sender.address, reply, context);
+  } catch (error) {
+    console.error("Error during OpenAI call:", error);
+    await context.reply("An error occurred while processing your request.");
+  }
+}
 export async function textGeneration(
   address: string,
   userPrompt: string,
   systemPrompt: string,
 ) {
-  let messages = chatHistories[address] || [];
+  let messages = chatMemory.getHistory(address);
+  chatMemory.initializeWithSystem(address, systemPrompt);
   if (messages.length === 0) {
     messages.push({
       role: "system",
@@ -36,8 +114,11 @@ export async function textGeneration(
       role: "assistant",
       content: reply || "No response from OpenAI.",
     });
-    const cleanedReply = responseParser(reply as string);
-    chatHistories[address] = messages;
+    const cleanedReply = parseMarkdown(reply as string);
+    chatMemory.addEntry(address, {
+      role: "assistant",
+      content: cleanedReply,
+    });
     return { reply: cleanedReply, history: messages };
   } catch (error) {
     console.error("Failed to fetch from OpenAI:", error);
@@ -45,43 +126,6 @@ export async function textGeneration(
   }
 }
 
-// New method to interpret an image
-export async function vision(imageData: Uint8Array, systemPrompt: string) {
-  const base64Image = Buffer.from(imageData).toString("base64");
-  const dataUrl = `data:image/jpeg;base64,${base64Image}`;
-
-  // Create a new thread for each vision request
-  const visionMessages = [
-    {
-      role: "system",
-      content: systemPrompt,
-    },
-    {
-      role: "user",
-      content: [
-        { type: "text", text: systemPrompt },
-        {
-          type: "image_url",
-          image_url: {
-            url: dataUrl,
-          },
-        },
-      ],
-    },
-  ];
-
-  try {
-    const response = await openai.chat.completions.create({
-      model: "gpt-4o",
-      messages: visionMessages as any,
-    });
-    return response.choices[0].message.content;
-  } catch (error) {
-    console.error("Failed to interpret image with OpenAI:", error);
-    throw error;
-  }
-}
-
 export async function processResponseWithSkill(
   address: string,
   reply: string,
@@ -89,24 +133,19 @@ export async function processResponseWithSkill(
 ) {
   let messages = reply
     .split("\n")
-    .map((message: string) => responseParser(message))
+    .map((message: string) => parseMarkdown(message))
     .filter((message): message is string => message.length > 0);
 
   console.log(messages);
   for (const message of messages) {
     if (message.startsWith("/")) {
       const response = await context.skill(message);
-      if (response && response.message) {
-        let msg = responseParser(response.message);
-
-        if (!chatHistories[address]) {
-          chatHistories[address] = [];
-        }
-        chatHistories[address].push({
+      if (response && typeof response.message === "string") {
+        let msg = parseMarkdown(response.message);
+        chatMemory.addEntry(address, {
           role: "system",
           content: msg,
         });
-
         await context.send(response.message);
       }
     } else {
@@ -114,7 +153,7 @@ export async function processResponseWithSkill(
     }
   }
 }
-export function responseParser(message: string) {
+export function parseMarkdown(message: string) {
   let trimmedMessage = message;
   // Remove bold and underline markdown
   trimmedMessage = trimmedMessage?.replace(/(\*\*|__)(.*?)\1/g, "$2");
@@ -133,7 +172,3 @@ export function responseParser(message: string) {
 
   return trimmedMessage;
 }
-
-export const clearChatHistories = () => {
-  chatHistories = {};
-};

package/templates/group/src/lib/resolver.ts

@@ -17,6 +17,7 @@ export type UserInfo = {
   ensDomain?: string | undefined;
   address?: string | undefined;
   converseUsername?: string | undefined;
+  preferredName?: string | undefined;
   ensInfo?: EnsData | undefined;
   avatar?: string | undefined;
 };
@@ -54,12 +55,11 @@ export const getUserInfo = async (
     converseUsername: undefined,
     ensInfo: undefined,
   };
-  //console.log("Getting user info", key, clientAddress);
   if (isAddress(clientAddress || "")) {
     data.address = clientAddress;
   } else if (isAddress(key || "")) {
     data.address = key;
-  } else if (key.includes(".eth")) {
+  } else if (key?.includes(".eth")) {
     data.ensDomain = key;
   } else if (key == "@user" || key == "@me" || key == "@bot") {
     data.address = clientAddress;
@@ -77,12 +77,8 @@ export const getUserInfo = async (
 
   let keyToUse = data.address || data.ensDomain || data.converseUsername;
   let cacheData = keyToUse && infoCache.get(keyToUse);
-  if (cacheData) {
-    //console.log("Getting user info", keyToUse, cacheData);
-    return cacheData;
-  } else {
-    //console.log("Getting user info", keyToUse, data);
-  }
+  console.log("Getting user info", { cacheData, keyToUse, data });
+  if (cacheData) return cacheData;
 
   if (keyToUse?.includes(".eth")) {
     const response = await fetch(`https://ensdata.net/${keyToUse}`);
@@ -124,3 +120,17 @@ export const isOnXMTP = async (
   if (domain == "fabri.eth") return false;
   if (address) return (await client.canMessage([address])).length > 0;
 };
+
+export const PROMPT_USER_CONTENT = (userInfo: UserInfo) => {
+  let { address, ensDomain, converseUsername, preferredName } = userInfo;
+  let prompt = `User context: 
+- Start by fetch their domain from or Convese username
+- Call the user by their name or domain, in case they have one
+- Ask for a name (if they don't have one) so you can suggest domains.
+- Users address is: ${address}`;
+  if (preferredName) prompt += `\n- Users name is: ${preferredName}`;
+  if (ensDomain) prompt += `\n- User ENS domain is: ${ensDomain}`;
+  if (converseUsername)
+    prompt += `\n- Converse username is: ${converseUsername}`;
+  return prompt;
+};

package/templates/group/src/lib/vision.ts

@@ -0,0 +1,43 @@
+import dotenv from "dotenv";
+dotenv.config();
+
+import OpenAI from "openai";
+const openai = new OpenAI({
+  apiKey: process.env.OPEN_AI_API_KEY,
+});
+
+export async function vision(imageData: Uint8Array, systemPrompt: string) {
+  const base64Image = Buffer.from(imageData).toString("base64");
+  const dataUrl = `data:image/jpeg;base64,${base64Image}`;
+
+  // Create a new thread for each vision request
+  const visionMessages = [
+    {
+      role: "system",
+      content: systemPrompt,
+    },
+    {
+      role: "user",
+      content: [
+        { type: "text", text: systemPrompt },
+        {
+          type: "image_url",
+          image_url: {
+            url: dataUrl,
+          },
+        },
+      ],
+    },
+  ];
+
+  try {
+    const response = await openai.chat.completions.create({
+      model: "gpt-4o",
+      messages: visionMessages as any,
+    });
+    return response.choices[0].message.content;
+  } catch (error) {
+    console.error("Failed to interpret image with OpenAI:", error);
+    throw error;
+  }
+}

package/templates/group/src/skills.ts

@@ -14,6 +14,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/tip [@usernames] [amount] [token]",
         triggers: ["/tip"],
+        examples: ["/tip @vitalik 10 usdc"],
         description: "Tip users in a specified token.",
         handler: tipping,
         params: {
@@ -37,6 +38,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/send [amount] [token] [username]",
         triggers: ["/send"],
+        examples: ["/send 10 usdc @vitalik"],
         description:
           "Send a specified amount of a cryptocurrency to a destination address.",
         handler: transaction,
@@ -59,6 +61,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/swap [amount] [token_from] [token_to]",
         triggers: ["/swap"],
+        examples: ["/swap 10 usdc eth"],
         description: "Exchange one type of cryptocurrency for another.",
         handler: transaction,
         params: {
@@ -81,6 +84,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/show",
         triggers: ["/show"],
+        examples: ["/show"],
         handler: transaction,
         description: "Show the whole frame.",
         params: {},
@@ -113,6 +117,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/points",
         triggers: ["/points"],
+        examples: ["/points"],
         handler: loyalty,
         description: "Check your points.",
         params: {},
@@ -134,6 +139,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/agent [prompt]",
         triggers: ["/agent", "@agent", "@bot"],
+        examples: ["/agent @vitalik"],
         handler: agent,
         description: "Manage agent commands.",
         params: {
@@ -152,6 +158,7 @@ export const skills: SkillGroup[] = [
       {
         command: "/help",
         triggers: ["/help"],
+        examples: ["/help"],
         handler: helpHandler,
         description: "Get help with the bot.",
         params: {},