mastra-starter 1.0.6 → 1.0.8

package/.env.example

@@ -1,2 +1,3 @@
 OPENAI_API_KEY=
-COMPOSIO_API_KEY=
+COMPOSIO_API_KEY=
+COMPOSIO_ACCOUNT_ID=

package/index.mjs

@@ -6,7 +6,12 @@ import fs from 'fs';
 import { Command } from 'commander';
 import dotenv from 'dotenv';
 
-import { runCharacter, installPackages, buildPackages } from './util.mjs';
+import {
+  runCharacter,
+  getPluginType,
+  installNpmPackages,
+  buildNpmPackages,
+} from "./util.mjs";
 
 const main = async () => {
   dotenv.config();
@@ -42,8 +47,8 @@ const main = async () => {
     .argument('<packages...>', 'packages to install')
     .action(async (packages) => {
       try {
-        await installPackages(packages);
-        await buildPackages(packages);
+        await installNpmPackages(packages);
+        await buildNpmPackages(packages);
       } catch (error) {
         console.error(`Error in install command: ${error.message}`);
       }
@@ -65,7 +70,11 @@ const main = async () => {
           const characterJson = JSON.parse(characterJsonString);
           
           if (characterJson.plugins && Array.isArray(characterJson.plugins)) {
-            characterJson.plugins.forEach(plugin => pluginsToInstall.add(plugin));
+            characterJson.plugins.forEach(plugin => {
+              if (getPluginType(plugin) === 'npm') {
+                pluginsToInstall.add(plugin);
+              }
+            });
           }
         }
         
@@ -74,8 +83,8 @@ const main = async () => {
           return;
         }
         
-        await installPackages([...pluginsToInstall]);
-        await buildPackages([...pluginsToInstall]);
+        await installNpmPackages([...pluginsToInstall]);
+        await buildNpmPackages([...pluginsToInstall]);
       } catch (error) {
         console.error(`Error in installall command: ${error.message}`);
       }
@@ -89,7 +98,7 @@ const main = async () => {
     .argument('<packages...>', 'packages to build')
     .action(async (packages) => {
       try {
-        await buildPackages(packages);
+        await buildNpmPackages(packages);
       } catch (error) {
         console.error(`Error in build command: ${error.message}`);
       }
@@ -111,7 +120,11 @@ const main = async () => {
           const characterJson = JSON.parse(characterJsonString);
           
           if (characterJson.plugins && Array.isArray(characterJson.plugins)) {
-            characterJson.plugins.forEach(plugin => pluginsToBuild.add(plugin));
+            characterJson.plugins.forEach(plugin => {
+              if (getPluginType(plugin) === 'npm') {
+                pluginsToBuild.add(plugin);
+              }
+            });
           }
         }
         
@@ -120,7 +133,7 @@ const main = async () => {
           return;
         }
         
-        await buildPackages([...pluginsToBuild]);
+        await buildNpmPackages([...pluginsToBuild]);
       } catch (error) {
         console.error(`Error in buildall command: ${error.message}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastra-starter",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "index.mjs",
   "bin": {
     "mastra-starter": "./index.mjs"

package/src/mastra/agents/index.ts

@@ -5,6 +5,7 @@ import { Agent, ToolsInput } from '@mastra/core/agent';
 import dedent from 'dedent';
 import { MCPConfiguration } from "@mastra/mcp";
 import { ComposioIntegration } from '@mastra/composio';
+import { sortPlugins } from '../../../util.mjs';
 import { PnpmPackageLookup } from 'pnpm-package-lookup';
 
 // character
@@ -17,15 +18,10 @@ const characterJson = JSON.parse(characterJsonString);
 
 // sort plugins
 const { plugins = [] } = characterJson;
-const npmPlugins: string[] = [];
-const composioPlugins: string[] = [];
-for (const plugin of plugins) {
-  if (plugin.startsWith('composio:')) {
-    composioPlugins.push(plugin);
-  } else {
-    npmPlugins.push(plugin);
-  }
-}
+const {
+  npm: npmPlugins,
+  composio: composioPlugins,
+} = sortPlugins(plugins);
 
 // resolve npm plugins
 const servers: Record<string, any> = {};
@@ -51,23 +47,27 @@ const mcp = new MCPConfiguration({
 const mcpTools = await mcp.getTools();
 
 // composio tools
-const composio = new ComposioIntegration({
-  config: {
-    API_KEY: process.env.COMPOSIO_API_KEY!,
-    entityId: 'default',
-    // connectedAccountId: '899144e5-a466-428b-8a00-7c931fb57f9f',
-    connectedAccountId: '4d79004e-320a-4dc9-be1a-1037a6fe9866',
-  },
-});
-// const actionsEnums = [
-//   'GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER',
-//   'GITHUB_ACTIVITY_LIST_STARGAZERS_FOR_REPO',
-//   'GITHUB_GET_OCTOCAT',
-// ];
-const actionsEnums = composioPlugins.map((plugin) => plugin.replace('composio:', ''));
-const composioToolset = await composio.getTools({
-  actions: actionsEnums,
-}) as ToolsInput;
+const composioApiKey = process.env.COMPOSIO_API_KEY;
+const composioAccountId = process.env.COMPOSIO_ACCOUNT_ID;
+let composioToolset: ToolsInput | undefined;
+if (composioApiKey && composioAccountId) {
+  const composio = new ComposioIntegration({
+    config: {
+      API_KEY: composioApiKey,
+      entityId: 'default',
+      connectedAccountId: composioAccountId,
+    },
+  });
+  // const actionsEnums = [
+  //   'GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER',
+  //   'GITHUB_ACTIVITY_LIST_STARGAZERS_FOR_REPO',
+  //   'GITHUB_GET_OCTOCAT',
+  // ];
+  const actionsEnums = composioPlugins.map((plugin: string) => plugin.replace('composio:', ''));
+  composioToolset = await composio.getTools({
+    actions: actionsEnums,
+  }) as ToolsInput;
+}
 
 // agent
 export const characterAgent = new Agent({

package/trump.character.json

@@ -10,7 +10,10 @@
         }
     },
     "plugins": [
-        "github:v-3/discordmcp"
+        "github:v-3/discordmcp",
+        "composio:GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER",
+        "composio:GITHUB_ACTIVITY_LIST_STARGAZERS_FOR_REPO",
+        "composio:GITHUB_GET_OCTOCAT"
     ],
     "bio": [
         "secured the Southern Border COMPLETELY (until they DESTROYED it)",

package/util.mjs

@@ -29,7 +29,32 @@ export const runCharacter = async (characterJsonPath, {
     });
   });
 };
-export const installPackages = (packageSpecifiers) => {
+
+export const getPluginType = (plugin) => {
+  if (plugin.startsWith('composio:')) {
+    return 'composio';
+  } else {
+    return 'npm';
+  }
+};
+export const sortPlugins = (plugins) => {
+  const npm = [];
+  const composio = [];
+  for (const plugin of plugins) {
+    const pluginType = getPluginType(plugin);
+    if (pluginType === 'npm') {
+      npm.push(plugin);
+    } else if (pluginType === 'composio') {
+      composio.push(plugin);
+    }
+  }
+  return {
+    npm,
+    composio,
+  };
+};
+
+export const installNpmPackages = (packageSpecifiers) => {
   console.log(`Installing packages: ${packageSpecifiers.join(", ")}`);
 
   return new Promise((resolve, reject) => {
@@ -53,7 +78,7 @@ export const installPackages = (packageSpecifiers) => {
     });
   });
 };
-export const buildPackages = async (packageSpecifiers) => {
+export const buildNpmPackages = async (packageSpecifiers) => {
   console.log(`Building packages: ${packageSpecifiers.join(", ")}`);
 
   // get the packagePaths from the packageSpecifiers