@mastra/rag 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/document/extractors/questions.d.ts

@@ -1,4 +1,4 @@
-import type { MastraLanguageModel } from '@mastra/core/agent';
+import type { MastraLanguageModel, MastraLegacyLanguageModel } from '@mastra/core/agent';
 import type { QuestionExtractPrompt } from '../prompts/index.js';
 import type { BaseNode } from '../schema/index.js';
 import { BaseExtractor } from './base.js';
@@ -13,7 +13,7 @@ type ExtractQuestion = {
  * Extract questions from a list of nodes.
  */
 export declare class QuestionsAnsweredExtractor extends BaseExtractor {
-    llm: MastraLanguageModel;
+    llm: MastraLanguageModel | MastraLegacyLanguageModel;
     questions: number;
     promptTemplate: QuestionExtractPrompt;
     embeddingOnly: boolean;

package/dist/document/extractors/questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/questions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAEzD,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,6BAA6B,EAAE,MAAM,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa;IAC3D,GAAG,EAAE,mBAAmB,CAAC;IACzB,SAAS,EAAE,MAAM,CAAK;IACtB,cAAc,EAAE,qBAAqB,CAAC;IACtC,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;;OAMG;gBACS,OAAO,CAAC,EAAE,yBAAyB;IAkB/C;;;;OAIG;IACG,wBAAwB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC;IA6CxE;;;;OAIG;IACG,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;CAKlF"}
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/questions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAEzF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAEzD,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,6BAA6B,EAAE,MAAM,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa;IAC3D,GAAG,EAAE,mBAAmB,GAAG,yBAAyB,CAAC;IACrD,SAAS,EAAE,MAAM,CAAK;IACtB,cAAc,EAAE,qBAAqB,CAAC;IACtC,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;;OAMG;gBACS,OAAO,CAAC,EAAE,yBAAyB;IAkB/C;;;;OAIG;IACG,wBAAwB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC;IA6CxE;;;;OAIG;IACG,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;CAKlF"}

package/dist/document/extractors/summary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/summary.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElD,KAAK,cAAc,GAAG;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,aAAa;IACjD,OAAO,CAAC,GAAG,CAAsB;IACjC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,WAAW,CAAU;gBACjB,OAAO,CAAC,EAAE,kBAAkB;IAsBxC;;;;OAIG;IACG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC1D;;;;OAIG;IACG,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAqB5D"}
+{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/summary.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElD,KAAK,cAAc,GAAG;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,aAAa;IACjD,OAAO,CAAC,GAAG,CAAkD;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,WAAW,CAAU;gBACjB,OAAO,CAAC,EAAE,kBAAkB;IAsBxC;;;;OAIG;IACG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC1D;;;;OAIG;IACG,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAqB5D"}

package/dist/document/extractors/title.d.ts

@@ -1,4 +1,4 @@
-import type { MastraLanguageModel } from '@mastra/core/agent';
+import type { MastraLanguageModel, MastraLegacyLanguageModel } from '@mastra/core/agent';
 import type { TitleCombinePrompt, TitleExtractorPrompt } from '../prompts/index.js';
 import type { BaseNode } from '../schema/index.js';
 import { BaseExtractor } from './base.js';
@@ -10,7 +10,7 @@ type ExtractTitle = {
  * Extract title from a list of nodes.
  */
 export declare class TitleExtractor extends BaseExtractor {
-    llm: MastraLanguageModel;
+    llm: MastraLegacyLanguageModel | MastraLanguageModel;
     isTextNodeOnly: boolean;
     nodes: number;
     nodeTemplate: TitleExtractorPrompt;

package/dist/document/extractors/title.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"title.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/title.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD,KAAK,YAAY,GAAG;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,cAAe,SAAQ,aAAa;IAC/C,GAAG,EAAE,mBAAmB,CAAC;IACzB,cAAc,EAAE,OAAO,CAAS;IAChC,KAAK,EAAE,MAAM,CAAK;IAClB,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,kBAAkB,CAAC;gBAExB,OAAO,CAAC,EAAE,mBAAmB;IAqBzC;;;;OAIG;IACG,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAoC9D,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,uBAAuB;YAYjB,aAAa;YA6Cb,mBAAmB;CAiClC"}
+{"version":3,"file":"title.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/title.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAEzF,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD,KAAK,YAAY,GAAG;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,cAAe,SAAQ,aAAa;IAC/C,GAAG,EAAE,yBAAyB,GAAG,mBAAmB,CAAC;IACrD,cAAc,EAAE,OAAO,CAAS;IAChC,KAAK,EAAE,MAAM,CAAK;IAClB,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,kBAAkB,CAAC;gBAExB,OAAO,CAAC,EAAE,mBAAmB;IAqBzC;;;;OAIG;IACG,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAoC9D,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,uBAAuB;YAYjB,aAAa;YA6Cb,mBAAmB;CAiClC"}

package/dist/document/extractors/types.d.ts

@@ -1,27 +1,27 @@
-import type { MastraLanguageModel } from '@mastra/core/agent';
+import type { MastraLanguageModel, MastraLegacyLanguageModel } from '@mastra/core/agent';
 import type { KeywordExtractPrompt, QuestionExtractPrompt, SummaryPrompt, TitleExtractorPrompt, TitleCombinePrompt } from '../prompts/index.js';
 export type KeywordExtractArgs = {
-    llm?: MastraLanguageModel;
+    llm?: MastraLegacyLanguageModel | MastraLanguageModel;
     keywords?: number;
     promptTemplate?: KeywordExtractPrompt['template'];
 };
 export type QuestionAnswerExtractArgs = {
-    llm?: MastraLanguageModel;
+    llm?: MastraLegacyLanguageModel | MastraLanguageModel;
     questions?: number;
     promptTemplate?: QuestionExtractPrompt['template'];
     embeddingOnly?: boolean;
 };
 export type SummaryExtractArgs = {
-    llm?: MastraLanguageModel;
+    llm?: MastraLegacyLanguageModel | MastraLanguageModel;
     summaries?: string[];
     promptTemplate?: SummaryPrompt['template'];
 };
 export type TitleExtractorsArgs = {
-    llm?: MastraLanguageModel;
+    llm?: MastraLegacyLanguageModel | MastraLanguageModel;
     nodes?: number;
     nodeTemplate?: TitleExtractorPrompt['template'];
     combineTemplate?: TitleCombinePrompt['template'];
 };
 export declare const STRIP_REGEX: RegExp;
-export declare const baseLLM: MastraLanguageModel;
+export declare const baseLLM: MastraLegacyLanguageModel | MastraLanguageModel;
 //# sourceMappingURL=types.d.ts.map

package/dist/document/extractors/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACnD,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAChD,eAAe,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,WAAW,QAAmB,CAAC;AAG5C,eAAO,MAAM,OAAO,EAAE,mBAAsC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/document/extractors/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,yBAAyB,GAAG,mBAAmB,CAAC;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,CAAC,EAAE,yBAAyB,GAAG,mBAAmB,CAAC;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACnD,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,yBAAyB,GAAG,mBAAmB,CAAC;IACtD,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,GAAG,CAAC,EAAE,yBAAyB,GAAG,mBAAmB,CAAC;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAChD,eAAe,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,WAAW,QAAmB,CAAC;AAG5C,eAAO,MAAM,OAAO,EAAE,yBAAyB,GAAG,mBAAsC,CAAC"}

package/dist/index.cjs

@@ -21,7 +21,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __knownSymbol = (name14, symbol15) => (symbol15 = Symbol[name14]) ? symbol15 : Symbol.for("Symbol." + name14);
+var __knownSymbol = (name14, symbol15) => (symbol15 = Symbol[name14]) ? symbol15 : /* @__PURE__ */ Symbol.for("Symbol." + name14);
 var __typeError = (msg) => {
   throw TypeError(msg);
 };
@@ -902,7 +902,7 @@ function loadApiKey({
   }
   return apiKey;
 }
-var validatorSymbol = Symbol.for("vercel.ai.validator");
+var validatorSymbol = /* @__PURE__ */ Symbol.for("vercel.ai.validator");
 function validator(validate) {
   return { [validatorSymbol]: true, validate };
 }
@@ -4141,7 +4141,7 @@ var TitleExtractor = class extends BaseExtractor {
       const titleCandidates = await this.getTitlesCandidates(nodes);
       const combinedTitles = titleCandidates.join(", ");
       let title = "";
-      if (this.llm.specificationVersion === "v2") {
+      if (agent.isSupportedLanguageModel(this.llm)) {
         const miniAgent = new agent.Agent({
           id: "title-extractor",
           model: this.llm,
@@ -4180,7 +4180,7 @@ var TitleExtractor = class extends BaseExtractor {
     });
     const titleJobs = nodes.map(async (node) => {
       let completion;
-      if (this.llm.specificationVersion === "v2") {
+      if (agent.isSupportedLanguageModel(this.llm)) {
         const result = await miniAgent.generate([
           { role: "user", content: this.nodeTemplate.format({ context: node.getContent() }) }
         ]);
@@ -4246,7 +4246,7 @@ var SummaryExtractor = class extends BaseExtractor {
       instructions: "You are a summary extractor. You are given a node and you need to extract the summary from the node."
     });
     let summary = "";
-    if (this.llm.specificationVersion === "v2") {
+    if (agent.isSupportedLanguageModel(this.llm)) {
       const result = await miniAgent.generate([{ role: "user", content: prompt }]);
       summary = result.text;
     } else {
@@ -4332,7 +4332,7 @@ var QuestionsAnsweredExtractor = class extends BaseExtractor {
       instructions: "You are a question extractor. You are given a node and you need to extract the questions from the node."
     });
     let questionsText = "";
-    if (this.llm.specificationVersion === "v2") {
+    if (agent.isSupportedLanguageModel(this.llm)) {
       const result2 = await miniAgent.generate([{ role: "user", content: prompt }]);
       questionsText = result2.text;
     } else {
@@ -4404,7 +4404,7 @@ var KeywordExtractor = class extends BaseExtractor {
         name: "keyword-extractor",
         instructions: "You are a keyword extractor. You are given a node and you need to extract the keywords from the node."
       });
-      if (this.llm.specificationVersion === "v2") {
+      if (agent.isSupportedLanguageModel(this.llm)) {
         const result = await miniAgent.generate([
           {
             role: "user",
@@ -6594,7 +6594,7 @@ Always return just the number, no explanation.`,
     const prompt = relevance.createSimilarityPrompt(query, text);
     const model = await this.agent.getModel();
     let response;
-    if (model.specificationVersion === "v2") {
+    if (agent.isSupportedLanguageModel(model)) {
       response = await this.agent.generate(prompt);
     } else {
       response = await this.agent.generateLegacy(prompt);
@@ -6980,11 +6980,20 @@ var vectorQuerySearch = async ({
   providerOptions
 }) => {
   let embeddingResult;
-  if (model.specificationVersion === "v2") {
+  if (model.specificationVersion === "v3") {
+    embeddingResult = await vector.embedV3({
+      model,
+      value: queryText,
+      maxRetries,
+      // Type assertion needed: providerOptions type is a union, but embedV3 expects specific version
+      ...providerOptions && { providerOptions }
+    });
+  } else if (model.specificationVersion === "v2") {
     embeddingResult = await vector.embedV2({
       model,
       value: queryText,
       maxRetries,
+      // Type assertion needed: providerOptions type is a union, but embedV2 expects specific version
       ...providerOptions && { providerOptions }
     });
   } else {
@@ -7108,6 +7117,106 @@ var filterSchema = zod.z.object({
   filter: zod.z.coerce.string().describe(filterDescription)
 });
 
+// src/utils/tool-helpers.ts
+function isValidMastraVector(value) {
+  return value !== null && value !== void 0 && typeof value === "object";
+}
+function buildContextString(context) {
+  const parts = [];
+  if (context.vectorStoreName) {
+    parts.push(`vectorStoreName="${context.vectorStoreName}"`);
+  }
+  if (context.requestContext) {
+    const schemaId = context.requestContext.get?.("schemaId");
+    const tenantId = context.requestContext.get?.("tenantId");
+    if (schemaId) parts.push(`schemaId="${schemaId}"`);
+    if (tenantId) parts.push(`tenantId="${tenantId}"`);
+  }
+  if (context.mastra) {
+    parts.push("mastra=provided");
+  }
+  return parts.length > 0 ? ` (context: ${parts.join(", ")})` : "";
+}
+async function resolveVectorStore(options, context, logger) {
+  const { requestContext, mastra, vectorStoreName, fallbackOnInvalid = false } = context;
+  if ("vectorStore" in options && options.vectorStore !== void 0) {
+    const vectorStoreOption = options.vectorStore;
+    if (typeof vectorStoreOption === "function") {
+      const resolved = await vectorStoreOption({ requestContext, mastra });
+      if (!isValidMastraVector(resolved)) {
+        const contextStr = buildContextString(context);
+        const receivedType = resolved === null ? "null" : resolved === void 0 ? "undefined" : typeof resolved;
+        if (fallbackOnInvalid) {
+          if (mastra && vectorStoreName) {
+            return mastra.getVector(vectorStoreName);
+          }
+          return void 0;
+        }
+        throw new Error(
+          `VectorStoreResolver returned invalid value: expected MastraVector instance, got ${receivedType}${contextStr}`
+        );
+      }
+      return resolved;
+    }
+    if (!isValidMastraVector(vectorStoreOption)) {
+      const contextStr = buildContextString(context);
+      const receivedType = vectorStoreOption === null ? "null" : vectorStoreOption === void 0 ? "undefined" : typeof vectorStoreOption;
+      if (fallbackOnInvalid) {
+        if (mastra && vectorStoreName) {
+          return mastra.getVector(vectorStoreName);
+        }
+        return void 0;
+      }
+      throw new Error(`vectorStore option is not a valid MastraVector instance: got ${receivedType}${contextStr}`);
+    }
+    return vectorStoreOption;
+  }
+  if (mastra) {
+    return mastra.getVector(vectorStoreName);
+  }
+  return void 0;
+}
+function coerceTopK(topK, defaultValue = 10) {
+  if (typeof topK === "number") {
+    if (Number.isFinite(topK) && topK > 0) {
+      return topK;
+    }
+    return defaultValue;
+  }
+  if (typeof topK === "string") {
+    const parsed = Number(topK);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      return parsed;
+    }
+    return defaultValue;
+  }
+  return defaultValue;
+}
+function parseFilterValue(filter, logger) {
+  if (!filter) {
+    return {};
+  }
+  if (typeof filter === "string") {
+    try {
+      return JSON.parse(filter);
+    } catch (error) {
+      if (logger) {
+        logger.error("Invalid filter", { filter, error });
+      }
+      throw new Error(`Invalid filter format: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  if (typeof filter !== "object" || filter === null || Array.isArray(filter)) {
+    if (logger) {
+      logger.error("Invalid filter", { filter, error: "Filter must be a plain object" });
+    }
+    throw new Error(
+      `Invalid filter format: expected a plain object, got ${Array.isArray(filter) ? "array" : typeof filter}`
+    );
+  }
+  return filter;
+}
+
 // src/utils/convert-sources.ts
 var convertToSources = (results) => {
   return results.map((result) => {
@@ -7150,7 +7259,8 @@ var defaultGraphOptions = {
 // src/tools/graph-rag.ts
 var createGraphRAGTool = (options) => {
   const { model, id, description } = options;
-  const toolId = id || `GraphRAG ${options.vectorStoreName} ${options.indexName} Tool`;
+  const storeName = options["vectorStoreName"] ? options.vectorStoreName : "DirectVectorStore";
+  const toolId = id || `GraphRAG ${storeName} ${options.indexName} Tool`;
   const toolDescription = description || defaultGraphRagDescription();
   const graphOptions = {
     ...defaultGraphOptions,
@@ -7167,7 +7277,7 @@ var createGraphRAGTool = (options) => {
     execute: async (inputData, context) => {
       const { requestContext, mastra } = context || {};
       const indexName = requestContext?.get("indexName") ?? options.indexName;
-      const vectorStoreName = requestContext?.get("vectorStoreName") ?? options.vectorStoreName;
+      const vectorStoreName = "vectorStore" in options ? storeName : requestContext?.get("vectorStoreName") ?? storeName;
       if (!indexName) throw new Error(`indexName is required, got: ${indexName}`);
       if (!vectorStoreName) throw new Error(`vectorStoreName is required, got: ${vectorStoreName}`);
       const includeSources = requestContext?.get("includeSources") ?? options.includeSources ?? true;
@@ -7179,36 +7289,19 @@ var createGraphRAGTool = (options) => {
       const providerOptions = requestContext?.get("providerOptions") ?? options.providerOptions;
       const enableFilter = !!requestContext?.get("filter") || (options.enableFilter ?? false);
       const logger = mastra?.getLogger();
-      if (!logger) {
-        console.warn(
-          "[GraphRAGTool] Logger not initialized: no debug or error logs will be recorded for this tool execution."
-        );
-      }
       if (logger) {
         logger.debug("[GraphRAGTool] execute called with:", { queryText, topK, filter });
       }
       try {
-        const topKValue = typeof topK === "number" && !isNaN(topK) ? topK : typeof topK === "string" && !isNaN(Number(topK)) ? Number(topK) : 10;
-        const vectorStore = mastra?.getVector(vectorStoreName);
+        const topKValue = coerceTopK(topK);
+        const vectorStore = await resolveVectorStore(options, { requestContext, mastra, vectorStoreName });
         if (!vectorStore) {
           if (logger) {
-            logger.error("Vector store not found", { vectorStoreName });
+            logger.error(`Vector store '${vectorStoreName}' not found`);
           }
           return { relevantContext: [], sources: [] };
         }
-        let queryFilter = {};
-        if (enableFilter) {
-          queryFilter = (() => {
-            try {
-              return typeof filter === "string" ? JSON.parse(filter) : filter;
-            } catch (error) {
-              if (logger) {
-                logger.error("Invalid filter", { filter, error });
-              }
-              throw new Error(`Invalid filter format: ${error instanceof Error ? error.message : String(error)}`);
-            }
-          })();
-        }
+        const queryFilter = enableFilter && filter ? parseFilterValue(filter, logger) : {};
         if (logger) {
           logger.debug("Prepared vector query parameters:", { queryFilter, topK: topKValue });
         }
@@ -7261,7 +7354,7 @@ var createGraphRAGTool = (options) => {
         };
       } catch (err) {
         if (logger) {
-          logger.error("Unexpected error in VectorQueryTool execute", {
+          logger.error("Unexpected error in GraphRAGTool execute", {
             error: err,
             errorMessage: err instanceof Error ? err.message : String(err),
             errorStack: err instanceof Error ? err.stack : void 0
@@ -7301,41 +7394,19 @@ var createVectorQueryTool = (options) => {
       const queryText = inputData.queryText;
       const enableFilter = !!requestContext?.get("filter") || (options.enableFilter ?? false);
       const logger = mastra?.getLogger();
-      if (!logger) {
-        console.warn(
-          "[VectorQueryTool] Logger not initialized: no debug or error logs will be recorded for this tool execution."
-        );
-      }
       if (logger) {
         logger.debug("[VectorQueryTool] execute called with:", { queryText, topK, filter, databaseConfig });
       }
       try {
-        const topKValue = typeof topK === "number" && !isNaN(topK) ? topK : typeof topK === "string" && !isNaN(Number(topK)) ? Number(topK) : 10;
-        let vectorStore = void 0;
-        if ("vectorStore" in options) {
-          vectorStore = options.vectorStore;
-        } else if (mastra) {
-          vectorStore = mastra.getVector(vectorStoreName);
-        }
+        const topKValue = coerceTopK(topK);
+        const vectorStore = await resolveVectorStore(options, { requestContext, mastra, vectorStoreName });
         if (!vectorStore) {
           if (logger) {
-            logger.error("Vector store not found", { vectorStoreName });
+            logger.error(`Vector store '${vectorStoreName}' not found`);
           }
           return { relevantContext: [], sources: [] };
         }
-        let queryFilter = {};
-        if (enableFilter && filter) {
-          queryFilter = (() => {
-            try {
-              return typeof filter === "string" ? JSON.parse(filter) : filter;
-            } catch (error) {
-              if (logger) {
-                logger.error("Invalid filter", { filter, error });
-              }
-              throw new Error(`Invalid filter format: ${error instanceof Error ? error.message : String(error)}`);
-            }
-          })();
-        }
+        const queryFilter = enableFilter && filter ? parseFilterValue(filter, logger) : {};
         if (logger) {
           logger.debug("Prepared vector query parameters", { queryText, topK: topKValue, queryFilter, databaseConfig });
         }