create-message-kit 1.1.7-beta.17 → 1.1.7-beta.19

package/package.json

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

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

@@ -13,15 +13,15 @@ export async function handleEns(
   const {
     message: {
       sender,
-      content: { command, params },
+      content: { skill, params },
     },
   } = context;
-  console.log(command, params);
-  if (command == "reset") {
+
+  if (skill == "reset") {
     clearMemory();
     return { code: 200, message: "Conversation reset." };
-  } else if (command == "renew") {
-    // Destructure and validate parameters for the ens command
+  } else if (skill == "renew") {
+    // Destructure and validate parameters for the ens
     const { domain } = params;
     // Check if the user holds the domain
     if (!domain) {
@@ -44,8 +44,8 @@ export async function handleEns(
     // Generate URL for the ens
     let url_ens = frameUrl + "frames/manage?name=" + domain;
     return { code: 200, message: `${url_ens}` };
-  } else if (command == "register") {
-    // Destructure and validate parameters for the ens command
+  } else if (skill == "register") {
+    // Destructure and validate parameters for the ens
     const { domain } = params;
 
     if (!domain) {
@@ -57,7 +57,7 @@ export async function handleEns(
     // Generate URL for the ens
     let url_ens = ensUrl + domain;
     return { code: 200, message: `${url_ens}` };
-  } else if (command == "info") {
+  } else if (skill == "info") {
     const { domain } = params;
 
     const data = await getUserInfo(domain);
@@ -94,7 +94,7 @@ export async function handleEns(
       );
     }
     return { code: 200, message };
-  } else if (command == "check") {
+  } else if (skill == "check") {
     const { domain } = params;
 
     if (!domain) {
@@ -119,7 +119,7 @@ export async function handleEns(
         message,
       };
     }
-  } else if (command == "tip") {
+  } else if (skill == "tip") {
     const { address } = params;
     if (!address) {
       return {
@@ -136,7 +136,7 @@ export async function handleEns(
       code: 200,
       message: txUrl,
     };
-  } else if (command == "cool") {
+  } else if (skill == "cool") {
     const { domain } = params;
     //What about these cool alternatives?\
     return {
@@ -144,7 +144,7 @@ export async function handleEns(
       message: `${generateCoolAlternatives(domain)}`,
     };
   } else {
-    return { code: 400, message: "Command not found." };
+    return { code: 400, message: "Skill not found." };
   }
 }
 

package/templates/agent/src/prompt.ts

@@ -13,7 +13,7 @@ export async function agent_prompt(userInfo: UserInfo) {
     PROMPT_USER_CONTENT(userInfo) +
     PROMPT_SKILLS_AND_EXAMPLES(skills, "@ens");
 
-  systemPrompt += `
+  let fineTunning = `
 
 ## Example responses:
 
@@ -53,12 +53,16 @@ export async function agent_prompt(userInfo: UserInfo) {
   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/agent/src/skills.ts

@@ -8,7 +8,7 @@ export const skills: SkillGroup[] = [
     description: "Register ENS domains.",
     skills: [
       {
-        command: "/register [domain]",
+        skill: "/register [domain]",
         triggers: ["/register"],
         handler: handleEns,
         description:
@@ -21,7 +21,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/exists",
+        skill: "/exists",
         examples: ["/exists"],
         handler: handleEns,
         triggers: ["/exists"],
@@ -33,7 +33,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/info [domain]",
+        skill: "/info [domain]",
         triggers: ["/info"],
         handler: handleEns,
         description:
@@ -46,7 +46,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/renew [domain]",
+        skill: "/renew [domain]",
         triggers: ["/renew"],
         handler: handleEns,
         description:
@@ -59,7 +59,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/check [domain]",
+        skill: "/check [domain]",
         triggers: ["/check"],
         handler: handleEns,
         examples: ["/check vitalik.eth", "/check fabri.base.eth"],
@@ -71,7 +71,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/cool [domain]",
+        skill: "/cool [domain]",
         triggers: ["/cool"],
         examples: ["/cool vitalik.eth"],
         handler: handleEns,
@@ -83,7 +83,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/reset",
+        skill: "/reset",
         triggers: ["/reset"],
         examples: ["/reset"],
         handler: handleEns,
@@ -91,7 +91,7 @@ export const skills: SkillGroup[] = [
         params: {},
       },
       {
-        command: "/tip [address]",
+        skill: "/tip [address]",
         description: "Show a URL for tipping a domain owner.",
         triggers: ["/tip"],
         handler: handleEns,

package/templates/gm/src/index.ts

@@ -1,9 +1,14 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
+import { skills } from "./skills.js";
+run(
+  async (context: HandlerContext) => {
+    // Get the message and the address from the sender
+    const { content, sender } = context.message;
 
-run(async (context: HandlerContext) => {
-  // Get the message and the address from the sender
-  const { content, sender } = context.message;
-
-  // To reply, just call `reply` on the HandlerContext
-  await context.send(`gm`);
-});
+    // To reply, just call `reply` on the HandlerContext
+    await context.send(`gm`);
+  },
+  {
+    skills: skills,
+  },
+);

package/templates/gm/src/skills.ts

@@ -0,0 +1,29 @@
+import type { SkillGroup } from "@xmtp/message-kit";
+
+export const skills: SkillGroup[] = [
+  {
+    name: "Group bot",
+    tag: "@bot",
+    description: "Group bot for tipping and transactions.",
+    skills: [
+      {
+        skill: "/tip [usernames] [amount] [token]",
+        triggers: ["/tip"],
+        examples: ["/tip @vitalik 10 usdc"],
+        description: "Tip users in a specified token.",
+        handler: undefined,
+        params: {
+          username: {
+            default: "",
+            plural: true,
+            type: "username",
+          },
+          amount: {
+            default: 10,
+            type: "number",
+          },
+        },
+      },
+    ],
+  },
+];

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

@@ -1,68 +1,31 @@
-import { HandlerContext, AbstractedMember } from "@xmtp/message-kit";
-import { textGeneration } from "@xmtp/message-kit";
+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";
 
-export async function handler(context: HandlerContext) {
+run(async (context: HandlerContext) => {
   const {
     message: {
+      content: { text, params },
       sender,
-      content: { params, text },
     },
   } = context;
 
-  const systemPrompt = generateSystemPrompt(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,
-      systemPrompt,
+      await agent_prompt(userInfo),
     );
-
-    try {
-      await context.executeSkill(reply);
-    } catch (error) {
-      console.error("Error executing skill:", error);
-      await context.reply("Failed to execute the requested action.");
-    }
+    await processMultilineResponse(sender.address, reply, context);
   } catch (error) {
     console.error("Error during OpenAI call:", error);
-    await context.reply("An error occurred while processing your request.");
+    await context.send("An error occurred while processing your request.");
   }
-}
-
-function generateSystemPrompt(context: HandlerContext) {
-  const {
-    members,
-    skills,
-    message: { sender },
-  } = context;
-
-  const systemPrompt = `
-  ### Context
-  
-  You are a helpful bot agent that lives inside a web3 messaging group that helps interpret user requests and execute commands.
-  #### Users
-   ${JSON.stringify(
-     members?.map((member: AbstractedMember) => ({
-       ...member,
-       username: `@${member.accountAddresses[0]}`,
-     })),
-   )}\n
-  #### Commands
-  ${JSON.stringify(skills)}\n
-  The message was sent by @${sender?.address}
-  
-  ### Examples
-  prompt /agent tip alix and bo
-  reply /tip @alix @bo 10
-
-  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 skills 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 systemPrompt;
-}
+});

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

@@ -1,13 +1,13 @@
 import { HandlerContext } from "@xmtp/message-kit";
 
-// Handler function to process game-related commands
+// Handler function to process game-related
 export async function handler(context: HandlerContext) {
   const {
     message: {
-      content: { command, params, text },
+      content: { skill, params, text },
     },
   } = context;
-  if (!command) {
+  if (!skill) {
     if (text === "🔎" || text === "🔍") {
       // Send the URL for the requested game
       context.reply("https://framedl.xyz/");
@@ -35,7 +35,7 @@ export async function handler(context: HandlerContext) {
     default:
       // Inform the user about unrecognized skills and provide available options
       context.send(
-        "Command not recognized. Available games: wordle, slot, or help.",
+        "Skill not recognized. Available games: wordle, slot, or help.",
       );
   }
 }

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

@@ -4,22 +4,25 @@ export async function handler(context: HandlerContext) {
   const {
     skills,
     message: {
-      content: { command },
+      content: { skill },
     },
     group,
   } = context;
 
-  if (command == "help") {
+  if (skill == "help") {
     const intro =
       "Available experiences:\n" +
       skills
         ?.flatMap((app) => app.skills)
-        .map((skill) => `${skill.command} - ${skill.description}`)
+        .map((skill) => `${skill.skill} - ${skill.description}`)
         .join("\n") +
       "\nUse these skills to interact with specific apps.";
     context.send(intro);
-  } else if (command == "id") {
-    console.log(group?.id);
+  } else if (skill == "id") {
+    if (!group?.id) {
+      context.send("This skill only works in group chats.");
+      return;
+    }
     context.send(group?.id);
   }
 }

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

@@ -8,33 +8,20 @@ import { getUserInfo } from "@xmtp/message-kit";
 export async function handler(context: HandlerContext): Promise<SkillResponse> {
   const {
     members,
-    getMessageById,
     message: {
-      content: { reference, reply, text, params },
+      content: {
+        reference,
+        reply,
+        text,
+        skill,
+        params: { amount, username },
+      },
       sender,
-      typeId,
     },
   } = context;
-  const msg = reference ? await getMessageById(reference) : undefined;
-  const replyReceiver = members?.find(
-    (member) => member.inboxId === msg?.senderInboxId,
-  );
-  let amount: number = 0,
-    receivers: AbstractedMember[] = [];
-  // Handle different types of messages
-  if (typeId === "reply" && replyReceiver) {
-    if (reply?.includes("degen")) {
-      receivers = [replyReceiver];
-      const match = reply.match(/(\d+)/);
-      if (match)
-        amount = parseInt(match[0]); // Extract amount from reply
-      else amount = 10;
-    }
-  } else if (typeId === "text" && text?.startsWith("/tip") && params) {
-    // Process text skills starting with "/tip"
-    const { amount: extractedAmount, username } = params;
-    amount = extractedAmount || 10; // Default amount if not specified
+  let receivers: AbstractedMember[] = [];
 
+  if (skill === "tip") {
     receivers = await Promise.all(
       username.map((username: string) => getUserInfo(username)),
     );
@@ -47,7 +34,6 @@ export async function handler(context: HandlerContext): Promise<SkillResponse> {
     };
   }
   const receiverAddresses = receivers.map((receiver) => receiver.address);
-  // Process sending tokens to each receiver
 
   context.sendTo(
     `You received ${amount} tokens from ${sender.address}.`,

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

@@ -1,17 +1,17 @@
 import { getUserInfo, HandlerContext, SkillResponse } from "@xmtp/message-kit";
 
-// Main handler function for processing commands
+// Main handler function for processing
 export async function handler(context: HandlerContext): Promise<SkillResponse> {
   const {
     message: {
-      content: { command, params },
+      content: { skill, params },
     },
   } = context;
   const baseUrl = "https://base-tx-frame.vercel.app/transaction";
 
-  switch (command) {
+  switch (skill) {
     case "send":
-      // Destructure and validate parameters for the send command
+      // Destructure and validate parameters for the send
       const { amount: amountSend, token: tokenSend, username } = params; // [!code hl] // [!code focus]
       let senderInfo = await getUserInfo(username);
       if (!amountSend || !tokenSend || !senderInfo) {
@@ -32,7 +32,7 @@ export async function handler(context: HandlerContext): Promise<SkillResponse> {
         message: `${sendUrl}`,
       };
     case "swap":
-      // Destructure and validate parameters for the swap command
+      // Destructure and validate parameters for the swap
       const { amount, token_from, token_to } = params; // [!code hl] // [!code focus]
 
       if (!amount || !token_from || !token_to) {
@@ -60,11 +60,10 @@ export async function handler(context: HandlerContext): Promise<SkillResponse> {
         message: `${baseUrl.replace("/transaction", "")}`,
       };
     default:
-      // Handle unknown commands
-      context.reply("Unknown command. Use help to see all available commands.");
+      context.reply("Unknown skill. Use help to see all available skills.");
       return {
         code: 400,
-        message: "Unknown command. Use help to see all available commands.",
+        message: "Unknown skill. Use help to see all available skills.",
       };
   }
 }

package/templates/group/src/index.ts

@@ -1,12 +1,32 @@
 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";
 
-// Main function to run the app
 run(async (context: HandlerContext) => {
-  const { group } = context;
+  const {
+    message: {
+      content: { text, params },
+      sender,
+    },
+    group,
+  } = context;
 
-  if (!group) {
-    context.send(
-      "This bot only works in group chats. Please add this bot to a group to continue",
+  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.");
   }
 });

package/templates/group/src/prompt.ts

@@ -0,0 +1,25 @@
+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");
+
+  // Replace the variables in the system prompt
+  systemPrompt = PROMPT_REPLACE_VARIABLES(
+    systemPrompt,
+    userInfo?.address ?? "",
+    userInfo,
+    "@bot",
+  );
+  console.log(systemPrompt);
+  return systemPrompt;
+}

package/templates/group/src/skills.ts

@@ -1,18 +1,17 @@
 import { handler as tipping } from "./handler/tipping.js";
-import { handler as agent } from "./handler/agent.js";
 import { handler as transaction } from "./handler/transaction.js";
 import { handler as games } from "./handler/game.js";
-import { handler as groupHelp } from "./handler/helpers.js";
+import { handler as help } from "./handler/helpers.js";
 import type { SkillGroup } from "@xmtp/message-kit";
 
 export const skills: SkillGroup[] = [
   {
-    name: "Tipping",
+    name: "Group bot",
     tag: "@bot",
-    description: "Tip tokens via emoji, replies or command.",
+    description: "Group bot for tipping and transactions.",
     skills: [
       {
-        command: "/tip [@usernames] [amount] [token]",
+        skill: "/tip [usernames] [amount] [token]",
         triggers: ["/tip"],
         examples: ["/tip @vitalik 10 usdc"],
         description: "Tip users in a specified token.",
@@ -29,15 +28,8 @@ export const skills: SkillGroup[] = [
           },
         },
       },
-    ],
-  },
-
-  {
-    name: "Transactions",
-    description: "Multipurpose transaction frame built onbase.",
-    skills: [
       {
-        command: "/send [amount] [token] [username]",
+        skill: "/send [amount] [token] [username]",
         triggers: ["/send"],
         examples: ["/send 10 usdc @vitalik"],
         description:
@@ -60,7 +52,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/swap [amount] [token_from] [token_to]",
+        skill: "/swap [amount] [token_from] [token_to]",
         triggers: ["/swap"],
         examples: ["/swap 10 usdc eth"],
         description: "Exchange one type of cryptocurrency for another.",
@@ -83,24 +75,19 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/show",
+        skill: "/show",
         triggers: ["/show"],
         examples: ["/show"],
         handler: transaction,
         description: "Show the whole frame.",
         params: {},
       },
-    ],
-  },
-  {
-    name: "Games",
-    description: "Provides various gaming experiences.",
-    skills: [
       {
-        command: "/game [game]",
+        skill: "/game [game]",
         triggers: ["/game", "🔎", "🔍"],
         handler: games,
         description: "Play a game.",
+        examples: ["/game wordle", "/game slot", "/game help"],
         params: {
           game: {
             default: "",
@@ -109,43 +96,19 @@ export const skills: SkillGroup[] = [
           },
         },
       },
-    ],
-  },
-  {
-    name: "Agent",
-    description: "Manage agent commands.",
-    skills: [
-      {
-        command: "/agent [prompt]",
-        triggers: ["/agent", "@agent", "@bot"],
-        examples: ["/agent @vitalik"],
-        handler: agent,
-        description: "Manage agent commands.",
-        params: {
-          prompt: {
-            default: "",
-            type: "prompt",
-          },
-        },
-      },
-    ],
-  },
-  {
-    name: "Help",
-    description: "Get help with the bot.",
-    skills: [
       {
-        command: "/help",
+        skill: "/help",
         triggers: ["/help"],
         examples: ["/help"],
-        handler: groupHelp,
+        handler: help,
         description: "Get help with the bot.",
         params: {},
       },
       {
-        command: "/id",
+        skill: "/id",
         adminOnly: true,
-        handler: groupHelp,
+        examples: ["/id"],
+        handler: help,
         triggers: ["/id"],
         description: "Get the group ID.",
         params: {},