create-message-kit 1.1.7-beta.1 → 1.1.7-beta.10

package/package.json

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

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

@@ -1,7 +1,7 @@
 import { HandlerContext, SkillResponse } from "@xmtp/message-kit";
-import { getUserInfo, clearInfoCache, isOnXMTP } from "../lib/resolver.js";
+import { getUserInfo, clearInfoCache, isOnXMTP } from "@xmtp/message-kit";
 import { isAddress } from "viem";
-import { clearMemory } from "../lib/gpt.js";
+import { clearMemory } from "@xmtp/message-kit";
 
 export const frameUrl = "https://ens.steer.fun/";
 export const ensUrl = "https://app.ens.domains/";
@@ -9,12 +9,12 @@ export const baseTxUrl = "https://base-tx-frame.vercel.app";
 
 export async function handleEns(
   context: HandlerContext,
-): Promise<SkillResponse> {
+): Promise<SkillResponse | undefined> {
   const {
     message: {
-      content: { command, params, sender },
+      sender,
+      content: { command, params },
     },
-    skill,
   } = context;
   if (command == "reset") {
     clearMemory();
@@ -87,13 +87,7 @@ export async function handleEns(
     }
     message += `\n\nWould you like to tip the domain owner for getting there first 🤣?`;
     message = message.trim();
-    if (
-      await isOnXMTP(
-        context.v2client,
-        data?.ensInfo?.ens,
-        data?.ensInfo?.address,
-      )
-    ) {
+    if (await isOnXMTP(context.client, context.v2client, sender?.address)) {
       await context.send(
         `Ah, this domains is in XMTP, you can message it directly: https://converse.xyz/dm/${domain}`,
       );
@@ -118,7 +112,7 @@ export async function handleEns(
       };
     } else {
       let message = `Looks like ${domain} is already registered!`;
-      await skill("/cool " + domain);
+      await context.executeSkill("/cool " + domain);
       return {
         code: 404,
         message,

package/templates/agent/src/index.ts

@@ -1,7 +1,7 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
-import { textGeneration, processMultilineResponse } from "./lib/gpt.js";
+import { textGeneration, processMultilineResponse } from "@xmtp/message-kit";
 import { agent_prompt } from "./prompt.js";
-import { getUserInfo } from "./lib/resolver.js";
+import { getUserInfo } from "@xmtp/message-kit";
 
 run(async (context: HandlerContext) => {
   /*All the skills are handled through the skills file*/

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

@@ -126,7 +126,7 @@ export async function processMultilineResponse(
   console.log(messages);
   for (const message of messages) {
     if (message.startsWith("/")) {
-      const response = await context.skill(message);
+      const response = await context.executeSkill(message);
       if (response && typeof response.message === "string") {
         let msg = parseMarkdown(response.message);
         chatMemory.addEntry(memoryKey, {

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

@@ -108,8 +108,8 @@ export const getUserInfo = async (
       }),
     });
     const converseData = (await response.json()) as ConverseProfile;
-    if (process.env.MSG_LOG === "true")
-      console.log("Converse data", keyToUse, converseData);
+    //if (process.env.MSG_LOG === "true")
+    //console.log("Converse data", keyToUse, converseData);
     data.converseUsername =
       converseData?.formattedName || converseData?.name || undefined;
     data.address = converseData?.address || undefined;

package/templates/agent/src/prompt.ts

@@ -1,6 +1,11 @@
 import { skills } from "./skills.js";
-import { UserInfo, PROMPT_USER_CONTENT } from "./lib/resolver.js";
-import { PROMPT_RULES, PROMPT_SKILLS_AND_EXAMPLES } from "./lib/gpt.js";
+import {
+  getUserInfo,
+  UserInfo,
+  PROMPT_USER_CONTENT,
+  PROMPT_RULES,
+  PROMPT_SKILLS_AND_EXAMPLES,
+} from "@xmtp/message-kit";
 
 export async function agent_prompt(userInfo: UserInfo) {
   let { address, ensDomain, converseUsername, preferredName } = userInfo;

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

@@ -1,5 +1,5 @@
 import { HandlerContext, AbstractedMember } from "@xmtp/message-kit";
-import { textGeneration } from "../lib/gpt.js";
+import { textGeneration } from "@xmtp/message-kit";
 
 export async function handler(context: HandlerContext) {
   if (!process?.env?.OPEN_AI_API_KEY) {
@@ -10,21 +10,26 @@ export async function handler(context: HandlerContext) {
   const {
     message: {
       sender,
-      content: { content, params },
+      content: { params, text },
     },
-    skill,
   } = context;
 
   const systemPrompt = generateSystemPrompt(context);
   try {
-    let userPrompt = params?.prompt ?? content;
+    let userPrompt = params?.prompt ?? text;
 
     const { reply } = await textGeneration(
       sender.address,
       userPrompt,
       systemPrompt,
     );
-    skill(reply);
+
+    try {
+      await context.executeSkill(reply);
+    } catch (error) {
+      console.error("Error executing skill:", error);
+      await context.reply("Failed to execute the requested action.");
+    }
   } catch (error) {
     console.error("Error during OpenAI call:", error);
     await context.reply("An error occurred while processing your request.");

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

@@ -4,11 +4,10 @@ import { HandlerContext } from "@xmtp/message-kit";
 export async function handler(context: HandlerContext) {
   const {
     message: {
-      content: { command, params },
+      content: { command, params, text },
     },
   } = context;
   if (!command) {
-    const { content: text } = context?.message?.content;
     if (text === "🔎" || text === "🔍") {
       // Send the URL for the requested game
       context.reply("https://framedl.xyz/");

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

@@ -0,0 +1,24 @@
+import { HandlerContext } from "@xmtp/message-kit";
+
+export async function handler(context: HandlerContext) {
+  const {
+    skills,
+    group,
+    message: {
+      content: { command },
+    },
+  } = context;
+
+  if (command == "help") {
+    const intro =
+      "Available experiences:\n" +
+      skills
+        ?.flatMap((app) => app.skills)
+        .map((skill) => `${skill.command} - ${skill.description}`)
+        .join("\n") +
+      "\nUse these skills to interact with specific apps.";
+    context.send(intro);
+  } else if (command == "id") {
+    context.send(context.group?.id);
+  }
+}

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

@@ -0,0 +1,23 @@
+import { HandlerContext } from "@xmtp/message-kit";
+
+export async function handler(context: HandlerContext) {
+  const {
+    skills,
+    message: {
+      content: { command },
+    },
+  } = context;
+
+  if (command == "help") {
+    const intro =
+      "Available experiences:\n" +
+      skills
+        ?.flatMap((app) => app.skills)
+        .map((skill) => `${skill.command} - ${skill.description}`)
+        .join("\n") +
+      "\nUse these skills to interact with specific apps.";
+    context.send(intro);
+  } else if (command == "id") {
+    context.send(context.group?.id);
+  }
+}

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

@@ -6,10 +6,13 @@ export async function handler(context: HandlerContext, fake?: boolean) {
   const {
     members,
     group,
-    message: { sender, typeId, content },
+    message: {
+      sender,
+      typeId,
+      content: { command, params, text },
+    },
   } = context;
   if (typeId === "text" && group) {
-    const { command } = content;
     if (command === "points") {
       const points = await stack?.getPoints(sender.address);
       context.reply(`You have ${points} points`);
@@ -31,7 +34,7 @@ export async function handler(context: HandlerContext, fake?: boolean) {
       return;
     }
   } else if (typeId === "group_updated" && group) {
-    const { initiatedByInboxId, addedInboxes } = content;
+    const { initiatedByInboxId, addedInboxes } = params;
     const adminAddress = members?.find(
       (member: AbstractedMember) => member.inboxId === initiatedByInboxId,
     );

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

@@ -1,13 +1,21 @@
-import { HandlerContext, AbstractedMember } from "@xmtp/message-kit";
-import { getUserInfo } from "../lib/resolver.js";
+import {
+  HandlerContext,
+  AbstractedMember,
+  SkillResponse,
+} from "@xmtp/message-kit";
+import { getUserInfo } from "@xmtp/message-kit";
 
-export async function handler(context: HandlerContext) {
+export async function handler(context: HandlerContext): Promise<SkillResponse> {
   const {
     members,
     getMessageById,
-    message: { content, sender, typeId },
+    message: {
+      content: { reference, reply, text, params },
+      sender,
+      typeId,
+    },
   } = context;
-  const msg = await getMessageById(content.reference);
+  const msg = reference ? await getMessageById(reference) : undefined;
   const replyReceiver = members?.find(
     (member) => member.inboxId === msg?.senderInboxId,
   );
@@ -15,32 +23,28 @@ export async function handler(context: HandlerContext) {
     receivers: AbstractedMember[] = [];
   // Handle different types of messages
   if (typeId === "reply" && replyReceiver) {
-    const { content: reply } = content;
-
-    if (reply.includes("degen")) {
+    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") {
-    const { content: text, params } = content;
-    if (text.startsWith("/tip") && params) {
-      // Process text skills starting with "/tip"
-      const {
-        params: { amount: extractedAmount, username },
-      } = content;
-      amount = extractedAmount || 10; // Default amount if not specified
+  } 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
 
-      receivers = await Promise.all(
-        username.map((username: string) => getUserInfo(username)),
-      );
-    }
+    receivers = await Promise.all(
+      username.map((username: string) => getUserInfo(username)),
+    );
   }
   if (!sender || receivers.length === 0 || amount === 0) {
     context.reply("Sender or receiver or amount not found.");
-    return;
+    return {
+      code: 400,
+      message: "Sender or receiver or amount not found.",
+    };
   }
   const receiverAddresses = receivers.map((receiver) => receiver.address);
   // Process sending tokens to each receiver
@@ -55,4 +59,8 @@ export async function handler(context: HandlerContext) {
     `You sent ${amount * receiverAddresses.length} tokens in total.`,
     [sender.address],
   );
+  return {
+    code: 200,
+    message: "Success",
+  };
 }

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

@@ -1,8 +1,7 @@
-import { HandlerContext } from "@xmtp/message-kit";
-import { getUserInfo } from "../lib/resolver.js";
+import { getUserInfo, HandlerContext, SkillResponse } from "@xmtp/message-kit";
 
 // Main handler function for processing commands
-export async function handler(context: HandlerContext) {
+export async function handler(context: HandlerContext): Promise<SkillResponse> {
   const {
     message: {
       content: { command, params },
@@ -19,12 +18,19 @@ export async function handler(context: HandlerContext) {
         context.reply(
           "Missing required parameters. Please provide amount, token, and username.",
         );
-        return;
+        return {
+          code: 400,
+          message:
+            "Missing required parameters. Please provide amount, token, and username.",
+        };
       }
 
       let sendUrl = `${baseUrl}/?transaction_type=send&amount=${amountSend}&token=${tokenSend}&receiver=${senderInfo.address}`;
       context.send(`${sendUrl}`);
-      break;
+      return {
+        code: 200,
+        message: `${sendUrl}`,
+      };
     case "swap":
       // Destructure and validate parameters for the swap command
       const { amount, token_from, token_to } = params; // [!code hl] // [!code focus]
@@ -33,18 +39,32 @@ export async function handler(context: HandlerContext) {
         context.reply(
           "Missing required parameters. Please provide amount, token_from, and token_to.",
         );
-        return;
+        return {
+          code: 400,
+          message:
+            "Missing required parameters. Please provide amount, token_from, and token_to.",
+        };
       }
 
       let swapUrl = `${baseUrl}/?transaction_type=swap&token_from=${token_from}&token_to=${token_to}&amount=${amount}`;
       context.send(`${swapUrl}`);
-      break;
+      return {
+        code: 200,
+        message: `${swapUrl}`,
+      };
     case "show": // [!code hl] // [!code focus]
       // Show the base URL without the transaction path
       context.reply(`${baseUrl.replace("/transaction", "")}`);
-      break;
+      return {
+        code: 200,
+        message: `${baseUrl.replace("/transaction", "")}`,
+      };
     default:
       // Handle unknown commands
       context.reply("Unknown command. Use help to see all available commands.");
+      return {
+        code: 400,
+        message: "Unknown command. Use help to see all available commands.",
+      };
   }
 }

package/templates/group/src/index.ts

@@ -1,57 +1,12 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
-import { handler as splitpayment } from "./handler/splitpayment.js";
 
 // Main function to run the app
-run(
-  async (context: HandlerContext) => {
-    const {
-      message: { typeId },
-    } = context;
-    switch (typeId) {
-      case "reply":
-        handleReply(context);
-        break;
-      case "remoteStaticAttachment":
-        handleAttachment(context);
-        break;
-    }
-    if (!context.group) {
-      context.send("This is a group bot, add this address to a group");
-    }
-  },
-  { attachments: true },
-);
-async function handleReply(context: HandlerContext) {
-  const {
-    v2client,
-    getReplyChain,
-    version,
-    message: {
-      content: { reference },
-    },
-  } = context;
-
-  const { chain, isSenderInChain } = await getReplyChain(
-    reference,
-    version,
-    v2client.address,
-  );
-  //await context.skill(chain);
-}
-
-// Handle attachment messages
-async function handleAttachment(context: HandlerContext) {
-  await splitpayment(context);
-}
-
-export async function helpHandler(context: HandlerContext) {
-  const { skills } = context;
-  const intro =
-    "Available experiences:\n" +
-    skills
-      ?.flatMap((app) => app.skills)
-      .map((skill) => `${skill.command} - ${skill.description}`)
-      .join("\n") +
-    "\nUse these skills to interact with specific apps.";
-  context.send(intro);
-}
+run(async (context: HandlerContext) => {
+  const { group } = context;
+
+  if (!group) {
+    context.send(
+      "This This bot only works in group chats. Please add this bot to a group to continue",
+    );
+  }
+});

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

@@ -126,7 +126,7 @@ export async function processMultilineResponse(
   console.log(messages);
   for (const message of messages) {
     if (message.startsWith("/")) {
-      const response = await context.skill(message);
+      const response = await context.executeSkill(message);
       if (response && typeof response.message === "string") {
         let msg = parseMarkdown(response.message);
         chatMemory.addEntry(memoryKey, {

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

@@ -108,8 +108,8 @@ export const getUserInfo = async (
       }),
     });
     const converseData = (await response.json()) as ConverseProfile;
-    if (process.env.MSG_LOG === "true")
-      console.log("Converse data", keyToUse, converseData);
+    /// if (process.env.MSG_LOG === "true")
+    //console.log("Converse data", keyToUse, converseData);
     data.converseUsername =
       converseData?.formattedName || converseData?.name || undefined;
     data.address = converseData?.address || undefined;

package/templates/group/src/skills.ts

@@ -3,7 +3,7 @@ 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 loyalty } from "./handler/loyalty.js";
-import { helpHandler } from "./index.js";
+import { handler as groupHelp } from "./handler/helpers.js";
 import type { SkillGroup } from "@xmtp/message-kit";
 
 export const skills: SkillGroup[] = [
@@ -31,6 +31,7 @@ export const skills: SkillGroup[] = [
       },
     ],
   },
+
   {
     name: "Transactions",
     description: "Multipurpose transaction frame built onbase.",
@@ -159,10 +160,18 @@ export const skills: SkillGroup[] = [
         command: "/help",
         triggers: ["/help"],
         examples: ["/help"],
-        handler: helpHandler,
+        handler: groupHelp,
         description: "Get help with the bot.",
         params: {},
       },
+      {
+        command: "/id",
+        adminOnly: true,
+        handler: groupHelp,
+        triggers: ["/id"],
+        description: "Get the group ID.",
+        params: {},
+      },
     ],
   },
 ];