create-message-kit 1.1.7-beta.9 → 1.1.8-beta.2

package/README.md

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

package/index.js

@@ -5,6 +5,7 @@ import { fileURLToPath } from "node:url";
 import { log, outro, text, select } from "@clack/prompts";
 import { default as fs } from "fs-extra";
 import { isCancel } from "@clack/prompts";
+import { detect } from "detect-package-manager";
 import pc from "picocolors";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -15,9 +16,14 @@ const packageJson = JSON.parse(
 );
 const version = packageJson.version;
 program
-  .name("byob")
+  .name("message-kit")
   .description("CLI to initialize projects")
   .action(async () => {
+    // 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 = `
 ███╗   ███╗███████╗███████╗███████╗ █████╗  ██████╗ ███████╗██╗  ██╗██╗████████╗
@@ -32,9 +38,6 @@ Powered by XMTP`;
 
     const { templateType, displayName, destDir } = await gatherProjectInfo();
 
-    // Replace dot files
-    //replaceDotfiles(destDir);
-
     // Create .gitignore
     createGitignore(destDir);
 
@@ -44,13 +47,11 @@ Powered by XMTP`;
     // Create tsconfig.json file
     createTsconfig(destDir);
 
-    // Replace package.json properties
-    updatePackageJson(destDir, displayName);
-
     // Wrap up
     log.success(`Project launched in ${pc.red(destDir)}!`);
 
-    const pkgManager = detectPackageManager();
+    // Add package.json
+    addPackagejson(destDir, displayName, pkgManager);
 
     // Create README.md file
     createReadme(destDir, templateType, displayName, pkgManager);
@@ -63,6 +64,41 @@ Powered by XMTP`;
 
 program.parse(process.argv);
 
+async function addPackagejson(destDir, name, pkgManager) {
+  // Create package.json based on the template
+  let packageTemplate = {
+    name: name,
+    private: true,
+    type: "module",
+    scripts: {
+      build: "tsc",
+      dev: "tsc -w & sleep 1 && node --watch dist/index.js",
+      start: "node dist/index.js",
+      postinstall: "tsc",
+    },
+    dependencies: {
+      "@xmtp/message-kit": "latest",
+    },
+    engines: {
+      node: ">=20",
+    },
+  };
+
+  if (pkgManager.startsWith("yarn")) {
+    packageTemplate.packageManager = `${pkgManager}`;
+    // Add .yarnrc.yml to disable PnP mode
+  }
+
+  fs.writeFileSync(
+    resolve(destDir, ".yarnrc.yml"),
+    "nodeLinker: node-modules\n",
+  );
+
+  fs.writeJsonSync(resolve(destDir, "package.json"), packageTemplate, {
+    spaces: 2,
+  });
+}
+
 async function gatherProjectInfo() {
   const templateOptions = [
     { value: "gm", label: "GM" },
@@ -108,24 +144,6 @@ async function gatherProjectInfo() {
   return { templateType, displayName, destDir, templateDir };
 }
 
-function updateDependenciesToLatest(pkgJson) {
-  const updateToLatest = (deps) => {
-    for (const key in deps) {
-      if (deps[key].startsWith("workspace:")) {
-        deps[key] = "latest";
-      }
-    }
-  };
-
-  if (pkgJson.dependencies) {
-    updateToLatest(pkgJson.dependencies);
-  }
-
-  if (pkgJson.devDependencies) {
-    updateToLatest(pkgJson.devDependencies);
-  }
-}
-
 function createTsconfig(destDir) {
   const tsconfigContent = {
     include: ["src/**/*"],
@@ -151,22 +169,6 @@ function createTsconfig(destDir) {
     spaces: 2,
   });
 }
-function replaceDotfiles(destDir) {
-  for (const file of fs.readdirSync(destDir)) {
-    if (!file.startsWith("_")) continue;
-    fs.renameSync(
-      resolve(destDir, file),
-      resolve(destDir, `.${file.slice(1)}`),
-    );
-  }
-}
-
-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 });
-}
 
 function logNextSteps(name) {
   log.message("Next steps:");
@@ -202,14 +204,24 @@ yarn-error.log*
   fs.writeFileSync(resolve(destDir, ".gitignore"), gitignoreContent.trim());
 }
 
-function detectPackageManager() {
-  const userAgent = process.env.npm_config_user_agent;
-  if (!userAgent) return "npm";
-  if (userAgent.includes("bun")) return "bun";
-  if (userAgent.includes("yarn")) return "yarn";
-  if (userAgent.includes("pnpm")) return "pnpm";
-  if (userAgent.includes("npm")) return "npm";
-  return "npm";
+async function detectPackageManager() {
+  try {
+    const pkgManager = await detect();
+    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 + version;
+  } catch (error) {
+    // Fallback to npm if detection fails
+    return "npm";
+  }
 }
 
 function kebabcase(str) {

package/package.json

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

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

@@ -5,21 +5,23 @@ 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,
-): Promise<SkillResponse> {
+): Promise<SkillResponse | undefined> {
   const {
     message: {
-      content: { command, params, sender },
+      sender,
+      content: { skill, params },
     },
   } = context;
-  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) {
@@ -42,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) {
@@ -55,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);
@@ -92,7 +94,7 @@ export async function handleEns(
       );
     }
     return { code: 200, message };
-  } else if (command == "check") {
+  } else if (skill == "check") {
     const { domain } = params;
 
     if (!domain) {
@@ -117,7 +119,7 @@ export async function handleEns(
         message,
       };
     }
-  } else if (command == "tip") {
+  } else if (skill == "tip") {
     const { address } = params;
     if (!address) {
       return {
@@ -126,15 +128,14 @@ 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 (command == "cool") {
+  } else if (skill == "cool") {
     const { domain } = params;
     //What about these cool alternatives?\
     return {
@@ -142,7 +143,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/index.ts

@@ -1,35 +1,22 @@
 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) => {
-  /*All the skills are handled through the skills 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;
-  }
-
   const {
     message: {
-      content: { content, params },
+      content: { text, params },
       sender,
     },
   } = context;
 
   try {
-    let userPrompt = params?.prompt ?? content;
-    const userInfo = await getUserInfo(sender.address);
-    if (!userInfo) {
-      console.log("User info not found");
-      return;
-    }
+    let userPrompt = params?.prompt ?? text;
+
     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/agent/src/prompt.ts

@@ -1,57 +1,39 @@
 import { skills } from "./skills.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;
-
-  //Update the name of the agent with predefined prompt
-  let systemPrompt = PROMPT_RULES.replace("{NAME}", skills?.[0]?.tag ?? "@ens");
-
-  //Add user context to the prompt
-  systemPrompt += PROMPT_USER_CONTENT(userInfo);
-
-  //Add skills and examples to the prompt
-  systemPrompt += PROMPT_SKILLS_AND_EXAMPLES(skills, "@ens");
-
-  systemPrompt += `
+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 ${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
+  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 ${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}
+  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 ${ensDomain}. Give me a moment.\n/check ${ensDomain}
+  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 ${ensDomain} is available! Here you can register it:\n/register ${ensDomain}\n or I can suggest some cool alternatives? Le me know!
+  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 ${ensDomain} is already registered!\n What about these cool alternatives?\n/cool ${ensDomain}
+  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 ${ensDomain} is available! Let me help you register it\n/register ${ensDomain} 
+  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 ${ensDomain}
+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 ${ensDomain}.\n Give me a moment.\n/info ${ensDomain}  
+  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 ${ensDomain}. Give me a moment.\n/renew ${ensDomain} 
+  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 ${ensDomain}
+  Here are some cool suggestions for your domain.\n/cool  {ENS_DOMAIN}
 
 ## Most common bugs
 
@@ -59,5 +41,6 @@ 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
 `;
-  return systemPrompt;
+
+  return defaultPromptTemplate(fineTuning, senderAddress, skills, "@ens");
 }

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,20 +21,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/exists",
-        adminOnly: true,
-        examples: ["/exists"],
-        handler: handleEns,
-        triggers: ["/exists"],
-        description: "Check if an address is onboarded.",
-        params: {
-          address: {
-            type: "address",
-          },
-        },
-      },
-      {
-        command: "/info [domain]",
+        skill: "/info [domain]",
         triggers: ["/info"],
         handler: handleEns,
         description:
@@ -47,7 +34,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/renew [domain]",
+        skill: "/renew [domain]",
         triggers: ["/renew"],
         handler: handleEns,
         description:
@@ -60,7 +47,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/check [domain]",
+        skill: "/check [domain]",
         triggers: ["/check"],
         handler: handleEns,
         examples: ["/check vitalik.eth", "/check fabri.base.eth"],
@@ -72,7 +59,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/cool [domain]",
+        skill: "/cool [domain]",
         triggers: ["/cool"],
         examples: ["/cool vitalik.eth"],
         handler: handleEns,
@@ -84,7 +71,7 @@ export const skills: SkillGroup[] = [
         },
       },
       {
-        command: "/reset",
+        skill: "/reset",
         triggers: ["/reset"],
         examples: ["/reset"],
         handler: handleEns,
@@ -92,7 +79,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/.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,9 +1,5 @@
 import { run, HandlerContext } from "@xmtp/message-kit";
 
 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`);
+  context.send("gm");
 });

package/templates/group/.env.example

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

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

@@ -1,14 +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 },
+      content: { skill, params, text },
     },
   } = context;
-  if (!command) {
-    const { content: text } = context?.message?.content;
+  if (!skill) {
     if (text === "🔎" || text === "🔍") {
       // Send the URL for the requested game
       context.reply("https://framedl.xyz/");
@@ -36,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

@@ -3,22 +3,26 @@ import { HandlerContext } from "@xmtp/message-kit";
 export async function handler(context: HandlerContext) {
   const {
     skills,
-    group,
     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") {
-    context.send(context.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/payment.ts

@@ -0,0 +1,29 @@
+import { getUserInfo, HandlerContext } from "@xmtp/message-kit";
+
+export async function handler(context: HandlerContext) {
+  const {
+    message: {
+      content: { skill, params },
+    },
+  } = context;
+  const txpayUrl = "https://txpay.vercel.app";
+
+  if (skill === "pay") {
+    const { amount: amountSend, token: tokenSend, username } = params;
+    console.log("username", username);
+    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 = `${txpayUrl}/?&amount=${amountSend}&token=${tokenSend}&receiver=${senderInfo.address}`;
+    await context.send(`${sendUrl}`);
+  }
+}

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

@@ -1,49 +1,31 @@
-import { HandlerContext, AbstractedMember } from "@xmtp/message-kit";
+import {
+  HandlerContext,
+  AbstractedMember,
+  SkillResponse,
+} from "@xmtp/message-kit";
 import { getUserInfo } from "@xmtp/message-kit";
 
 export async function handler(context: HandlerContext) {
   const {
-    members,
-    getMessageById,
-    message: { content, sender, typeId },
+    message: {
+      content: {
+        skill,
+        params: { amount, username },
+      },
+      sender,
+    },
   } = context;
-  const msg = await getMessageById(content.reference);
-  const replyReceiver = members?.find(
-    (member) => member.inboxId === msg?.senderInboxId,
-  );
-  let amount: number = 0,
-    receivers: AbstractedMember[] = [];
-  // Handle different types of messages
-  if (typeId === "reply" && replyReceiver) {
-    const { content: reply } = content;
-
-    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
+  let receivers: AbstractedMember[] = [];
 
-      receivers = await Promise.all(
-        username.map((username: string) => getUserInfo(username)),
-      );
-    }
+  if (skill === "tip") {
+    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;
   }
   const receiverAddresses = receivers.map((receiver) => receiver.address);
-  // Process sending tokens to each receiver
 
   context.sendTo(
     `You received ${amount} tokens from ${sender.address}.`,