@mastra/rag 1.0.4 → 1.0.5-alpha.1

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/rag@1.0.3 build /home/runner/work/mastra/mastra/packages/rag
+> @mastra/rag@1.0.5-alpha.1 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.5.0
 TSC Build start
-TSC ⚡️ Build success in 14122ms
+TSC ⚡️ Build success in 15061ms
 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 13921ms
+DTS ⚡️ Build success in 14790ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs 248.07 KB
-CJS ⚡️ Build success in 4905ms
-ESM dist/index.js 245.98 KB
-ESM ⚡️ Build success in 4906ms
+CJS dist/index.cjs 248.32 KB
+CJS ⚡️ Build success in 5123ms
+ESM dist/index.js 246.24 KB
+ESM ⚡️ Build success in 5124ms

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @mastra/rag
 
+## 1.0.5-alpha.1
+
+### Patch Changes
+
+- f42c4c2: update peer deps for packages to latest core range
+  - @mastra/core@0.12.0-alpha.5
+
+## 1.0.5-alpha.0
+
+### Patch Changes
+
+- fc437d9: dependencies updates:
+  - Updated dependency [`node-html-better-parser@^1.5.1` ↗︎](https://www.npmjs.com/package/node-html-better-parser/v/1.5.1) (from `^1.4.11`, in `dependencies`)
+- b5a6da2: Allow vector query tool to be used without a Mastra server
+- Updated dependencies [510e2c8]
+- Updated dependencies [2f72fb2]
+- Updated dependencies [3f89307]
+- Updated dependencies [9eda7d4]
+- Updated dependencies [9d49408]
+- Updated dependencies [2ecf658]
+- Updated dependencies [7a7754f]
+- Updated dependencies [fc92d80]
+- Updated dependencies [23a6a7c]
+- Updated dependencies [09bca64]
+  - @mastra/core@0.12.0-alpha.0
+
 ## 1.0.4
 
 ### Patch Changes

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

@@ -1264,7 +1264,6 @@ export declare type VectorQueryToolOptions = {
     id?: string;
     description?: string;
     indexName: string;
-    vectorStoreName: string;
     model: EmbeddingModel<string>;
     enableFilter?: boolean;
     includeVectors?: boolean;
@@ -1272,7 +1271,12 @@ export declare type VectorQueryToolOptions = {
     reranker?: RerankConfig;
     /** Database-specific configuration options */
     databaseConfig?: DatabaseConfig;
-};
+} & ({
+    vectorStoreName: string;
+} | {
+    vectorStoreName?: string;
+    vectorStore: MastraVector;
+});
 
 declare type WeightConfig = {
     semantic?: number;

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

@@ -1264,7 +1264,6 @@ export declare type VectorQueryToolOptions = {
     id?: string;
     description?: string;
     indexName: string;
-    vectorStoreName: string;
     model: EmbeddingModel<string>;
     enableFilter?: boolean;
     includeVectors?: boolean;
@@ -1272,7 +1271,12 @@ export declare type VectorQueryToolOptions = {
     reranker?: RerankConfig;
     /** Database-specific configuration options */
     databaseConfig?: DatabaseConfig;
-};
+} & ({
+    vectorStoreName: string;
+} | {
+    vectorStoreName?: string;
+    vectorStore: MastraVector;
+});
 
 declare type WeightConfig = {
     semantic?: number;

package/dist/index.cjs

@@ -735,7 +735,7 @@ var customAlphabet = (alphabet, defaultSize = 21) => {
   };
 };
 
-// ../../node_modules/.pnpm/@ai-sdk+provider-utils@2.2.8_zod@3.25.67/node_modules/@ai-sdk/provider-utils/dist/index.mjs
+// ../../node_modules/.pnpm/@ai-sdk+provider-utils@2.2.8_zod@3.25.76/node_modules/@ai-sdk/provider-utils/dist/index.mjs
 var import_secure_json_parse = __toESM(require_secure_json_parse());
 function combineHeaders(...headers) {
   return headers.reduce(
@@ -6672,7 +6672,8 @@ var createGraphRAGTool = (options) => {
 };
 var createVectorQueryTool = (options) => {
   const { id, description } = options;
-  const toolId = id || `VectorQuery ${options.vectorStoreName} ${options.indexName} Tool`;
+  const storeName = options["vectorStoreName"] ? options.vectorStoreName : "DirectVectorStore";
+  const toolId = id || `VectorQuery ${storeName} ${options.indexName} Tool`;
   const toolDescription = description || defaultVectorQueryDescription();
   const inputSchema = options.enableFilter ? filterSchema : zod.z.object(baseSchema).passthrough();
   return tools.createTool({
@@ -6682,7 +6683,7 @@ var createVectorQueryTool = (options) => {
     outputSchema,
     execute: async ({ context, mastra, runtimeContext }) => {
       const indexName = runtimeContext.get("indexName") ?? options.indexName;
-      const vectorStoreName = runtimeContext.get("vectorStoreName") ?? options.vectorStoreName;
+      const vectorStoreName = "vectorStore" in options ? storeName : runtimeContext.get("vectorStoreName") ?? storeName;
       const includeVectors = runtimeContext.get("includeVectors") ?? options.includeVectors ?? false;
       const includeSources = runtimeContext.get("includeSources") ?? options.includeSources ?? true;
       const reranker = runtimeContext.get("reranker") ?? options.reranker;
@@ -6705,7 +6706,12 @@ var createVectorQueryTool = (options) => {
       }
       try {
         const topKValue = typeof topK === "number" && !isNaN(topK) ? topK : typeof topK === "string" && !isNaN(Number(topK)) ? Number(topK) : 10;
-        const vectorStore = mastra?.getVector(vectorStoreName);
+        let vectorStore = void 0;
+        if ("vectorStore" in options) {
+          vectorStore = options.vectorStore;
+        } else if (mastra) {
+          vectorStore = mastra.getVector(vectorStoreName);
+        }
         if (!vectorStore) {
           if (logger) {
             logger.error("Vector store not found", { vectorStoreName });

package/dist/index.js

@@ -729,7 +729,7 @@ var customAlphabet = (alphabet, defaultSize = 21) => {
   };
 };
 
-// ../../node_modules/.pnpm/@ai-sdk+provider-utils@2.2.8_zod@3.25.67/node_modules/@ai-sdk/provider-utils/dist/index.mjs
+// ../../node_modules/.pnpm/@ai-sdk+provider-utils@2.2.8_zod@3.25.76/node_modules/@ai-sdk/provider-utils/dist/index.mjs
 var import_secure_json_parse = __toESM(require_secure_json_parse());
 function combineHeaders(...headers) {
   return headers.reduce(
@@ -6666,7 +6666,8 @@ var createGraphRAGTool = (options) => {
 };
 var createVectorQueryTool = (options) => {
   const { id, description } = options;
-  const toolId = id || `VectorQuery ${options.vectorStoreName} ${options.indexName} Tool`;
+  const storeName = options["vectorStoreName"] ? options.vectorStoreName : "DirectVectorStore";
+  const toolId = id || `VectorQuery ${storeName} ${options.indexName} Tool`;
   const toolDescription = description || defaultVectorQueryDescription();
   const inputSchema = options.enableFilter ? filterSchema : z.object(baseSchema).passthrough();
   return createTool({
@@ -6676,7 +6677,7 @@ var createVectorQueryTool = (options) => {
     outputSchema,
     execute: async ({ context, mastra, runtimeContext }) => {
       const indexName = runtimeContext.get("indexName") ?? options.indexName;
-      const vectorStoreName = runtimeContext.get("vectorStoreName") ?? options.vectorStoreName;
+      const vectorStoreName = "vectorStore" in options ? storeName : runtimeContext.get("vectorStoreName") ?? storeName;
       const includeVectors = runtimeContext.get("includeVectors") ?? options.includeVectors ?? false;
       const includeSources = runtimeContext.get("includeSources") ?? options.includeSources ?? true;
       const reranker = runtimeContext.get("reranker") ?? options.reranker;
@@ -6699,7 +6700,12 @@ var createVectorQueryTool = (options) => {
       }
       try {
         const topKValue = typeof topK === "number" && !isNaN(topK) ? topK : typeof topK === "string" && !isNaN(Number(topK)) ? Number(topK) : 10;
-        const vectorStore = mastra?.getVector(vectorStoreName);
+        let vectorStore = void 0;
+        if ("vectorStore" in options) {
+          vectorStore = options.vectorStore;
+        } else if (mastra) {
+          vectorStore = mastra.getVector(vectorStoreName);
+        }
         if (!vectorStore) {
           if (logger) {
             logger.error("Vector store not found", { vectorStoreName });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/rag",
-  "version": "1.0.4",
+  "version": "1.0.5-alpha.1",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -24,13 +24,13 @@
     "@paralleldrive/cuid2": "^2.2.2",
     "big.js": "^7.0.1",
     "js-tiktoken": "^1.0.20",
-    "node-html-better-parser": "^1.4.11",
+    "node-html-better-parser": "^1.5.1",
     "pathe": "^2.0.3",
     "zeroentropy": "0.1.0-alpha.6",
     "zod": "^3.25.67"
   },
   "peerDependencies": {
-    "@mastra/core": ">=0.10.0-0 <0.12.0-0",
+    "@mastra/core": ">=0.10.0-0 <0.13.0-0",
     "ai": "^4.0.0"
   },
   "devDependencies": {
@@ -45,8 +45,8 @@
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",
-    "@internal/lint": "0.0.22",
-    "@mastra/core": "0.11.1"
+    "@internal/lint": "0.0.23",
+    "@mastra/core": "0.12.0-alpha.5"
   },
   "keywords": [
     "rag",

package/src/tools/types.ts

@@ -1,3 +1,4 @@
+import type { MastraVector } from '@mastra/core/vector';
 import type { EmbeddingModel } from 'ai';
 import type { RerankConfig } from '../rerank';
 
@@ -56,7 +57,6 @@ export type VectorQueryToolOptions = {
   id?: string;
   description?: string;
   indexName: string;
-  vectorStoreName: string;
   model: EmbeddingModel<string>;
   enableFilter?: boolean;
   includeVectors?: boolean;
@@ -64,7 +64,15 @@ export type VectorQueryToolOptions = {
   reranker?: RerankConfig;
   /** Database-specific configuration options */
   databaseConfig?: DatabaseConfig;
-};
+} & (
+  | {
+      vectorStoreName: string;
+    }
+  | {
+      vectorStoreName?: string;
+      vectorStore: MastraVector;
+    }
+);
 
 export type GraphRagToolOptions = {
   id?: string;

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

@@ -262,6 +262,93 @@ describe('createVectorQueryTool', () => {
         }),
       );
     });
+
+    it('Returns early when no Mastra server or vector store is provided', async () => {
+      const tool = createVectorQueryTool({
+        id: 'test',
+        model: mockModel,
+        indexName: 'testIndex',
+        vectorStoreName: 'testStore',
+      });
+
+      const runtimeContext = new RuntimeContext();
+      const result = await tool.execute({
+        context: { queryText: 'foo', topK: 1 },
+        runtimeContext,
+      });
+
+      expect(result).toEqual({ relevantContext: [], sources: [] });
+      expect(vectorQuerySearch).not.toHaveBeenCalled();
+    });
+
+    it('works without a mastra server if a vector store is passed as an argument', async () => {
+      const testStore = {
+        testStore: {},
+      };
+      const tool = createVectorQueryTool({
+        id: 'test',
+        model: mockModel,
+        indexName: 'testIndex',
+        vectorStoreName: 'testStore',
+        vectorStore: testStore as any,
+      });
+
+      const runtimeContext = new RuntimeContext();
+      const result = await tool.execute({
+        context: { queryText: 'foo', topK: 1 },
+        runtimeContext,
+      });
+
+      expect(result.relevantContext[0]).toEqual({ text: 'foo' });
+      expect(vectorQuerySearch).toHaveBeenCalledWith(
+        expect.objectContaining({
+          databaseConfig: undefined,
+          indexName: 'testIndex',
+          vectorStore: {
+            testStore: {},
+          },
+          queryText: 'foo',
+          model: mockModel,
+          queryFilter: undefined,
+          topK: 1,
+        }),
+      );
+    });
+
+    it('prefers the passed vector store over one from a passed Mastra server', async () => {
+      const thirdStore = {
+        thirdStore: {},
+      };
+      const tool = createVectorQueryTool({
+        id: 'test',
+        model: mockModel,
+        indexName: 'testIndex',
+        vectorStoreName: 'thirdStore',
+        vectorStore: thirdStore as any,
+      });
+
+      const runtimeContext = new RuntimeContext();
+      const result = await tool.execute({
+        context: { queryText: 'foo', topK: 1 },
+        mastra: mockMastra as any,
+        runtimeContext,
+      });
+
+      expect(result.relevantContext[0]).toEqual({ text: 'foo' });
+      expect(vectorQuerySearch).toHaveBeenCalledWith(
+        expect.objectContaining({
+          databaseConfig: undefined,
+          indexName: 'testIndex',
+          vectorStore: {
+            thirdStore: {},
+          },
+          queryText: 'foo',
+          model: mockModel,
+          queryFilter: undefined,
+          topK: 1,
+        }),
+      );
+    });
   });
 
   describe('runtimeContext', () => {

package/src/tools/vector-query.ts

@@ -1,4 +1,5 @@
 import { createTool } from '@mastra/core/tools';
+import type { MastraVector } from '@mastra/core/vector';
 import type { EmbeddingModel } from 'ai';
 import { z } from 'zod';
 
@@ -11,7 +12,9 @@ import type { VectorQueryToolOptions } from './types';
 
 export const createVectorQueryTool = (options: VectorQueryToolOptions) => {
   const { id, description } = options;
-  const toolId = id || `VectorQuery ${options.vectorStoreName} ${options.indexName} Tool`;
+  const storeName = options['vectorStoreName'] ? options.vectorStoreName : 'DirectVectorStore';
+
+  const toolId = id || `VectorQuery ${storeName} ${options.indexName} Tool`;
   const toolDescription = description || defaultVectorQueryDescription();
   const inputSchema = options.enableFilter ? filterSchema : z.object(baseSchema).passthrough();
 
@@ -22,7 +25,8 @@ export const createVectorQueryTool = (options: VectorQueryToolOptions) => {
     outputSchema,
     execute: async ({ context, mastra, runtimeContext }) => {
       const indexName: string = runtimeContext.get('indexName') ?? options.indexName;
-      const vectorStoreName: string = runtimeContext.get('vectorStoreName') ?? options.vectorStoreName;
+      const vectorStoreName: string =
+        'vectorStore' in options ? storeName : (runtimeContext.get('vectorStoreName') ?? storeName);
       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;
@@ -30,7 +34,7 @@ export const createVectorQueryTool = (options: VectorQueryToolOptions) => {
       const model: EmbeddingModel<string> = runtimeContext.get('model') ?? options.model;
 
       if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
-      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
+      if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`); // won't fire
 
       const topK: number = runtimeContext.get('topK') ?? context.topK ?? 10;
       const filter: Record<string, any> = runtimeContext.get('filter') ?? context.filter;
@@ -54,8 +58,12 @@ export const createVectorQueryTool = (options: VectorQueryToolOptions) => {
               ? Number(topK)
               : 10;
 
-        const vectorStore = mastra?.getVector(vectorStoreName);
-
+        let vectorStore: MastraVector | undefined = undefined;
+        if ('vectorStore' in options) {
+          vectorStore = options.vectorStore;
+        } else if (mastra) {
+          vectorStore = mastra.getVector(vectorStoreName);
+        }
         if (!vectorStore) {
           if (logger) {
             logger.error('Vector store not found', { vectorStoreName });