@mastra/rag 0.10.1-alpha.1 → 0.10.2-alpha.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/rag@0.10.1-alpha.1 build /home/runner/work/mastra/mastra/packages/rag
+> @mastra/rag@0.10.2-alpha.0 build /home/runner/work/mastra/mastra/packages/rag
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.4.0
 TSC Build start
-TSC ⚡️ Build success in 15915ms
+TSC ⚡️ Build success in 13387ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/rag/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/rag/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 14168ms
+DTS ⚡️ Build success in 10836ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs 239.65 KB
-CJS ⚡️ Build success in 4626ms
-ESM dist/index.js 237.94 KB
-ESM ⚡️ Build success in 4627ms
+ESM dist/index.js 239.65 KB
+ESM ⚡️ Build success in 3608ms
+CJS dist/index.cjs 241.36 KB
+CJS ⚡️ Build success in 3609ms

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @mastra/rag
 
+## 0.10.2-alpha.0
+
+### Patch Changes
+
+- f0d559f: Fix peerdeps for alpha channel
+- Updated dependencies [1e8bb40]
+  - @mastra/core@0.10.2-alpha.2
+
+## 0.10.1
+
+### Patch Changes
+
+- 8784cef: Changed stripHeaders for markdown chunking to strip headers correctly from output when true
+- f56fd29: added return type for vector-query and graph-rag
+- Updated dependencies [d70b807]
+- Updated dependencies [6d16390]
+- Updated dependencies [1e4a421]
+- Updated dependencies [200d0da]
+- Updated dependencies [bf5f17b]
+- Updated dependencies [5343f93]
+- Updated dependencies [38aee50]
+- Updated dependencies [5c41100]
+- Updated dependencies [d6a759b]
+- Updated dependencies [6015bdf]
+  - @mastra/core@0.10.1
+
 ## 0.10.1-alpha.1
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -174,21 +174,7 @@ export { createDocumentChunkerTool }
 export { createDocumentChunkerTool as createDocumentChunkerTool_alias_1 }
 export { createDocumentChunkerTool as createDocumentChunkerTool_alias_2 }
 
-declare const createGraphRAGTool: ({ vectorStoreName, indexName, model, enableFilter, includeSources, graphOptions, id, description, }: {
-    vectorStoreName: string;
-    indexName: string;
-    model: EmbeddingModel<string>;
-    enableFilter?: boolean;
-    includeSources?: boolean;
-    graphOptions?: {
-        dimension?: number;
-        randomWalkSteps?: number;
-        restartProb?: number;
-        threshold?: number;
-    };
-    id?: string;
-    description?: string;
-}) => RagTool<z.ZodObject<{
+declare const createGraphRAGTool: (options: GraphRagToolOptions) => RagTool<z.ZodObject<{
     filter: z.ZodString;
     queryText: z.ZodString;
     topK: z.ZodNumber;
@@ -214,17 +200,7 @@ export { createGraphRAGTool }
 export { createGraphRAGTool as createGraphRAGTool_alias_1 }
 export { createGraphRAGTool as createGraphRAGTool_alias_2 }
 
-declare const createVectorQueryTool: ({ vectorStoreName, indexName, model, enableFilter, includeVectors, includeSources, reranker, id, description, }: {
-    vectorStoreName: string;
-    indexName: string;
-    model: EmbeddingModel<string>;
-    enableFilter?: boolean;
-    includeVectors?: boolean;
-    includeSources?: boolean;
-    reranker?: RerankConfig;
-    id?: string;
-    description?: string;
-}) => RagTool<z.ZodObject<{
+declare const createVectorQueryTool: (options: VectorQueryToolOptions) => RagTool<z.ZodObject<{
     filter: z.ZodString;
     queryText: z.ZodString;
     topK: z.ZodNumber;
@@ -250,6 +226,25 @@ export { createVectorQueryTool }
 export { createVectorQueryTool as createVectorQueryTool_alias_1 }
 export { createVectorQueryTool as createVectorQueryTool_alias_2 }
 
+/**
+ * Default options for GraphRAG
+ * @default
+ * ```json
+ * {
+ *   "dimension": 1536,
+ *   "randomWalkSteps": 100,
+ *   "restartProb": 0.15,
+ *   "threshold": 0.7
+ * }
+ * ```
+ */
+export declare const defaultGraphOptions: {
+    dimension: number;
+    randomWalkSteps: number;
+    restartProb: number;
+    threshold: number;
+};
+
 declare const defaultGraphRagDescription: () => string;
 export { defaultGraphRagDescription }
 export { defaultGraphRagDescription as defaultGraphRagDescription_alias_1 }
@@ -403,6 +398,22 @@ declare class GraphRAG {
 export { GraphRAG }
 export { GraphRAG as GraphRAG_alias_1 }
 
+export declare type GraphRagToolOptions = {
+    id?: string;
+    description?: string;
+    indexName: string;
+    vectorStoreName: string;
+    model: EmbeddingModel<string>;
+    enableFilter?: boolean;
+    includeSources?: boolean;
+    graphOptions?: {
+        dimension?: number;
+        randomWalkSteps?: number;
+        restartProb?: number;
+        threshold?: number;
+    };
+};
+
 export declare class HTMLHeaderTransformer {
     private headersToSplitOn;
     private returnEachElement;
@@ -1165,6 +1176,18 @@ declare interface VectorQuerySearchResult {
     queryEmbedding: number[];
 }
 
+export declare type VectorQueryToolOptions = {
+    id?: string;
+    description?: string;
+    indexName: string;
+    vectorStoreName: string;
+    model: EmbeddingModel<string>;
+    enableFilter?: boolean;
+    includeVectors?: boolean;
+    includeSources?: boolean;
+    reranker?: RerankConfig;
+};
+
 declare type WeightConfig = {
     semantic?: number;
     vector?: number;

package/dist/_tsup-dts-rollup.d.ts

@@ -174,21 +174,7 @@ export { createDocumentChunkerTool }
 export { createDocumentChunkerTool as createDocumentChunkerTool_alias_1 }
 export { createDocumentChunkerTool as createDocumentChunkerTool_alias_2 }
 
-declare const createGraphRAGTool: ({ vectorStoreName, indexName, model, enableFilter, includeSources, graphOptions, id, description, }: {
-    vectorStoreName: string;
-    indexName: string;
-    model: EmbeddingModel<string>;
-    enableFilter?: boolean;
-    includeSources?: boolean;
-    graphOptions?: {
-        dimension?: number;
-        randomWalkSteps?: number;
-        restartProb?: number;
-        threshold?: number;
-    };
-    id?: string;
-    description?: string;
-}) => RagTool<z.ZodObject<{
+declare const createGraphRAGTool: (options: GraphRagToolOptions) => RagTool<z.ZodObject<{
     filter: z.ZodString;
     queryText: z.ZodString;
     topK: z.ZodNumber;
@@ -214,17 +200,7 @@ export { createGraphRAGTool }
 export { createGraphRAGTool as createGraphRAGTool_alias_1 }
 export { createGraphRAGTool as createGraphRAGTool_alias_2 }
 
-declare const createVectorQueryTool: ({ vectorStoreName, indexName, model, enableFilter, includeVectors, includeSources, reranker, id, description, }: {
-    vectorStoreName: string;
-    indexName: string;
-    model: EmbeddingModel<string>;
-    enableFilter?: boolean;
-    includeVectors?: boolean;
-    includeSources?: boolean;
-    reranker?: RerankConfig;
-    id?: string;
-    description?: string;
-}) => RagTool<z.ZodObject<{
+declare const createVectorQueryTool: (options: VectorQueryToolOptions) => RagTool<z.ZodObject<{
     filter: z.ZodString;
     queryText: z.ZodString;
     topK: z.ZodNumber;
@@ -250,6 +226,25 @@ export { createVectorQueryTool }
 export { createVectorQueryTool as createVectorQueryTool_alias_1 }
 export { createVectorQueryTool as createVectorQueryTool_alias_2 }
 
+/**
+ * Default options for GraphRAG
+ * @default
+ * ```json
+ * {
+ *   "dimension": 1536,
+ *   "randomWalkSteps": 100,
+ *   "restartProb": 0.15,
+ *   "threshold": 0.7
+ * }
+ * ```
+ */
+export declare const defaultGraphOptions: {
+    dimension: number;
+    randomWalkSteps: number;
+    restartProb: number;
+    threshold: number;
+};
+
 declare const defaultGraphRagDescription: () => string;
 export { defaultGraphRagDescription }
 export { defaultGraphRagDescription as defaultGraphRagDescription_alias_1 }
@@ -403,6 +398,22 @@ declare class GraphRAG {
 export { GraphRAG }
 export { GraphRAG as GraphRAG_alias_1 }
 
+export declare type GraphRagToolOptions = {
+    id?: string;
+    description?: string;
+    indexName: string;
+    vectorStoreName: string;
+    model: EmbeddingModel<string>;
+    enableFilter?: boolean;
+    includeSources?: boolean;
+    graphOptions?: {
+        dimension?: number;
+        randomWalkSteps?: number;
+        restartProb?: number;
+        threshold?: number;
+    };
+};
+
 export declare class HTMLHeaderTransformer {
     private headersToSplitOn;
     private returnEachElement;
@@ -1165,6 +1176,18 @@ declare interface VectorQuerySearchResult {
     queryEmbedding: number[];
 }
 
+export declare type VectorQueryToolOptions = {
+    id?: string;
+    description?: string;
+    indexName: string;
+    vectorStoreName: string;
+    model: EmbeddingModel<string>;
+    enableFilter?: boolean;
+    includeVectors?: boolean;
+    includeSources?: boolean;
+    reranker?: RerankConfig;
+};
+
 declare type WeightConfig = {
     semantic?: number;
     vector?: number;

package/dist/index.cjs

@@ -6334,33 +6334,43 @@ var convertToSources = (results) => {
   });
 };
 
+// src/tools/types.ts
+var defaultGraphOptions = {
+  dimension: 1536,
+  randomWalkSteps: 100,
+  restartProb: 0.15,
+  threshold: 0.7
+};
+
 // src/tools/graph-rag.ts
-var createGraphRAGTool = ({
-  vectorStoreName,
-  indexName,
-  model,
-  enableFilter = false,
-  includeSources = true,
-  graphOptions = {
-    dimension: 1536,
-    randomWalkSteps: 100,
-    restartProb: 0.15,
-    threshold: 0.7
-  },
-  id,
-  description
-}) => {
-  const toolId = id || `GraphRAG ${vectorStoreName} ${indexName} Tool`;
+var createGraphRAGTool = (options) => {
+  const { model, id, description } = options;
+  const toolId = id || `GraphRAG ${options.vectorStoreName} ${options.indexName} Tool`;
   const toolDescription = description || defaultGraphRagDescription();
+  const graphOptions = {
+    ...defaultGraphOptions,
+    ...options.graphOptions || {}
+  };
   const graphRag = new GraphRAG(graphOptions.dimension, graphOptions.threshold);
   let isInitialized = false;
-  const inputSchema = enableFilter ? filterSchema : zod.z.object(baseSchema).passthrough();
+  const inputSchema = options.enableFilter ? filterSchema : zod.z.object(baseSchema).passthrough();
   return tools.createTool({
     id: toolId,
     inputSchema,
     outputSchema,
     description: toolDescription,
-    execute: async ({ context: { queryText, topK, filter }, mastra }) => {
+    execute: async ({ context, mastra, runtimeContext }) => {
+      const indexName = runtimeContext.get("indexName") ?? options.indexName;
+      const vectorStoreName = runtimeContext.get("vectorStoreName") ?? options.vectorStoreName;
+      if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
+      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
+      const includeSources = runtimeContext.get("includeSources") ?? options.includeSources ?? true;
+      const randomWalkSteps = runtimeContext.get("randomWalkSteps") ?? graphOptions.randomWalkSteps;
+      const restartProb = runtimeContext.get("restartProb") ?? graphOptions.restartProb;
+      const topK = runtimeContext.get("topK") ?? context.topK ?? 10;
+      const filter = runtimeContext.get("filter") ?? context.filter;
+      const queryText = context.queryText;
+      const enableFilter = !!runtimeContext.get("filter") || (options.enableFilter ?? false);
       const logger = mastra?.getLogger();
       if (!logger) {
         console.warn(
@@ -6426,8 +6436,8 @@ var createGraphRAGTool = ({
         const rerankedResults = graphRag.query({
           query: queryEmbedding,
           topK: topKValue,
-          randomWalkSteps: graphOptions.randomWalkSteps,
-          restartProb: graphOptions.restartProb
+          randomWalkSteps,
+          restartProb
         });
         if (logger) {
           logger.debug("GraphRAG query returned results", { count: rerankedResults.length });
@@ -6455,26 +6465,28 @@ var createGraphRAGTool = ({
     // Use any for output schema as the structure of the output causes type inference issues
   });
 };
-var createVectorQueryTool = ({
-  vectorStoreName,
-  indexName,
-  model,
-  enableFilter = false,
-  includeVectors = false,
-  includeSources = true,
-  reranker,
-  id,
-  description
-}) => {
-  const toolId = id || `VectorQuery ${vectorStoreName} ${indexName} Tool`;
+var createVectorQueryTool = (options) => {
+  const { model, id, description } = options;
+  const toolId = id || `VectorQuery ${options.vectorStoreName} ${options.indexName} Tool`;
   const toolDescription = description || defaultVectorQueryDescription();
-  const inputSchema = enableFilter ? filterSchema : zod.z.object(baseSchema).passthrough();
+  const inputSchema = options.enableFilter ? filterSchema : zod.z.object(baseSchema).passthrough();
   return tools.createTool({
     id: toolId,
+    description: toolDescription,
     inputSchema,
     outputSchema,
-    description: toolDescription,
-    execute: async ({ context: { queryText, topK, filter }, mastra }) => {
+    execute: async ({ context, mastra, runtimeContext }) => {
+      const indexName = runtimeContext.get("indexName") ?? options.indexName;
+      const vectorStoreName = runtimeContext.get("vectorStoreName") ?? options.vectorStoreName;
+      const includeVectors = runtimeContext.get("includeVectors") ?? options.includeVectors ?? false;
+      const includeSources = runtimeContext.get("includeSources") ?? options.includeSources ?? true;
+      const reranker = runtimeContext.get("reranker") ?? options.reranker;
+      if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
+      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
+      const topK = runtimeContext.get("topK") ?? context.topK ?? 10;
+      const filter = runtimeContext.get("filter") ?? context.filter;
+      const queryText = context.queryText;
+      const enableFilter = !!runtimeContext.get("filter") || (options.enableFilter ?? false);
       const logger = mastra?.getLogger();
       if (!logger) {
         console.warn(

package/dist/index.js

@@ -6332,33 +6332,43 @@ var convertToSources = (results) => {
   });
 };
 
+// src/tools/types.ts
+var defaultGraphOptions = {
+  dimension: 1536,
+  randomWalkSteps: 100,
+  restartProb: 0.15,
+  threshold: 0.7
+};
+
 // src/tools/graph-rag.ts
-var createGraphRAGTool = ({
-  vectorStoreName,
-  indexName,
-  model,
-  enableFilter = false,
-  includeSources = true,
-  graphOptions = {
-    dimension: 1536,
-    randomWalkSteps: 100,
-    restartProb: 0.15,
-    threshold: 0.7
-  },
-  id,
-  description
-}) => {
-  const toolId = id || `GraphRAG ${vectorStoreName} ${indexName} Tool`;
+var createGraphRAGTool = (options) => {
+  const { model, id, description } = options;
+  const toolId = id || `GraphRAG ${options.vectorStoreName} ${options.indexName} Tool`;
   const toolDescription = description || defaultGraphRagDescription();
+  const graphOptions = {
+    ...defaultGraphOptions,
+    ...options.graphOptions || {}
+  };
   const graphRag = new GraphRAG(graphOptions.dimension, graphOptions.threshold);
   let isInitialized = false;
-  const inputSchema = enableFilter ? filterSchema : z.object(baseSchema).passthrough();
+  const inputSchema = options.enableFilter ? filterSchema : z.object(baseSchema).passthrough();
   return createTool({
     id: toolId,
     inputSchema,
     outputSchema,
     description: toolDescription,
-    execute: async ({ context: { queryText, topK, filter }, mastra }) => {
+    execute: async ({ context, mastra, runtimeContext }) => {
+      const indexName = runtimeContext.get("indexName") ?? options.indexName;
+      const vectorStoreName = runtimeContext.get("vectorStoreName") ?? options.vectorStoreName;
+      if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
+      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
+      const includeSources = runtimeContext.get("includeSources") ?? options.includeSources ?? true;
+      const randomWalkSteps = runtimeContext.get("randomWalkSteps") ?? graphOptions.randomWalkSteps;
+      const restartProb = runtimeContext.get("restartProb") ?? graphOptions.restartProb;
+      const topK = runtimeContext.get("topK") ?? context.topK ?? 10;
+      const filter = runtimeContext.get("filter") ?? context.filter;
+      const queryText = context.queryText;
+      const enableFilter = !!runtimeContext.get("filter") || (options.enableFilter ?? false);
       const logger = mastra?.getLogger();
       if (!logger) {
         console.warn(
@@ -6424,8 +6434,8 @@ var createGraphRAGTool = ({
         const rerankedResults = graphRag.query({
           query: queryEmbedding,
           topK: topKValue,
-          randomWalkSteps: graphOptions.randomWalkSteps,
-          restartProb: graphOptions.restartProb
+          randomWalkSteps,
+          restartProb
         });
         if (logger) {
           logger.debug("GraphRAG query returned results", { count: rerankedResults.length });
@@ -6453,26 +6463,28 @@ var createGraphRAGTool = ({
     // Use any for output schema as the structure of the output causes type inference issues
   });
 };
-var createVectorQueryTool = ({
-  vectorStoreName,
-  indexName,
-  model,
-  enableFilter = false,
-  includeVectors = false,
-  includeSources = true,
-  reranker,
-  id,
-  description
-}) => {
-  const toolId = id || `VectorQuery ${vectorStoreName} ${indexName} Tool`;
+var createVectorQueryTool = (options) => {
+  const { model, id, description } = options;
+  const toolId = id || `VectorQuery ${options.vectorStoreName} ${options.indexName} Tool`;
   const toolDescription = description || defaultVectorQueryDescription();
-  const inputSchema = enableFilter ? filterSchema : z.object(baseSchema).passthrough();
+  const inputSchema = options.enableFilter ? filterSchema : z.object(baseSchema).passthrough();
   return createTool({
     id: toolId,
+    description: toolDescription,
     inputSchema,
     outputSchema,
-    description: toolDescription,
-    execute: async ({ context: { queryText, topK, filter }, mastra }) => {
+    execute: async ({ context, mastra, runtimeContext }) => {
+      const indexName = runtimeContext.get("indexName") ?? options.indexName;
+      const vectorStoreName = runtimeContext.get("vectorStoreName") ?? options.vectorStoreName;
+      const includeVectors = runtimeContext.get("includeVectors") ?? options.includeVectors ?? false;
+      const includeSources = runtimeContext.get("includeSources") ?? options.includeSources ?? true;
+      const reranker = runtimeContext.get("reranker") ?? options.reranker;
+      if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
+      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
+      const topK = runtimeContext.get("topK") ?? context.topK ?? 10;
+      const filter = runtimeContext.get("filter") ?? context.filter;
+      const queryText = context.queryText;
+      const enableFilter = !!runtimeContext.get("filter") || (options.enableFilter ?? false);
       const logger = mastra?.getLogger();
       if (!logger) {
         console.warn(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/rag",
-  "version": "0.10.1-alpha.1",
+  "version": "0.10.2-alpha.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
   },
   "peerDependencies": {
     "ai": "^4.0.0",
-    "@mastra/core": "^0.10.0"
+    "@mastra/core": "^0.10.0-alpha.0"
   },
   "devDependencies": {
     "@ai-sdk/cohere": "latest",
@@ -44,8 +44,8 @@
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
-    "@internal/lint": "0.0.6",
-    "@mastra/core": "0.10.1-alpha.0"
+    "@internal/lint": "0.0.7",
+    "@mastra/core": "0.10.2-alpha.2"
   },
   "keywords": [
     "rag",

package/src/tools/graph-rag.test.ts

@@ -0,0 +1,115 @@
+import { RuntimeContext } from '@mastra/core/runtime-context';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { GraphRAG } from '../graph-rag';
+import { vectorQuerySearch } from '../utils';
+import { createGraphRAGTool } from './graph-rag';
+
+vi.mock('../utils', async importOriginal => {
+  const actual: any = await importOriginal();
+  return {
+    ...actual,
+    vectorQuerySearch: vi.fn().mockResolvedValue({
+      results: [
+        { metadata: { text: 'foo' }, vector: [1, 2, 3] },
+        { metadata: { text: 'bar' }, vector: [4, 5, 6] },
+      ],
+      queryEmbedding: [1, 2, 3],
+    }),
+  };
+});
+
+vi.mock('../graph-rag', async importOriginal => {
+  const actual: any = await importOriginal();
+  return {
+    ...actual,
+    GraphRAG: vi.fn().mockImplementation(() => {
+      return {
+        createGraph: vi.fn(),
+        query: vi.fn(() => [
+          { content: 'foo', metadata: { text: 'foo' } },
+          { content: 'bar', metadata: { text: 'bar' } },
+        ]),
+      };
+    }),
+  };
+});
+
+const mockModel = { name: 'test-model' } as any;
+const mockMastra = {
+  getVector: vi.fn(storeName => ({
+    [storeName]: {},
+  })),
+  getLogger: vi.fn(() => ({
+    debug: vi.fn(),
+    warn: vi.fn(),
+    info: vi.fn(),
+    error: vi.fn(),
+  })),
+};
+
+describe('createGraphRAGTool', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('validates input schema', () => {
+    const tool = createGraphRAGTool({
+      id: 'test',
+      model: mockModel,
+      vectorStoreName: 'testStore',
+      indexName: 'testIndex',
+    });
+    expect(() => tool.inputSchema?.parse({ queryText: 'foo', topK: 10 })).not.toThrow();
+    expect(() => tool.inputSchema?.parse({})).toThrow();
+  });
+
+  describe('runtimeContext', () => {
+    it('calls vectorQuerySearch and GraphRAG with runtimeContext params', async () => {
+      const tool = createGraphRAGTool({
+        id: 'test',
+        model: mockModel,
+        indexName: 'testIndex',
+        vectorStoreName: 'testStore',
+      });
+      const runtimeContext = new RuntimeContext();
+      runtimeContext.set('indexName', 'anotherIndex');
+      runtimeContext.set('vectorStoreName', 'anotherStore');
+      runtimeContext.set('topK', 5);
+      runtimeContext.set('filter', { foo: 'bar' });
+      runtimeContext.set('randomWalkSteps', 99);
+      runtimeContext.set('restartProb', 0.42);
+      const result = await tool.execute({
+        context: { queryText: 'foo', topK: 2 },
+        mastra: mockMastra as any,
+        runtimeContext,
+      });
+      expect(result.relevantContext).toEqual(['foo', 'bar']);
+      expect(result.sources.length).toBe(2);
+      expect(vectorQuerySearch).toHaveBeenCalledWith(
+        expect.objectContaining({
+          indexName: 'anotherIndex',
+          vectorStore: {
+            anotherStore: {},
+          },
+          queryText: 'foo',
+          model: mockModel,
+          queryFilter: { foo: 'bar' },
+          topK: 5,
+          includeVectors: true,
+        }),
+      );
+      // GraphRAG createGraph and query should be called
+      expect(GraphRAG).toHaveBeenCalled();
+      const instance = (GraphRAG as any).mock.results[0].value;
+      expect(instance.createGraph).toHaveBeenCalled();
+      expect(instance.query).toHaveBeenCalledWith(
+        expect.objectContaining({
+          query: [1, 2, 3],
+          topK: 5,
+          randomWalkSteps: 99,
+          restartProb: 0.42,
+        }),
+      );
+    });
+  });
+});

package/src/tools/graph-rag.ts

@@ -1,55 +1,47 @@
 import { createTool } from '@mastra/core/tools';
-import type { EmbeddingModel } from 'ai';
 import { z } from 'zod';
 
 import { GraphRAG } from '../graph-rag';
 import { vectorQuerySearch, defaultGraphRagDescription, filterSchema, outputSchema, baseSchema } from '../utils';
 import type { RagTool } from '../utils';
 import { convertToSources } from '../utils/convert-sources';
+import type { GraphRagToolOptions } from './types';
+import { defaultGraphOptions } from './types';
 
-export const createGraphRAGTool = ({
-  vectorStoreName,
-  indexName,
-  model,
-  enableFilter = false,
-  includeSources = true,
-  graphOptions = {
-    dimension: 1536,
-    randomWalkSteps: 100,
-    restartProb: 0.15,
-    threshold: 0.7,
-  },
-  id,
-  description,
-}: {
-  vectorStoreName: string;
-  indexName: string;
-  model: EmbeddingModel<string>;
-  enableFilter?: boolean;
-  includeSources?: boolean;
-  graphOptions?: {
-    dimension?: number;
-    randomWalkSteps?: number;
-    restartProb?: number;
-    threshold?: number;
-  };
-  id?: string;
-  description?: string;
-}) => {
-  const toolId = id || `GraphRAG ${vectorStoreName} ${indexName} Tool`;
+export const createGraphRAGTool = (options: GraphRagToolOptions) => {
+  const { model, id, description } = options;
+
+  const toolId = id || `GraphRAG ${options.vectorStoreName} ${options.indexName} Tool`;
   const toolDescription = description || defaultGraphRagDescription();
+  const graphOptions = {
+    ...defaultGraphOptions,
+    ...(options.graphOptions || {}),
+  };
   // Initialize GraphRAG
   const graphRag = new GraphRAG(graphOptions.dimension, graphOptions.threshold);
   let isInitialized = false;
 
-  const inputSchema = enableFilter ? filterSchema : z.object(baseSchema).passthrough();
+  const inputSchema = options.enableFilter ? filterSchema : z.object(baseSchema).passthrough();
 
   return createTool({
     id: toolId,
     inputSchema,
     outputSchema,
     description: toolDescription,
-    execute: async ({ context: { queryText, topK, filter }, mastra }) => {
+    execute: async ({ context, mastra, runtimeContext }) => {
+      const indexName: string = runtimeContext.get('indexName') ?? options.indexName;
+      const vectorStoreName: string = runtimeContext.get('vectorStoreName') ?? options.vectorStoreName;
+      if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
+      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
+      const includeSources: boolean = runtimeContext.get('includeSources') ?? options.includeSources ?? true;
+      const randomWalkSteps: number | undefined = runtimeContext.get('randomWalkSteps') ?? graphOptions.randomWalkSteps;
+      const restartProb: number | undefined = runtimeContext.get('restartProb') ?? graphOptions.restartProb;
+      const topK: number = runtimeContext.get('topK') ?? context.topK ?? 10;
+      const filter: Record<string, any> = runtimeContext.get('filter') ?? context.filter;
+      const queryText = context.queryText;
+
+      const enableFilter = !!runtimeContext.get('filter') || (options.enableFilter ?? false);
+
       const logger = mastra?.getLogger();
       if (!logger) {
         console.warn(
@@ -129,8 +121,8 @@ export const createGraphRAGTool = ({
         const rerankedResults = graphRag.query({
           query: queryEmbedding,
           topK: topKValue,
-          randomWalkSteps: graphOptions.randomWalkSteps,
-          restartProb: graphOptions.restartProb,
+          randomWalkSteps,
+          restartProb,
         });
         if (logger) {
           logger.debug('GraphRAG query returned results', { count: rerankedResults.length });

package/src/tools/types.ts

@@ -0,0 +1,49 @@
+import type { EmbeddingModel } from 'ai';
+import type { RerankConfig } from '../rerank';
+
+export type VectorQueryToolOptions = {
+  id?: string;
+  description?: string;
+  indexName: string;
+  vectorStoreName: string;
+  model: EmbeddingModel<string>;
+  enableFilter?: boolean;
+  includeVectors?: boolean;
+  includeSources?: boolean;
+  reranker?: RerankConfig;
+};
+
+export type GraphRagToolOptions = {
+  id?: string;
+  description?: string;
+  indexName: string;
+  vectorStoreName: string;
+  model: EmbeddingModel<string>;
+  enableFilter?: boolean;
+  includeSources?: boolean;
+  graphOptions?: {
+    dimension?: number;
+    randomWalkSteps?: number;
+    restartProb?: number;
+    threshold?: number;
+  };
+};
+
+/**
+ * Default options for GraphRAG
+ * @default
+ * ```json
+ * {
+ *   "dimension": 1536,
+ *   "randomWalkSteps": 100,
+ *   "restartProb": 0.15,
+ *   "threshold": 0.7
+ * }
+ * ```
+ */
+export const defaultGraphOptions = {
+  dimension: 1536,
+  randomWalkSteps: 100,
+  restartProb: 0.15,
+  threshold: 0.7,
+};

package/src/tools/vector-query.test.ts

@@ -1,4 +1,6 @@
+import { RuntimeContext } from '@mastra/core/runtime-context';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { rerank } from '../rerank';
 import { vectorQuerySearch } from '../utils';
 import { createVectorQueryTool } from './vector-query';
 
@@ -6,7 +8,19 @@ vi.mock('../utils', async importOriginal => {
   const actual: any = await importOriginal();
   return {
     ...actual,
-    vectorQuerySearch: vi.fn().mockResolvedValue({ results: [] }),
+    vectorQuerySearch: vi.fn().mockResolvedValue({ results: [{ metadata: { text: 'foo' }, vector: [1, 2, 3] }] }),
+  };
+});
+
+vi.mock('../rerank', async importOriginal => {
+  const actual: any = await importOriginal();
+  return {
+    ...actual,
+    rerank: vi
+      .fn()
+      .mockResolvedValue([
+        { result: { id: '1', metadata: { text: 'bar' }, score: 1, details: { semantic: 1, vector: 1, position: 1 } } },
+      ]),
   };
 });
 
@@ -17,9 +31,12 @@ describe('createVectorQueryTool', () => {
       testStore: {
         // Mock vector store methods
       },
+      anotherStore: {
+        // Mock vector store methods
+      },
     },
-    getVector: vi.fn(() => ({
-      testStore: {
+    getVector: vi.fn(storeName => ({
+      [storeName]: {
         // Mock vector store methods
       },
     })),
@@ -154,6 +171,8 @@ describe('createVectorQueryTool', () => {
 
   describe('execute function', () => {
     it('should not process filter when enableFilter is false', async () => {
+      const runtimeContext = new RuntimeContext();
+
       // Create tool with enableFilter set to false
       const tool = createVectorQueryTool({
         vectorStoreName: 'testStore',
@@ -169,7 +188,7 @@ describe('createVectorQueryTool', () => {
           topK: 5,
         },
         mastra: mockMastra as any,
-        runtimeContext: {} as any,
+        runtimeContext,
       });
 
       // Check that vectorQuerySearch was called with undefined queryFilter
@@ -181,6 +200,7 @@ describe('createVectorQueryTool', () => {
     });
 
     it('should process filter when enableFilter is true and filter is provided', async () => {
+      const runtimeContext = new RuntimeContext();
       // Create tool with enableFilter set to true
       const tool = createVectorQueryTool({
         vectorStoreName: 'testStore',
@@ -199,7 +219,7 @@ describe('createVectorQueryTool', () => {
           filter: filterJson,
         },
         mastra: mockMastra as any,
-        runtimeContext: {} as any,
+        runtimeContext,
       });
 
       // Check that vectorQuerySearch was called with the parsed filter
@@ -211,6 +231,7 @@ describe('createVectorQueryTool', () => {
     });
 
     it('should handle string filters correctly', async () => {
+      const runtimeContext = new RuntimeContext();
       // Create tool with enableFilter set to true
       const tool = createVectorQueryTool({
         vectorStoreName: 'testStore',
@@ -229,7 +250,7 @@ describe('createVectorQueryTool', () => {
           filter: stringFilter,
         },
         mastra: mockMastra as any,
-        runtimeContext: {} as any,
+        runtimeContext,
       });
 
       // Since this is not a valid filter, it should be ignored
@@ -240,4 +261,69 @@ describe('createVectorQueryTool', () => {
       );
     });
   });
+
+  describe('runtimeContext', () => {
+    it('calls vectorQuerySearch with runtimeContext params', async () => {
+      const tool = createVectorQueryTool({
+        id: 'test',
+        model: mockModel,
+        indexName: 'testIndex',
+        vectorStoreName: 'testStore',
+      });
+      const runtimeContext = new RuntimeContext();
+      runtimeContext.set('indexName', 'anotherIndex');
+      runtimeContext.set('vectorStoreName', 'anotherStore');
+      runtimeContext.set('topK', 3);
+      runtimeContext.set('filter', { foo: 'bar' });
+      runtimeContext.set('includeVectors', true);
+      runtimeContext.set('includeSources', false);
+      const result = await tool.execute({
+        context: { queryText: 'foo', topK: 6 },
+        mastra: mockMastra as any,
+        runtimeContext,
+      });
+      expect(result.relevantContext.length).toBeGreaterThan(0);
+      expect(result.sources).toEqual([]); // includeSources false
+      expect(vectorQuerySearch).toHaveBeenCalledWith(
+        expect.objectContaining({
+          indexName: 'anotherIndex',
+          vectorStore: {
+            anotherStore: {},
+          },
+          queryText: 'foo',
+          model: mockModel,
+          queryFilter: { foo: 'bar' },
+          topK: 3,
+          includeVectors: true,
+        }),
+      );
+    });
+
+    it('handles reranker from runtimeContext', async () => {
+      const tool = createVectorQueryTool({
+        id: 'test',
+        model: mockModel,
+        indexName: 'testIndex',
+        vectorStoreName: 'testStore',
+      });
+      const runtimeContext = new RuntimeContext();
+      runtimeContext.set('indexName', 'testIndex');
+      runtimeContext.set('vectorStoreName', 'testStore');
+      runtimeContext.set('reranker', { model: 'reranker-model', options: { topK: 1 } });
+      // Mock rerank
+      vi.mocked(rerank).mockResolvedValue([
+        {
+          result: { id: '1', metadata: { text: 'bar' }, score: 1 },
+          score: 1,
+          details: { semantic: 1, vector: 1, position: 1 },
+        },
+      ]);
+      const result = await tool.execute({
+        context: { queryText: 'foo', topK: 1 },
+        mastra: mockMastra as any,
+        runtimeContext,
+      });
+      expect(result.relevantContext[0]).toEqual({ text: 'bar' });
+    });
+  });
 });

package/src/tools/vector-query.ts

@@ -1,5 +1,4 @@
 import { createTool } from '@mastra/core/tools';
-import type { EmbeddingModel } from 'ai';
 import { z } from 'zod';
 
 import { rerank } from '../rerank';
@@ -7,37 +6,33 @@ import type { RerankConfig } from '../rerank';
 import { vectorQuerySearch, defaultVectorQueryDescription, filterSchema, outputSchema, baseSchema } from '../utils';
 import type { RagTool } from '../utils';
 import { convertToSources } from '../utils/convert-sources';
+import type { VectorQueryToolOptions } from './types';
 
-export const createVectorQueryTool = ({
-  vectorStoreName,
-  indexName,
-  model,
-  enableFilter = false,
-  includeVectors = false,
-  includeSources = true,
-  reranker,
-  id,
-  description,
-}: {
-  vectorStoreName: string;
-  indexName: string;
-  model: EmbeddingModel<string>;
-  enableFilter?: boolean;
-  includeVectors?: boolean;
-  includeSources?: boolean;
-  reranker?: RerankConfig;
-  id?: string;
-  description?: string;
-}) => {
-  const toolId = id || `VectorQuery ${vectorStoreName} ${indexName} Tool`;
+export const createVectorQueryTool = (options: VectorQueryToolOptions) => {
+  const { model, id, description } = options;
+  const toolId = id || `VectorQuery ${options.vectorStoreName} ${options.indexName} Tool`;
   const toolDescription = description || defaultVectorQueryDescription();
-  const inputSchema = enableFilter ? filterSchema : z.object(baseSchema).passthrough();
+  const inputSchema = options.enableFilter ? filterSchema : z.object(baseSchema).passthrough();
+
   return createTool({
     id: toolId,
+    description: toolDescription,
     inputSchema,
     outputSchema,
-    description: toolDescription,
-    execute: async ({ context: { queryText, topK, filter }, mastra }) => {
+    execute: async ({ context, mastra, runtimeContext }) => {
+      const indexName: string = runtimeContext.get('indexName') ?? options.indexName;
+      const vectorStoreName: string = runtimeContext.get('vectorStoreName') ?? options.vectorStoreName;
+      const includeVectors: boolean = runtimeContext.get('includeVectors') ?? options.includeVectors ?? false;
+      const includeSources: boolean = runtimeContext.get('includeSources') ?? options.includeSources ?? true;
+      const reranker: RerankConfig = runtimeContext.get('reranker') ?? options.reranker;
+      if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
+      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
+
+      const topK: number = runtimeContext.get('topK') ?? context.topK ?? 10;
+      const filter: Record<string, any> = runtimeContext.get('filter') ?? context.filter;
+      const queryText = context.queryText;
+      const enableFilter = !!runtimeContext.get('filter') || (options.enableFilter ?? false);
+
       const logger = mastra?.getLogger();
       if (!logger) {
         console.warn(