@mastra/memory 0.0.0-studio-deploy-20260404182525 → 0.0.0-studio-cli-20260504022012

package/dist/index.js

@@ -1,15 +1,13 @@
-import { __commonJS, require_token_error, __toESM } from './chunk-SVPZMV27.js';
-import { __commonJS as __commonJS$1, require_token_error as require_token_error$1, __toESM as __toESM$1 } from './chunk-RC6RZVYE.js';
-import { truncateStringByTokens, resolveToolResultValue, formatToolResultForObserver } from './chunk-C7PARRAD.js';
-export { ModelByInputTokens, getObservationsAsOf } from './chunk-C7PARRAD.js';
+import { truncateStringByTokens, resolveToolResultValue, formatToolResultForObserver } from './chunk-Z5GWA7LB.js';
+export { ModelByInputTokens, getObservationsAsOf } from './chunk-Z5GWA7LB.js';
 import { ZodFirstPartyTypeKind } from 'zod/v3';
 import { z } from 'zod';
 import * as z4 from 'zod/v4';
 import { z as z$1 } from 'zod/v4';
 import { MessageList } from '@mastra/core/agent';
 import { coreFeatures } from '@mastra/core/features';
-import { MastraMemory, removeWorkingMemoryTags, extractWorkingMemoryContent } from '@mastra/core/memory';
-export { extractWorkingMemoryContent, extractWorkingMemoryTags, removeWorkingMemoryTags } from '@mastra/core/memory';
+import { MastraMemory } from '@mastra/core/memory';
+import { EntityType, SpanType } from '@mastra/core/observability';
 import { generateEmptyFromSchema } from '@mastra/core/utils';
 import { isStandardSchemaWithJSON, toStandardSchema, standardSchemaToJSONSchema } from '@mastra/schema-compat/schema';
 import { Mutex } from 'async-mutex';
@@ -26,7 +24,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS3 = (cb, mod) => function __require2() {
+var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __copyProps = (to, from, except, desc) => {
@@ -37,7 +35,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM3 = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
@@ -45,7 +43,7 @@ var __toESM3 = (mod, isNodeMode, target) => (target = mod != null ? __create(__g
   __defProp(target, "default", { value: mod, enumerable: true }),
   mod
 ));
-var require_secure_json_parse = __commonJS3({
+var require_secure_json_parse = __commonJS({
   "../../../node_modules/.pnpm/secure-json-parse@2.7.0/node_modules/secure-json-parse/index.js"(exports$1, module) {
     var hasBuffer = typeof Buffer !== "undefined";
     var suspectProtoRx3 = /"(?:_|\\u005[Ff])(?:_|\\u005[Ff])(?:p|\\u0070)(?:r|\\u0072)(?:o|\\u006[Ff])(?:t|\\u0074)(?:o|\\u006[Ff])(?:_|\\u005[Ff])(?:_|\\u005[Ff])"\s*:/;
@@ -316,7 +314,7 @@ var customAlphabet = (alphabet, defaultSize = 21) => {
     return id;
   };
 };
-var import_secure_json_parse = __toESM3(require_secure_json_parse());
+var import_secure_json_parse = __toESM(require_secure_json_parse());
 function convertAsyncIteratorToReadableStream(iterator) {
   return new ReadableStream({
     /**
@@ -4563,7 +4561,7 @@ function withUserAgentSuffix(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION2 = "3.0.22";
+var VERSION2 = "3.0.23";
 var getOriginalFetch = () => globalThis.fetch;
 var getFromApi = async ({
   url,
@@ -6225,138 +6223,17 @@ function asSchema2(schema) {
 function withoutTrailingSlash(url) {
   return url == null ? void 0 : url.replace(/\/$/, "");
 }
-var require_get_context = __commonJS({
-  "../../../node_modules/.pnpm/@vercel+oidc@3.1.0/node_modules/@vercel/oidc/dist/get-context.js"(exports$1, module) {
-    var __defProp22 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export22 = (target, all) => {
-      for (var name163 in all)
-        __defProp22(target, name163, { get: all[name163], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp22(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toCommonJS = (mod) => __copyProps2(__defProp22({}, "__esModule", { value: true }), mod);
-    var get_context_exports = {};
-    __export22(get_context_exports, {
-      SYMBOL_FOR_REQ_CONTEXT: () => SYMBOL_FOR_REQ_CONTEXT,
-      getContext: () => getContext3
-    });
-    module.exports = __toCommonJS(get_context_exports);
-    var SYMBOL_FOR_REQ_CONTEXT = /* @__PURE__ */ Symbol.for("@vercel/request-context");
-    function getContext3() {
-      const fromSymbol = globalThis;
-      return fromSymbol[SYMBOL_FOR_REQ_CONTEXT]?.get?.() ?? {};
-    }
-  }
-});
-var require_get_vercel_oidc_token = __commonJS({
-  "../../../node_modules/.pnpm/@vercel+oidc@3.1.0/node_modules/@vercel/oidc/dist/get-vercel-oidc-token.js"(exports$1, module) {
-    var __defProp22 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export22 = (target, all) => {
-      for (var name163 in all)
-        __defProp22(target, name163, { get: all[name163], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp22(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toCommonJS = (mod) => __copyProps2(__defProp22({}, "__esModule", { value: true }), mod);
-    var get_vercel_oidc_token_exports = {};
-    __export22(get_vercel_oidc_token_exports, {
-      getVercelOidcToken: () => getVercelOidcToken3,
-      getVercelOidcTokenSync: () => getVercelOidcTokenSync2
-    });
-    module.exports = __toCommonJS(get_vercel_oidc_token_exports);
-    var import_get_context = require_get_context();
-    var import_token_error = require_token_error();
-    async function getVercelOidcToken3() {
-      let token = "";
-      let err;
-      try {
-        token = getVercelOidcTokenSync2();
-      } catch (error) {
-        err = error;
-      }
-      try {
-        const [{ getTokenPayload, isExpired }, { refreshToken }] = await Promise.all([
-          await import('./token-util-RMHT2CPJ-WJZ2SYAR.js'),
-          await import('./token-APYSY3BW-YTVQELJT.js')
-        ]);
-        if (!token || isExpired(getTokenPayload(token))) {
-          await refreshToken();
-          token = getVercelOidcTokenSync2();
-        }
-      } catch (error) {
-        let message = err instanceof Error ? err.message : "";
-        if (error instanceof Error) {
-          message = `${message}
-${error.message}`;
-        }
-        if (message) {
-          throw new import_token_error.VercelOidcTokenError(message);
-        }
-        throw error;
-      }
-      return token;
-    }
-    function getVercelOidcTokenSync2() {
-      const token = (0, import_get_context.getContext)().headers?.["x-vercel-oidc-token"] ?? process.env.VERCEL_OIDC_TOKEN;
-      if (!token) {
-        throw new Error(
-          `The 'x-vercel-oidc-token' header is missing from the request. Do you have the OIDC option enabled in the Vercel project settings?`
-        );
-      }
-      return token;
-    }
-  }
-});
-var require_dist = __commonJS({
-  "../../../node_modules/.pnpm/@vercel+oidc@3.1.0/node_modules/@vercel/oidc/dist/index.js"(exports$1, module) {
-    var __defProp22 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export22 = (target, all) => {
-      for (var name163 in all)
-        __defProp22(target, name163, { get: all[name163], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp22(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toCommonJS = (mod) => __copyProps2(__defProp22({}, "__esModule", { value: true }), mod);
-    var src_exports = {};
-    __export22(src_exports, {
-      getContext: () => import_get_context.getContext,
-      getVercelOidcToken: () => import_get_vercel_oidc_token.getVercelOidcToken,
-      getVercelOidcTokenSync: () => import_get_vercel_oidc_token.getVercelOidcTokenSync
-    });
-    module.exports = __toCommonJS(src_exports);
-    var import_get_vercel_oidc_token = require_get_vercel_oidc_token();
-    var import_get_context = require_get_context();
+function getContext() {
+  return {
+    headers: {}
+  };
+}
+async function getVercelOidcToken() {
+  if (process.env.VERCEL_OIDC_TOKEN) {
+    return process.env.VERCEL_OIDC_TOKEN ?? "";
   }
-});
-var import_oidc = __toESM(require_dist(), 1);
-var import_oidc2 = __toESM(require_dist(), 1);
+  throw new Error("@vercel/oidc is not available in the vendored @internal AI packages. Provide an API key instead.");
+}
 var marker18 = "vercel.ai.gateway.error";
 var symbol18 = Symbol.for(marker18);
 var _a18;
@@ -6731,6 +6608,7 @@ async function parseAuthMethod(headers) {
 var gatewayAuthMethodSchema = lazyValidator(
   () => zodSchema2(z$1.union([z$1.literal("api-key"), z$1.literal("oidc")]))
 );
+var KNOWN_MODEL_TYPES = ["embedding", "image", "language"];
 var GatewayFetchMetadata = class {
   constructor(config) {
     this.config = config;
@@ -6801,8 +6679,12 @@ var gatewayAvailableModelsResponseSchema = lazyValidator(
             provider: z$1.string(),
             modelId: z$1.string()
           }),
-          modelType: z$1.enum(["language", "embedding", "image"]).nullish()
+          modelType: z$1.string().nullish()
         })
+      ).transform(
+        (models) => models.filter(
+          (m) => m.modelType == null || KNOWN_MODEL_TYPES.includes(m.modelType)
+        )
       )
     })
   )
@@ -6818,6 +6700,187 @@ var gatewayCreditsResponseSchema = lazyValidator(
     }))
   )
 );
+var GatewaySpendReport = class {
+  constructor(config) {
+    this.config = config;
+  }
+  async getSpendReport(params) {
+    try {
+      const baseUrl = new URL(this.config.baseURL);
+      const searchParams = new URLSearchParams();
+      searchParams.set("start_date", params.startDate);
+      searchParams.set("end_date", params.endDate);
+      if (params.groupBy) {
+        searchParams.set("group_by", params.groupBy);
+      }
+      if (params.datePart) {
+        searchParams.set("date_part", params.datePart);
+      }
+      if (params.userId) {
+        searchParams.set("user_id", params.userId);
+      }
+      if (params.model) {
+        searchParams.set("model", params.model);
+      }
+      if (params.provider) {
+        searchParams.set("provider", params.provider);
+      }
+      if (params.credentialType) {
+        searchParams.set("credential_type", params.credentialType);
+      }
+      if (params.tags && params.tags.length > 0) {
+        searchParams.set("tags", params.tags.join(","));
+      }
+      const { value } = await getFromApi({
+        url: `${baseUrl.origin}/v1/report?${searchParams.toString()}`,
+        headers: await resolve(this.config.headers()),
+        successfulResponseHandler: createJsonResponseHandler(
+          gatewaySpendReportResponseSchema
+        ),
+        failedResponseHandler: createJsonErrorResponseHandler({
+          errorSchema: z$1.any(),
+          errorToMessage: (data) => data
+        }),
+        fetch: this.config.fetch
+      });
+      return value;
+    } catch (error) {
+      throw await asGatewayError(error);
+    }
+  }
+};
+var gatewaySpendReportResponseSchema = lazySchema(
+  () => zodSchema2(
+    z$1.object({
+      results: z$1.array(
+        z$1.object({
+          day: z$1.string().optional(),
+          hour: z$1.string().optional(),
+          user: z$1.string().optional(),
+          model: z$1.string().optional(),
+          tag: z$1.string().optional(),
+          provider: z$1.string().optional(),
+          credential_type: z$1.enum(["byok", "system"]).optional(),
+          total_cost: z$1.number(),
+          market_cost: z$1.number().optional(),
+          input_tokens: z$1.number().optional(),
+          output_tokens: z$1.number().optional(),
+          cached_input_tokens: z$1.number().optional(),
+          cache_creation_input_tokens: z$1.number().optional(),
+          reasoning_tokens: z$1.number().optional(),
+          request_count: z$1.number().optional()
+        }).transform(
+          ({
+            credential_type,
+            total_cost,
+            market_cost,
+            input_tokens,
+            output_tokens,
+            cached_input_tokens,
+            cache_creation_input_tokens,
+            reasoning_tokens,
+            request_count,
+            ...rest
+          }) => ({
+            ...rest,
+            ...credential_type !== void 0 ? { credentialType: credential_type } : {},
+            totalCost: total_cost,
+            ...market_cost !== void 0 ? { marketCost: market_cost } : {},
+            ...input_tokens !== void 0 ? { inputTokens: input_tokens } : {},
+            ...output_tokens !== void 0 ? { outputTokens: output_tokens } : {},
+            ...cached_input_tokens !== void 0 ? { cachedInputTokens: cached_input_tokens } : {},
+            ...cache_creation_input_tokens !== void 0 ? { cacheCreationInputTokens: cache_creation_input_tokens } : {},
+            ...reasoning_tokens !== void 0 ? { reasoningTokens: reasoning_tokens } : {},
+            ...request_count !== void 0 ? { requestCount: request_count } : {}
+          })
+        )
+      )
+    })
+  )
+);
+var GatewayGenerationInfoFetcher = class {
+  constructor(config) {
+    this.config = config;
+  }
+  async getGenerationInfo(params) {
+    try {
+      const baseUrl = new URL(this.config.baseURL);
+      const { value } = await getFromApi({
+        url: `${baseUrl.origin}/v1/generation?id=${encodeURIComponent(params.id)}`,
+        headers: await resolve(this.config.headers()),
+        successfulResponseHandler: createJsonResponseHandler(
+          gatewayGenerationInfoResponseSchema
+        ),
+        failedResponseHandler: createJsonErrorResponseHandler({
+          errorSchema: z$1.any(),
+          errorToMessage: (data) => data
+        }),
+        fetch: this.config.fetch
+      });
+      return value;
+    } catch (error) {
+      throw await asGatewayError(error);
+    }
+  }
+};
+var gatewayGenerationInfoResponseSchema = lazySchema(
+  () => zodSchema2(
+    z$1.object({
+      data: z$1.object({
+        id: z$1.string(),
+        total_cost: z$1.number(),
+        upstream_inference_cost: z$1.number(),
+        usage: z$1.number(),
+        created_at: z$1.string(),
+        model: z$1.string(),
+        is_byok: z$1.boolean(),
+        provider_name: z$1.string(),
+        streamed: z$1.boolean(),
+        finish_reason: z$1.string(),
+        latency: z$1.number(),
+        generation_time: z$1.number(),
+        native_tokens_prompt: z$1.number(),
+        native_tokens_completion: z$1.number(),
+        native_tokens_reasoning: z$1.number(),
+        native_tokens_cached: z$1.number(),
+        native_tokens_cache_creation: z$1.number(),
+        billable_web_search_calls: z$1.number()
+      }).transform(
+        ({
+          total_cost,
+          upstream_inference_cost,
+          created_at,
+          is_byok,
+          provider_name,
+          finish_reason,
+          generation_time,
+          native_tokens_prompt,
+          native_tokens_completion,
+          native_tokens_reasoning,
+          native_tokens_cached,
+          native_tokens_cache_creation,
+          billable_web_search_calls,
+          ...rest
+        }) => ({
+          ...rest,
+          totalCost: total_cost,
+          upstreamInferenceCost: upstream_inference_cost,
+          createdAt: created_at,
+          isByok: is_byok,
+          providerName: provider_name,
+          finishReason: finish_reason,
+          generationTime: generation_time,
+          promptTokens: native_tokens_prompt,
+          completionTokens: native_tokens_completion,
+          reasoningTokens: native_tokens_reasoning,
+          cachedTokens: native_tokens_cached,
+          cacheCreationTokens: native_tokens_cache_creation,
+          billableWebSearchCalls: billable_web_search_calls
+        })
+      )
+    }).transform(({ data }) => data)
+  )
+);
 var GatewayLanguageModel = class {
   constructor(modelId, config) {
     this.modelId = modelId;
@@ -7318,9 +7381,9 @@ var gatewayTools = {
 };
 async function getVercelRequestId() {
   var _a932;
-  return (_a932 = (0, import_oidc.getContext)().headers) == null ? void 0 : _a932["x-vercel-id"];
+  return (_a932 = getContext().headers) == null ? void 0 : _a932["x-vercel-id"];
 }
-var VERSION3 = "2.0.59";
+var VERSION3 = "2.0.82";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
   var _a932, _b93;
@@ -7418,6 +7481,30 @@ function createGatewayProvider(options = {}) {
       );
     });
   };
+  const getSpendReport = async (params) => {
+    return new GatewaySpendReport({
+      baseURL,
+      headers: getHeaders,
+      fetch: options.fetch
+    }).getSpendReport(params).catch(async (error) => {
+      throw await asGatewayError(
+        error,
+        await parseAuthMethod(await getHeaders())
+      );
+    });
+  };
+  const getGenerationInfo = async (params) => {
+    return new GatewayGenerationInfoFetcher({
+      baseURL,
+      headers: getHeaders,
+      fetch: options.fetch
+    }).getGenerationInfo(params).catch(async (error) => {
+      throw await asGatewayError(
+        error,
+        await parseAuthMethod(await getHeaders())
+      );
+    });
+  };
   const provider = function(modelId) {
     if (new.target) {
       throw new Error(
@@ -7428,6 +7515,8 @@ function createGatewayProvider(options = {}) {
   };
   provider.getAvailableModels = getAvailableModels;
   provider.getCredits = getCredits;
+  provider.getSpendReport = getSpendReport;
+  provider.getGenerationInfo = getGenerationInfo;
   provider.imageModel = (modelId) => {
     return new GatewayImageModel(modelId, {
       provider: "gateway",
@@ -7463,7 +7552,7 @@ async function getGatewayAuthToken(options) {
     };
   }
   try {
-    const oidcToken = await (0, import_oidc2.getVercelOidcToken)();
+    const oidcToken = await getVercelOidcToken();
     return {
       token: oidcToken,
       authMethod: "oidc"
@@ -8281,7 +8370,7 @@ function getGlobalProvider() {
   var _a163;
   return (_a163 = globalThis.AI_SDK_DEFAULT_PROVIDER) != null ? _a163 : gateway;
 }
-var VERSION32 = "5.0.155";
+var VERSION32 = "5.0.179";
 var dataContentSchema2 = z$1.union([
   z$1.string(),
   z$1.instanceof(Uint8Array),
@@ -9892,7 +9981,7 @@ function withUserAgentSuffix2(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION4 = "4.0.19";
+var VERSION4 = "4.0.23";
 var getOriginalFetch3 = () => globalThis.fetch;
 var getFromApi2 = async ({
   url,
@@ -11552,138 +11641,17 @@ var createJsonResponseHandler2 = (responseSchema) => async ({ response, url, req
 function withoutTrailingSlash2(url) {
   return url == null ? void 0 : url.replace(/\/$/, "");
 }
-var require_get_context2 = __commonJS$1({
-  "../../../node_modules/.pnpm/@vercel+oidc@3.1.0/node_modules/@vercel/oidc/dist/get-context.js"(exports$1, module) {
-    var __defProp22 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export22 = (target, all) => {
-      for (var name21 in all)
-        __defProp22(target, name21, { get: all[name21], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp22(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toCommonJS = (mod) => __copyProps2(__defProp22({}, "__esModule", { value: true }), mod);
-    var get_context_exports = {};
-    __export22(get_context_exports, {
-      SYMBOL_FOR_REQ_CONTEXT: () => SYMBOL_FOR_REQ_CONTEXT,
-      getContext: () => getContext3
-    });
-    module.exports = __toCommonJS(get_context_exports);
-    var SYMBOL_FOR_REQ_CONTEXT = /* @__PURE__ */ Symbol.for("@vercel/request-context");
-    function getContext3() {
-      const fromSymbol = globalThis;
-      return fromSymbol[SYMBOL_FOR_REQ_CONTEXT]?.get?.() ?? {};
-    }
-  }
-});
-var require_get_vercel_oidc_token2 = __commonJS$1({
-  "../../../node_modules/.pnpm/@vercel+oidc@3.1.0/node_modules/@vercel/oidc/dist/get-vercel-oidc-token.js"(exports$1, module) {
-    var __defProp22 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export22 = (target, all) => {
-      for (var name21 in all)
-        __defProp22(target, name21, { get: all[name21], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp22(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toCommonJS = (mod) => __copyProps2(__defProp22({}, "__esModule", { value: true }), mod);
-    var get_vercel_oidc_token_exports = {};
-    __export22(get_vercel_oidc_token_exports, {
-      getVercelOidcToken: () => getVercelOidcToken3,
-      getVercelOidcTokenSync: () => getVercelOidcTokenSync2
-    });
-    module.exports = __toCommonJS(get_vercel_oidc_token_exports);
-    var import_get_context = require_get_context2();
-    var import_token_error = require_token_error$1();
-    async function getVercelOidcToken3() {
-      let token = "";
-      let err;
-      try {
-        token = getVercelOidcTokenSync2();
-      } catch (error) {
-        err = error;
-      }
-      try {
-        const [{ getTokenPayload, isExpired }, { refreshToken }] = await Promise.all([
-          await import('./token-util-RMHT2CPJ-RJEA3FAN.js'),
-          await import('./token-APYSY3BW-2DN6RAUY.js')
-        ]);
-        if (!token || isExpired(getTokenPayload(token))) {
-          await refreshToken();
-          token = getVercelOidcTokenSync2();
-        }
-      } catch (error) {
-        let message = err instanceof Error ? err.message : "";
-        if (error instanceof Error) {
-          message = `${message}
-${error.message}`;
-        }
-        if (message) {
-          throw new import_token_error.VercelOidcTokenError(message);
-        }
-        throw error;
-      }
-      return token;
-    }
-    function getVercelOidcTokenSync2() {
-      const token = (0, import_get_context.getContext)().headers?.["x-vercel-oidc-token"] ?? process.env.VERCEL_OIDC_TOKEN;
-      if (!token) {
-        throw new Error(
-          `The 'x-vercel-oidc-token' header is missing from the request. Do you have the OIDC option enabled in the Vercel project settings?`
-        );
-      }
-      return token;
-    }
-  }
-});
-var require_dist2 = __commonJS$1({
-  "../../../node_modules/.pnpm/@vercel+oidc@3.1.0/node_modules/@vercel/oidc/dist/index.js"(exports$1, module) {
-    var __defProp22 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export22 = (target, all) => {
-      for (var name21 in all)
-        __defProp22(target, name21, { get: all[name21], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp22(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toCommonJS = (mod) => __copyProps2(__defProp22({}, "__esModule", { value: true }), mod);
-    var src_exports = {};
-    __export22(src_exports, {
-      getContext: () => import_get_context.getContext,
-      getVercelOidcToken: () => import_get_vercel_oidc_token.getVercelOidcToken,
-      getVercelOidcTokenSync: () => import_get_vercel_oidc_token.getVercelOidcTokenSync
-    });
-    module.exports = __toCommonJS(src_exports);
-    var import_get_vercel_oidc_token = require_get_vercel_oidc_token2();
-    var import_get_context = require_get_context2();
+function getContext2() {
+  return {
+    headers: {}
+  };
+}
+async function getVercelOidcToken2() {
+  if (process.env.VERCEL_OIDC_TOKEN) {
+    return process.env.VERCEL_OIDC_TOKEN ?? "";
   }
-});
-var import_oidc3 = __toESM$1(require_dist2(), 1);
-var import_oidc22 = __toESM$1(require_dist2(), 1);
+  throw new Error("@vercel/oidc is not available in the vendored @internal AI packages. Provide an API key instead.");
+}
 var marker20 = "vercel.ai.gateway.error";
 var symbol20 = Symbol.for(marker20);
 var _a20;
@@ -12098,6 +12066,13 @@ async function parseAuthMethod2(headers) {
 var gatewayAuthMethodSchema2 = lazySchema2(
   () => zodSchema3(z$1.union([z$1.literal("api-key"), z$1.literal("oidc")]))
 );
+var KNOWN_MODEL_TYPES2 = [
+  "embedding",
+  "image",
+  "language",
+  "reranking",
+  "video"
+];
 var GatewayFetchMetadata2 = class {
   constructor(config) {
     this.config = config;
@@ -12168,8 +12143,12 @@ var gatewayAvailableModelsResponseSchema2 = lazySchema2(
             provider: z$1.string(),
             modelId: z$1.string()
           }),
-          modelType: z$1.enum(["embedding", "image", "language", "video"]).nullish()
+          modelType: z$1.string().nullish()
         })
+      ).transform(
+        (models) => models.filter(
+          (m) => m.modelType == null || KNOWN_MODEL_TYPES2.includes(m.modelType)
+        )
       )
     })
   )
@@ -12185,6 +12164,187 @@ var gatewayCreditsResponseSchema2 = lazySchema2(
     }))
   )
 );
+var GatewaySpendReport2 = class {
+  constructor(config) {
+    this.config = config;
+  }
+  async getSpendReport(params) {
+    try {
+      const baseUrl = new URL(this.config.baseURL);
+      const searchParams = new URLSearchParams();
+      searchParams.set("start_date", params.startDate);
+      searchParams.set("end_date", params.endDate);
+      if (params.groupBy) {
+        searchParams.set("group_by", params.groupBy);
+      }
+      if (params.datePart) {
+        searchParams.set("date_part", params.datePart);
+      }
+      if (params.userId) {
+        searchParams.set("user_id", params.userId);
+      }
+      if (params.model) {
+        searchParams.set("model", params.model);
+      }
+      if (params.provider) {
+        searchParams.set("provider", params.provider);
+      }
+      if (params.credentialType) {
+        searchParams.set("credential_type", params.credentialType);
+      }
+      if (params.tags && params.tags.length > 0) {
+        searchParams.set("tags", params.tags.join(","));
+      }
+      const { value } = await getFromApi2({
+        url: `${baseUrl.origin}/v1/report?${searchParams.toString()}`,
+        headers: await resolve2(this.config.headers()),
+        successfulResponseHandler: createJsonResponseHandler2(
+          gatewaySpendReportResponseSchema2
+        ),
+        failedResponseHandler: createJsonErrorResponseHandler2({
+          errorSchema: z$1.any(),
+          errorToMessage: (data) => data
+        }),
+        fetch: this.config.fetch
+      });
+      return value;
+    } catch (error) {
+      throw await asGatewayError2(error);
+    }
+  }
+};
+var gatewaySpendReportResponseSchema2 = lazySchema2(
+  () => zodSchema3(
+    z$1.object({
+      results: z$1.array(
+        z$1.object({
+          day: z$1.string().optional(),
+          hour: z$1.string().optional(),
+          user: z$1.string().optional(),
+          model: z$1.string().optional(),
+          tag: z$1.string().optional(),
+          provider: z$1.string().optional(),
+          credential_type: z$1.enum(["byok", "system"]).optional(),
+          total_cost: z$1.number(),
+          market_cost: z$1.number().optional(),
+          input_tokens: z$1.number().optional(),
+          output_tokens: z$1.number().optional(),
+          cached_input_tokens: z$1.number().optional(),
+          cache_creation_input_tokens: z$1.number().optional(),
+          reasoning_tokens: z$1.number().optional(),
+          request_count: z$1.number().optional()
+        }).transform(
+          ({
+            credential_type,
+            total_cost,
+            market_cost,
+            input_tokens,
+            output_tokens,
+            cached_input_tokens,
+            cache_creation_input_tokens,
+            reasoning_tokens,
+            request_count,
+            ...rest
+          }) => ({
+            ...rest,
+            ...credential_type !== void 0 ? { credentialType: credential_type } : {},
+            totalCost: total_cost,
+            ...market_cost !== void 0 ? { marketCost: market_cost } : {},
+            ...input_tokens !== void 0 ? { inputTokens: input_tokens } : {},
+            ...output_tokens !== void 0 ? { outputTokens: output_tokens } : {},
+            ...cached_input_tokens !== void 0 ? { cachedInputTokens: cached_input_tokens } : {},
+            ...cache_creation_input_tokens !== void 0 ? { cacheCreationInputTokens: cache_creation_input_tokens } : {},
+            ...reasoning_tokens !== void 0 ? { reasoningTokens: reasoning_tokens } : {},
+            ...request_count !== void 0 ? { requestCount: request_count } : {}
+          })
+        )
+      )
+    })
+  )
+);
+var GatewayGenerationInfoFetcher2 = class {
+  constructor(config) {
+    this.config = config;
+  }
+  async getGenerationInfo(params) {
+    try {
+      const baseUrl = new URL(this.config.baseURL);
+      const { value } = await getFromApi2({
+        url: `${baseUrl.origin}/v1/generation?id=${encodeURIComponent(params.id)}`,
+        headers: await resolve2(this.config.headers()),
+        successfulResponseHandler: createJsonResponseHandler2(
+          gatewayGenerationInfoResponseSchema2
+        ),
+        failedResponseHandler: createJsonErrorResponseHandler2({
+          errorSchema: z$1.any(),
+          errorToMessage: (data) => data
+        }),
+        fetch: this.config.fetch
+      });
+      return value;
+    } catch (error) {
+      throw await asGatewayError2(error);
+    }
+  }
+};
+var gatewayGenerationInfoResponseSchema2 = lazySchema2(
+  () => zodSchema3(
+    z$1.object({
+      data: z$1.object({
+        id: z$1.string(),
+        total_cost: z$1.number(),
+        upstream_inference_cost: z$1.number(),
+        usage: z$1.number(),
+        created_at: z$1.string(),
+        model: z$1.string(),
+        is_byok: z$1.boolean(),
+        provider_name: z$1.string(),
+        streamed: z$1.boolean(),
+        finish_reason: z$1.string(),
+        latency: z$1.number(),
+        generation_time: z$1.number(),
+        native_tokens_prompt: z$1.number(),
+        native_tokens_completion: z$1.number(),
+        native_tokens_reasoning: z$1.number(),
+        native_tokens_cached: z$1.number(),
+        native_tokens_cache_creation: z$1.number(),
+        billable_web_search_calls: z$1.number()
+      }).transform(
+        ({
+          total_cost,
+          upstream_inference_cost,
+          created_at,
+          is_byok,
+          provider_name,
+          finish_reason,
+          generation_time,
+          native_tokens_prompt,
+          native_tokens_completion,
+          native_tokens_reasoning,
+          native_tokens_cached,
+          native_tokens_cache_creation,
+          billable_web_search_calls,
+          ...rest
+        }) => ({
+          ...rest,
+          totalCost: total_cost,
+          upstreamInferenceCost: upstream_inference_cost,
+          createdAt: created_at,
+          isByok: is_byok,
+          providerName: provider_name,
+          finishReason: finish_reason,
+          generationTime: generation_time,
+          promptTokens: native_tokens_prompt,
+          completionTokens: native_tokens_completion,
+          reasoningTokens: native_tokens_reasoning,
+          cachedTokens: native_tokens_cached,
+          cacheCreationTokens: native_tokens_cache_creation,
+          billableWebSearchCalls: billable_web_search_calls
+        })
+      )
+    }).transform(({ data }) => data)
+  )
+);
 var GatewayLanguageModel2 = class {
   constructor(modelId, config) {
     this.modelId = modelId;
@@ -12732,37 +12892,117 @@ var gatewayVideoEventSchema = z$1.discriminatedUnion("type", [
     param: z$1.unknown().nullable()
   })
 ]);
-var parallelSearchInputSchema2 = lazySchema2(
-  () => zodSchema3(
-    z.object({
-      objective: z.string().describe(
-        "Natural-language description of the web research goal, including source or freshness guidance and broader context from the task. Maximum 5000 characters."
-      ),
-      search_queries: z.array(z.string()).optional().describe(
-        "Optional search queries to supplement the objective. Maximum 200 characters per query."
-      ),
-      mode: z.enum(["one-shot", "agentic"]).optional().describe(
-        'Mode preset: "one-shot" for comprehensive results with longer excerpts (default), "agentic" for concise, token-efficient results for multi-step workflows.'
-      ),
-      max_results: z.number().optional().describe(
-        "Maximum number of results to return (1-20). Defaults to 10 if not specified."
-      ),
-      source_policy: z.object({
-        include_domains: z.array(z.string()).optional().describe("List of domains to include in search results."),
-        exclude_domains: z.array(z.string()).optional().describe("List of domains to exclude from search results."),
-        after_date: z.string().optional().describe(
-          "Only include results published after this date (ISO 8601 format)."
-        )
-      }).optional().describe(
-        "Source policy for controlling which domains to include/exclude and freshness."
-      ),
-      excerpts: z.object({
-        max_chars_per_result: z.number().optional().describe("Maximum characters per result."),
-        max_chars_total: z.number().optional().describe("Maximum total characters across all results.")
-      }).optional().describe("Excerpt configuration for controlling result length."),
-      fetch_policy: z.object({
-        max_age_seconds: z.number().optional().describe(
-          "Maximum age in seconds for cached content. Set to 0 to always fetch fresh content."
+var GatewayRerankingModel = class {
+  constructor(modelId, config) {
+    this.modelId = modelId;
+    this.config = config;
+    this.specificationVersion = "v3";
+  }
+  get provider() {
+    return this.config.provider;
+  }
+  async doRerank({
+    documents,
+    query,
+    topN,
+    headers,
+    abortSignal,
+    providerOptions
+  }) {
+    const resolvedHeaders = await resolve2(this.config.headers());
+    try {
+      const {
+        responseHeaders,
+        value: responseBody,
+        rawValue
+      } = await postJsonToApi2({
+        url: this.getUrl(),
+        headers: combineHeaders2(
+          resolvedHeaders,
+          headers != null ? headers : {},
+          this.getModelConfigHeaders(),
+          await resolve2(this.config.o11yHeaders)
+        ),
+        body: {
+          documents,
+          query,
+          ...topN != null ? { topN } : {},
+          ...providerOptions ? { providerOptions } : {}
+        },
+        successfulResponseHandler: createJsonResponseHandler2(
+          gatewayRerankingResponseSchema
+        ),
+        failedResponseHandler: createJsonErrorResponseHandler2({
+          errorSchema: z$1.any(),
+          errorToMessage: (data) => data
+        }),
+        ...abortSignal && { abortSignal },
+        fetch: this.config.fetch
+      });
+      return {
+        ranking: responseBody.ranking,
+        providerMetadata: responseBody.providerMetadata,
+        response: { headers: responseHeaders, body: rawValue },
+        warnings: []
+      };
+    } catch (error) {
+      throw await asGatewayError2(error, await parseAuthMethod2(resolvedHeaders));
+    }
+  }
+  getUrl() {
+    return `${this.config.baseURL}/reranking-model`;
+  }
+  getModelConfigHeaders() {
+    return {
+      "ai-reranking-model-specification-version": "3",
+      "ai-model-id": this.modelId
+    };
+  }
+};
+var gatewayRerankingResponseSchema = lazySchema2(
+  () => zodSchema3(
+    z$1.object({
+      ranking: z$1.array(
+        z$1.object({
+          index: z$1.number(),
+          relevanceScore: z$1.number()
+        })
+      ),
+      providerMetadata: z$1.record(z$1.string(), z$1.record(z$1.string(), z$1.unknown())).optional()
+    })
+  )
+);
+var parallelSearchInputSchema2 = lazySchema2(
+  () => zodSchema3(
+    z.object({
+      objective: z.string().describe(
+        "Natural-language description of the web research goal, including source or freshness guidance and broader context from the task. Maximum 5000 characters."
+      ),
+      search_queries: z.array(z.string()).optional().describe(
+        "Optional search queries to supplement the objective. Maximum 200 characters per query."
+      ),
+      mode: z.enum(["one-shot", "agentic"]).optional().describe(
+        'Mode preset: "one-shot" for comprehensive results with longer excerpts (default), "agentic" for concise, token-efficient results for multi-step workflows.'
+      ),
+      max_results: z.number().optional().describe(
+        "Maximum number of results to return (1-20). Defaults to 10 if not specified."
+      ),
+      source_policy: z.object({
+        include_domains: z.array(z.string()).optional().describe("List of domains to include in search results."),
+        exclude_domains: z.array(z.string()).optional().describe("List of domains to exclude from search results."),
+        after_date: z.string().optional().describe(
+          "Only include results published after this date (ISO 8601 format)."
+        )
+      }).optional().describe(
+        "Source policy for controlling which domains to include/exclude and freshness."
+      ),
+      excerpts: z.object({
+        max_chars_per_result: z.number().optional().describe("Maximum characters per result."),
+        max_chars_total: z.number().optional().describe("Maximum total characters across all results.")
+      }).optional().describe("Excerpt configuration for controlling result length."),
+      fetch_policy: z.object({
+        max_age_seconds: z.number().optional().describe(
+          "Maximum age in seconds for cached content. Set to 0 to always fetch fresh content."
         )
       }).optional().describe("Fetch policy for controlling content freshness.")
     })
@@ -12906,9 +13146,9 @@ var gatewayTools2 = {
 };
 async function getVercelRequestId2() {
   var _a932;
-  return (_a932 = (0, import_oidc3.getContext)().headers) == null ? void 0 : _a932["x-vercel-id"];
+  return (_a932 = getContext2().headers) == null ? void 0 : _a932["x-vercel-id"];
 }
-var VERSION5 = "3.0.66";
+var VERSION5 = "3.0.104";
 var AI_GATEWAY_PROTOCOL_VERSION2 = "0.0.1";
 function createGatewayProvider2(options = {}) {
   var _a932, _b93;
@@ -13008,6 +13248,30 @@ function createGatewayProvider2(options = {}) {
       );
     });
   };
+  const getSpendReport = async (params) => {
+    return new GatewaySpendReport2({
+      baseURL,
+      headers: getHeaders,
+      fetch: options.fetch
+    }).getSpendReport(params).catch(async (error) => {
+      throw await asGatewayError2(
+        error,
+        await parseAuthMethod2(await getHeaders())
+      );
+    });
+  };
+  const getGenerationInfo = async (params) => {
+    return new GatewayGenerationInfoFetcher2({
+      baseURL,
+      headers: getHeaders,
+      fetch: options.fetch
+    }).getGenerationInfo(params).catch(async (error) => {
+      throw await asGatewayError2(
+        error,
+        await parseAuthMethod2(await getHeaders())
+      );
+    });
+  };
   const provider = function(modelId) {
     if (new.target) {
       throw new Error(
@@ -13019,6 +13283,8 @@ function createGatewayProvider2(options = {}) {
   provider.specificationVersion = "v3";
   provider.getAvailableModels = getAvailableModels;
   provider.getCredits = getCredits;
+  provider.getSpendReport = getSpendReport;
+  provider.getGenerationInfo = getGenerationInfo;
   provider.imageModel = (modelId) => {
     return new GatewayImageModel2(modelId, {
       provider: "gateway",
@@ -13049,6 +13315,17 @@ function createGatewayProvider2(options = {}) {
       o11yHeaders: createO11yHeaders()
     });
   };
+  const createRerankingModel = (modelId) => {
+    return new GatewayRerankingModel(modelId, {
+      provider: "gateway",
+      baseURL,
+      headers: getHeaders,
+      fetch: options.fetch,
+      o11yHeaders: createO11yHeaders()
+    });
+  };
+  provider.rerankingModel = createRerankingModel;
+  provider.reranking = createRerankingModel;
   provider.chat = provider.languageModel;
   provider.embedding = provider.embeddingModel;
   provider.image = provider.imageModel;
@@ -13068,7 +13345,7 @@ async function getGatewayAuthToken2(options) {
       authMethod: "api-key"
     };
   }
-  const oidcToken = await (0, import_oidc22.getVercelOidcToken)();
+  const oidcToken = await getVercelOidcToken2();
   return {
     token: oidcToken,
     authMethod: "oidc"
@@ -13981,7 +14258,7 @@ function getTotalTimeoutMs(timeout) {
   }
   return timeout.totalMs;
 }
-var VERSION33 = "6.0.116";
+var VERSION33 = "6.0.168";
 var dataContentSchema3 = z$1.union([
   z$1.string(),
   z$1.instanceof(Uint8Array),
@@ -15425,10 +15702,16 @@ var DefaultEmbedManyResult3 = class {
 };
 createIdGenerator3({ prefix: "aiobj", size: 24 });
 createIdGenerator3({ prefix: "aiobj", size: 24 });
+function getMessageParts(msg) {
+  if (typeof msg.content === "string") return [];
+  if (Array.isArray(msg.content)) return msg.content;
+  const parts = msg.content?.parts;
+  return Array.isArray(parts) ? parts : [];
+}
 function hasVisibleParts(msg) {
   if (typeof msg.content === "string") return msg.content.length > 0;
-  const parts = msg.content?.parts;
-  if (!parts || !Array.isArray(parts)) return false;
+  const parts = getMessageParts(msg);
+  if (parts.length === 0) return Boolean(msg.content?.content);
   return parts.some((p) => !p.type?.startsWith("data-"));
 }
 function parseRangeFormat(cursor) {
@@ -15689,13 +15972,13 @@ function lowDetailPartLimit(type) {
   if (type === "tool-result" || type === "tool-call") return AUTO_EXPAND_TOOL_TOKENS;
   return LOW_DETAIL_PART_TOKENS;
 }
-function makePart(msg, partIndex, type, fullText, detail) {
+function makePart(msg, partIndex, type, fullText, detail, toolName) {
   if (detail === "high") {
-    return { messageId: msg.id, partIndex, role: msg.role, type, text: fullText, fullText };
+    return { messageId: msg.id, partIndex, role: msg.role, type, text: fullText, fullText, toolName };
   }
   const hint = `recall cursor="${msg.id}" partIndex=${partIndex} detail="high"`;
   const { text: text4 } = truncateByTokens(fullText, lowDetailPartLimit(type), hint);
-  return { messageId: msg.id, partIndex, role: msg.role, type, text: text4, fullText };
+  return { messageId: msg.id, partIndex, role: msg.role, type, text: text4, fullText, toolName };
 }
 function formatMessageParts(msg, detail) {
   const parts = [];
@@ -15703,32 +15986,73 @@ function formatMessageParts(msg, detail) {
     parts.push(makePart(msg, 0, "text", msg.content, detail));
     return parts;
   }
-  if (msg.content?.parts && Array.isArray(msg.content.parts)) {
-    for (let i = 0; i < msg.content.parts.length; i++) {
-      const part = msg.content.parts[i];
+  const messageParts = getMessageParts(msg);
+  if (messageParts.length > 0) {
+    for (let i = 0; i < messageParts.length; i++) {
+      const part = messageParts[i];
       const partType = part.type;
       if (partType === "text") {
         const text4 = part.text;
-        parts.push(makePart(msg, i, "text", text4, detail));
+        if (text4) {
+          parts.push(makePart(msg, i, "text", text4, detail));
+        }
       } else if (partType === "tool-invocation") {
         const inv = part.toolInvocation;
-        if (inv.state === "result") {
-          const { value: resultValue } = resolveToolResultValue(
-            part,
-            inv.result
-          );
-          const resultStr = formatToolResultForObserver(resultValue, { maxTokens: HIGH_DETAIL_TOOL_RESULT_TOKENS });
-          const fullText = `[Tool Result: ${inv.toolName}]
-${resultStr}`;
-          parts.push(makePart(msg, i, "tool-result", fullText, detail));
-        } else {
-          const argsStr = detail === "low" ? "" : `
+        if (inv?.toolName) {
+          const hasArgs = inv.args != null;
+          if (inv.state !== "partial-call" && hasArgs) {
+            const argsStr = detail === "low" ? "" : `
 ${JSON.stringify(inv.args, null, 2)}`;
-          const fullText = `[Tool Call: ${inv.toolName}]${argsStr}`;
-          parts.push({ messageId: msg.id, partIndex: i, role: msg.role, type: "tool-call", text: fullText, fullText });
+            const fullText = `[Tool Call: ${inv.toolName}]${argsStr}`;
+            parts.push({
+              messageId: msg.id,
+              partIndex: i,
+              role: msg.role,
+              type: "tool-call",
+              text: fullText,
+              fullText,
+              toolName: inv.toolName
+            });
+          }
+          if (inv.state === "result") {
+            const { value: resultValue } = resolveToolResultValue(
+              part,
+              inv.result
+            );
+            const resultStr = formatToolResultForObserver(resultValue, { maxTokens: HIGH_DETAIL_TOOL_RESULT_TOKENS });
+            const fullText = `[Tool Result: ${inv.toolName}]
+${resultStr}`;
+            parts.push(makePart(msg, i, "tool-result", fullText, detail, inv.toolName));
+          }
+        }
+      } else if (partType === "tool-call") {
+        const toolName = part.toolName;
+        if (toolName) {
+          const rawArgs = part.input ?? part.args;
+          const argsStr = detail === "low" || rawArgs == null ? "" : `
+${typeof rawArgs === "string" ? rawArgs : JSON.stringify(rawArgs, null, 2)}`;
+          const fullText = `[Tool Call: ${toolName}]${argsStr}`;
+          parts.push({
+            messageId: msg.id,
+            partIndex: i,
+            role: msg.role,
+            type: "tool-call",
+            text: fullText,
+            fullText,
+            toolName
+          });
+        }
+      } else if (partType === "tool-result") {
+        const toolName = part.toolName;
+        if (toolName) {
+          const rawResult = part.output ?? part.result;
+          const resultStr = formatToolResultForObserver(rawResult, { maxTokens: HIGH_DETAIL_TOOL_RESULT_TOKENS });
+          const fullText = `[Tool Result: ${toolName}]
+${resultStr}`;
+          parts.push(makePart(msg, i, "tool-result", fullText, detail, toolName));
         }
       } else if (partType === "reasoning") {
-        const reasoning = part.reasoning;
+        const reasoning = part.reasoning ?? part.text;
         if (reasoning) {
           parts.push(makePart(msg, i, "reasoning", reasoning, detail));
         }
@@ -15866,7 +16190,7 @@ async function recallPart({
       `Message ${cursor} has no visible content (it may be an internal system message). Try a neighboring message ID instead.`
     );
   }
-  const target = allParts.find((p) => p.partIndex === partIndex);
+  const target = [...allParts].reverse().find((p) => p.partIndex === partIndex);
   if (!target) {
     const availableIndices = allParts.map((p) => p.partIndex).join(", ");
     const highestVisiblePartIndex = Math.max(...allParts.map((p) => p.partIndex));
@@ -15919,6 +16243,8 @@ async function recallMessages({
   page = 1,
   limit = 20,
   detail = "low",
+  partType,
+  toolName,
   threadScope,
   maxTokens = DEFAULT_MAX_RESULT_TOKENS
 }) {
@@ -16008,12 +16334,18 @@ async function recallMessages({
   }
   const hasNextPage = isForward ? hasMore : pageIndex > 0;
   const hasPrevPage = isForward ? pageIndex > 0 : hasMore;
-  const allParts = [];
+  let allParts = [];
   const timestamps = /* @__PURE__ */ new Map();
   for (const msg of messages) {
     timestamps.set(msg.id, msg.createdAt);
     allParts.push(...formatMessageParts(msg, detail));
   }
+  if (toolName) {
+    allParts = allParts.filter((p) => (p.type === "tool-call" || p.type === "tool-result") && p.toolName === toolName);
+  }
+  if (partType) {
+    allParts = allParts.filter((p) => p.type === partType);
+  }
   if (detail === "high" && allParts.length > 0) {
     const firstPart = allParts[0];
     const sameMsgParts = allParts.filter((p) => p.messageId === firstPart.messageId);
@@ -16050,8 +16382,9 @@ High detail returns 1 part at a time. To continue: ${hints.join(", or ")}.`;
     };
   }
   const rendered = renderFormattedParts(allParts, timestamps, { maxTokens });
+  const emptyMessage = allParts.length === 0 ? partType || toolName ? "(no message parts matched the current filters)" : "(no visible message parts found for this page)" : "(no messages found)";
   return {
-    messages: rendered.text,
+    messages: rendered.text || emptyMessage,
     count: messages.length,
     cursor,
     page: normalizedPage,
@@ -16070,6 +16403,9 @@ async function recallThreadFromStart({
   page = 1,
   limit = 20,
   detail = "low",
+  partType,
+  toolName,
+  anchor = "start",
   maxTokens = DEFAULT_MAX_RESULT_TOKENS
 }) {
   if (!memory) {
@@ -16095,29 +16431,37 @@ async function recallThreadFromStart({
     resourceId,
     page: 0,
     perPage: fetchCount,
-    orderBy: { field: "createdAt", direction: "ASC" }
+    orderBy: { field: "createdAt", direction: anchor === "end" ? "DESC" : "ASC" }
   });
-  const visibleMessages = result.messages.filter(hasVisibleParts);
-  const total = visibleMessages.length;
+  const visibleMessages = anchor === "end" ? result.messages.slice(0, fetchCount).filter(hasVisibleParts).reverse() : result.messages.slice(0, fetchCount).filter(hasVisibleParts);
   const skip = pageIndex * normalizedLimit;
-  const hasMore = total > skip + normalizedLimit;
   const messages = visibleMessages.slice(skip, skip + normalizedLimit);
-  const allParts = [];
+  const hasExtraMessage = visibleMessages.length > skip + messages.length;
+  const hasNextPage = messages.length > 0 ? anchor === "end" ? pageIndex > 0 : hasExtraMessage : false;
+  const hasPrevPage = messages.length > 0 ? anchor === "end" ? hasExtraMessage : pageIndex > 0 : pageIndex > 0;
+  let allParts = [];
   const timestamps = /* @__PURE__ */ new Map();
   for (const msg of messages) {
     timestamps.set(msg.id, msg.createdAt);
     allParts.push(...formatMessageParts(msg, detail));
   }
+  if (toolName) {
+    allParts = allParts.filter((p) => (p.type === "tool-call" || p.type === "tool-result") && p.toolName === toolName);
+  }
+  if (partType) {
+    allParts = allParts.filter((p) => p.type === partType);
+  }
   const rendered = renderFormattedParts(allParts, timestamps, { maxTokens });
+  const emptyMessage = messages.length === 0 ? pageIndex > 0 ? `(no messages found on page ${normalizedPage} for this thread)` : "(no messages in this thread)" : partType || toolName ? "(no message parts matched the current filters)" : "(no messages found)";
   return {
-    messages: rendered.text || "(no messages in this thread)",
+    messages: rendered.text || emptyMessage,
     count: messages.length,
     cursor: messages[0]?.id || "",
     page: normalizedPage,
     limit: normalizedLimit,
     detail,
-    hasNextPage: hasMore,
-    hasPrevPage: pageIndex > 0,
+    hasNextPage,
+    hasPrevPage,
     truncated: rendered.truncated,
     tokenOffset: rendered.tokenOffset
   };
@@ -16125,7 +16469,7 @@ async function recallThreadFromStart({
 var recallTool = (_memoryConfig, options) => {
   const retrievalScope = options?.retrievalScope ?? "thread";
   const isResourceScope = retrievalScope === "resource";
-  const description = isResourceScope ? 'Browse conversation history. Use mode="threads" to list all threads for the current user. Use mode="messages" (default) to browse messages in the current thread or pass threadId to browse another thread in the active resource. If you pass only a cursor, it must belong to the current thread. Use mode="search" to find messages by content across all threads.' : `Browse conversation history in the current thread. Use mode="messages" (default) to page through messages near a cursor. Use mode="search" to find messages by content in this thread. Use mode="threads" to get the current thread's ID and title.`;
+  const description = isResourceScope ? 'Browse conversation history. Use mode="threads" to list all threads for the current user. Use mode="messages" (default) to browse messages in the current thread or pass threadId to browse another thread in the active resource. When mode="messages" has no cursor or threadId, it defaults to the current thread and says so at the top of the result. If you pass only a cursor, it must belong to the current thread. Use mode="search" to find messages by content across all threads.' : `Browse conversation history in the current thread. Use mode="messages" (default) to page through messages near a cursor. Use mode="search" to find messages by content in this thread. Use mode="threads" to get the current thread's ID and title.`;
   return createTool({
     id: "recall",
     description,
@@ -16134,7 +16478,9 @@ var recallTool = (_memoryConfig, options) => {
         mode: z.enum(["messages", "threads", "search"]).optional().describe(
           'What to retrieve. "messages" (default) pages through message history. "threads" lists all threads for the current user. "search" finds messages by semantic similarity across all threads.'
         ),
-        threadId: z.string().min(1).optional().describe('Browse a different thread. Use mode="threads" first to discover thread IDs.'),
+        threadId: z.string().min(1).optional().describe(
+          'Browse a different thread, or use "current" for the active thread. Use mode="threads" first to discover thread IDs.'
+        ),
         before: z.string().optional().describe(
           'For mode="threads": only show threads created before this date. ISO 8601 or natural date string (e.g. "2026-03-15", "2026-03-10T00:00:00Z").'
         ),
@@ -16148,7 +16494,10 @@ var recallTool = (_memoryConfig, options) => {
       },
       query: z.string().min(1).optional().describe('Search query for mode="search". Finds messages semantically similar to this text.'),
       cursor: z.string().min(1).optional().describe(
-        'A message ID to use as the pagination cursor. For mode="messages", provide either cursor or threadId. If only cursor is provided, it must belong to the current thread. Extract it from the start or end of an observation group range.'
+        'A message ID to use as the pagination cursor. For mode="messages", omit both cursor and threadId to browse the current thread. If only cursor is provided, it must belong to the current thread. Extract it from the start or end of an observation group range.'
+      ),
+      anchor: z.enum(["start", "end"]).optional().describe(
+        'For mode="messages" without a cursor, page from the start (oldest-first) or end (newest-first) of the thread. Defaults to "start".'
       ),
       page: z.number().int().min(-50).max(50).optional().describe(
         "Pagination offset. For messages: positive pages move forward from cursor, negative move backward. For threads: page number (0-indexed). 0 is treated as 1 for messages."
@@ -16157,6 +16506,10 @@ var recallTool = (_memoryConfig, options) => {
       detail: z.enum(["low", "high"]).optional().describe(
         'Detail level for messages. "low" (default) returns truncated text and tool names. "high" returns full content with tool args/results.'
       ),
+      partType: z.enum(["text", "tool-call", "tool-result", "reasoning", "image", "file"]).optional().describe('Filter results to only include parts of this type. Only applies to mode="messages".'),
+      toolName: z.string().min(1).optional().describe(
+        'Filter results to only include tool-call and tool-result parts matching this tool name. Only applies to mode="messages".'
+      ),
       partIndex: z.number().int().min(0).optional().describe(
         "Fetch a single part from the cursor message by its positional index. When provided, returns only that part at high detail. Indices are shown as [p0], [p1], etc. in recall results."
       )
@@ -16166,9 +16519,12 @@ var recallTool = (_memoryConfig, options) => {
       query,
       cursor,
       threadId: explicitThreadId,
+      anchor,
       page,
       limit,
       detail,
+      partType,
+      toolName,
       partIndex,
       before,
       after
@@ -16176,9 +16532,13 @@ var recallTool = (_memoryConfig, options) => {
       const memory = context2?.memory;
       const currentThreadId = context2?.agent?.threadId;
       const resourceId = context2?.agent?.resourceId;
+      const resolvedExplicitThreadId = explicitThreadId === "current" ? currentThreadId : explicitThreadId;
       if (!memory) {
         throw new Error("Memory instance is required for recall");
       }
+      if (explicitThreadId === "current" && !currentThreadId) {
+        throw new Error("Could not resolve current thread.");
+      }
       if (mode === "search") {
         if (!query) {
           throw new Error('query is required for mode="search"');
@@ -16194,11 +16554,12 @@ var recallTool = (_memoryConfig, options) => {
           topK: limit ?? 10,
           before,
           after,
-          threadScope: !isResourceScope ? currentThreadId || void 0 : void 0
+          threadScope: !isResourceScope ? currentThreadId || void 0 : resolvedExplicitThreadId || void 0
         });
       }
       if (mode === "threads") {
-        if (!isResourceScope) {
+        const requestedCurrentThread = explicitThreadId === "current";
+        if (!isResourceScope || requestedCurrentThread) {
           if (!currentThreadId || !memory.getThreadById) {
             return { error: "Could not resolve current thread." };
           }
@@ -16206,6 +16567,9 @@ var recallTool = (_memoryConfig, options) => {
           if (!thread) {
             return { error: "Could not resolve current thread." };
           }
+          if (isResourceScope && resourceId && thread.resourceId !== resourceId) {
+            throw new Error("Thread does not belong to the active resource");
+          }
           return {
             threads: `- **${thread.title || "(untitled)"}** \u2190 current
   id: ${thread.id}
@@ -16228,7 +16592,13 @@ var recallTool = (_memoryConfig, options) => {
           after
         });
       }
-      const hasExplicitThreadId = typeof explicitThreadId === "string" && explicitThreadId.length > 0;
+      const usedDefaultThreadId = isResourceScope && !explicitThreadId && !cursor && Boolean(currentThreadId);
+      const defaultThreadNote = usedDefaultThreadId ? `threadId wasn't passed so used default ${currentThreadId}.
+
+` : "";
+      const effectiveThreadId = explicitThreadId || (usedDefaultThreadId ? "current" : void 0);
+      const resolvedThreadId = effectiveThreadId === "current" ? currentThreadId : effectiveThreadId;
+      const hasExplicitThreadId = typeof resolvedThreadId === "string" && resolvedThreadId.length > 0;
       const hasCursor = typeof cursor === "string" && cursor.length > 0;
       if (!hasExplicitThreadId && !hasCursor) {
         throw new Error('Either cursor or threadId is required for mode="messages"');
@@ -16245,7 +16615,7 @@ var recallTool = (_memoryConfig, options) => {
         if (!memory.getThreadById) {
           throw new Error("Memory instance cannot verify thread access for recall");
         }
-        const thread = await memory.getThreadById({ threadId: explicitThreadId });
+        const thread = await memory.getThreadById({ threadId: resolvedThreadId });
         if (!thread || thread.resourceId !== resourceId) {
           throw new Error("Thread does not belong to the active resource");
         }
@@ -16280,14 +16650,21 @@ var recallTool = (_memoryConfig, options) => {
         throw new Error("Thread ID is required for recall");
       }
       if (!cursor) {
-        return recallThreadFromStart({
+        const result = await recallThreadFromStart({
           memory,
           threadId: targetThreadId,
           resourceId: isResourceScope ? resourceId : void 0,
           page: page ?? 1,
           limit: limit ?? 20,
-          detail: detail ?? "low"
+          detail: detail ?? "low",
+          partType,
+          toolName,
+          anchor: anchor ?? "start"
         });
+        if (defaultThreadNote) {
+          return { ...result, messages: `${defaultThreadNote}${result.messages}` };
+        }
+        return result;
       }
       if (partIndex !== void 0 && partIndex !== null) {
         return recallPart({
@@ -16307,6 +16684,8 @@ var recallTool = (_memoryConfig, options) => {
         page,
         limit,
         detail: detail ?? "low",
+        partType,
+        toolName,
         threadScope
       });
     }
@@ -16338,6 +16717,25 @@ function deepMergeWorkingMemory(existing, update) {
   }
   return result;
 }
+function stripNullsFromOptional(value, schema) {
+  if (Array.isArray(value)) {
+    const itemSchema = schema.items ?? {};
+    return value.map((item) => stripNullsFromOptional(item, itemSchema));
+  }
+  if (typeof value === "object" && value !== null) {
+    const properties = schema.properties ?? {};
+    const required = schema.required ?? [];
+    const result = {};
+    for (const [key, propertyValue] of Object.entries(value)) {
+      if (propertyValue === null && !required.includes(key)) {
+        continue;
+      }
+      result[key] = stripNullsFromOptional(propertyValue, properties[key] ?? {});
+    }
+    return result;
+  }
+  return value;
+}
 var updateWorkingMemoryTool = (memoryConfig) => {
   const schema = memoryConfig?.workingMemory?.schema;
   let inputSchema = z.object({
@@ -16347,7 +16745,7 @@ var updateWorkingMemoryTool = (memoryConfig) => {
     const standardSchema2 = isStandardSchemaWithJSON$1(schema) ? schema : toStandardSchema$1(schema);
     const jsonSchema4 = standardSchemaToJSONSchema(standardSchema2, { io: "input" });
     delete jsonSchema4.$schema;
-    inputSchema = toStandardSchema$1({
+    const wrappedSchema = toStandardSchema$1({
       $schema: "http://json-schema.org/draft-07/schema#",
       type: "object",
       description: "The JSON formatted working memory content to store.",
@@ -16356,6 +16754,41 @@ var updateWorkingMemoryTool = (memoryConfig) => {
       },
       required: ["memory"]
     });
+    inputSchema = {
+      "~standard": {
+        version: 1,
+        vendor: "mastra",
+        validate: (value) => {
+          const wrappedResult = wrappedSchema["~standard"].validate(value);
+          if (wrappedResult instanceof Promise) {
+            return wrappedResult.then((result) => {
+              if (!("issues" in result) || !result.issues) {
+                return result;
+              }
+              if (!value || typeof value !== "object" || Array.isArray(value) || "memory" in value) {
+                return result;
+              }
+              return wrappedSchema["~standard"].validate({
+                memory: stripNullsFromOptional(value, jsonSchema4)
+              });
+            });
+          }
+          if (!("issues" in wrappedResult) || !wrappedResult.issues) {
+            return wrappedResult;
+          }
+          if (!value || typeof value !== "object" || Array.isArray(value) || "memory" in value) {
+            return wrappedResult;
+          }
+          return wrappedSchema["~standard"].validate({
+            memory: stripNullsFromOptional(value, jsonSchema4)
+          });
+        },
+        jsonSchema: {
+          input: (props) => wrappedSchema["~standard"].jsonSchema.input(props),
+          output: (props) => wrappedSchema["~standard"].jsonSchema.output(props)
+        }
+      }
+    };
   }
   const usesMergeSemantics = Boolean(schema);
   const description = schema ? `Update the working memory with new information. Data is merged with existing memory - only include fields you want to add or update. To preserve existing data, omit the field entirely. Arrays are replaced entirely when provided, so pass the complete array or omit it to keep the existing values.` : `Update the working memory with new information. Any data not included will be overwritten. Always pass data as string to the memory field. Never pass an object.`;
@@ -16527,6 +16960,69 @@ var __experimental_updateWorkingMemoryToolVNext = (config) => {
     }
   });
 };
+var WORKING_MEMORY_START_TAG = "<working_memory>";
+var WORKING_MEMORY_END_TAG = "</working_memory>";
+var LEGACY_SYSTEM_REMINDER_METADATA_KEY = "dynamicAgentsMdReminder";
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function extractWorkingMemoryTags(text4) {
+  const results = [];
+  let pos = 0;
+  while (pos < text4.length) {
+    const start = text4.indexOf(WORKING_MEMORY_START_TAG, pos);
+    if (start === -1) break;
+    const end = text4.indexOf(WORKING_MEMORY_END_TAG, start + WORKING_MEMORY_START_TAG.length);
+    if (end === -1) break;
+    results.push(text4.substring(start, end + WORKING_MEMORY_END_TAG.length));
+    pos = end + WORKING_MEMORY_END_TAG.length;
+  }
+  return results.length > 0 ? results : null;
+}
+function removeWorkingMemoryTags(text4) {
+  let result = "";
+  let pos = 0;
+  while (pos < text4.length) {
+    const start = text4.indexOf(WORKING_MEMORY_START_TAG, pos);
+    if (start === -1) {
+      result += text4.substring(pos);
+      break;
+    }
+    result += text4.substring(pos, start);
+    const end = text4.indexOf(WORKING_MEMORY_END_TAG, start + WORKING_MEMORY_START_TAG.length);
+    if (end === -1) {
+      result += text4.substring(start);
+      break;
+    }
+    pos = end + WORKING_MEMORY_END_TAG.length;
+  }
+  return result;
+}
+function extractWorkingMemoryContent(text4) {
+  const start = text4.indexOf(WORKING_MEMORY_START_TAG);
+  if (start === -1) return null;
+  const contentStart = start + WORKING_MEMORY_START_TAG.length;
+  const end = text4.indexOf(WORKING_MEMORY_END_TAG, contentStart);
+  if (end === -1) return null;
+  return text4.substring(contentStart, end);
+}
+function isSystemReminderMessage(message) {
+  if (message.role !== "user" || !isRecord(message.content)) {
+    return false;
+  }
+  const metadata = message.content.metadata;
+  if (isRecord(metadata) && (isRecord(metadata.systemReminder) || LEGACY_SYSTEM_REMINDER_METADATA_KEY in metadata)) {
+    return true;
+  }
+  const firstTextPart = message.content.parts.find((part) => part.type === "text");
+  return typeof firstTextPart?.text === "string" && firstTextPart.text.startsWith("<system-reminder");
+}
+function filterSystemReminderMessages(messages, includeSystemReminders) {
+  if (includeSystemReminders) {
+    return messages;
+  }
+  return messages.filter((message) => !isSystemReminderMessage(message));
+}
 function normalizeObservationalMemoryConfig(config) {
   if (config === true) return { model: "google/gemini-2.5-flash" };
   if (config === false || config === void 0) return void 0;
@@ -16599,94 +17095,149 @@ var Memory = class extends MastraMemory {
       );
     }
   }
+  createMemorySpan(operationType, observabilityContext, input, attributes) {
+    const currentSpan = observabilityContext?.tracingContext?.currentSpan;
+    if (!currentSpan) return void 0;
+    return currentSpan.createChildSpan({
+      type: SpanType.MEMORY_OPERATION,
+      name: `memory: ${operationType}`,
+      entityType: EntityType.MEMORY,
+      entityName: "Memory",
+      input,
+      attributes: { operationType, ...attributes }
+    });
+  }
   async recall(args) {
-    const { threadId, resourceId, perPage: perPageArg, page, orderBy, threadConfig, vectorSearchString, filter: filter3 } = args;
-    const config = this.getMergedThreadConfig(threadConfig || {});
-    if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId, config);
-    const perPage = perPageArg !== void 0 ? perPageArg : config.lastMessages;
-    const historyDisabledByConfig = config.lastMessages === false && perPageArg === void 0;
-    const shouldGetNewestAndReverse = !orderBy && perPage !== false;
-    const effectiveOrderBy = shouldGetNewestAndReverse ? { field: "createdAt", direction: "DESC" } : orderBy;
-    const vectorResults = [];
-    this.logger.debug("Memory recall", {
+    const {
       threadId,
-      perPage,
+      resourceId,
+      perPage: perPageArg,
       page,
-      orderBy: effectiveOrderBy,
-      hasWorkingMemorySchema: Boolean(config.workingMemory?.schema),
-      workingMemoryEnabled: config.workingMemory?.enabled,
-      semanticRecallEnabled: Boolean(config.semanticRecall),
-      historyDisabledByConfig
-    });
-    const defaultRange = DEFAULT_MESSAGE_RANGE;
-    const defaultTopK = DEFAULT_TOP_K;
-    const vectorConfig = typeof config?.semanticRecall === `boolean` ? {
-      topK: defaultTopK,
-      messageRange: defaultRange
-    } : {
-      topK: config?.semanticRecall?.topK ?? defaultTopK,
-      messageRange: config?.semanticRecall?.messageRange ?? defaultRange
-    };
-    const resourceScope = typeof config?.semanticRecall === "object" && config?.semanticRecall?.scope !== `thread` || config.semanticRecall === true;
-    if (resourceScope && !resourceId && config?.semanticRecall && vectorSearchString) {
-      throw new Error(
-        `Memory error: Resource-scoped semantic recall is enabled but no resourceId was provided. Either provide a resourceId or explicitly set semanticRecall.scope to 'thread'.`
-      );
-    }
-    let usage;
-    if (historyDisabledByConfig && (!config.semanticRecall || !vectorSearchString || !this.vector)) {
-      return { messages: [], usage: void 0, total: 0, page: page ?? 0, perPage: 0, hasMore: false };
-    }
-    if (config?.semanticRecall && vectorSearchString && this.vector) {
-      const result = await this.embedMessageContent(vectorSearchString);
-      usage = result.usage;
-      const { embeddings, dimension } = result;
-      const { indexName } = await this.createEmbeddingIndex(dimension, config);
-      await Promise.all(
-        embeddings.map(async (embedding) => {
-          if (typeof this.vector === `undefined`) {
-            throw new Error(
-              `Tried to query vector index ${indexName} but this Memory instance doesn't have an attached vector db.`
+      orderBy,
+      threadConfig,
+      vectorSearchString,
+      includeSystemReminders,
+      filter: filter3
+    } = args;
+    const config = this.getMergedThreadConfig(threadConfig || {});
+    const semanticRecallEnabled = Boolean(config.semanticRecall);
+    const span = this.createMemorySpan(
+      "recall",
+      args.observabilityContext,
+      { threadId, resourceId, vectorSearchString },
+      {
+        semanticRecallEnabled,
+        lastMessages: config.lastMessages
+      }
+    );
+    try {
+      if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId, config);
+      const perPage = perPageArg !== void 0 ? perPageArg : config.lastMessages;
+      const historyDisabledByConfig = config.lastMessages === false && perPageArg === void 0;
+      const shouldGetNewestAndReverse = !orderBy && perPage !== false;
+      const effectiveOrderBy = shouldGetNewestAndReverse ? { field: "createdAt", direction: "DESC" } : orderBy;
+      const vectorResults = [];
+      this.logger.debug("Memory recall", {
+        threadId,
+        perPage,
+        page,
+        orderBy: effectiveOrderBy,
+        hasWorkingMemorySchema: Boolean(config.workingMemory?.schema),
+        workingMemoryEnabled: config.workingMemory?.enabled,
+        semanticRecallEnabled,
+        historyDisabledByConfig
+      });
+      const defaultRange = DEFAULT_MESSAGE_RANGE;
+      const defaultTopK = DEFAULT_TOP_K;
+      const vectorConfig = typeof config?.semanticRecall === `boolean` ? {
+        topK: defaultTopK,
+        messageRange: defaultRange
+      } : {
+        topK: config?.semanticRecall?.topK ?? defaultTopK,
+        messageRange: config?.semanticRecall?.messageRange ?? defaultRange
+      };
+      const resourceScope = typeof config?.semanticRecall === "object" && config?.semanticRecall?.scope !== `thread` || config.semanticRecall === true;
+      if (resourceScope && !resourceId && config?.semanticRecall && vectorSearchString) {
+        throw new Error(
+          `Memory error: Resource-scoped semantic recall is enabled but no resourceId was provided. Either provide a resourceId or explicitly set semanticRecall.scope to 'thread'.`
+        );
+      }
+      let usage;
+      if (historyDisabledByConfig && (!config.semanticRecall || !vectorSearchString || !this.vector)) {
+        const result = {
+          messages: [],
+          usage: void 0,
+          total: 0,
+          page: page ?? 0,
+          perPage: 0,
+          hasMore: false
+        };
+        span?.end({ output: { success: true }, attributes: { messageCount: 0 } });
+        return result;
+      }
+      if (config?.semanticRecall && vectorSearchString && this.vector) {
+        const result = await this.embedMessageContent(vectorSearchString);
+        usage = result.usage;
+        const { embeddings, dimension } = result;
+        const { indexName } = await this.createEmbeddingIndex(dimension, config);
+        await Promise.all(
+          embeddings.map(async (embedding) => {
+            if (typeof this.vector === `undefined`) {
+              throw new Error(
+                `Tried to query vector index ${indexName} but this Memory instance doesn't have an attached vector db.`
+              );
+            }
+            vectorResults.push(
+              ...await this.vector.query({
+                indexName,
+                queryVector: embedding,
+                topK: vectorConfig.topK,
+                filter: resourceScope ? {
+                  resource_id: resourceId
+                } : {
+                  thread_id: threadId
+                }
+              })
             );
-          }
-          vectorResults.push(
-            ...await this.vector.query({
-              indexName,
-              queryVector: embedding,
-              topK: vectorConfig.topK,
-              filter: resourceScope ? {
-                resource_id: resourceId
-              } : {
-                thread_id: threadId
-              }
-            })
-          );
-        })
-      );
+          })
+        );
+      }
+      const memoryStore = await this.getMemoryStore();
+      const effectivePerPage = historyDisabledByConfig ? 0 : perPage;
+      const paginatedResult = await memoryStore.listMessages({
+        threadId,
+        resourceId,
+        perPage: effectivePerPage,
+        page,
+        orderBy: effectiveOrderBy,
+        filter: filter3,
+        ...vectorResults?.length ? {
+          include: vectorResults.map((r) => ({
+            id: r.metadata?.message_id,
+            threadId: r.metadata?.thread_id,
+            withNextMessages: typeof vectorConfig.messageRange === "number" ? vectorConfig.messageRange : vectorConfig.messageRange.after,
+            withPreviousMessages: typeof vectorConfig.messageRange === "number" ? vectorConfig.messageRange : vectorConfig.messageRange.before
+          }))
+        } : {}
+      });
+      const rawMessages = shouldGetNewestAndReverse ? paginatedResult.messages.reverse() : paginatedResult.messages;
+      const list = new MessageList({ threadId, resourceId }).add(rawMessages, "memory");
+      const messages = filterSystemReminderMessages(list.get.all.db(), includeSystemReminders);
+      const { total, page: resultPage, perPage: resultPerPage, hasMore } = paginatedResult;
+      const recallResult = { messages, usage, total, page: resultPage, perPage: resultPerPage, hasMore };
+      span?.end({
+        output: { success: true },
+        attributes: {
+          messageCount: messages.length,
+          embeddingTokens: usage?.tokens,
+          vectorResultCount: vectorResults.length
+        }
+      });
+      return recallResult;
+    } catch (error) {
+      span?.error({ error, endSpan: true });
+      throw error;
     }
-    const memoryStore = await this.getMemoryStore();
-    const effectivePerPage = historyDisabledByConfig ? 0 : perPage;
-    const paginatedResult = await memoryStore.listMessages({
-      threadId,
-      resourceId,
-      perPage: effectivePerPage,
-      page,
-      orderBy: effectiveOrderBy,
-      filter: filter3,
-      ...vectorResults?.length ? {
-        include: vectorResults.map((r) => ({
-          id: r.metadata?.message_id,
-          threadId: r.metadata?.thread_id,
-          withNextMessages: typeof vectorConfig.messageRange === "number" ? vectorConfig.messageRange : vectorConfig.messageRange.after,
-          withPreviousMessages: typeof vectorConfig.messageRange === "number" ? vectorConfig.messageRange : vectorConfig.messageRange.before
-        }))
-      } : {}
-    });
-    const rawMessages = shouldGetNewestAndReverse ? paginatedResult.messages.reverse() : paginatedResult.messages;
-    const list = new MessageList({ threadId, resourceId }).add(rawMessages, "memory");
-    const messages = list.get.all.db();
-    const { total, page: resultPage, perPage: resultPerPage, hasMore } = paginatedResult;
-    return { messages, usage, total, page: resultPage, perPage: resultPerPage, hasMore };
   }
   async getThreadById({ threadId }) {
     const memoryStore = await this.getMemoryStore();
@@ -16796,45 +17347,60 @@ var Memory = class extends MastraMemory {
     threadId,
     resourceId,
     workingMemory,
-    memoryConfig
+    memoryConfig,
+    observabilityContext
   }) {
     const config = this.getMergedThreadConfig(memoryConfig || {});
     if (!config.workingMemory?.enabled) {
       throw new Error("Working memory is not enabled for this memory instance");
     }
-    const scope = config.workingMemory.scope || "resource";
-    if (scope === "resource" && !resourceId) {
-      throw new Error(
-        `Memory error: Resource-scoped working memory is enabled but no resourceId was provided. Either provide a resourceId or explicitly set workingMemory.scope to 'thread'.`
-      );
-    }
-    const mutexKey = scope === "resource" ? `resource-${resourceId}` : `thread-${threadId}`;
-    const mutex = this.updateWorkingMemoryMutexes.has(mutexKey) ? this.updateWorkingMemoryMutexes.get(mutexKey) : new Mutex();
-    this.updateWorkingMemoryMutexes.set(mutexKey, mutex);
-    const release = await mutex.acquire();
+    const span = this.createMemorySpan(
+      "update",
+      observabilityContext,
+      { threadId, resourceId },
+      {
+        workingMemoryEnabled: true
+      }
+    );
     try {
-      const memoryStore = await this.getMemoryStore();
-      if (scope === "resource" && resourceId) {
-        await memoryStore.updateResource({
-          resourceId,
-          workingMemory
-        });
-      } else {
-        const thread = await this.getThreadById({ threadId });
-        if (!thread) {
-          throw new Error(`Thread ${threadId} not found`);
-        }
-        await memoryStore.updateThread({
-          id: threadId,
-          title: thread.title || "",
-          metadata: {
-            ...thread.metadata,
+      const scope = config.workingMemory.scope || "resource";
+      if (scope === "resource" && !resourceId) {
+        throw new Error(
+          `Memory error: Resource-scoped working memory is enabled but no resourceId was provided. Either provide a resourceId or explicitly set workingMemory.scope to 'thread'.`
+        );
+      }
+      const mutexKey = scope === "resource" ? `resource-${resourceId}` : `thread-${threadId}`;
+      const mutex = this.updateWorkingMemoryMutexes.has(mutexKey) ? this.updateWorkingMemoryMutexes.get(mutexKey) : new Mutex();
+      this.updateWorkingMemoryMutexes.set(mutexKey, mutex);
+      const release = await mutex.acquire();
+      try {
+        const memoryStore = await this.getMemoryStore();
+        if (scope === "resource" && resourceId) {
+          await memoryStore.updateResource({
+            resourceId,
             workingMemory
+          });
+        } else {
+          const thread = await this.getThreadById({ threadId });
+          if (!thread) {
+            throw new Error(`Thread ${threadId} not found`);
           }
-        });
+          await memoryStore.updateThread({
+            id: threadId,
+            title: thread.title || "",
+            metadata: {
+              ...thread.metadata,
+              workingMemory
+            }
+          });
+        }
+      } finally {
+        release();
       }
-    } finally {
-      release();
+      span?.end({ output: { success: true } });
+    } catch (error) {
+      span?.error({ error, endSpan: true });
+      throw error;
     }
   }
   updateWorkingMemoryMutexes = /* @__PURE__ */ new Map();
@@ -17012,67 +17578,85 @@ ${workingMemory}`;
   }
   async saveMessages({
     messages,
-    memoryConfig
+    memoryConfig,
+    observabilityContext
   }) {
-    const updatedMessages = messages.map((m) => {
-      return this.updateMessageToHideWorkingMemoryV2(m);
-    }).filter((m) => Boolean(m));
-    const config = this.getMergedThreadConfig(memoryConfig);
-    const dbMessages = new MessageList({
-      generateMessageId: () => this.generateId()
-    }).add(updatedMessages, "memory").get.all.db();
-    const memoryStore = await this.getMemoryStore();
-    const result = await memoryStore.saveMessages({
-      messages: dbMessages
+    const span = this.createMemorySpan("save", observabilityContext, void 0, {
+      messageCount: messages.length
     });
-    let totalTokens = 0;
-    if (this.vector && config.semanticRecall) {
-      const embeddingData = [];
-      let dimension;
-      await Promise.all(
-        updatedMessages.map(async (message) => {
-          let textForEmbedding = null;
-          if (message.content.content && typeof message.content.content === "string" && message.content.content.trim() !== "") {
-            textForEmbedding = message.content.content;
-          } else if (message.content.parts && message.content.parts.length > 0) {
-            const joined = message.content.parts.filter((part) => part.type === "text").map((part) => part.text).join(" ").trim();
-            if (joined) textForEmbedding = joined;
+    try {
+      const updatedMessages = messages.map((m) => {
+        return this.updateMessageToHideWorkingMemoryV2(m);
+      }).filter((m) => Boolean(m));
+      const config = this.getMergedThreadConfig(memoryConfig);
+      const dbMessages = new MessageList({
+        generateMessageId: () => this.generateId()
+      }).add(updatedMessages, "memory").get.all.db();
+      const memoryStore = await this.getMemoryStore();
+      const result = await memoryStore.saveMessages({
+        messages: dbMessages
+      });
+      let totalTokens = 0;
+      if (this.vector && config.semanticRecall) {
+        const embeddingData = [];
+        let dimension;
+        await Promise.all(
+          updatedMessages.map(async (message) => {
+            let textForEmbedding = null;
+            if (message.content.content && typeof message.content.content === "string" && message.content.content.trim() !== "") {
+              textForEmbedding = message.content.content;
+            } else if (message.content.parts && message.content.parts.length > 0) {
+              const joined = message.content.parts.filter((part) => part.type === "text").map((part) => part.text).join(" ").trim();
+              if (joined) textForEmbedding = joined;
+            }
+            if (!textForEmbedding) return;
+            const result2 = await this.embedMessageContent(textForEmbedding);
+            dimension = result2.dimension;
+            if (result2.usage?.tokens) {
+              totalTokens += result2.usage.tokens;
+            }
+            embeddingData.push({
+              embeddings: result2.embeddings,
+              metadata: result2.chunks.map(() => ({
+                message_id: message.id,
+                thread_id: message.threadId,
+                resource_id: message.resourceId
+              }))
+            });
+          })
+        );
+        if (embeddingData.length > 0 && dimension !== void 0) {
+          if (typeof this.vector === `undefined`) {
+            throw new Error(`Tried to upsert embeddings but this Memory instance doesn't have an attached vector db.`);
           }
-          if (!textForEmbedding) return;
-          const result2 = await this.embedMessageContent(textForEmbedding);
-          dimension = result2.dimension;
-          if (result2.usage?.tokens) {
-            totalTokens += result2.usage.tokens;
+          const { indexName } = await this.createEmbeddingIndex(dimension, config);
+          const allVectors = [];
+          const allMetadata = [];
+          for (const data of embeddingData) {
+            allVectors.push(...data.embeddings);
+            allMetadata.push(...data.metadata);
           }
-          embeddingData.push({
-            embeddings: result2.embeddings,
-            metadata: result2.chunks.map(() => ({
-              message_id: message.id,
-              thread_id: message.threadId,
-              resource_id: message.resourceId
-            }))
+          await this.vector.upsert({
+            indexName,
+            vectors: allVectors,
+            metadata: allMetadata
           });
-        })
-      );
-      if (embeddingData.length > 0 && dimension !== void 0) {
-        if (typeof this.vector === `undefined`) {
-          throw new Error(`Tried to upsert embeddings but this Memory instance doesn't have an attached vector db.`);
-        }
-        const { indexName } = await this.createEmbeddingIndex(dimension, config);
-        const allVectors = [];
-        const allMetadata = [];
-        for (const data of embeddingData) {
-          allVectors.push(...data.embeddings);
-          allMetadata.push(...data.metadata);
         }
-        await this.vector.upsert({
-          indexName,
-          vectors: allVectors,
-          metadata: allMetadata
-        });
       }
+      const saveResult = { ...result, usage: totalTokens > 0 ? { tokens: totalTokens } : void 0 };
+      span?.end({
+        output: { success: true },
+        attributes: {
+          messageCount: dbMessages.length,
+          embeddingTokens: saveResult.usage?.tokens,
+          semanticRecallEnabled: Boolean(config.semanticRecall)
+        }
+      });
+      return saveResult;
+    } catch (error) {
+      span?.error({ error, endSpan: true });
+      throw error;
     }
-    return { ...result, usage: totalTokens > 0 ? { tokens: totalTokens } : void 0 };
   }
   updateMessageToHideWorkingMemoryV2(message) {
     const newMessage = { ...message };
@@ -17244,7 +17828,7 @@ ${workingMemory}`;
         if (obsSystemMessage) {
           systemParts.push(obsSystemMessage);
         }
-        const { OBSERVATION_CONTINUATION_HINT } = await import('./constants-BDOITAO3.js');
+        const { OBSERVATION_CONTINUATION_HINT } = await import('./constants-XEHPYRDJ.js');
         continuationMessage = {
           id: "om-continuation",
           role: "user",
@@ -17344,7 +17928,7 @@ ${workingMemory}`;
         "Observational memory requires @mastra/core support for request-response-id-rotation. Please bump @mastra/core to a newer version."
       );
     }
-    const { ObservationalMemory: OMClass } = await import('./observational-memory-B7AUSTEY.js');
+    const { ObservationalMemory: OMClass } = await import('./observational-memory-UMDC4VC2.js');
     const onIndexObservations = this.hasRetrievalSearch(omConfig.retrieval) ? async (observation) => {
       await this.indexObservation(observation);
     } : void 0;
@@ -17352,6 +17936,8 @@ ${workingMemory}`;
       storage: memoryStore,
       scope: omConfig.scope,
       retrieval: omConfig.retrieval,
+      activateAfterIdle: omConfig.activateAfterIdle,
+      activateOnProviderChange: omConfig.activateOnProviderChange,
       shareTokenBudget: omConfig.shareTokenBudget,
       model: omConfig.model,
       onIndexObservations,
@@ -17607,6 +18193,32 @@ Notes:
       }))
     });
   }
+  /**
+   * Update per-record observational memory config overrides for a thread.
+   * The provided config is deep-merged, so you only need to specify fields you want to change.
+   *
+   * @example
+   * ```ts
+   * await memory.updateObservationalMemoryConfig({
+   *   threadId: 'thread-1',
+   *   config: {
+   *     observation: { messageTokens: 2000 },
+   *     reflection: { observationTokens: 8000 },
+   *   },
+   * });
+   * ```
+   */
+  async updateObservationalMemoryConfig({
+    threadId,
+    resourceId,
+    config
+  }) {
+    const omEngine = await this.omEngine;
+    if (!omEngine) {
+      throw new Error("Observational memory is not enabled");
+    }
+    await omEngine.updateRecordConfig(threadId, resourceId, config);
+  }
   /**
    * Index a list of messages directly (without querying storage).
    * Used by observe-time indexing to vectorize newly-observed messages.
@@ -17780,7 +18392,7 @@ Notes:
    *   - Message objects with 'id' properties
    * @returns Promise that resolves when all messages are deleted
    */
-  async deleteMessages(input) {
+  async deleteMessages(input, observabilityContext) {
     let messageIds;
     if (!Array.isArray(input)) {
       throw new Error("Invalid input: must be an array of message IDs or message objects");
@@ -17801,10 +18413,19 @@ Notes:
     if (invalidIds.length > 0) {
       throw new Error("All message IDs must be non-empty strings");
     }
-    const memoryStore = await this.getMemoryStore();
-    await memoryStore.deleteMessages(messageIds);
-    if (this.vector) {
-      void this.deleteMessageVectors(messageIds);
+    const span = this.createMemorySpan("delete", observabilityContext, void 0, {
+      messageCount: messageIds.length
+    });
+    try {
+      const memoryStore = await this.getMemoryStore();
+      await memoryStore.deleteMessages(messageIds);
+      if (this.vector) {
+        void this.deleteMessageVectors(messageIds);
+      }
+      span?.end({ output: { success: true }, attributes: { messageCount: messageIds.length } });
+    } catch (error) {
+      span?.error({ error, endSpan: true });
+      throw error;
     }
   }
   /**
@@ -18232,11 +18853,13 @@ Notes:
     if (!effectiveConfig) return null;
     const engine = await this.omEngine;
     if (!engine) return null;
-    const { ObservationalMemoryProcessor } = await import('./observational-memory-B7AUSTEY.js');
-    return new ObservationalMemoryProcessor(engine, this);
+    const { ObservationalMemoryProcessor } = await import('./observational-memory-UMDC4VC2.js');
+    return new ObservationalMemoryProcessor(engine, this, {
+      temporalMarkers: effectiveConfig.temporalMarkers
+    });
   }
 };
 
-export { Memory, deepMergeWorkingMemory };
+export { Memory, deepMergeWorkingMemory, extractWorkingMemoryContent, extractWorkingMemoryTags, removeWorkingMemoryTags };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map