create-message-kit 1.1.8 → 1.1.9-beta.1

package/index.js

@@ -79,19 +79,25 @@ async function addPackagejson(destDir, name, pkgManager) {
     dependencies: {
       "@xmtp/message-kit": "latest",
     },
+    devDependencies: {
+      "@types/node": "latest",
+      typescript: "latest",
+    },
     engines: {
       node: ">=20",
     },
   };
 
-  if (pkgManager.startsWith("yarn")) {
-    packageTemplate.packageManager = `${pkgManager}`;
+  if (pkgManager.includes("yarn")) {
+    //packageTemplate.packageManager = `${pkgManager}`;
     // Add .yarnrc.yml to disable PnP mode
-    fs.writeFileSync(
-      resolve(destDir, ".yarnrc.yml"),
-      "nodeLinker: node-modules\n",
-    );
   }
+
+  fs.writeFileSync(
+    resolve(destDir, ".yarnrc.yml"),
+    "nodeLinker: node-modules\n",
+  );
+
   fs.writeJsonSync(resolve(destDir, "package.json"), packageTemplate, {
     spaces: 2,
   });
@@ -99,9 +105,10 @@ async function addPackagejson(destDir, name, pkgManager) {
 
 async function gatherProjectInfo() {
   const templateOptions = [
-    { value: "gm", label: "GM" },
+    { value: "gpt", label: "GPT" },
     { value: "agent", label: "Agent" },
     { value: "group", label: "Group" },
+    { value: "ens-agent-pro", label: "Ens Agent Pro" },
   ];
 
   const templateType = await select({
@@ -201,11 +208,27 @@ yarn-error.log*
 
   fs.writeFileSync(resolve(destDir, ".gitignore"), gitignoreContent.trim());
 }
-
 async function detectPackageManager() {
   try {
-    const pkgManager = await detect();
+    // Check if running through bun create
+    if (process.env.BUN_CREATE === "true" || process.env._?.includes("bun")) {
+      return "bun";
+    }
+
     const userAgent = process.env.npm_config_user_agent;
+
+    // Check if running through npm init
+    if (userAgent?.startsWith("npm")) {
+      return "npm";
+    }
+
+    // Check for Bun in process.argv
+    if (process.argv.some((arg) => arg.includes("bun"))) {
+      return "bun";
+    }
+
+    // Fallback to detect for other cases
+    const pkgManager = await detect();
     let version = "";
 
     if (userAgent && pkgManager === "yarn") {
@@ -217,11 +240,9 @@ async function detectPackageManager() {
 
     return pkgManager + version;
   } catch (error) {
-    // Fallback to npm if detection fails
     return "npm";
   }
 }
-
 function kebabcase(str) {
   return str
     .replace(/([a-z])([A-Z])/g, "$1-$2")

package/package.json

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

package/templates/agent/src/{handler/ens.ts → handler.ts}

@@ -1,11 +1,10 @@
 import { HandlerContext, SkillResponse } from "@xmtp/message-kit";
 import { getUserInfo, clearInfoCache, isOnXMTP } from "@xmtp/message-kit";
-import { isAddress } from "viem";
 import { clearMemory } from "@xmtp/message-kit";
 
 export const frameUrl = "https://ens.steer.fun/";
 export const ensUrl = "https://app.ens.domains/";
-export const baseTxUrl = "https://base-tx-frame.vercel.app";
+export const txpayUrl = "https://txpay.vercel.app";
 
 export async function handleEns(
   context: HandlerContext,
@@ -56,6 +55,7 @@ export async function handleEns(
     }
     // Generate URL for the ens
     let url_ens = ensUrl + domain;
+    context.send(`${url_ens}`);
     return { code: 200, message: `${url_ens}` };
   } else if (skill == "info") {
     const { domain } = params;
@@ -128,13 +128,12 @@ export async function handleEns(
       };
     }
     const data = await getUserInfo(address);
-    let txUrl = `${baseTxUrl}/transaction/?transaction_type=send&buttonName=Tip%20${data?.ensDomain ?? ""}&amount=1&token=USDC&receiver=${
-      isAddress(address) ? address : data?.address
-    }`;
-    console.log(txUrl);
+
+    let sendUrl = `${txpayUrl}/?&amount=1&token=USDC&receiver=${address}`;
+
     return {
       code: 200,
-      message: txUrl,
+      message: sendUrl,
     };
   } else if (skill == "cool") {
     const { domain } = params;

package/templates/agent/src/index.ts

@@ -1,31 +1,55 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
-import { textGeneration, processMultilineResponse } from "@xmtp/message-kit";
-import { agent_prompt } from "./prompt.js";
-import { getUserInfo } from "@xmtp/message-kit";
+import { agentRun } from "@xmtp/message-kit";
+import { skills } from "./skills.js";
+import { defaultPromptTemplate } from "@xmtp/message-kit";
+
+export async function agent_prompt(senderAddress: string) {
+  let fineTuning = `
+## Example responses:
+
+1. Check if the user does not have a ENS domain
+  Hey {PREFERRED_NAME}! 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 {CONVERSE_USERNAME}.eth
+
+2. If the user has a ENS domain
+  Hello  {PREFERRED_NAME} ! I'll help you get your ENS domain.\n Let's start by checking your ENS domain  {ENS_DOMAIN}. Give me a moment.\n/check  {ENS_DOMAIN}
+
+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  {ENS_DOMAIN}. Give me a moment.\n/check  {ENS_DOMAIN}
+
+4. If the ENS domain is available,
+  Looks like  {ENS_DOMAIN} is available! Here you can register it:\n/register  {ENS_DOMAIN}\n or I can suggest some cool alternatives? Le me know!
+
+5. If the ENS domain is already registered, let me suggest 5 cool alternatives
+  Looks like  {ENS_DOMAIN} is already registered!\n What about these cool alternatives?\n/cool  {ENS_DOMAIN}
+
+6. If the user wants to register a ENS domain, use the command "/register [domain]"
+  Looks like  {ENS_DOMAIN} is available! Let me help you register it\n/register  {ENS_DOMAIN} 
+  
+7. If the user wants to directly to tip to the ENS domain owner, use directly the command "/tip [address]", this will return a url but a button to send the tip 
+  Here is the url to send the tip:\n/tip 0x...
+
+8. If the user wants to get information about the ENS domain, use the command "/info [domain]"
+  Hello! I'll help you get info about  {ENS_DOMAIN}.\n Give me a moment.\n/info  {ENS_DOMAIN}  
+
+9. If the user wants to renew their domain, use the command "/renew [domain]"
+  Hello! I'll help you get your ENS domain.\n Let's start by checking your ENS domain  {ENS_DOMAIN}. Give me a moment.\n/renew  {ENS_DOMAIN} 
+
+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  {ENS_DOMAIN}
+
+## 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
+`;
+
+  return defaultPromptTemplate(fineTuning, senderAddress, skills, "@ens");
+}
 
 run(async (context: HandlerContext) => {
-  const {
-    message: {
-      content: { text, params },
-      sender,
-    },
-  } = context;
-
-  try {
-    let userPrompt = params?.prompt ?? text;
-    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 processMultilineResponse(sender.address, reply, context);
-  } catch (error) {
-    console.error("Error during OpenAI call:", error);
-    await context.send("An error occurred while processing your request.");
-  }
+  agentRun(context, async (address: string) => {
+    const result = (await agent_prompt(address)) ?? "No response available";
+    return result;
+  });
 });

package/templates/agent/src/skills.ts

@@ -1,4 +1,4 @@
-import { handleEns } from "./handler/ens.js";
+import { handleEns } from "./handler.js";
 import type { SkillGroup } from "@xmtp/message-kit";
 
 export const skills: SkillGroup[] = [
@@ -9,7 +9,6 @@ export const skills: SkillGroup[] = [
     skills: [
       {
         skill: "/register [domain]",
-        triggers: ["/register"],
         handler: handleEns,
         description:
           "Register a new ENS domain. Returns a URL to complete the registration process.",
@@ -20,21 +19,8 @@ export const skills: SkillGroup[] = [
           },
         },
       },
-      {
-        skill: "/exists",
-        examples: ["/exists"],
-        handler: handleEns,
-        triggers: ["/exists"],
-        description: "Check if an address is onboarded.",
-        params: {
-          address: {
-            type: "address",
-          },
-        },
-      },
       {
         skill: "/info [domain]",
-        triggers: ["/info"],
         handler: handleEns,
         description:
           "Get detailed information about an ENS domain including owner, expiry date, and resolver.",
@@ -47,7 +33,6 @@ export const skills: SkillGroup[] = [
       },
       {
         skill: "/renew [domain]",
-        triggers: ["/renew"],
         handler: handleEns,
         description:
           "Extend the registration period of your ENS domain. Returns a URL to complete the renewal.",
@@ -60,7 +45,6 @@ export const skills: SkillGroup[] = [
       },
       {
         skill: "/check [domain]",
-        triggers: ["/check"],
         handler: handleEns,
         examples: ["/check vitalik.eth", "/check fabri.base.eth"],
         description: "Check if a domain is available.",
@@ -72,7 +56,6 @@ export const skills: SkillGroup[] = [
       },
       {
         skill: "/cool [domain]",
-        triggers: ["/cool"],
         examples: ["/cool vitalik.eth"],
         handler: handleEns,
         description: "Get cool alternatives for a .eth domain.",
@@ -84,7 +67,6 @@ export const skills: SkillGroup[] = [
       },
       {
         skill: "/reset",
-        triggers: ["/reset"],
         examples: ["/reset"],
         handler: handleEns,
         description: "Reset the conversation.",
@@ -93,7 +75,6 @@ export const skills: SkillGroup[] = [
       {
         skill: "/tip [address]",
         description: "Show a URL for tipping a domain owner.",
-        triggers: ["/tip"],
         handler: handleEns,
         examples: ["/tip 0x1234567890123456789012345678901234567890"],
         params: {

package/templates/ens-agent-pro/.env.example

@@ -0,0 +1,2 @@
+KEY= # the private key of the wallet
+OPEN_AI_API_KEY= # sk-proj-...

package/templates/ens-agent-pro/src/index.ts

@@ -0,0 +1,90 @@
+import { run, HandlerContext } from "@xmtp/message-kit";
+import { ChatOpenAI } from "@langchain/openai";
+import { createOpenAIFunctionsAgent, AgentExecutor } from "langchain/agents";
+import { tools } from "./skills.js";
+import { systemPrompt } from "./prompt.js";
+import { ChatPromptTemplate } from "@langchain/core/prompts";
+
+// Initialize OpenAI chat model
+const model = new ChatOpenAI({
+  temperature: 0.7,
+  modelName: "gpt-4o",
+  openAIApiKey: process.env.OPEN_AI_API_KEY,
+});
+
+// Create the prompt template with required variables
+const prompt = ChatPromptTemplate.fromMessages([
+  ["system", systemPrompt],
+]).partial({
+  tools: tools.map((tool) => `${tool.name}: ${tool.description}`).join("\n"),
+  tool_names: tools.map((tool) => tool.name).join(", "),
+});
+
+// Initialize chat history storage
+const chatHistory = new Map<string, { role: string; content: string }[]>();
+
+// Initialize the agent and executor
+const initializeAgent = async () => {
+  const agent = await createOpenAIFunctionsAgent({
+    llm: model,
+    tools: tools as any,
+    prompt: await prompt,
+  });
+
+  return new AgentExecutor({
+    agent,
+    tools: tools as any,
+    returnIntermediateSteps: false,
+    verbose: true, // Set to true for checking the agent's thought process
+  });
+};
+
+// Create executor instance
+const executor = await initializeAgent();
+
+run(
+  async (context: HandlerContext) => {
+    const {
+      message: {
+        content: { text },
+        sender,
+      },
+    } = context;
+
+    console.log("Received message:", text);
+
+    // Get or initialize chat history for this sender
+    if (!chatHistory.has(sender.address)) {
+      chatHistory.set(sender.address, []);
+    }
+    const userHistory: any = chatHistory.get(sender.address)!;
+
+    // Add user message to history
+    userHistory.push({ role: "user", content: context.message.content.text });
+
+    try {
+      // Execute agent with user's message and chat history
+      const result = await executor.invoke({
+        input: text,
+        chat_history: userHistory,
+      });
+
+      console.log("Agent response:", result.output);
+      const output = result.output.replace(/\*/g, "");
+
+      // Add assistant's response to history
+      userHistory.push({ role: "assistant", content: output });
+
+      await context.send(output);
+    } catch (error) {
+      console.error("Error:", error);
+      // Add error message to history
+      userHistory.push({
+        role: "assistant",
+        content: "An error occurred while processing your request.",
+      });
+      await context.send("An error occurred while processing your request.");
+    }
+  },
+  { skills: [] },
+);

package/templates/ens-agent-pro/src/prompt.ts

@@ -0,0 +1,19 @@
+export const systemPrompt = `You are a helpful AI assistant that can use various tools to help users.
+
+You have access to the following tools:
+{tools}
+
+Tool Names: {tool_names}
+
+Instructions:
+1. DO NOT respond in markdown. ALWAYS respond in plain text.
+2. Use tools when appropriate
+3. Be friendly and helpful
+4. Ask for clarification if you don't understand the user's request
+5. For tipping, always confirm the amount with the user once
+
+Previous conversation history:
+{chat_history}
+
+User Input: {input}
+{agent_scratchpad}`; 

package/templates/ens-agent-pro/src/skills.ts

@@ -0,0 +1,233 @@
+import { DynamicStructuredTool } from "langchain/tools";
+import { getUserInfo } from "@xmtp/message-kit";
+import { clearMemory } from "@xmtp/message-kit";
+import { isAddress } from "viem";
+import { z } from "zod";
+
+const frameUrl = "https://ens.steer.fun/";
+const ensUrl = "https://app.ens.domains/";
+const txpayUrl = "https://txpay.vercel.app";
+const converseUrl = "https://converse.xyz/profile/";
+
+// Add interface for Converse API response
+interface ConverseProfile {
+  address: string;
+  avatar?: string;
+  formattedName?: string;
+  name?: string;
+  onXmtp: boolean;
+}
+
+// Add function to check XMTP status
+async function checkXMTPStatus(address: string): Promise<boolean> {
+  try {
+    const response = await fetch(converseUrl + address, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+      body: JSON.stringify({ address }),
+    });
+
+    if (!response.ok) {
+      console.error(`Failed to check XMTP status: ${response.status}`);
+      return false;
+    }
+
+    const data = (await response.json()) as ConverseProfile;
+    return data.onXmtp;
+  } catch (error) {
+    console.error("Error checking XMTP status:", error);
+    return false;
+  }
+}
+
+const generateCoolAlternatives = (domain: string) => {
+  const suffixes = ["lfg", "cool", "degen", "moon", "base", "gm"];
+  const alternatives = [];
+  for (let i = 0; i < 5; i++) {
+    const randomPosition = Math.random() < 0.5;
+    const baseDomain = domain.replace(/\.eth$/, ""); // Remove any existing .eth suffix
+    alternatives.push(
+      randomPosition
+        ? `${suffixes[i]}${baseDomain}.eth`
+        : `${baseDomain}${suffixes[i]}.eth`,
+    );
+  }
+
+  return alternatives
+    .map(
+      (alternative: string, index: number) => `${index + 1}. ${alternative} ✨`,
+    )
+    .join("\n");
+};
+
+// Export tools array with all tools
+export const tools = [
+  new DynamicStructuredTool({
+    name: "reset_ens_conversation",
+    description: "Reset the ENS conversation and clear memory",
+    schema: z.object({}),
+    func: async () => {
+      clearMemory();
+      return "Conversation reset successfully.";
+    },
+  }),
+
+  new DynamicStructuredTool({
+    name: "renew_ens_domain",
+    description:
+      "Generate renewal URL for an ENS domain. Only works if sender owns the domain",
+    schema: z.object({
+      domain: z.string().describe("The ENS domain to renew"),
+    }),
+    func: async ({ domain }) => {
+      const data = await getUserInfo(domain);
+      if (!data?.address) {
+        return "Domain not found or not registered.";
+      }
+      return `${frameUrl}frames/manage?name=${domain}`;
+    },
+  }),
+
+  new DynamicStructuredTool({
+    name: "register_ens_domain",
+    description: "Get URL to register a new ENS domain",
+    schema: z.object({
+      domain: z.string().describe("The ENS domain to register"),
+    }),
+    func: async ({ domain }) => {
+      if (!domain) return "Please provide a domain name";
+      return `${ensUrl}${domain}`;
+    },
+  }),
+
+  new DynamicStructuredTool({
+    name: "get_ens_info",
+    description:
+      "Get detailed information about an ENS domain including owner, avatar, description, etc",
+    schema: z.object({
+      domain: z.string().describe("The ENS domain to get information about"),
+    }),
+    func: async ({ domain }) => {
+      const data = await getUserInfo(domain);
+      if (!data?.ensDomain) {
+        return "Domain not found.";
+      }
+
+      const formattedData = {
+        Address: data?.address,
+        "Avatar URL": data?.ensInfo?.avatar,
+        Description: data?.ensInfo?.description,
+        ENS: data?.ensDomain,
+        "Primary ENS": data?.ensInfo?.ens_primary,
+        GitHub: data?.ensInfo?.github,
+        Resolver: data?.ensInfo?.resolverAddress,
+        Twitter: data?.ensInfo?.twitter,
+        URL: `${ensUrl}${domain}`,
+      };
+
+      let message = "Domain information:\n\n";
+      for (const [key, value] of Object.entries(formattedData)) {
+        if (value) {
+          message += `${key}: ${value}\n`;
+        }
+      }
+      message +=
+        "\nWould you like to tip the domain owner for getting there first? 🤣";
+
+      // Check XMTP status if we have an address
+      if (data.address) {
+        const isOnXMTP = await checkXMTPStatus(data.address);
+        if (isOnXMTP) {
+          message += `\n\nAh, this domain is on XMTP! You can message it directly: https://converse.xyz/dm/${domain}`;
+        }
+      }
+
+      return message;
+    },
+  }),
+
+  new DynamicStructuredTool({
+    name: "check_ens_availability",
+    description: "Check if an ENS domain is available for registration",
+    schema: z.object({
+      domain: z
+        .string()
+        .transform((str) => str.replace(/^["'](.+)["']$/, "$1")) // Remove quotes if present
+        .transform((str) => str.toLowerCase())
+        .describe("The ENS domain to check availability for"),
+    }),
+    func: async ({ domain }) => {
+      if (!domain) return "Please provide a domain name to check.";
+
+      if (domain.includes(".") && !domain.endsWith(".eth")) {
+        return "Invalid ENS domain. Only .eth domains are supported.";
+      }
+
+      if (!domain.includes(".")) {
+        domain = `${domain}.eth`;
+      }
+
+      const data = await getUserInfo(domain);
+      if (!data?.address) {
+        return `Looks like ${domain} is available! Here you can register it: ${ensUrl}${domain} or would you like to see some cool alternatives?`;
+      } else {
+        const alternatives = generateCoolAlternatives(domain);
+        return `Looks like ${domain} is already registered!\n\nHere are some cool alternatives:\n${alternatives}`;
+      }
+    },
+  }),
+
+  new DynamicStructuredTool({
+    name: "get_ens_alternatives",
+    description: "Generate cool alternative names for an ENS domain",
+    schema: z.object({
+      domain: z
+        .string()
+        .describe("The ENS domain to generate alternatives for"),
+    }),
+    func: async ({ domain }) => {
+      if (!domain) return "Please provide a domain name.";
+      return `What about these cool alternatives?\n\n${generateCoolAlternatives(domain)}`;
+    },
+  }),
+
+  new DynamicStructuredTool({
+    name: "get_ens_tip_url",
+    description:
+      "Generate a URL to tip an ENS domain owner in USDC. Works with both ENS domains and Ethereum addresses.",
+    schema: z.object({
+      addressOrDomain: z
+        .string()
+        .describe("The ENS domain or Ethereum address to tip"),
+      amount: z
+        .number()
+        .optional()
+        .default(1)
+        .describe("The amount of USDC to tip"),
+    }),
+    func: async ({ addressOrDomain, amount }) => {
+      if (!addressOrDomain) {
+        return "Please provide an address or ENS domain to tip.";
+      }
+
+      let address: string | undefined;
+
+      if (isAddress(addressOrDomain)) {
+        address = addressOrDomain;
+      } else {
+        const data = await getUserInfo(addressOrDomain);
+        address = data?.address;
+      }
+
+      if (!address) {
+        return "Could not resolve address for tipping. Please provide a valid ENS domain or Ethereum address.";
+      }
+
+      let sendUrl = `${txpayUrl}/?&amount=${amount}&token=USDC&receiver=${address}`;
+      return sendUrl;
+    },
+  }),
+];

package/templates/gpt/.env.example

@@ -0,0 +1,2 @@
+KEY= # the private key of the agent wallet 
+OPEN_AI_API_KEY= # the API key for OpenAI

package/templates/gpt/src/index.ts

@@ -0,0 +1,38 @@
+import {
+  run,
+  HandlerContext,
+  textGeneration,
+  processMultilineResponse,
+} from "@xmtp/message-kit";
+import { agent_prompt } from "./prompt.js";
+
+if (!process.env.OPEN_AI_API_KEY) {
+  console.error("OPEN_AI_API_KEY is not set");
+}
+
+run(async (context: HandlerContext) => {
+  if (!process.env.OPEN_AI_API_KEY) {
+    context.send("gm");
+    return;
+  }
+
+  const {
+    message: {
+      content: { text, params },
+      sender,
+    },
+  } = context;
+
+  try {
+    let userPrompt = params?.prompt ?? text;
+    const { reply } = await textGeneration(
+      sender.address,
+      userPrompt,
+      await agent_prompt(sender.address),
+    );
+    await processMultilineResponse(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/gpt/src/prompt.ts

@@ -0,0 +1,20 @@
+import { defaultPromptTemplate } from "@xmtp/message-kit";
+
+export async function agent_prompt(senderAddress: string) {
+  let fineTunedPrompt = `
+ 
+  ### Context
+  
+  You are a helpful agent that lives inside a web3 messaging group that helps interpret user requests and execute commands.
+  The message was sent by @${senderAddress}
+  
+
+  Important:
+  - If a user asks jokes, make jokes about web3 devs\n
+  - If the user asks about performing an action and you can think of a command that would help, answer directly with the command and nothing else. 
+  - Populate the command with the correct or random values. Always return commands with real values only, using usernames with @ and excluding addresses.\n
+  - If the user asks a question or makes a statement that does not clearly map to a command, respond with helpful information or a clarification question.\n
+  - If the user is grateful, respond asking for a tip in a playful manner.
+  `;
+  return defaultPromptTemplate(fineTunedPrompt, senderAddress, [], "@bot");
+}

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

@@ -6,10 +6,10 @@ export async function handler(context: HandlerContext) {
       content: { skill, params },
     },
   } = context;
-  const baseUrl = "https://txpay.vercel.app";
+  const txpayUrl = "https://txpay.vercel.app";
 
   if (skill === "pay") {
-    const { amount: amountSend, token: tokenSend, username } = params; // [!code hl] // [!code focus]
+    const { amount: amountSend, token: tokenSend, username } = params;
     console.log("username", username);
     let senderInfo = await getUserInfo(username);
     if (!amountSend || !tokenSend || !senderInfo) {
@@ -23,7 +23,7 @@ export async function handler(context: HandlerContext) {
       };
     }
 
-    let sendUrl = `${baseUrl}/?&amount=${amountSend}&token=${tokenSend}&receiver=${senderInfo.address}`;
+    let sendUrl = `${txpayUrl}/?&amount=${amountSend}&token=${tokenSend}&receiver=${senderInfo.address}`;
     await context.send(`${sendUrl}`);
   }
 }

package/templates/group/src/index.ts

@@ -1,7 +1,6 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
 import { textGeneration, processMultilineResponse } from "@xmtp/message-kit";
 import { agent_prompt } from "./prompt.js";
-import { getUserInfo } from "@xmtp/message-kit";
 
 run(async (context: HandlerContext) => {
   const {
@@ -13,15 +12,10 @@ run(async (context: HandlerContext) => {
 
   try {
     let userPrompt = params?.prompt ?? text;
-    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 agent_prompt(sender.address),
     );
     await processMultilineResponse(sender.address, reply, context);
   } catch (error) {

package/templates/group/src/prompt.ts

@@ -1,18 +1,7 @@
 import { skills } from "./skills.js";
-import {
-  UserInfo,
-  PROMPT_USER_CONTENT,
-  PROMPT_RULES,
-  PROMPT_SKILLS_AND_EXAMPLES,
-  PROMPT_REPLACE_VARIABLES,
-} from "@xmtp/message-kit";
-
-export async function agent_prompt(userInfo: UserInfo) {
-  let systemPrompt =
-    PROMPT_RULES +
-    PROMPT_USER_CONTENT(userInfo) +
-    PROMPT_SKILLS_AND_EXAMPLES(skills, "@bot");
+import { defaultPromptTemplate } from "@xmtp/message-kit";
 
+export async function agent_prompt(senderAddress: string) {
   let fineTunedPrompt = `
 ## Example response
 
@@ -20,7 +9,7 @@ export async function agent_prompt(userInfo: UserInfo) {
   Hey! Sure let's do that.\n/game wordle
   
 2. When user wants to pay a specific token:
-  I'll help you pay 1 USDC to 0x123...\n/pay 1 {TOKE}} 0x123456789...
+  I'll help you pay 1 USDC to 0x123...\n/pay 1 [token] 0x123456789...
   *This will return a url to pay
 
 3. If the user wants to pay a eth domain:
@@ -30,16 +19,10 @@ export async function agent_prompt(userInfo: UserInfo) {
 4. If the user wants to pay a username:
   I'll help you pay 1 USDC to @fabri\nBe aware that this only works on mobile with a installed wallet on Base network\n/pay 1 @fabri
   *This will return a url to pay
+
+5. If the user wants to play a game suggest direcly a game like wordle:
+  Let's play wordle!\n/game wordle
   `;
 
-  systemPrompt += fineTunedPrompt;
-  // Replace the variables in the system prompt
-  systemPrompt = PROMPT_REPLACE_VARIABLES(
-    systemPrompt,
-    userInfo?.address ?? "",
-    userInfo,
-    "@bot",
-  );
-  console.log(systemPrompt);
-  return systemPrompt;
+  return defaultPromptTemplate(fineTunedPrompt, senderAddress, skills, "@bot");
 }

package/templates/group/src/skills.ts

@@ -12,7 +12,6 @@ export const skills: SkillGroup[] = [
     skills: [
       {
         skill: "/tip [usernames] [amount] [token]",
-        triggers: ["/tip"],
         examples: ["/tip @vitalik 10 usdc"],
         description: "Tip users in a specified token.",
         handler: tipping,
@@ -26,12 +25,16 @@ export const skills: SkillGroup[] = [
             default: 10,
             type: "number",
           },
+          token: {
+            default: "usdc",
+            type: "string",
+            values: ["eth", "dai", "usdc", "degen"],
+          },
         },
       },
       {
         skill: "/pay [amount] [token] [username]",
-        triggers: ["/pay"],
-        examples: ["/pay 10 vitalik.eth"],
+        examples: ["/pay 10 usdc vitalik.eth", "/pay 1 @alix"],
         description:
           "Send a specified amount of a cryptocurrency to a destination address.",
         handler: payment,
@@ -53,7 +56,6 @@ export const skills: SkillGroup[] = [
       },
       {
         skill: "/game [game]",
-        triggers: ["/game", "🔎", "🔍"],
         handler: games,
         description: "Play a game.",
         examples: ["/game wordle", "/game slot", "/game help"],
@@ -67,7 +69,6 @@ export const skills: SkillGroup[] = [
       },
       {
         skill: "/help",
-        triggers: ["/help"],
         examples: ["/help"],
         handler: help,
         description: "Get help with the bot.",
@@ -78,7 +79,6 @@ export const skills: SkillGroup[] = [
         adminOnly: true,
         examples: ["/id"],
         handler: help,
-        triggers: ["/id"],
         description: "Get the group ID.",
         params: {},
       },

package/templates/agent/src/prompt.ts

@@ -1,69 +0,0 @@
-import { skills } from "./skills.js";
-import {
-  UserInfo,
-  PROMPT_USER_CONTENT,
-  PROMPT_RULES,
-  PROMPT_SKILLS_AND_EXAMPLES,
-  PROMPT_REPLACE_VARIABLES,
-} from "@xmtp/message-kit";
-
-export async function agent_prompt(userInfo: UserInfo) {
-  let systemPrompt =
-    PROMPT_RULES +
-    PROMPT_USER_CONTENT(userInfo) +
-    PROMPT_SKILLS_AND_EXAMPLES(skills, "@ens");
-
-  let fineTunning = `
-
-## Example responses:
-
-1. Check if the user does not have a ENS domain
-  Hey {PREFERRED_NAME}! 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 {CONVERSE_USERNAME}.eth
-
-2. If the user has a ENS domain
-  Hello  {PREFERRED_NAME} ! I'll help you get your ENS domain.\n Let's start by checking your ENS domain  {ENS_DOMAIN}. Give me a moment.\n/check  {ENS_DOMAIN}
-
-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  {ENS_DOMAIN}. Give me a moment.\n/check  {ENS_DOMAIN}
-
-4. If the ENS domain is available,
-  Looks like  {ENS_DOMAIN} is available! Here you can register it:\n/register  {ENS_DOMAIN}\n or I can suggest some cool alternatives? Le me know!
-
-5. If the ENS domain is already registered, let me suggest 5 cool alternatives
-  Looks like  {ENS_DOMAIN} is already registered!\n What about these cool alternatives?\n/cool  {ENS_DOMAIN}
-
-6. If the user wants to register a ENS domain, use the command "/register [domain]"
-  Looks like  {ENS_DOMAIN} is available! Let me help you register it\n/register  {ENS_DOMAIN} 
-  
-7. If the user wants to directly to tip to the ENS domain owner, use directly the command "/tip [domain]", this will return a url but a button to send the tip 
-  Here is the url to send the tip:\n/tip  {ENS_DOMAIN}
-
-8. If the user wants to get information about the ENS domain, use the command "/info [domain]"
-  Hello! I'll help you get info about  {ENS_DOMAIN}.\n Give me a moment.\n/info  {ENS_DOMAIN}  
-
-9. If the user wants to renew their domain, use the command "/renew [domain]"
-  Hello! I'll help you get your ENS domain.\n Let's start by checking your ENS domain  {ENS_DOMAIN}. Give me a moment.\n/renew  {ENS_DOMAIN} 
-
-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  {ENS_DOMAIN}
-
-## 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
-`;
-
-  // Add the fine tuning to the system prompt
-  systemPrompt += fineTunning;
-
-  // Replace the variables in the system prompt
-  systemPrompt = PROMPT_REPLACE_VARIABLES(
-    systemPrompt,
-    userInfo?.address ?? "",
-    userInfo,
-    "@ens",
-  );
-  // console.log(systemPrompt);
-  return systemPrompt;
-}

package/templates/gm/.env.example

@@ -1 +0,0 @@
-KEY= # the private key of the agent wallet 

package/templates/gm/src/index.ts

@@ -1,5 +0,0 @@
-import { run, HandlerContext } from "@xmtp/message-kit";
-
-run(async (context: HandlerContext) => {
-  context.send("gm");
-});