@dbx-tools/appkit-mastra 0.9.117 → 0.9.119

package/package.json

@@ -34,20 +34,21 @@
   },
   "dependencies": {
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.117",
-    "@dbx-tools/core": "^0.9.117",
-    "@dbx-tools/databricks": "^0.9.117",
-    "@dbx-tools/fs": "^0.9.117",
-    "@dbx-tools/genie": "^0.9.117",
-    "@dbx-tools/model": "^0.9.117",
-    "@dbx-tools/model-protocol": "^0.9.117",
-    "@dbx-tools/path": "^0.9.117",
-    "@dbx-tools/postgres": "^0.9.117",
-    "@dbx-tools/shared-core": "^0.9.117",
-    "@dbx-tools/shared-fs": "^0.9.117",
-    "@dbx-tools/shared-genie": "^0.9.117",
-    "@dbx-tools/shared-mastra": "^0.9.117",
-    "@dbx-tools/shared-model": "^0.9.117",
+    "@dbx-tools/appkit": "^0.9.119",
+    "@dbx-tools/cache": "^0.9.119",
+    "@dbx-tools/core": "^0.9.119",
+    "@dbx-tools/databricks": "^0.9.119",
+    "@dbx-tools/fs": "^0.9.119",
+    "@dbx-tools/genie": "^0.9.119",
+    "@dbx-tools/model": "^0.9.119",
+    "@dbx-tools/model-protocol": "^0.9.119",
+    "@dbx-tools/path": "^0.9.119",
+    "@dbx-tools/postgres": "^0.9.119",
+    "@dbx-tools/shared-core": "^0.9.119",
+    "@dbx-tools/shared-fs": "^0.9.119",
+    "@dbx-tools/shared-genie": "^0.9.119",
+    "@dbx-tools/shared-mastra": "^0.9.119",
+    "@dbx-tools/shared-model": "^0.9.119",
     "@mastra/ai-sdk": "1.10.5",
     "@mastra/core": "1.71.0",
     "@mastra/express": "1.5.15",
@@ -68,7 +69,6 @@
     "ai": "^7.0.0",
     "express": "^5.1.0",
     "fuse.js": "^7.4.2",
-    "lru-cache": "11.5.3",
     "pg": "^8.22.0",
     "yaml": "^2.9.0",
     "zod": "4.3.6"
@@ -164,10 +164,6 @@
         "types": "./lib/src/rest.d.ts",
         "default": "./lib/src/rest.js"
       },
-      "./sandbox": {
-        "types": "./lib/src/sandbox.d.ts",
-        "default": "./lib/src/sandbox.js"
-      },
       "./server": {
         "types": "./lib/src/server.d.ts",
         "default": "./lib/src/server.js"
@@ -223,7 +219,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.117",
+  "version": "0.9.119",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [
@@ -316,10 +312,6 @@
       "types": "./lib/src/rest.d.ts",
       "default": "./lib/src/rest.js"
     },
-    "./sandbox": {
-      "types": "./lib/src/sandbox.d.ts",
-      "default": "./lib/src/sandbox.js"
-    },
     "./server": {
       "types": "./lib/src/server.d.ts",
       "default": "./lib/src/server.js"

package/src/agents.ts

@@ -35,7 +35,7 @@ import type {
 } from "@mastra/core/agent";
 import { Agent } from "@mastra/core/agent";
 import { createEventedAgent } from "@mastra/core/agent/durable";
-import { SkillSearchProcessor } from "@mastra/core/processors";
+import { SkillSearchProcessor, ToolCallFilter } from "@mastra/core/processors";
 import type { OutputProcessor } from "@mastra/core/processors";
 import { MASTRA_RESOURCE_ID_KEY } from "@mastra/core/request-context";
 import type { RequestContext } from "@mastra/core/request-context";
@@ -738,6 +738,11 @@ export async function buildAgents(opts: {
   // turn's `[chart:<id>]` markers. Opt out per-plugin via
   // `config.stripStaleCharts: false`.
   const inputProcessors = [
+    // `render_data` can carry hundreds of inline rows. Keep the complete call
+    // in Memory and the UI transcript, but use Mastra's native prompt-stage
+    // filter to omit prior calls/results from later model requests. Current
+    // turn calls remain available to the agent loop.
+    new ToolCallFilter({ exclude: ["render_data"] }),
     ...(config.stripStaleCharts === false ? [] : [stripStaleChartsProcessor]),
   ];
   const agents: Record<string, Agent> = {};
@@ -762,7 +767,7 @@ export async function buildAgents(opts: {
         fallbackToTmp: config.workspaceFallbackToTmp,
         ...(config.workspaceTools !== undefined ? { tools: config.workspaceTools } : {}),
         pluginContext: context,
-        sandbox: config.sandbox === true ? "databricks" : config.sandbox,
+        sandbox: config.sandbox,
       });
       markDefaultWorkspace(workspace);
     } else if (workspace) {

package/src/config.ts

@@ -20,14 +20,17 @@ import type { BrandContext } from "@dbx-tools/shared-core";
 import type { AgentConfig } from "@mastra/core/agent";
 import type { RequestContext } from "@mastra/core/request-context";
 import { MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from "@mastra/core/request-context";
-import type { WorkspaceToolsConfig } from "@mastra/core/workspace";
+import type {
+  WorkspaceSandbox,
+  WorkspaceSandboxResolver,
+  WorkspaceToolsConfig,
+} from "@mastra/core/workspace";
 import type { PgVectorConfig, PostgresStoreConfig } from "@mastra/pg";
 
 import type { AnyMastraAgentDefinition, MastraTools } from "./agents.ts";
 import type { GenieSpacesConfig } from "./genie.ts";
 import { IDENTITY_MODES, type MastraIdentityMode } from "./identity.ts";
-import type { RemoteSkillsOption } from "./remote-skills.ts";
-import type { DatabricksWorkspaceSandboxOptions } from "./sandbox.ts";
+import type { LocalSkillMount, RemoteSkillsOption } from "./remote-skills.ts";
 
 /**
  * `RequestContext` key under which {@link MastraServer} stores the
@@ -226,20 +229,22 @@ export interface MastraPluginConfig extends BasePluginConfig {
    */
   memory?: boolean | MastraMemoryConfig;
   /**
-   * Expose executable tools from each agent definition through native Mastra
-   * Code Mode. Defaults on whenever the agent has executable tools. The plugin
-   * selects Mastra's isolated-vm transport once during startup and falls back
-   * to Mastra QuickJS when the native transport is unavailable. Set `false` to
+   * Expose executable tools available to the current request through native
+   * Mastra Code Mode. Defaults on whenever the request has executable tools.
+   * The plugin selects Mastra's isolated-vm transport once during startup and
+   * falls back to Mastra QuickJS when the native transport is unavailable.
+   * These transports do not execute through the workspace command sandbox;
+   * SSH is used only when an exposed SSH-backed tool is called. Set `false` to
    * opt out.
    */
   codeMode?: boolean | MastraCodeModeConfig;
   /**
    * Sandbox for auto-created agent workspaces. Defaults to Monty. `false`
-   * disables command execution; `true`, `"databricks"`, or an object
-   * selects/configures Databricks Sandbox. An agent with an explicit custom
-   * `workspace` keeps that workspace and its sandbox.
+   * disables command execution; `true` or `"monty"` selects Monty; an explicit
+   * Mastra sandbox or resolver supplies a remote transport. An agent with an
+   * explicit custom `workspace` keeps that workspace and its sandbox.
    */
-  sandbox?: boolean | "databricks" | "monty" | DatabricksWorkspaceSandboxOptions;
+  sandbox?: boolean | "monty" | WorkspaceSandbox | WorkspaceSandboxResolver;
   /** Add user-scoped `/tmp` only when no configured workspace path mounts writable. */
   workspaceFallbackToTmp?: boolean;
   /** Native Mastra workspace tool availability, approval, and hook configuration. */
@@ -634,10 +639,10 @@ export interface MastraPluginConfig extends BasePluginConfig {
    * without it, a URL source is fetched directly. A source that resolves
    * through neither fails startup unless `failOnError: false`.
    *
-   * Provisioned skills are written to the Databricks user's Assistant skills
-   * folder (`/Workspace/Users/<email>/.assistant/skills`, the personal skill
-   * target) so they persist and are picked up by the built-in Assistant-skills
-   * mount. With no writable workspace, they go to a local temp dir instead.
+   * AI Tools is cached daily with `@dbx-tools/cache` and served to every
+   * auto-created workspace from the shared `/.databricks/skills` memory mount.
+   * Other sources are written to the Databricks user's Assistant skills folder
+   * when writable, with a read-only local-memory fallback.
    *
    * @example
    * ```ts
@@ -651,6 +656,8 @@ export interface MastraPluginConfig extends BasePluginConfig {
    * ```
    */
   remoteSkills?: RemoteSkillsOption;
+  /** Read-only local skill trees mounted into every default agent workspace. */
+  localSkillMounts?: LocalSkillMount[];
 }
 
 /**
@@ -677,7 +684,7 @@ export const MASTRA_CONFIG_SCHEMA: ConfigSchema = {
     remoteSkills: {
       type: ["string", "array", "object"],
       description:
-        'Remote Agent-Skill sources provisioned at startup: "aitools" for Databricks\' own skill set (read from the public databricks/databricks-agent-skills repo, no CLI needed), a GitHub owner/repo, a git/GitLab URL, or a direct SKILL.md/archive URL. Non-aitools sources prefer the optional `skills` npm CLI, else a direct fetch; fails startup on error unless failOnError:false. Written to the Databricks user Assistant skills folder, or read-only local backing storage exposed at stable virtual workspace mounts.',
+        'Remote Agent-Skill sources provisioned at startup: "aitools" for Databricks\' own skill set (daily @dbx-tools/cache snapshot served from the shared in-memory /.databricks/skills mount), a GitHub owner/repo, a git/GitLab URL, or a direct SKILL.md/archive URL. Non-aitools sources prefer the optional `skills` npm CLI, else a direct fetch; fails startup on error unless failOnError:false. Other sources write to the Databricks user Assistant skills folder or a read-only local-memory fallback.',
     },
     storage: {
       type: ["boolean", "object"],
@@ -692,12 +699,12 @@ export const MASTRA_CONFIG_SCHEMA: ConfigSchema = {
     codeMode: {
       type: ["boolean", "object"],
       description:
-        "Expose all executable tools available to the current request, including native workspace tools, through dynamically generated Mastra Code Mode for sandboxed TypeScript batching, aggregation, and arithmetic. The plugin selects Mastra isolated-vm once during startup and falls back to Mastra QuickJS when native initialization is unavailable. False disables it.",
+        "Expose all executable tools available to the current request through native Mastra Code Mode for TypeScript batching, aggregation, and arithmetic. The plugin uses Mastra isolated-vm with the existing QuickJS fallback; neither transport runs through the workspace command sandbox, so SSH is used only when an SSH-backed tool is called. False disables it.",
     },
     sandbox: {
       type: ["boolean", "string", "object"],
       description:
-        'Command sandbox for auto-created agent workspaces. Defaults to Monty. False disables command execution; true, "databricks", or an object selects/configures Databricks Sandbox.',
+        'Command sandbox for auto-created agent workspaces. Defaults to Monty. False disables command execution; true or "monty" selects Monty; an explicit sandbox or resolver supplies another transport.',
     },
     workspaceFallbackToTmp: {
       type: "boolean",

package/src/defaults.ts

@@ -53,9 +53,9 @@ const STATEMENT_CACHE_TTL_SEC = 5 * 60;
 export const modelCatalogueDefaults: ExecuteSettings = {
   default: {
     // Cache disabled here because `listServingEndpoints` already memoizes the
-    // catalogue through the same `CacheManager`, keyed by workspace host with
-    // `config.modelCacheTtlMs`. That entry is shared across identities; a
-    // second interceptor cache would duplicate it once per user.
+    // catalogue in the shared model cache, keyed by workspace host and trusted
+    // credential identity with `config.modelCacheTtlMs`. A second interceptor
+    // cache would duplicate it once per user.
     cache: { enabled: false },
     // Retry enabled: listing endpoints is an idempotent GET, and the listing
     // is on the chat UI's load path, so a transient 5xx should not blank the

package/src/genie.ts

@@ -45,6 +45,7 @@ import {
 } from "@databricks/appkit";
 import type { WorkspaceClient } from "@databricks/appkit";
 import { pluginRegistry } from "@dbx-tools/appkit";
+import { createCache } from "@dbx-tools/cache/cache";
 import { chat, space as genieSpace } from "@dbx-tools/genie";
 import { errorUtils, log, stringUtils } from "@dbx-tools/shared-core";
 import { genieModel, type GenieMessage } from "@dbx-tools/shared-genie";
@@ -52,7 +53,6 @@ import type { StartedEvent } from "@dbx-tools/shared-mastra";
 import type { RequestContext } from "@mastra/core/request-context";
 import { MASTRA_THREAD_ID_KEY } from "@mastra/core/request-context";
 import { createTool, type ToolExecutionContext } from "@mastra/core/tools";
-import { LRUCache } from "lru-cache";
 import { z } from "zod";
 
 import type { MastraTools } from "./agents.ts";
@@ -1091,19 +1091,19 @@ const SUGGESTION_LIMIT = 6;
 const SUGGESTION_CACHE_TTL_MS = 10 * 60_000;
 
 /** Bounded process-local cache of parsed sample questions by Genie space id. */
-const _suggestionCache = new LRUCache<string, string[]>({
-  max: 128,
+const _suggestionCache = createCache({
+  maxEntries: 128,
   ttl: SUGGESTION_CACHE_TTL_MS,
 });
 
 /** Read a space's cached questions, or `undefined` on miss / expiry. */
-function readSuggestionCache(spaceId: string): string[] | undefined {
-  return _suggestionCache.get(spaceId);
+function readSuggestionCache(spaceId: string): Promise<string[] | undefined> {
+  return _suggestionCache.get<string[]>(spaceId);
 }
 
 /** Cache a space's parsed questions for {@link SUGGESTION_CACHE_TTL_MS}. */
-function writeSuggestionCache(spaceId: string, questions: string[]): void {
-  _suggestionCache.set(spaceId, questions);
+async function writeSuggestionCache(spaceId: string, questions: string[]): Promise<void> {
+  await _suggestionCache.set(spaceId, questions);
 }
 
 /**
@@ -1128,7 +1128,7 @@ export async function collectSpaceSuggestions(opts: {
   const seen = new Set<string>();
 
   for (const { spaceId } of Object.values(opts.spaces)) {
-    let questions = readSuggestionCache(spaceId);
+    let questions = await readSuggestionCache(spaceId);
     if (!questions) {
       try {
         const space = await genieSpace.getGenieSpace(spaceId, {
@@ -1136,7 +1136,7 @@ export async function collectSpaceSuggestions(opts: {
           ...(opts.signal ? { context: opts.signal } : {}),
         });
         questions = genieSpace.genieSampleQuestions(space);
-        writeSuggestionCache(spaceId, questions);
+        await writeSuggestionCache(spaceId, questions);
       } catch (err) {
         logger.warn("suggestions:fetch-error", {
           spaceId,

package/src/model.ts

@@ -22,13 +22,14 @@
  * @module
  */
 
-import { getExecutionContext } from "@databricks/appkit";
+import { createWorkspaceClient, type WorkspaceClient } from "@databricks/appkit";
+import { appkit } from "@dbx-tools/appkit";
 import { classes, policy, resolve } from "@dbx-tools/model";
 import { createDatabricksLanguageModel } from "@dbx-tools/model-protocol/provider";
 import { log } from "@dbx-tools/shared-core";
 import { model, type ServingEndpointSummary } from "@dbx-tools/shared-model";
 import type { MastraModelConfig } from "@mastra/core/llm";
-import type { RequestContext } from "@mastra/core/request-context";
+import { RequestContext } from "@mastra/core/request-context";
 
 import { MASTRA_USER_KEY, type MastraPluginConfig, type User } from "./config.ts";
 import {
@@ -73,6 +74,32 @@ export interface BuildModelOverrides {
   modelClass?: ModelClass;
 }
 
+/** Resolved workspace client and the authentication mode backing it. */
+interface ResolvedModelWorkspaceClient {
+  client: WorkspaceClient;
+  auth: "obo" | "service-principal";
+}
+
+/** Resolve an OBO workspace client when present, else a service-principal client. */
+function resolveModelWorkspaceContext(
+  requestContext?: RequestContext,
+): ResolvedModelWorkspaceClient {
+  const user = requestContext?.get(MASTRA_USER_KEY) as User | undefined;
+  const executionContext = user?.executionContext ?? appkit.tryGetExecutionContext();
+  if (executionContext?.client.config) {
+    return {
+      client: executionContext.client,
+      auth: "isUserContext" in executionContext ? "obo" : "service-principal",
+    };
+  }
+  return { client: createWorkspaceClient(), auth: "service-principal" };
+}
+
+/** Resolve the workspace client used for model discovery and inference. */
+export function resolveModelWorkspaceClient(requestContext?: RequestContext): WorkspaceClient {
+  return resolveModelWorkspaceContext(requestContext).client;
+}
+
 function selectionInput(
   config: MastraPluginConfig,
   requested: string | undefined,
@@ -125,24 +152,24 @@ export function resolveDefaultModelId(
  */
 export async function buildModel(
   config: MastraPluginConfig,
-  requestContext: RequestContext,
+  requestContext?: RequestContext,
   overrides: BuildModelOverrides = {},
 ): Promise<MastraModelConfig> {
+  const context = requestContext ?? new RequestContext();
   // The chat path stamps the AppKit user on the request context via
   // `MastraServer`. The MCP transport routes don't thread that context
   // into tool execution, so fall back to the ambient execution context
   // (the active OBO scope, or the service principal) when it's absent.
-  const user = requestContext.get(MASTRA_USER_KEY) as User | undefined;
-  const executionContext = user?.executionContext ?? getExecutionContext();
-  recordActiveTraceAuth("isUserContext" in executionContext ? "obo" : "service-principal");
-  const clientConfig = executionContext.client.config;
+  const { client, auth } = resolveModelWorkspaceContext(context);
+  recordActiveTraceAuth(auth);
+  const clientConfig = client.config;
   const host = (await clientConfig.getHost()).toString();
   const headers = new Headers();
   await clientConfig.authenticate(headers);
   const logger = log.logger(config);
   const serving = resolveServingConfig(config);
   const override = serving.allowOverride
-    ? (requestContext.get(MASTRA_MODEL_OVERRIDE_KEY) as string | undefined)
+    ? (context.get(MASTRA_MODEL_OVERRIDE_KEY) as string | undefined)
     : undefined;
 
   // The override / agent default / env value can be either a concrete
@@ -155,12 +182,12 @@ export async function buildModel(
   const requested = override ?? overrides.modelId ?? process.env.DATABRICKS_SERVING_ENDPOINT_NAME;
 
   const { modelId, source } = await selectModel(
-    executionContext.client,
+    client,
     host,
     selectionInput(config, requested, overrides.modelClass, serving),
   );
   logger.debug("model selected", { modelId, source, requested });
-  requestContext.set(MASTRA_RESOLVED_MODEL_KEY, modelId);
+  context.set(MASTRA_RESOLVED_MODEL_KEY, modelId);
   recordActiveTraceModel(modelId);
 
   return createDatabricksLanguageModel({

package/src/plugin.ts

@@ -1126,7 +1126,7 @@ export class MastraPlugin extends Plugin<MastraPluginConfig> {
       context: this.context,
       memoryBuilder,
       log: this.logger,
-      extraSkillMounts: provisioned.localSkillMounts,
+      extraSkillMounts: [...(this.config.localSkillMounts ?? []), ...provisioned.localSkillMounts],
     });
 
     // `mastra.server.apiRoutes` is only honored by Mastra's standalone