create-message-kit 1.1.7-beta.31 → 1.1.7-beta.33

package/README.md

@@ -9,13 +9,13 @@ bun create message-kit
 ```
 
 ```bash
-npx create-message-kit@latest
+npx create-message-kit
 ```
 
 ```bash
-yarn create message-kit@latest
+yarn create message-kit
 ```
 
 ```bash [npm]
-npm init message-kit@latest
+npm init message-kit
 ```

package/index.js

@@ -22,6 +22,8 @@ program
     // Add Yarn 4 check at the start of the action
     const pkgManager = await detectPackageManager();
 
+    log.info(pc.cyan(`pkgManager detected: ${pkgManager}`));
+
     log.info(pc.cyan(`Welcome to MessageKit CLI v${version}!`));
     const coolLogo = `
 ███╗   ███╗███████╗███████╗███████╗ █████╗  ██████╗ ███████╗██╗  ██╗██╗████████╗
@@ -203,16 +205,17 @@ yarn-error.log*
 async function detectPackageManager() {
   try {
     const pkgManager = await detect();
-    // Still maintain the Yarn 4 check if needed
-    if (
-      pkgManager === "yarn" &&
-      process.env.npm_config_user_agent?.includes("yarn/4")
-    ) {
-      //yarn/4.5.1 npm/? node/v20.15.0 darwin arm64
-      const version = process.env.npm_config_user_agent?.split("/")[1];
-      return `yarn@${version}`;
+    const userAgent = process.env.npm_config_user_agent;
+    let version = "";
+
+    if (userAgent && pkgManager === "yarn") {
+      const parts = userAgent.split(" ")[0]?.split("/");
+      if (parts && parts.length > 1) {
+        version = `@${parts[1]}`;
+      }
     }
-    return pkgManager;
+
+    return pkgManager + version;
   } catch (error) {
     // Fallback to npm if detection fails
     return "npm";

package/package.json

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

package/templates/agent/src/prompt.ts

@@ -64,5 +64,6 @@ export async function agent_prompt(userInfo: UserInfo) {
     userInfo,
     "@ens",
   );
+  // console.log(systemPrompt);
   return systemPrompt;
 }

package/templates/gm/.env.example

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

package/templates/gm/src/index.ts

@@ -1,20 +1,5 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
-run(async (context: HandlerContext) => {
-  // To reply, just call `reply` on the HandlerContext
-  await context.send(`gm`);
 
-  // Set the awaited handler to process the user's response
-  context.setAwaitedHandler(async (responseContext: HandlerContext) => {
-    console.log("awaited handler");
-    const userResponse = responseContext?.message?.content?.text?.toLowerCase();
-    if (userResponse === "yes") {
-      await responseContext.send("Action confirmed.");
-    } else if (userResponse === "no") {
-      await responseContext.send("Action canceled.");
-    } else {
-      await responseContext.send("Please respond with 'yes' or 'no'.");
-      // Re-set the handler to await the correct response again
-      context.setAwaitedHandler(responseContext?.awaitedHandler!);
-    }
-  });
+run(async (context: HandlerContext) => {
+  context.send("gm");
 });

package/templates/group/.env.example

@@ -1,2 +1,2 @@
-KEY= # the private key of the bot wallet 
+KEY= # the private key of the agent wallet 
 OPEN_AI_API_KEY= # openai api key

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

@@ -0,0 +1,28 @@
+import { getUserInfo, HandlerContext } from "@xmtp/message-kit";
+
+export async function handler(context: HandlerContext) {
+  const {
+    message: {
+      content: { skill, params },
+    },
+  } = context;
+  const baseUrl = "https://txpay.vercel.app";
+
+  if (skill === "pay") {
+    const { amount: amountSend, token: tokenSend, username } = params; // [!code hl] // [!code focus]
+    let senderInfo = await getUserInfo(username);
+    if (!amountSend || !tokenSend || !senderInfo) {
+      context.reply(
+        "Missing required parameters. Please provide amount, token, and username.",
+      );
+      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}`;
+    await context.send(`${sendUrl}`);
+  }
+}

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

@@ -5,14 +5,10 @@ import {
 } from "@xmtp/message-kit";
 import { getUserInfo } from "@xmtp/message-kit";
 
-export async function handler(context: HandlerContext): Promise<SkillResponse> {
+export async function handler(context: HandlerContext) {
   const {
-    members,
     message: {
       content: {
-        reference,
-        reply,
-        text,
         skill,
         params: { amount, username },
       },
@@ -28,10 +24,6 @@ export async function handler(context: HandlerContext): Promise<SkillResponse> {
   }
   if (!sender || receivers.length === 0 || amount === 0) {
     context.reply("Sender or receiver or amount not found.");
-    return {
-      code: 400,
-      message: "Sender or receiver or amount not found.",
-    };
   }
   const receiverAddresses = receivers.map((receiver) => receiver.address);
 
@@ -45,8 +37,4 @@ export async function handler(context: HandlerContext): Promise<SkillResponse> {
     `You sent ${amount * receiverAddresses.length} tokens in total.`,
     [sender.address],
   );
-  return {
-    code: 200,
-    message: "Success",
-  };
 }

package/templates/group/src/index.ts

@@ -9,7 +9,6 @@ run(async (context: HandlerContext) => {
       content: { text, params },
       sender,
     },
-    group,
   } = context;
 
   try {

package/templates/group/src/prompt.ts

@@ -13,6 +13,15 @@ export async function agent_prompt(userInfo: UserInfo) {
     PROMPT_USER_CONTENT(userInfo) +
     PROMPT_SKILLS_AND_EXAMPLES(skills, "@bot");
 
+  let fineTunedPrompt = `
+  ## Example response
+  1. If user wants to play a game, use the skill 'game' and specify the game type.
+    Hey! Sure let's do that.\n/game wordle
+  1. If user wants to pay, use the skill 'pay' and if not specified default to 1 USDC.
+    Hey! Sure let's do that.\n/pay 1 USDC vitalik.eth
+  `;
+
+  systemPrompt += fineTunedPrompt;
   // Replace the variables in the system prompt
   systemPrompt = PROMPT_REPLACE_VARIABLES(
     systemPrompt,

package/templates/group/src/skills.ts

@@ -1,5 +1,5 @@
 import { handler as tipping } from "./handler/tipping.js";
-import { handler as transaction } from "./handler/transaction.js";
+import { handler as payment } from "./handler/payment.js";
 import { handler as games } from "./handler/game.js";
 import { handler as help } from "./handler/helpers.js";
 import type { SkillGroup } from "@xmtp/message-kit";
@@ -8,7 +8,7 @@ export const skills: SkillGroup[] = [
   {
     name: "Group bot",
     tag: "@bot",
-    description: "Group bot for tipping and transactions.",
+    description: "Group agent for tipping and transactions.",
     skills: [
       {
         skill: "/tip [usernames] [amount] [token]",
@@ -29,12 +29,12 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        skill: "/send [amount] [token] [username]",
-        triggers: ["/send"],
-        examples: ["/send 10 usdc @vitalik"],
+        skill: "/pay [amount] [token] [username]",
+        triggers: ["/pay"],
+        examples: ["/pay 10 vitalik.eth"],
         description:
           "Send a specified amount of a cryptocurrency to a destination address.",
-        handler: transaction,
+        handler: payment,
         params: {
           amount: {
             default: 10,
@@ -51,37 +51,6 @@ export const skills: SkillGroup[] = [
           },
         },
       },
-      {
-        skill: "/swap [amount] [token_from] [token_to]",
-        triggers: ["/swap"],
-        examples: ["/swap 10 usdc eth"],
-        description: "Exchange one type of cryptocurrency for another.",
-        handler: transaction,
-        params: {
-          amount: {
-            default: 10,
-            type: "number",
-          },
-          token_from: {
-            default: "usdc",
-            type: "string",
-            values: ["eth", "dai", "usdc", "degen"], // Accepted tokens
-          },
-          token_to: {
-            default: "eth",
-            type: "string",
-            values: ["eth", "dai", "usdc", "degen"], // Accepted tokenss
-          },
-        },
-      },
-      {
-        skill: "/show",
-        triggers: ["/show"],
-        examples: ["/show"],
-        handler: transaction,
-        description: "Show the whole frame.",
-        params: {},
-      },
       {
         skill: "/game [game]",
         triggers: ["/game", "🔎", "🔍"],

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

@@ -1,31 +0,0 @@
-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 {
-    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.");
-  }
-});

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

@@ -1,69 +0,0 @@
-import { getUserInfo, HandlerContext, SkillResponse } from "@xmtp/message-kit";
-
-// Main handler function for processing
-export async function handler(context: HandlerContext): Promise<SkillResponse> {
-  const {
-    message: {
-      content: { skill, params },
-    },
-  } = context;
-  const baseUrl = "https://base-tx-frame.vercel.app/transaction";
-
-  switch (skill) {
-    case "send":
-      // 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) {
-        context.reply(
-          "Missing required parameters. Please provide amount, token, and username.",
-        );
-        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}`);
-      return {
-        code: 200,
-        message: `${sendUrl}`,
-      };
-    case "swap":
-      // Destructure and validate parameters for the swap
-      const { amount, token_from, token_to } = params; // [!code hl] // [!code focus]
-
-      if (!amount || !token_from || !token_to) {
-        context.reply(
-          "Missing required parameters. Please provide amount, token_from, and token_to.",
-        );
-        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}`);
-      return {
-        code: 200,
-        message: `${swapUrl}`,
-      };
-    case "show": // [!code hl] // [!code focus]
-      // Show the base URL without the transaction path
-      context.reply(`${baseUrl.replace("/transaction", "")}`);
-      return {
-        code: 200,
-        message: `${baseUrl.replace("/transaction", "")}`,
-      };
-    default:
-      context.reply("Unknown skill. Use help to see all available skills.");
-      return {
-        code: 400,
-        message: "Unknown skill. Use help to see all available skills.",
-      };
-  }
-}