mastra-starter 1.0.10 → 1.0.12

package/package.json

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

package/src/mastra/agents/index.ts

@@ -17,9 +17,19 @@ const characterJsonString = await fs.promises.readFile(
 );
 const characterJson = JSON.parse(characterJsonString);
 
+const cleanName = (name: string) => {
+  return name
+    .replace(/[\/:]+/g, "-")
+    .replace(/[^a-zA-Z0-9_-]/g, "");
+};
+
 // sort plugins
 const { plugins = [] } = characterJson;
-const { npm: npmPlugins, composio: composioPlugins } = sortPlugins(plugins);
+const {
+  http: httpPlugins,
+  npm: npmPlugins,
+  composio: composioPlugins,
+} = sortPlugins(plugins);
 
 // resolve npm plugins
 const servers: Record<string, any> = {};
@@ -27,6 +37,18 @@ const pnpmLockYamlPath = path.resolve(rootDir, "pnpm-lock.yaml");
 const pnpmPackageLookup = new PnpmPackageLookup({
   pnpmLockYamlPath,
 });
+
+console.log("Initializing plugin servers...");
+
+// http plugins
+for (const pluginSpecifier of httpPlugins) {
+  const pluginName = cleanName(pluginSpecifier)
+  console.log('pluginName', pluginName, pluginSpecifier);
+  servers[pluginName] = {
+    url: new URL(pluginSpecifier),
+  };
+}
+// npm plugins
 for (const pluginSpecifier of npmPlugins) {
   const npmPackageType = getNpmPackageType(pluginSpecifier);
 
@@ -40,7 +62,7 @@ for (const pluginSpecifier of npmPlugins) {
     pluginSpecifier2 =
       await pnpmPackageLookup.getPackageNameBySpecifier(packageResolvedName);
     if (!pluginSpecifier2) {
-      throw new Error(
+      console.error(
         `Could not resolve package name for ${JSON.stringify(
           {
             pluginSpecifier,
@@ -51,6 +73,7 @@ for (const pluginSpecifier of npmPlugins) {
           2
         )}`
       );
+      continue;
     }
   } else {
     pluginSpecifier2 = pluginSpecifier;
@@ -61,13 +84,10 @@ for (const pluginSpecifier of npmPlugins) {
   const packageJson = JSON.parse(
     await fs.promises.readFile(packageJsonPath, "utf8")
   );
-  const pluginName =
-    pluginSpecifier
-      // .replace(/^github:/, "")
-      .replace(/[\/:]+/g, "-")
-      .replace(/[^a-zA-Z0-9_-]/g, "");
+  const pluginName = cleanName(pluginSpecifier)
   if (!pluginName) {
-    throw new Error(`Could not clean up plugin name for ${pluginSpecifier}`);
+    console.error(`Could not clean up plugin name for ${pluginSpecifier}`);
+    continue;
   }
   if (packageJson.scripts.start) {
     servers[pluginName] = {
@@ -85,7 +105,7 @@ for (const pluginSpecifier of npmPlugins) {
         env: process.env as any,
       };
     } else {
-      throw new Error(
+      console.error(
         `No start script or bins found for ${pluginSpecifier} name ${pluginName}`
       );
     }
@@ -93,15 +113,26 @@ for (const pluginSpecifier of npmPlugins) {
 }
 
 // mcp tools
-const mcp = new MCPConfiguration({
-  servers,
-});
-const mcpTools = await mcp.getTools();
+console.log("Retrieving MCP tools...");
+let mcpTools: ToolsInput = {};
+try {
+  const mcp = new MCPConfiguration({
+    servers,
+  });
+
+  mcpTools = await mcp.getTools();
+  console.log(
+    `Successfully initialized ${Object.keys(mcpTools).length} MCP tools`
+  );
+} catch (error) {
+  console.error("Error initializing MCP tools:", error);
+  console.log("Continuing with limited functionality...");
+}
 
 // composio tools
 const composioApiKey = process.env.COMPOSIO_API_KEY;
 const composioAccountId = process.env.COMPOSIO_ACCOUNT_ID;
-let composioToolset: ToolsInput | undefined;
+let composioToolset: ToolsInput = {};
 if (composioApiKey && composioAccountId) {
   const composio = new ComposioIntegration({
     config: {
@@ -124,10 +155,12 @@ if (composioApiKey && composioAccountId) {
 }
 
 // agent
+console.log("Initializing agent...");
 const model = createOpenAI({
   baseURL: process.env.OPENAI_API_URL || "https://api.openai.com/v1",
   apiKey: process.env.OPENAI_API_KEY,
 })("gpt-4o");
+
 export const characterAgent = new Agent({
   name: "Character",
   instructions:
@@ -143,3 +176,5 @@ export const characterAgent = new Agent({
     ...composioToolset,
   },
 });
+
+console.log("Agent initialization completed!");

package/util.mjs

@@ -1,5 +1,5 @@
 import path from "path";
-import fs from "fs";
+// import fs from "fs";
 import child_process from "child_process";
 import { mkdirp } from "mkdirp";
 import { rimraf } from "rimraf";
@@ -35,24 +35,30 @@ export const runCharacter = async (characterJsonPath, { env = {} } = {}) => {
 };
 
 export const getPluginType = (plugin) => {
-  if (plugin.startsWith("composio:")) {
+  if (/^https?:\/\//.test(plugin)) {
+    return "http";
+  } else if (plugin.startsWith("composio:")) {
     return "composio";
   } else {
     return "npm";
   }
 };
 export const sortPlugins = (plugins) => {
+  const http = [];
   const npm = [];
   const composio = [];
   for (const plugin of plugins) {
     const pluginType = getPluginType(plugin);
-    if (pluginType === "npm") {
+    if (pluginType === "http") {
+      http.push(plugin);
+    } else if (pluginType === "npm") {
       npm.push(plugin);
     } else if (pluginType === "composio") {
       composio.push(plugin);
     }
   }
   return {
+    http,
     npm,
     composio,
   };