mastra 0.1.57-alpha.96 → 0.1.57-alpha.97

package/dist/templates/express-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"express-server.d.ts","sourceRoot":"","sources":["../../src/templates/express-server.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAsjCzC,eAAO,MAAM,OAAO,oBAAkB,CAAC;AAQvC,eAAe,OAAO,CAAC"}
+{"version":3,"file":"express-server.d.ts","sourceRoot":"","sources":["../../src/templates/express-server.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AA48BzC,eAAO,MAAM,OAAO,oBAAkB,CAAC;AAQvC,eAAe,OAAO,CAAC"}

package/dist/templates/express-server.js

@@ -163,11 +163,14 @@ app.get('/api/agents', async (_req, res) => {
     }
 });
 /**
- * POST /api/agents/{agentId}/generate
- * @summary Send text messages to agent
+ * POST /api/agents/:agentId/generate
+ * @summary Send messages to agent
  * @tags Agent
  * @param {string} agentId.path.required - Agent identifier
  * @param {Messages} request.body.required - Messages to send
+ * @param {string} request.body.optional - Thread ID
+ * @param {string} request.body.optional - Resource ID
+ * @param {string} request.body.optional - Output schema
  * @return {object} 200 - Agent response
  * @return {Error} 400 - Validation error
  * @return {Error} 500 - Server error
@@ -176,7 +179,7 @@ app.post('/api/agents/:agentId/generate', async (req, res) => {
     try {
         const agentId = req.params.agentId;
         const agent = mastra.getAgent(agentId);
-        const { messages, threadId, resourceid } = req.body;
+        const { messages, threadId, resourceid, output } = req.body;
         const { ok, errorResponse } = await validateBody({
             messages,
         });
@@ -184,26 +187,33 @@ app.post('/api/agents/:agentId/generate', async (req, res) => {
             res.status(400).json({ error: errorResponse });
             return;
         }
-        const result = await agent.generate(messages, { threadId, resourceid });
-        const textResult = {
-            text: result.text,
-            agent: agent.name,
-        };
-        res.json(textResult);
+        const result = await agent.generate(messages, { output, threadId, resourceid });
+        if (output) {
+            res.json({
+                object: result.object,
+                agent: result.agent,
+            });
+        }
+        else {
+            res.json({ text: result.text, agent: agent.name });
+        }
     }
     catch (error) {
         const apiError = error;
-        console.error('Error texting from agent', apiError);
-        res.status(apiError.status || 500).json({ error: apiError.message || 'Error texting from agent' });
+        console.error('Error generating from agent', apiError);
+        res.status(apiError.status || 500).json({ error: apiError.message || 'Error generating from agent' });
         return;
     }
 });
 /**
- * POST /api/agents/{agentId}/stream
+ * POST /api/agents/:agentId/stream
  * @summary Stream messages to agent
  * @tags Agent
  * @param {string} agentId.path.required - Agent identifier
  * @param {Messages} request.body.required - Messages to stream
+ * @param {string} request.body.optional - Thread ID
+ * @param {string} request.body.optional - Resource ID
+ * @param {string} request.body.optional - Output schema
  * @return {stream} 200 - Agent response stream
  * @return {Error} 400 - Validation error
  * @return {Error} 500 - Server error
@@ -212,7 +222,7 @@ app.post('/api/agents/:agentId/stream', async (req, res) => {
     try {
         const agentId = req.params.agentId;
         const agent = mastra.getAgent(agentId);
-        const { messages, threadId, resourceid } = req.body;
+        const { messages, threadId, resourceid, output } = req.body;
         const { ok, errorResponse } = await validateBody({
             messages,
         });
@@ -221,6 +231,7 @@ app.post('/api/agents/:agentId/stream', async (req, res) => {
             return;
         }
         const streamResult = await agent.stream(messages, {
+            output,
             threadId,
             resourceid,
         });
@@ -233,112 +244,6 @@ app.post('/api/agents/:agentId/stream', async (req, res) => {
         return;
     }
 });
-/**
- * POST /api/agents/{agentId}/text-object
- * @summary Get structured output from agent
- * @tags Agent
- * @param {string} agentId.path.required - Agent identifier
- * @param {TextObjectRequest} request.body.required - Request with messages and schema spec
- * @return {object} 200 - Structured output response
- * @return {Error} 400 - Validation error
- * @return {Error} 500 - Server error
- */
-app.post('/api/agents/:agentId/text-object', async (req, res) => {
-    try {
-        const agentId = req.params.agentId;
-        const agent = mastra.getAgent(agentId);
-        const { messages, schema, threadId, resourceid } = req.body;
-        const { ok, errorResponse } = await validateBody({
-            messages,
-            schema,
-        });
-        if (!ok) {
-            res.status(400).json({ error: errorResponse });
-            return;
-        }
-        const result = await agent.generate(messages, { output: schema, threadId, resourceid });
-        const objectResult = {
-            object: result.object,
-            agent: result.agent,
-        };
-        res.json(objectResult);
-    }
-    catch (error) {
-        const apiError = error;
-        console.error('Error getting structured output from agent', apiError);
-        res
-            .status(apiError.status || 500)
-            .json({ error: apiError.message || 'Error getting structured output from agent' });
-        return;
-    }
-});
-/**
- * POST /api/agents/{agentId}/stream-object
- * @summary Stream structured output from agent
- * @tags Agent
- * @param {string} agentId.path.required - Agent identifier
- * @param {TextObjectRequest} request.body.required - Request with messages and schema spec
- * @return {stream} 200 - Structured output stream
- * @return {Error} 400 - Validation error
- * @return {Error} 500 - Server error
- */
-app.post('/api/agents/:agentId/stream-object', async (req, res) => {
-    try {
-        const agentId = req.params.agentId;
-        const agent = mastra.getAgent(agentId);
-        const { messages, schema, threadId, resourceid } = req.body;
-        const { ok, errorResponse } = await validateBody({
-            messages,
-            schema,
-        });
-        if (!ok) {
-            res.status(400).json({ error: errorResponse });
-            return;
-        }
-        const streamResult = await agent.stream(messages, { output: schema, threadId, resourceid });
-        streamResult.pipeTextStreamToResponse(res);
-    }
-    catch (error) {
-        const apiError = error;
-        console.error('Error streaming structured output from agent', apiError);
-        res
-            .status(apiError.status || 500)
-            .json({ error: apiError.message || 'Error streaming structured output from agent' });
-        return;
-    }
-});
-/**
- * POST /api/agents/{agentId}/tools/{toolId}/execute
- * @summary Execute an Agent tool
- * @tags Agent
- * @param {string} agentId.path.required - Agent identifier
- * @param {string} toolId.path.required - Tool identifier
- * @param {object} request.body.required - Tool input data
- * @return {object} 200 - Tool execution result
- * @return {Error} 500 - Server error
- */
-app.post('/api/agents/:agentId/tools/:toolId/execute', async (req, res) => {
-    try {
-        const agentId = req.params.agentId;
-        const toolId = req.params.toolId;
-        const agent = mastra.getAgent(agentId);
-        const tool = Object.values(agent?.tools || {}).find((tool) => tool.id === toolId);
-        const result = await tool.execute({
-            context: {
-                ...req.body,
-            },
-            mastra,
-            runId: agentId,
-        });
-        res.json(result);
-    }
-    catch (error) {
-        const apiError = error;
-        console.error('Error executing tool', apiError);
-        res.status(apiError.status || 500).json({ error: apiError.message || 'Error executing tool' });
-        return;
-    }
-});
 /**
  * GET /api/workflows
  * @summary Get all workflows

package/dist/templates/netlify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"netlify.d.ts","sourceRoot":"","sources":["../../src/templates/netlify.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AA0tBzC,eAAO,MAAM,OAAO,oBAAkB,CAAC"}
+{"version":3,"file":"netlify.d.ts","sourceRoot":"","sources":["../../src/templates/netlify.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAuqBzC,eAAO,MAAM,OAAO,oBAAkB,CAAC"}

package/dist/templates/netlify.js

@@ -92,21 +92,27 @@ app.post('/api/agents/:agentId/generate', async (req, res) => {
     try {
         const agentId = req.params.agentId;
         const agent = mastra.getAgent(agentId);
-        const { messages, threadId, resourceid } = req.body;
-        const { ok, errorResponse } = await validateBody({
-            messages,
-        });
+        const { messages, threadId, resourceid, output } = req.body;
+        const { ok, errorResponse } = await validateBody({ messages });
         if (!ok) {
             res.status(400).json({ error: errorResponse });
             return;
         }
-        const result = await agent.generate(messages, { threadId, resourceid });
-        res.json(result);
+        const result = await agent.generate(messages, { output, threadId, resourceid });
+        if (output) {
+            res.json({
+                object: result.object,
+                agent: result.agent,
+            });
+        }
+        else {
+            res.json({ text: result.text, agent: agent.name });
+        }
     }
     catch (error) {
         const apiError = error;
-        console.error('Error texting from agent', apiError);
-        res.status(apiError.status || 500).json({ error: apiError.message || 'Error texting from agent' });
+        console.error('Error generating from agent', apiError);
+        res.status(apiError.status || 500).json({ error: apiError.message || 'Error generating from agent' });
         return;
     }
 });
@@ -114,7 +120,7 @@ app.post('/api/agents/:agentId/stream', async (req, res) => {
     try {
         const agentId = req.params.agentId;
         const agent = mastra.getAgent(agentId);
-        const { messages, threadId, resourceid } = req.body;
+        const { messages, threadId, resourceid, output } = req.body;
         const { ok, errorResponse } = await validateBody({
             messages,
         });
@@ -123,6 +129,7 @@ app.post('/api/agents/:agentId/stream', async (req, res) => {
             return;
         }
         const streamResult = await agent.stream(messages, {
+            output,
             threadId,
             resourceid,
         });
@@ -135,56 +142,6 @@ app.post('/api/agents/:agentId/stream', async (req, res) => {
         return;
     }
 });
-app.post('/api/agents/:agentId/text-object', async (req, res) => {
-    try {
-        const agentId = req.params.agentId;
-        const agent = mastra.getAgent(agentId);
-        const { messages, schema, threadId, resourceid } = req.body;
-        const { ok, errorResponse } = await validateBody({
-            messages,
-            schema,
-        });
-        if (!ok) {
-            res.status(400).json({ error: errorResponse });
-            return;
-        }
-        const result = await agent.generate(messages, { output: schema, threadId, resourceid });
-        res.json(result);
-    }
-    catch (error) {
-        const apiError = error;
-        console.error('Error getting structured output from agent', apiError);
-        res
-            .status(apiError.status || 500)
-            .json({ error: apiError.message || 'Error getting structured output from agent' });
-        return;
-    }
-});
-app.post('/api/agents/:agentId/stream-object', async (req, res) => {
-    try {
-        const agentId = req.params.agentId;
-        const agent = mastra.getAgent(agentId);
-        const { messages, schema, threadId, resourceid } = req.body;
-        const { ok, errorResponse } = await validateBody({
-            messages,
-            schema,
-        });
-        if (!ok) {
-            res.status(400).json({ error: errorResponse });
-            return;
-        }
-        const streamResult = await agent.stream(messages, { output: schema, threadId, resourceid });
-        streamResult.pipeTextStreamToResponse(res);
-    }
-    catch (error) {
-        const apiError = error;
-        console.error('Error streaming structured output from agent', apiError);
-        res
-            .status(apiError.status || 500)
-            .json({ error: apiError.message || 'Error streaming structured output from agent' });
-        return;
-    }
-});
 app.post('/api/agents/:agentId/tools/:toolId/execute', async (req, res) => {
     try {
         const agentId = req.params.agentId;

package/dist/templates/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/templates/worker.ts"],"names":[],"mappings":"AA8CA,UAAU,gBAAgB;IACxB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACvC,sBAAsB,IAAI,IAAI,CAAC;CAChC;;mBA4hCsB,OAAO,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,gBAAgB;;AADlF,wBAQE"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/templates/worker.ts"],"names":[],"mappings":"AA8CA,UAAU,gBAAgB;IACxB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACvC,sBAAsB,IAAI,IAAI,CAAC;CAChC;;mBAm8BsB,OAAO,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,gBAAgB;;AADlF,wBAQE"}

package/dist/templates/worker.js

@@ -116,7 +116,7 @@ router.post('/api/agents/:agentId/generate', async ({ params, json, mastra }) =>
     try {
         const agentId = decodeURIComponent(params.agentId);
         const agent = mastra.getAgent(agentId);
-        const { messages, threadId, resourceid } = await json();
+        const { messages, threadId, resourceid, output } = await json();
         const { ok, errorResponse } = await validateBody({ messages });
         if (!ok) {
             return new Response(JSON.stringify({ error: errorResponse }), {
@@ -134,8 +134,10 @@ router.post('/api/agents/:agentId/generate', async ({ params, json, mastra }) =>
                 },
             });
         }
-        const result = await agent.generate(messages, { threadId, resourceid });
-        return new Response(JSON.stringify(result), {
+        const result = await agent.generate(messages, { output, threadId, resourceid });
+        return new Response(output
+            ? JSON.stringify({ object: result.object, agent: result.agent })
+            : JSON.stringify({ text: result.text, agent: agent.name }), {
             headers: {
                 'Content-Type': 'application/json',
             },
@@ -143,8 +145,8 @@ router.post('/api/agents/:agentId/generate', async ({ params, json, mastra }) =>
     }
     catch (error) {
         const apiError = error;
-        console.error('Error texting from agent', apiError);
-        return new Response(JSON.stringify({ error: apiError.message || 'Error texting from agent' }), {
+        console.error('Error generating from agent', apiError);
+        return new Response(JSON.stringify({ error: apiError.message || 'Error generating from agent' }), {
             status: apiError.status || 500,
             headers: {
                 'Content-Type': 'application/json',
@@ -156,52 +158,9 @@ router.post('/api/agents/:agentId/stream', async ({ params, json, mastra }) => {
     try {
         const agentId = decodeURIComponent(params.agentId);
         const agent = mastra.getAgent(agentId);
-        const { messages, threadId, resourceid } = await json();
-        const { ok, errorResponse } = await validateBody({ messages });
-        if (!ok) {
-            return new Response(JSON.stringify({ error: errorResponse }), {
-                status: 400,
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-        }
-        if (!Array.isArray(messages)) {
-            return new Response(JSON.stringify({ error: { messages: 'Messages should be an array' } }), {
-                status: 400,
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-        }
-        const streamResult = await agent.stream(messages, { threadId, resourceid });
-        return streamResult.toDataStreamResponse({
-            headers: {
-                'Content-Type': 'text/x-unknown',
-                'content-encoding': 'identity',
-                'transfer-encoding': 'chunked',
-            },
-        });
-    }
-    catch (error) {
-        const apiError = error;
-        console.error('Error streaming from agent', apiError);
-        return new Response(JSON.stringify({ error: apiError.message || 'Error streaming from agent' }), {
-            status: apiError.status || 500,
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        });
-    }
-});
-router.post('/api/agents/:agentId/text-object', async ({ params, json, mastra }) => {
-    try {
-        const agentId = decodeURIComponent(params.agentId);
-        const agent = mastra.getAgent(agentId);
-        const { messages, schema, threadId, resourceid } = await json();
+        const { messages, threadId, resourceid, output } = await json();
         const { ok, errorResponse } = await validateBody({
             messages,
-            schema,
         });
         if (!ok) {
             return new Response(JSON.stringify({ error: errorResponse }), {
@@ -219,50 +178,7 @@ router.post('/api/agents/:agentId/text-object', async ({ params, json, mastra })
                 },
             });
         }
-        const result = await agent.generate(messages, { output: schema, threadId, resourceid });
-        return new Response(JSON.stringify(result), {
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        });
-    }
-    catch (error) {
-        const apiError = error;
-        console.error('Error getting structured output from agent', apiError);
-        return new Response(JSON.stringify({ error: apiError.message || 'Error getting structured output from agent' }), {
-            status: apiError.status || 500,
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        });
-    }
-});
-router.post('/api/agents/:agentId/stream-object', async ({ params, json, mastra }) => {
-    try {
-        const agentId = decodeURIComponent(params.agentId);
-        const agent = mastra.getAgent(agentId);
-        const { messages, schema, threadId, resourceid } = await json();
-        const { ok, errorResponse } = await validateBody({
-            messages,
-            schema,
-        });
-        if (!ok) {
-            return new Response(JSON.stringify({ error: errorResponse }), {
-                status: 400,
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-        }
-        if (!Array.isArray(messages)) {
-            return new Response(JSON.stringify({ error: { messages: 'Messages should be an array' } }), {
-                status: 400,
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-        }
-        const streamResult = await agent.stream(messages, { output: schema, threadId, resourceid });
+        const streamResult = await agent.stream(messages, { threadId, resourceid, output });
         return streamResult.toTextStreamResponse({
             headers: {
                 'Content-Type': 'text/x-unknown',
@@ -273,8 +189,8 @@ router.post('/api/agents/:agentId/stream-object', async ({ params, json, mastra
     }
     catch (error) {
         const apiError = error;
-        console.error('Error streaming structured output from agent', apiError);
-        return new Response(JSON.stringify({ error: apiError.message || 'Error streaming structured output from agent' }), {
+        console.error('Error streaming from agent', apiError);
+        return new Response(JSON.stringify({ error: apiError.message || 'Error streaming from agent' }), {
             status: apiError.status || 500,
             headers: {
                 'Content-Type': 'application/json',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastra",
-  "version": "0.1.57-alpha.96",
+  "version": "0.1.57-alpha.97",
   "license": "MIT",
   "description": "cli for mastra",
   "type": "module",