@dbx-tools/appkit-mastra 0.9.95 → 0.9.99

package/package.json

@@ -34,19 +34,19 @@
   },
   "dependencies": {
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.95",
-    "@dbx-tools/core": "^0.9.95",
-    "@dbx-tools/databricks": "^0.9.95",
-    "@dbx-tools/fs": "^0.9.95",
-    "@dbx-tools/genie": "^0.9.95",
-    "@dbx-tools/model": "^0.9.95",
-    "@dbx-tools/path": "^0.9.95",
-    "@dbx-tools/postgres": "^0.9.95",
-    "@dbx-tools/shared-core": "^0.9.95",
-    "@dbx-tools/shared-fs": "^0.9.95",
-    "@dbx-tools/shared-genie": "^0.9.95",
-    "@dbx-tools/shared-mastra": "^0.9.95",
-    "@dbx-tools/shared-model": "^0.9.95",
+    "@dbx-tools/appkit": "^0.9.99",
+    "@dbx-tools/core": "^0.9.99",
+    "@dbx-tools/databricks": "^0.9.99",
+    "@dbx-tools/fs": "^0.9.99",
+    "@dbx-tools/genie": "^0.9.99",
+    "@dbx-tools/model": "^0.9.99",
+    "@dbx-tools/path": "^0.9.99",
+    "@dbx-tools/postgres": "^0.9.99",
+    "@dbx-tools/shared-core": "^0.9.99",
+    "@dbx-tools/shared-fs": "^0.9.99",
+    "@dbx-tools/shared-genie": "^0.9.99",
+    "@dbx-tools/shared-mastra": "^0.9.99",
+    "@dbx-tools/shared-model": "^0.9.99",
     "@mastra/ai-sdk": "1.10.5",
     "@mastra/core": "1.71.0",
     "@mastra/express": "1.5.15",
@@ -219,7 +219,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.95",
+  "version": "0.9.99",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [

package/src/agents.ts

@@ -51,7 +51,7 @@ import { stripStaleChartsProcessor } from "./processors.ts";
 import { MASTRA_RESOLVED_MODEL_KEY } from "./serving.ts";
 import { TYPOGRAPHY_RULE } from "./style.ts";
 import { buildSummarizeTool } from "./summarize.ts";
-import { createWorkspace } from "./workspaces.ts";
+import { bindDatabricksWorkspaceContext, databricksWorkspace } from "./workspaces.ts";
 
 /**
  * Tool record accepted by every Mastra `Agent.tools` field and by the
@@ -168,8 +168,8 @@ function deriveToolId(description: string): string {
  * ```
  *
  * Adds the package's default workspace when the definition omits one. That
- * workspace carries Databricks skill mounts and Databricks Sandbox command
- * execution. An explicit workspace remains the caller's complete override.
+ * workspace carries Databricks skill mounts and Monty command execution. An
+ * explicit workspace remains the caller's complete override.
  */
 export function createAgent<
   TRequestContext extends Record<string, unknown> | unknown = unknown,
@@ -177,7 +177,7 @@ export function createAgent<
     MastraAgentDefinition<TRequestContext>,
 >(def: TDefinition): TDefinition {
   if (def.workspace) return { ...def };
-  const workspace = createWorkspace();
+  const workspace = databricksWorkspace();
   markDefaultWorkspace(workspace);
   return { ...def, workspace };
 }
@@ -338,7 +338,7 @@ export interface MastraAgentDefinition<
   /**
    * Mastra {@link Workspace} for this agent (filesystem, sandbox, or other
    * providers). Assistant skills from Databricks workspace paths are wired
-   * via {@link createWorkspace}.
+   * via {@link databricksWorkspace}.
    */
   workspace?: Workspace | MastraAgentWorkspaceResolver;
 }
@@ -580,13 +580,15 @@ export async function buildAgents(opts: {
         context !== undefined) &&
         isDefaultWorkspace(workspace))
     ) {
-      workspace = createWorkspace({
+      workspace = databricksWorkspace({
         extraSkillPaths,
         ...(config.workspaceTools !== undefined ? { tools: config.workspaceTools } : {}),
         pluginContext: context,
         sandbox: config.sandbox === true ? "databricks" : config.sandbox,
       });
       markDefaultWorkspace(workspace);
+    } else if (workspace) {
+      workspace = bindDatabricksWorkspaceContext(workspace, context);
     }
     const gated = approvalGatedToolIds(tools);
     if (gated.length > 0) approvalGatedByAgent.push({ agentId: id, toolIds: gated });

package/src/monty-sandbox.ts

@@ -11,12 +11,13 @@
 
 import { configUtils } from "@dbx-tools/core";
 import { errorUtils, functionUtils, log } from "@dbx-tools/shared-core";
+import { availableParallelism } from "node:os";
 import type {
   CommandResult,
   ExecuteCommandOptions,
   SandboxInfo,
-  WorkspaceSandbox,
 } from "@mastra/core/workspace";
+import { MastraSandbox, type ProviderStatus } from "@mastra/core/workspace";
 import type { CheckoutOptions, Monty, MontyCrashedError, MontySession } from "@pydantic/monty";
 
 const DEFAULT_COMMAND_TIMEOUT_MS = 30_000;
@@ -38,6 +39,11 @@ interface MontyContext {
   pool: MontyPool;
 }
 
+/** @internal Size the shared worker pool from the host's available processors. */
+export function montyMaxProcesses(parallelism: number = availableParallelism()): number {
+  return Math.max(4, Math.floor(parallelism) * 2);
+}
+
 const montyContext = functionUtils.memoize(async (): Promise<MontyContext> => {
   const errors: Error[] = [];
   const targets = configUtils.boolean(undefined, "MONTY_FORCE_WASM")
@@ -47,12 +53,13 @@ const montyContext = functionUtils.memoize(async (): Promise<MontyContext> => {
     try {
       const module = await target.load();
       logger.debug(`${target.name} module available`);
+      const maxProcesses = montyMaxProcesses();
       const pool = await module.Monty.create({
         minProcesses: 1,
-        maxProcesses: 4,
+        maxProcesses,
         requestTimeout: 35,
       });
-      logger.debug(`${target.name} pool created`);
+      logger.debug(`${target.name} pool created`, { maxProcesses });
       return {
         crashedError: module.MontyCrashedError,
         pool,
@@ -82,12 +89,11 @@ export interface MontySandboxOptions {
 }
 
 /** Python-only, deny-by-default sandbox backed by Monty's selected worker pool. */
-export class MontySandbox implements WorkspaceSandbox {
+export class MontySandbox extends MastraSandbox {
   readonly id: string;
   readonly name: string;
   readonly provider = "monty";
-  status: WorkspaceSandbox["status"] = "pending";
-  error?: string;
+  status: ProviderStatus = "pending";
 
   private readonly commandTimeoutMs: number;
   private readonly maxMemoryBytes: number;
@@ -96,8 +102,10 @@ export class MontySandbox implements WorkspaceSandbox {
   private lastUsedAt?: Date;
 
   constructor(options: MontySandboxOptions = {}) {
+    const name = options.name ?? "Pydantic Monty";
+    super({ name });
     this.id = options.id ?? "monty";
-    this.name = options.name ?? "Pydantic Monty";
+    this.name = name;
     this.commandTimeoutMs = options.commandTimeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS;
     this.maxMemoryBytes = options.maxMemoryBytes ?? DEFAULT_MAX_MEMORY_BYTES;
     this.typeCheck = options.typeCheck ?? false;
@@ -105,33 +113,14 @@ export class MontySandbox implements WorkspaceSandbox {
 
   /** Warm the shared crash-isolated worker pool. */
   async start(): Promise<void> {
-    if (this.status === "running") return;
-    this.status = "starting";
-    this.error = undefined;
-    try {
-      await montyContext();
-      this.status = "running";
-    } catch (caught) {
-      this.status = "error";
-      this.error = errorUtils.errorMessage(caught);
-      throw caught;
-    }
+    await montyContext();
   }
 
   /** The process-wide pool stays warm; this instance carries no open session. */
-  async stop(): Promise<void> {
-    this.status = "stopped";
-  }
+  async stop(): Promise<void> {}
 
   /** The process-wide pool stays warm; each command closes its own checkout. */
-  async destroy(): Promise<void> {
-    this.status = "destroyed";
-  }
-
-  /** Monty sessions are ephemeral and do not provide persistent checkpoints. */
-  async snapshot(): Promise<void> {}
-
-  readonly supportsCheckpoints = false;
+  async destroy(): Promise<void> {}
 
   /** Execute Python source and map Monty output to Mastra's command result. */
   async executeCommand(

package/src/openapi-tool.ts

@@ -9,16 +9,7 @@ import { urlBuilder, type UrlBuilder } from "@dbx-tools/shared-core/net";
 import type { JSONSchema7 } from "json-schema";
 import { z } from "zod";
 
-const HTTP_METHODS = [
-  "GET",
-  "POST",
-  "PUT",
-  "PATCH",
-  "DELETE",
-  "OPTIONS",
-  "HEAD",
-  "TRACE",
-] as const;
+const HTTP_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "HEAD", "TRACE"] as const;
 
 const JsonObjectSchema = z
   .record(z.string(), z.unknown())
@@ -208,7 +199,7 @@ function operationUrl(document: OpenApiDocument, sourceUrl: URL | undefined, pat
       ? base.withPathAppend(path).toString()
       : `${server.replace(/\/$/, "")}/${path.replace(/^\//, "")}`;
   }
-  return sourceUrl ? urlBuilder(sourceUrl)?.withPathReplace(path).toString() ?? path : path;
+  return sourceUrl ? (urlBuilder(sourceUrl)?.withPathReplace(path).toString() ?? path) : path;
 }
 
 function resolveReferences(

package/src/server.ts

@@ -470,25 +470,27 @@ export function attachRoutePatchMiddleware(app: express.Express): void {
  * completed turn.
  */
 export function attachStaleResumeRecovery(app: express.Express): void {
-  app.use((error: unknown, req: express.Request, res: express.Response, next: express.NextFunction) => {
-    if (!isStaleMastraResumeError(error)) {
-      next(error);
-      return;
-    }
-    logger.warn("ignored stale mastra resume", {
-      path: req.path,
-      error: errorUtils.errorMessage(error),
-    });
-    if (res.headersSent) {
+  app.use(
+    (error: unknown, req: express.Request, res: express.Response, next: express.NextFunction) => {
+      if (!isStaleMastraResumeError(error)) {
+        next(error);
+        return;
+      }
+      logger.warn("ignored stale mastra resume", {
+        path: req.path,
+        error: errorUtils.errorMessage(error),
+      });
+      if (res.headersSent) {
+        res.end();
+        return;
+      }
+      res.status(200);
+      res.setHeader("content-type", "text/event-stream; charset=utf-8");
+      res.setHeader("cache-control", "no-cache");
+      res.write(`data: ${JSON.stringify({ type: "start" })}\n\n`);
+      res.write(`data: ${JSON.stringify({ type: "finish" })}\n\n`);
+      res.write("data: [DONE]\n\n");
       res.end();
-      return;
-    }
-    res.status(200);
-    res.setHeader("content-type", "text/event-stream; charset=utf-8");
-    res.setHeader("cache-control", "no-cache");
-    res.write(`data: ${JSON.stringify({ type: "start" })}\n\n`);
-    res.write(`data: ${JSON.stringify({ type: "finish" })}\n\n`);
-    res.write("data: [DONE]\n\n");
-    res.end();
-  });
+    },
+  );
 }

package/src/skill-paths.ts

@@ -2,7 +2,7 @@
  * Where Databricks Assistant `SKILL.md` trees live.
  *
  * Two modules need these paths and must agree on them: `workspaces.ts` MOUNTS
- * them per request (see `DEFAULT_SKILL_FOLDERS`), and `remote-skills.ts`
+ * them per request (see `DEFAULT_DATABRICKS_WORKSPACE_PATHS`), and `remote-skills.ts`
  * WRITES provisioned skills into them at startup. They live here rather than being
  * spelled out in both, where a change to one would silently provision skills into a
  * tree the other never scanned.