mastracode 0.18.0-alpha.7 → 0.18.0-alpha.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # mastracode
 
+## 0.18.0-alpha.8
+
+### Patch Changes
+
+- Replace `js-tiktoken` with `tokenx` for MastraCode web search and extract result truncation to reduce bundle size while preserving lightweight token-estimated output limits. ([#16326](https://github.com/mastra-ai/mastra/pull/16326))
+
+- Made caveman-style observations opt-in. Observations and reflections now default to standard prose; turn caveman style back on via `/om` → "Caveman observations". The setting persists per thread, restores when Mastra Code starts, and new threads inherit the last selected value. ([#16275](https://github.com/mastra-ai/mastra/pull/16275))
+
+- Updated dependencies [[`b560d6f`](https://github.com/mastra-ai/mastra/commit/b560d6f88b9b904b15c10f75c949eb145bc27684), [`36b3bbf`](https://github.com/mastra-ai/mastra/commit/36b3bbf5a8d59f7e23d47e29340e76c681b4929c), [`b275631`](https://github.com/mastra-ai/mastra/commit/b275631dc10541a482b2e2d4a3e3cfa843bd5fa1)]:
+  - @mastra/core@1.33.0-alpha.6
+  - @mastra/memory@1.17.6-alpha.1
+
 ## 0.18.0-alpha.7
 
 ### Patch Changes

package/dist/agents/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../src/agents/memory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAoExC;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,YAAY,IAC3E,oBAAoB;IAAE,cAAc,EAAE,cAAc,CAAA;CAAE,YAsD/D"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../src/agents/memory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAuExC;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,YAAY,IAC3E,oBAAoB;IAAE,cAAc,EAAE,cAAc,CAAA;CAAE,YA0D/D"}

package/dist/agents/thread-caveman-state.d.ts

@@ -0,0 +1,16 @@
+import type { Harness } from '@mastra/core/harness';
+/**
+ * Wires the `cavemanObservations` toggle into harness thread events so it
+ * persists per-thread and new threads inherit the most recent value.
+ *
+ * This is intentionally implemented in mastracode rather than core: the toggle
+ * is a mastracode-specific OM concept, so persistence stays scoped to the host.
+ */
+export declare function attachCavemanThreadStatePersistence(harness: Harness<Record<string, unknown>>): void;
+/**
+ * Eagerly restores `cavemanObservations` for the currently-selected thread.
+ * Called once at TUI startup after the initial thread is selected, since the
+ * subscription set up later misses the startup `thread_changed` event.
+ */
+export declare function restoreCavemanForCurrentThread(harness: Harness<Record<string, unknown>>): Promise<void>;
+//# sourceMappingURL=thread-caveman-state.d.ts.map

package/dist/agents/thread-caveman-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"thread-caveman-state.d.ts","sourceRoot":"","sources":["../../src/agents/thread-caveman-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,sBAAsB,CAAC;AA0CnE;;;;;;GAMG;AACH,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CASnG;AAED;;;;GAIG;AACH,wBAAsB,8BAA8B,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7G"}

package/dist/{chunk-DLEPYUVF.cjs → chunk-BV5IMX2N.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkH3UXL3U6_cjs = require('./chunk-H3UXL3U6.cjs');
+var chunkU3HWL5UG_cjs = require('./chunk-U3HWL5UG.cjs');
 var chunk24SDVHO7_cjs = require('./chunk-24SDVHO7.cjs');
 var chunkOBFBUWOR_cjs = require('./chunk-OBFBUWOR.cjs');
 var path = require('path');
@@ -14,8 +14,7 @@ var observability = require('@mastra/observability');
 var child_process = require('child_process');
 var tools = require('@mastra/core/tools');
 var tavily = require('@mastra/tavily');
-var lite = require('js-tiktoken/lite');
-var o200k_base = require('js-tiktoken/ranks/o200k_base');
+var tokenx = require('tokenx');
 var os = require('os');
 var workspace = require('@mastra/core/workspace');
 var zod = require('zod');
@@ -31,8 +30,6 @@ var libsql = require('@mastra/libsql');
 var pg = require('@mastra/pg');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   var n = Object.create(null);
@@ -52,7 +49,6 @@ function _interopNamespace(e) {
 }
 
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
-var o200k_base__default = /*#__PURE__*/_interopDefault(o200k_base);
 var os__namespace = /*#__PURE__*/_interopNamespace(os);
 var fs3__namespace = /*#__PURE__*/_interopNamespace(fs3);
 
@@ -386,16 +382,17 @@ You are in FAST mode. Optimize for speed and brevity.
 - If the user asks for a quick edit and you know the file, read it and edit it. Don't ask for confirmation.
 - One tool call to read + one to edit is ideal. Minimize round trips.
 `;
-var enc = new lite.Tiktoken(o200k_base__default.default);
 function sanitizeInput(text) {
   if (!text) return "";
   return (typeof text === `string` ? text : JSON.stringify(text)).replaceAll(`<|endoftext|>`, ``).replaceAll(`<|endofprompt|>`, ``);
 }
 function truncateStringForTokenEstimate(text, desiredTokenCount, fromEnd = true) {
-  const tokens = enc.encode(sanitizeInput(text));
-  if (tokens.length <= desiredTokenCount) return text;
-  return `[Truncated ${tokens.length - desiredTokenCount} tokens]
-${enc.decode(tokens.slice(fromEnd ? -desiredTokenCount : 0, fromEnd ? void 0 : desiredTokenCount))}`;
+  const sanitized = sanitizeInput(text);
+  const totalTokens = tokenx.estimateTokenCount(sanitized);
+  if (totalTokens <= desiredTokenCount) return sanitized;
+  const kept = fromEnd ? tokenx.sliceByTokens(sanitized, -desiredTokenCount) : tokenx.sliceByTokens(sanitized, 0, desiredTokenCount);
+  return `[Truncated ~${totalTokens - desiredTokenCount} tokens]
+${kept}`;
 }
 
 // src/tools/web-search.ts
@@ -583,8 +580,8 @@ function getDynamicWorkspace({ requestContext, mastra: mastra2 }) {
     existing.setToolsConfig(isPlanMode ? { ...chunkOBFBUWOR_cjs.TOOL_NAME_OVERRIDES, ...planModeTools } : chunkOBFBUWOR_cjs.TOOL_NAME_OVERRIDES);
     return existing;
   }
-  const userLsp = chunkH3UXL3U6_cjs.loadSettings().lsp ?? {};
-  const mcModulePath = path.join(path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-DLEPYUVF.cjs', document.baseURI).href)))), "..");
+  const userLsp = chunkU3HWL5UG_cjs.loadSettings().lsp ?? {};
+  const mcModulePath = path.join(path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-BV5IMX2N.cjs', document.baseURI).href)))), "..");
   const lspConfig = {
     ...userLsp,
     packageRunner: userLsp.packageRunner || detectPackageRunner(projectPath),
@@ -1031,18 +1028,19 @@ function getHarnessState(requestContext) {
 }
 function getObserverModel({ requestContext }) {
   const state = getHarnessState(requestContext);
-  return chunkH3UXL3U6_cjs.resolveModel(state?.observerModelId ?? DEFAULT_OM_MODEL_ID, {
+  return chunkU3HWL5UG_cjs.resolveModel(state?.observerModelId ?? DEFAULT_OM_MODEL_ID, {
     remapForCodexOAuth: true,
     requestContext
   });
 }
 function getReflectorModel({ requestContext }) {
   const state = getHarnessState(requestContext);
-  return chunkH3UXL3U6_cjs.resolveModel(state?.reflectorModelId ?? DEFAULT_OM_MODEL_ID, {
+  return chunkU3HWL5UG_cjs.resolveModel(state?.reflectorModelId ?? DEFAULT_OM_MODEL_ID, {
     remapForCodexOAuth: true,
     requestContext
   });
 }
+var DYNAMIC_AGENTS_MD_INSTRUCTION = 'Messages wrapped in <system-reminder type="dynamic-agents-md" ...>...</system-reminder> are ephemeral project-context instructions injected from files on disk. Do NOT observe or extract information from these messages \u2014 they are reloaded automatically when needed and should not be stored in memory.';
 var CAVEMAN_OM_INSTRUCTION = `Respond terse like smart caveman. All technical substance stay. Only fluff die.
 
 Use full caveman compression style.
@@ -1071,12 +1069,17 @@ function getDynamicMemory(storage, vector) {
     const omScope = state?.omScope ?? chunk24SDVHO7_cjs.getOmScope(state?.projectPath);
     const obsThreshold = state?.observationThreshold ?? DEFAULT_OBS_THRESHOLD;
     const refThreshold = state?.reflectionThreshold ?? DEFAULT_REF_THRESHOLD;
+    const caveman = state?.cavemanObservations ?? false;
     const observerPreviousObservationTokens = 1e3;
-    const cacheKey = `${obsThreshold}:${refThreshold}:${omScope}:${observerPreviousObservationTokens}`;
+    const cacheKey = `${obsThreshold}:${refThreshold}:${omScope}:${observerPreviousObservationTokens}:${caveman ? 1 : 0}`;
     if (cachedMemory && cachedMemoryKey === cacheKey) {
       return cachedMemory;
     }
     const isResourceScope = omScope === "resource";
+    const observerInstruction = caveman ? `${DYNAMIC_AGENTS_MD_INSTRUCTION}
+
+${CAVEMAN_OM_INSTRUCTION}` : DYNAMIC_AGENTS_MD_INSTRUCTION;
+    const reflectionInstruction = caveman ? CAVEMAN_OM_INSTRUCTION : void 0;
     cachedMemory = new memory.Memory({
       storage,
       vector: vector || false,
@@ -1097,14 +1100,14 @@ function getDynamicMemory(storage, vector) {
             blockAfter: 2,
             previousObserverTokens: observerPreviousObservationTokens,
             threadTitle: true,
-            instruction: 'Messages wrapped in <system-reminder type="dynamic-agents-md" ...>...</system-reminder> are ephemeral project-context instructions injected from files on disk. Do NOT observe or extract information from these messages \u2014 they are reloaded automatically when needed and should not be stored in memory.\n\n' + CAVEMAN_OM_INSTRUCTION
+            instruction: observerInstruction
           },
           reflection: {
             bufferActivation: isResourceScope ? void 0 : 1 / 2,
             blockAfter: 1.1,
             model: getReflectorModel,
             observationTokens: refThreshold,
-            instruction: CAVEMAN_OM_INSTRUCTION
+            instruction: reflectionInstruction
           }
         }
       }
@@ -1225,6 +1228,46 @@ Structure your plan as:
 Be specific about code locations (file paths, function names, line numbers). Keep the plan actionable and under 500 words.`,
   allowedWorkspaceTools: [chunkOBFBUWOR_cjs.MC_TOOLS.VIEW, chunkOBFBUWOR_cjs.MC_TOOLS.SEARCH_CONTENT, chunkOBFBUWOR_cjs.MC_TOOLS.FIND_FILES]
 };
+
+// src/agents/thread-caveman-state.ts
+var META_KEY = "cavemanObservations";
+function getStateCaveman(harness) {
+  const value = harness.getState()[META_KEY];
+  return typeof value === "boolean" ? value : void 0;
+}
+async function findThread(harness, threadId) {
+  const threads = await harness.listThreads({ allResources: true });
+  return threads.find((t) => t.id === threadId);
+}
+async function restoreCavemanForThread(harness, threadId) {
+  const thread = await findThread(harness, threadId);
+  if (harness.getCurrentThreadId() !== threadId) return;
+  const persisted = thread?.metadata?.[META_KEY];
+  if (typeof persisted === "boolean") {
+    if (getStateCaveman(harness) !== persisted) {
+      await harness.setState({ [META_KEY]: persisted });
+    }
+    return;
+  }
+  const current = getStateCaveman(harness);
+  if (typeof current === "boolean") {
+    await harness.setThreadSetting({ key: META_KEY, value: current });
+  }
+}
+function attachCavemanThreadStatePersistence(harness) {
+  harness.subscribe((event) => {
+    if (event.type === "thread_changed" || event.type === "thread_created") {
+      const threadId = event.type === "thread_changed" ? event.threadId : event.thread.id;
+      void restoreCavemanForThread(harness, threadId).catch(() => {
+      });
+    }
+  });
+}
+async function restoreCavemanForCurrentThread(harness) {
+  const threadId = harness.getCurrentThreadId();
+  if (!threadId) return;
+  await restoreCavemanForThread(harness, threadId);
+}
 function wrapToolWithHooks(toolName, tool, hookManager) {
   if (!hookManager || typeof tool?.execute !== "function") {
     return tool;
@@ -2560,6 +2603,10 @@ var stateSchema = zod.z.object({
   // Observational Memory threshold settings
   observationThreshold: zod.z.number().default(3e4),
   reflectionThreshold: zod.z.number().default(4e4),
+  // Whether observations and reflections use the terse caveman-style instruction.
+  // Off by default — caveman style is opt-in via `/om` settings; observers and
+  // reflectors fall back to their built-in (prose) behavior unless enabled.
+  cavemanObservations: zod.z.boolean().default(false),
   // Observational Memory scope — 'thread' (per-conversation) or 'resource' (shared across threads)
   omScope: zod.z.enum(["thread", "resource"]).optional(),
   // Thinking level for model reasoning effort
@@ -2823,14 +2870,14 @@ var PROVIDER_TO_OAUTH_ID = {
 };
 function createAuthStorage() {
   const authStorage = new chunk24SDVHO7_cjs.AuthStorage();
-  chunkH3UXL3U6_cjs.setAuthStorage(authStorage);
-  chunkH3UXL3U6_cjs.setAuthStorage2(authStorage);
+  chunkU3HWL5UG_cjs.setAuthStorage(authStorage);
+  chunkU3HWL5UG_cjs.setAuthStorage2(authStorage);
   return authStorage;
 }
 function resolveCloudObservabilityConfig(settings, authStorage, resourceId) {
   const resourceConfig = settings.observability.resources[resourceId];
   if (resourceConfig) {
-    const token = authStorage.getStoredApiKey(`${chunkH3UXL3U6_cjs.OBSERVABILITY_AUTH_PREFIX}${resourceId}`);
+    const token = authStorage.getStoredApiKey(`${chunkU3HWL5UG_cjs.OBSERVABILITY_AUTH_PREFIX}${resourceId}`);
     if (token) {
       return { accessToken: token, projectId: resourceConfig.projectId };
     }
@@ -2848,8 +2895,8 @@ async function createMastraCode(config) {
   }
   const gatewayRegistry = llm.GatewayRegistry.getInstance({ useDynamicLoading: true });
   const authStorage = createAuthStorage();
-  const globalSettings = chunkH3UXL3U6_cjs.loadSettings(config?.settingsPath);
-  const storedGatewayKey = authStorage.getStoredApiKey(chunkH3UXL3U6_cjs.MEMORY_GATEWAY_PROVIDER);
+  const globalSettings = chunkU3HWL5UG_cjs.loadSettings(config?.settingsPath);
+  const storedGatewayKey = authStorage.getStoredApiKey(chunkU3HWL5UG_cjs.MEMORY_GATEWAY_PROVIDER);
   const storedGatewayUrl = globalSettings.memoryGateway?.baseUrl;
   if (storedGatewayKey) {
     process.env["MASTRA_GATEWAY_API_KEY"] ??= storedGatewayKey;
@@ -2864,11 +2911,11 @@ async function createMastraCode(config) {
       const envVars = cfg?.apiKeyEnvVar;
       providerEnvVars[provider] = Array.isArray(envVars) ? envVars[0] : envVars;
     }
-    providerEnvVars[chunkH3UXL3U6_cjs.MEMORY_GATEWAY_PROVIDER] ??= "MASTRA_GATEWAY_API_KEY";
+    providerEnvVars[chunkU3HWL5UG_cjs.MEMORY_GATEWAY_PROVIDER] ??= "MASTRA_GATEWAY_API_KEY";
     authStorage.loadStoredApiKeysIntoEnv(providerEnvVars);
   } catch {
     authStorage.loadStoredApiKeysIntoEnv({
-      [chunkH3UXL3U6_cjs.MEMORY_GATEWAY_PROVIDER]: "MASTRA_GATEWAY_API_KEY",
+      [chunkU3HWL5UG_cjs.MEMORY_GATEWAY_PROVIDER]: "MASTRA_GATEWAY_API_KEY",
       anthropic: "ANTHROPIC_API_KEY",
       openai: "OPENAI_API_KEY",
       google: "GOOGLE_GENERATIVE_AI_API_KEY",
@@ -2881,7 +2928,7 @@ async function createMastraCode(config) {
   } catch (error) {
     console.warn("Failed to sync gateways at startup", error);
   }
-  const mgApiKey = authStorage.getStoredApiKey(chunkH3UXL3U6_cjs.MEMORY_GATEWAY_PROVIDER) ?? process.env["MASTRA_GATEWAY_API_KEY"];
+  const mgApiKey = authStorage.getStoredApiKey(chunkU3HWL5UG_cjs.MEMORY_GATEWAY_PROVIDER) ?? process.env["MASTRA_GATEWAY_API_KEY"];
   const project = chunk24SDVHO7_cjs.detectProject(cwd);
   const resourceIdOverride = chunk24SDVHO7_cjs.getResourceIdOverride(project.rootPath);
   if (resourceIdOverride) {
@@ -2983,7 +3030,7 @@ async function createMastraCode(config) {
     id: "code-agent",
     name: "Code Agent",
     instructions: getDynamicInstructions,
-    model: chunkH3UXL3U6_cjs.getDynamicModel,
+    model: chunkU3HWL5UG_cjs.getDynamicModel,
     tools: createDynamicTools(mcpManager, config?.extraTools, hookManager, config?.disabledTools),
     scorers: {
       outcome: {
@@ -3014,21 +3061,21 @@ async function createMastraCode(config) {
       name: "Build",
       default: true,
       defaultModelId: "anthropic/claude-opus-4-6",
-      color: chunkH3UXL3U6_cjs.mastra.green,
+      color: chunkU3HWL5UG_cjs.mastra.green,
       agent: codeAgent
     },
     {
       id: "plan",
       name: "Plan",
       defaultModelId: "openai/gpt-5.2-codex",
-      color: chunkH3UXL3U6_cjs.mastra.purple,
+      color: chunkU3HWL5UG_cjs.mastra.purple,
       agent: codeAgent
     },
     {
       id: "fast",
       name: "Fast",
       defaultModelId: "cerebras/zai-glm-4.7",
-      color: chunkH3UXL3U6_cjs.mastra.orange,
+      color: chunkU3HWL5UG_cjs.mastra.orange,
       agent: codeAgent
     }
   ];
@@ -3065,13 +3112,14 @@ async function createMastraCode(config) {
     }
   } catch {
   }
-  const builtinPacks = chunkH3UXL3U6_cjs.getAvailableModePacks(startupAccess);
-  const builtinOmPacks = chunkH3UXL3U6_cjs.getAvailableOmPacks(startupAccess);
-  const effectiveDefaults = chunkH3UXL3U6_cjs.resolveModelDefaults(globalSettings, builtinPacks);
-  const effectiveObserverModel = chunkH3UXL3U6_cjs.resolveOmRoleModel(globalSettings, "observer", builtinOmPacks);
-  const effectiveReflectorModel = chunkH3UXL3U6_cjs.resolveOmRoleModel(globalSettings, "reflector", builtinOmPacks);
+  const builtinPacks = chunkU3HWL5UG_cjs.getAvailableModePacks(startupAccess);
+  const builtinOmPacks = chunkU3HWL5UG_cjs.getAvailableOmPacks(startupAccess);
+  const effectiveDefaults = chunkU3HWL5UG_cjs.resolveModelDefaults(globalSettings, builtinPacks);
+  const effectiveObserverModel = chunkU3HWL5UG_cjs.resolveOmRoleModel(globalSettings, "observer", builtinOmPacks);
+  const effectiveReflectorModel = chunkU3HWL5UG_cjs.resolveOmRoleModel(globalSettings, "reflector", builtinOmPacks);
   const effectiveObservationThreshold = globalSettings.models.omObservationThreshold ?? void 0;
   const effectiveReflectionThreshold = globalSettings.models.omReflectionThreshold ?? void 0;
+  const effectiveCavemanObservations = globalSettings.models.omCavemanObservations ?? void 0;
   const modes = (config?.modes ?? defaultModes).map((mode) => {
     const savedModel = effectiveDefaults[mode.id];
     return savedModel ? { ...mode, defaultModelId: savedModel } : mode;
@@ -3110,6 +3158,9 @@ async function createMastraCode(config) {
   if (effectiveReflectionThreshold !== void 0) {
     globalInitialState.reflectionThreshold = effectiveReflectionThreshold;
   }
+  if (effectiveCavemanObservations !== void 0) {
+    globalInitialState.cavemanObservations = effectiveCavemanObservations;
+  }
   if (globalSettings.preferences.yolo !== null) {
     globalInitialState.yolo = globalSettings.preferences.yolo;
   }
@@ -3132,7 +3183,7 @@ async function createMastraCode(config) {
     memory,
     stateSchema,
     subagents,
-    resolveModel: (modelId) => chunkH3UXL3U6_cjs.resolveModel(modelId),
+    resolveModel: (modelId) => chunkU3HWL5UG_cjs.resolveModel(modelId),
     toolCategoryResolver: chunkOBFBUWOR_cjs.getToolCategory,
     initialState: {
       projectPath: project.rootPath,
@@ -3147,7 +3198,7 @@ async function createMastraCode(config) {
     modes,
     heartbeatHandlers: config?.heartbeatHandlers ?? defaultHeartbeatHandlers,
     modelAuthChecker: (provider) => {
-      const gatewayKey = authStorage.getStoredApiKey(chunkH3UXL3U6_cjs.MEMORY_GATEWAY_PROVIDER) ?? process.env["MASTRA_GATEWAY_API_KEY"];
+      const gatewayKey = authStorage.getStoredApiKey(chunkU3HWL5UG_cjs.MEMORY_GATEWAY_PROVIDER) ?? process.env["MASTRA_GATEWAY_API_KEY"];
       if (gatewayKey) {
         const providerConfig = gatewayRegistry.getProviders()[provider];
         if (providerConfig?.gateway === "mastra") return true;
@@ -3171,32 +3222,32 @@ async function createMastraCode(config) {
           return true;
         }
       }
-      const customProvider = chunkH3UXL3U6_cjs.loadSettings().customProviders.find((entry) => {
-        return provider === chunkH3UXL3U6_cjs.getCustomProviderId(entry.name);
+      const customProvider = chunkU3HWL5UG_cjs.loadSettings().customProviders.find((entry) => {
+        return provider === chunkU3HWL5UG_cjs.getCustomProviderId(entry.name);
       });
       if (customProvider) {
         return true;
       }
       return void 0;
     },
-    modelUseCountProvider: () => chunkH3UXL3U6_cjs.loadSettings().modelUseCounts,
+    modelUseCountProvider: () => chunkU3HWL5UG_cjs.loadSettings().modelUseCounts,
     modelUseCountTracker: (modelId) => {
       try {
-        const settings = chunkH3UXL3U6_cjs.loadSettings();
+        const settings = chunkU3HWL5UG_cjs.loadSettings();
         settings.modelUseCounts[modelId] = (settings.modelUseCounts[modelId] ?? 0) + 1;
-        chunkH3UXL3U6_cjs.saveSettings(settings);
+        chunkU3HWL5UG_cjs.saveSettings(settings);
       } catch (error) {
         console.error("Failed to persist model usage count", error);
       }
     },
     customModelCatalogProvider: () => {
-      const settings = chunkH3UXL3U6_cjs.loadSettings();
+      const settings = chunkU3HWL5UG_cjs.loadSettings();
       const customModels = [];
       for (const provider of settings.customProviders) {
-        const providerId = chunkH3UXL3U6_cjs.getCustomProviderId(provider.name);
+        const providerId = chunkU3HWL5UG_cjs.getCustomProviderId(provider.name);
         for (const modelName of provider.models) {
           customModels.push({
-            id: chunkH3UXL3U6_cjs.toCustomProviderModelId(provider.name, modelName),
+            id: chunkU3HWL5UG_cjs.toCustomProviderModelId(provider.name, modelName),
             provider: providerId,
             modelName,
             hasApiKey: true,
@@ -3207,8 +3258,8 @@ async function createMastraCode(config) {
       return customModels;
     },
     threadLock: {
-      acquire: chunkH3UXL3U6_cjs.acquireThreadLock,
-      release: chunkH3UXL3U6_cjs.releaseThreadLock
+      acquire: chunkU3HWL5UG_cjs.acquireThreadLock,
+      release: chunkU3HWL5UG_cjs.releaseThreadLock
     }
   });
   if (hookManager) {
@@ -3220,12 +3271,16 @@ async function createMastraCode(config) {
       }
     });
   }
+  const cavemanHarness = harness$1;
+  attachCavemanThreadStatePersistence(cavemanHarness);
+  await restoreCavemanForCurrentThread(cavemanHarness).catch(() => {
+  });
   return {
     harness: harness$1,
     mcpManager,
     hookManager,
     authStorage,
-    resolveModel: chunkH3UXL3U6_cjs.resolveModel,
+    resolveModel: chunkU3HWL5UG_cjs.resolveModel,
     storageWarning,
     observabilityWarning,
     builtinPacks,
@@ -3236,5 +3291,5 @@ async function createMastraCode(config) {
 
 exports.createAuthStorage = createAuthStorage;
 exports.createMastraCode = createMastraCode;
-//# sourceMappingURL=chunk-DLEPYUVF.cjs.map
-//# sourceMappingURL=chunk-DLEPYUVF.cjs.map
+//# sourceMappingURL=chunk-BV5IMX2N.cjs.map
+//# sourceMappingURL=chunk-BV5IMX2N.cjs.map