Merge pull request #20 from ssdeanx/develop

feat: Refactor tool imports and improve progress logging

Author: ssdeanx

lib/client-stream-to-ai-sdk.ts

@@ -39,7 +39,7 @@ async function* asyncIterableFromReadableStream<T>(
   try {
     while (true) {
       const { done, value } = await reader.read();
-      if (done) break;
+      if (done) {break;}
       yield value;
     }
   } finally {
@@ -49,16 +49,16 @@ async function* asyncIterableFromReadableStream<T>(
 
 /**
  * Creates a streaming Response for Next.js API routes using server-side Mastra agent.
- * 
+ *
  * IMPORTANT: This should be used in API 5stra instance,
  * not the client SDK. The client SDK (MastraClient) is for frontend use only.
- * 
+ *
  * @example
  * ```ts
  * // app/api/chat/route.ts
  * import { mastra } from "@/src/mastra";
  * import { createAgentStreamResponse } from "@/lib/server/agent-stream";
- * 
+ *
  * export async function POST(req: Request) {
  *   const { messages, agentId, threadId, resourceId, memory } = await req.json();
  *   return createAgentStreamResponse(mastra, agentId, messages, {
@@ -68,7 +68,7 @@ async function* asyncIterableFromReadableStream<T>(
  *   });
  * }
  * ```
- * 
+ *
  * @see https://mastra.ai/docs/frameworks/agentic-uis/ai-sdk
  */
 export async function createAgentStreamResponse(
@@ -78,7 +78,7 @@ export async function createAgentStreamResponse(
   options?: AgentStreamOptions
 ): Promise<Response> {
   const agent = mastra.getAgent(agentId);
-  
+
   const streamOptions = {
     format: options?.format ?? "aisdk",
     threadId: options?.threadId,
@@ -100,12 +100,12 @@ export async function createAgentStreamResponse(
   const uiMessageStream = createUIMessageStream({
     execute: async ({ writer }) => {
       const aiSdkResult = toAISdkFormat(stream, { from: "agent" });
-      
+
       // Handle both ReadableStream and AsyncIterable
       const iterable: AsyncIterable<unknown> = isReadableStream(aiSdkResult)
         ? asyncIterableFromReadableStream(aiSdkResult)
         : aiSdkResult;
-      
+
       for await (const value of iterable) {
         writer.write(value as Parameters<typeof writer.write>[0]);
       }
@@ -120,11 +120,11 @@ export async function createAgentStreamResponse(
  * This export exists for backward compatibility only.
  */
 export async function createMastraStreamResponse(
-  _client: unknown,
-  _options: StreamToAISdkOptions
+  client: unknown,
+  options: StreamToAISdkOptions
 ): Promise<Response> {
   throw new Error(
     "createMastraStreamResponse is deprecated. Use createAgentStreamResponse with " +
     "the server-side mastra instance instead. See: https://mastra.ai/docs/frameworks/agentic-uis/ai-sdk"
   );
-}
+}

src/mastra/index.ts

@@ -86,7 +86,8 @@ import { telephoneGameWorkflow } from './workflows/telephone-game';
 import { weatherWorkflow } from './workflows/weather-workflow';
 import { repoIngestionWorkflow } from './workflows/repo-ingestion-workflow';
 import { specGenerationWorkflow } from './workflows/spec-generation-workflow';
-
+import { ResearchRuntimeContext } from './agents/index';
+import { metadata } from '../../app/docs/layout';
 
 export const mastra = new Mastra({
   workflows: {
@@ -223,6 +224,36 @@ export const mastra = new Mastra({
   },
   server: {
     apiRoutes: [
+      workflowRoute({
+        path: "/workflow/:workflowId",
+        includeTextStreamParts: true,
+      }),
+      networkRoute({
+        path: "/network/:agentId",
+        defaultOptions: {
+          memory: {
+            thread: {
+              id: 'network',
+              resourceId: 'network',
+              metadata: { agentId: ':agentId' }
+            },
+            resource: "network",
+            options: {
+              lastMessages: 500,
+              semanticRecall: true,
+              workingMemory: { enabled: true },
+              threads: { generateTitle: true }
+            }
+          },
+          maxSteps: 200,
+          telemetry: {
+            isEnabled: true,
+            recordInputs: true,
+            recordOutputs: true,
+          },
+          includeRawChunks: true,
+        }
+      }),
       chatRoute({
         path: "/chat/:agentId",
         defaultOptions: {
@@ -500,97 +531,6 @@ export const mastra = new Mastra({
         sendReasoning: true,
         sendSources: true,
       }),
-      workflowRoute({
-        path: "/workflow/:agentId",
-        workflow: "specGenerationWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/weatherWorkflow",
-        workflow: "weatherWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/contentStudioWorkflow",
-        workflow: "contentStudioWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/contentlogWorkflow",
-        workflow: "changelogWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/contentReviewWorkflow",
-        workflow: "contentReviewWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/documentProcessingWorkflow",
-        workflow: "documentProcessingWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/financialReportWorkflow",
-        workflow: "financialReportWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/learningExtractionWorkflow",
-        workflow: "learningExtractionWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/researchSynthesisWorkflow",
-        workflow: "researchSynthesisWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/stockAnalysisWorkflow",
-        workflow: "stockAnalysisWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/telephoneGameWorkflow",
-        workflow: "telephoneGameWorkflow",
-        includeTextStreamParts: true,
-      }),
-      workflowRoute({
-        path: "/workflow/repoIngestionWorkflow",
-        workflow: "repoIngestionWorkflow",
-
-      }),
-      workflowRoute({
-        path: "/workflow/specGenerationWorkflow",
-        workflow: "specGenerationWorkflow",
-
-      }),
-      networkRoute({
-        path: "/network/:agentId",
-        defaultOptions: {
-          memory: {
-            thread: {
-              id: 'network',
-              resourceId: 'network',
-            },
-            resource: "network",
-            options: {
-              lastMessages: 500,
-              semanticRecall: true,
-              workingMemory: { enabled: true },
-              threads: { generateTitle: true }
-            }
-          },
-          maxSteps: 200,
-          telemetry: {
-            isEnabled: true,
-            recordInputs: true,
-            recordOutputs: true,
-          },
-          includeRawChunks: true,
-          savePerStep: true,
-        }
-      }),
     ],
 //    cors: {
 //      origin: ["*"], // Allow specific origins or '*' for all

src/mastra/tools/alpha-vantage.tool.ts

@@ -1,5 +1,6 @@
 import { AISpanType, InternalSpans } from "@mastra/core/ai-tracing";
-import { InferUITool, createTool } from "@mastra/core/tools";
+import type { InferUITool} from "@mastra/core/tools";
+import { createTool } from "@mastra/core/tools";
 import { z } from "zod";
 
 /**
@@ -63,11 +64,11 @@ export const alphaVantageCryptoTool = createTool({
       tracingPolicy: { internal: InternalSpans.TOOL }
     });
 
-    await writer?.write({ type: 'progress', data: { message: `📈 Fetching Alpha Vantage crypto data for ${context.symbol}/${context.market}` } });
+    await writer?.custom({ type: 'data-tool-progress', data: { message: `📈 Fetching Alpha Vantage crypto data for ${context.symbol}/${context.market}` } });
     const apiKey = process.env.ALPHA_VANTAGE_API_KEY;
 
     if (typeof apiKey !== "string" || apiKey.trim() === '') {
-      await writer?.write({ type: 'progress', data: { message: '❌ Missing ALPHA_VANTAGE_API_KEY' } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: '❌ Missing ALPHA_VANTAGE_API_KEY' } });
       return {
         data: null,
         error: "ALPHA_VANTAGE_API_KEY environment variable is required"
@@ -95,7 +96,7 @@ export const alphaVantageCryptoTool = createTool({
 
       const url = `https://www.alphavantage.co/query?${params.toString()}`;
 
-      await writer?.write({ type: 'progress', data: { message: '📡 Querying Alpha Vantage API...' } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: '📡 Querying Alpha Vantage API...' } });
       const response = await fetch(url);
 
       if (!response.ok) {
@@ -152,7 +153,7 @@ export const alphaVantageCryptoTool = createTool({
         return null;
       };
 
-      await writer?.write({ type: 'progress', data: { message: `✅ Crypto data ready for ${context.symbol}` } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: `✅ Crypto data ready for ${context.symbol}` } });
       const result = {
         data,
         metadata: {
@@ -170,7 +171,7 @@ export const alphaVantageCryptoTool = createTool({
 
     } catch (error) {
       const errMsg = error instanceof Error ? error.message : "Unknown error occurred";
-      await writer?.write({ type: 'progress', data: { message: `❌ Crypto fetch error: ${errMsg}` } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: `❌ Crypto fetch error: ${errMsg}` } });
       span?.error({ error: error instanceof Error ? error : new Error(errMsg), endSpan: true });
       return {
         data: null,
@@ -243,11 +244,11 @@ export const alphaVantageStockTool = createTool({
       tracingPolicy: { internal: InternalSpans.TOOL }
     });
 
-    await writer?.write({ type: 'progress', data: { message: `📈 Fetching Alpha Vantage stock data for ${context.symbol || 'symbol'}` } });
+    await writer?.custom({ type: 'data-tool-progress', data: { message: `📈 Fetching Alpha Vantage stock data for ${context.symbol || 'symbol'}` } });
     const apiKey = process.env.ALPHA_VANTAGE_API_KEY;
 
     if (typeof apiKey !== "string" || apiKey.trim() === '') {
-      await writer?.write({ type: 'progress', data: { message: '❌ Missing ALPHA_VANTAGE_API_KEY' } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: '❌ Missing ALPHA_VANTAGE_API_KEY' } });
       return {
         data: null,
         error: "ALPHA_VANTAGE_API_KEY environment variable is required"
@@ -438,11 +439,11 @@ export const alphaVantageTool = createTool({
       tracingPolicy: { internal: InternalSpans.TOOL }
     });
 
-    await writer?.write({ type: 'data-tool-progress', data: { message: `💰 Fetching general Alpha Vantage data for ${context.function}` } });
+    await writer?.custom({ type: 'data-tool-progress', data: { message: `💰 Fetching general Alpha Vantage data for ${context.function}` } });
     const apiKey = process.env.ALPHA_VANTAGE_API_KEY;
 
     if (typeof apiKey !== "string" || apiKey.trim() === "") {
-      await writer?.write({ type: 'data-tool-progress', data: { message: '❌ Missing ALPHA_VANTAGE_API_KEY' } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: '❌ Missing ALPHA_VANTAGE_API_KEY' } });
       return {
         data: null,
         error: "ALPHA_VANTAGE_API_KEY environment variable is required"
@@ -488,7 +489,7 @@ export const alphaVantageTool = createTool({
         params.append("function", context.economic_indicator);
       }
 
-      await writer?.write({ type: 'progress', data: { message: '📡 Querying Alpha Vantage API...' } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: '📡 Querying Alpha Vantage API...' } });
 
       const url = `https://www.alphavantage.co/query?${params.toString()}`;
 
@@ -524,7 +525,7 @@ export const alphaVantageTool = createTool({
 
       const metadataObj = metadata as unknown;
 
-      await writer?.write({ type: 'progress', data: { message: `✅ General data ready for ${context.function}` } });
+      await writer?.custom({ type: 'data-tool-progress', data: { message: `✅ General data ready for ${context.function}` } });
 
       const result = {
         data,

src/mastra/tools/arxiv.tool.ts

@@ -1,5 +1,6 @@
 import { AISpanType, InternalSpans } from "@mastra/core/ai-tracing";
-import { InferUITool, createTool } from "@mastra/core/tools";
+import type { InferUITool} from "@mastra/core/tools";
+import { createTool } from "@mastra/core/tools";
 import { z } from "zod";
 
 // In-memory counter to track tool calls per request

src/mastra/tools/browser-tool.ts

@@ -2,17 +2,19 @@
  * Not working
 */
 import { AISpanType, InternalSpans } from '@mastra/core/ai-tracing';
-import { InferUITool, createTool } from "@mastra/core/tools";
+import type { InferUITool} from "@mastra/core/tools";
+import { createTool } from "@mastra/core/tools";
 import { MDocument } from '@mastra/rag';
-import { Browser, chromium } from 'playwright-core';
+import type { Browser} from 'playwright-core';
+import { chromium } from 'playwright-core';
 import { z } from 'zod';
 import { log } from '../config/logger';
 
 // Browser instance cache for reuse
 let browserInstance: Browser | null = null;
 
 async function getBrowser(): Promise<Browser> {
-  if (!browserInstance || !browserInstance.isConnected()) {
+  if (!browserInstance?.isConnected()) {
     browserInstance = await chromium.launch({
       headless: true,
       chromiumSandbox: false,
@@ -423,7 +425,7 @@ export const extractTablesTool = createTool({
           bodyRows.forEach(row => {
             const rowData: string[] = [];
             row.querySelectorAll('td').forEach(cell => rowData.push(cell.textContent?.trim() ?? ''));
-            if (rowData.length > 0) rows.push(rowData);
+            if (rowData.length > 0) {rows.push(rowData);}
           });
 
           result.push({ headers, rows });
@@ -480,7 +482,7 @@ export const monitorPageTool = createTool({
       const selector = context.selector ?? 'body';
 
       await page.goto(context.url, { waitUntil: 'domcontentloaded' });
-      let previousContent = await page.$eval(selector, el => el.textContent ?? '');
+      const previousContent = await page.$eval(selector, el => el.textContent ?? '');
 
       let checkCount = 0;
       let changed = false;