@dbx-tools/appkit-mastra 0.6.218 → 0.6.219

package/lib/src/writer.js

@@ -1,8 +1,6 @@
 /**
- * Shared helper for publishing events through Mastra's
- * `ctx.writer`. Centralizes the "the downstream stream may already
- * be closed, don't take the whole tool down" pattern that the
- * Genie agent and chart tool both need.
+ * Shared helper for publishing Genie progress through Mastra's native
+ * `ctx.writer.custom()` data-part surface.
  *
  * Failures are logged at `warn` (a persistently-closed writer is
  * the most likely culprit when events go missing client-side) but
@@ -12,8 +10,10 @@
  * @module
  */
 import { error } from "@dbx-tools/shared-core";
+import { GENIE_PROGRESS_PART_TYPE } from "@dbx-tools/shared-mastra";
 /**
- * Best-effort `writer.write`. No-op when `writer` is undefined;
+ * Best-effort native custom progress write. No-op when the writer or owning
+ * tool call id is unavailable;
  * caught errors are logged via `log.warn("writer:error", ...)`
  * along with any caller-supplied `context` fields (e.g. a
  * `chartId` or `messageId`) so the warning is greppable per
@@ -21,13 +21,16 @@ import { error } from "@dbx-tools/shared-core";
  *
  * Returns when the write resolves or rejects; never throws.
  */
-export async function safeWrite(log, writer, chunk, context = {}) {
-    if (!writer) {
+export async function safeWriteProgress(log, writer, toolCallId, event, context = {}) {
+    if (!writer || !toolCallId) {
         log.debug("writer:no-writer", context);
         return;
     }
     try {
-        await writer.write(chunk);
+        await writer.custom({
+            type: GENIE_PROGRESS_PART_TYPE,
+            data: { toolCallId, event },
+        });
         log.debug("writer:ok", context);
     }
     catch (err) {
@@ -37,4 +40,4 @@ export async function safeWrite(log, writer, chunk, context = {}) {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3dyaXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7O0dBWUc7QUFFSCxPQUFPLEVBQUUsS0FBSyxFQUFPLE1BQU0sd0JBQXdCLENBQUM7QUFHcEQ7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFNBQVMsQ0FDN0IsR0FBZSxFQUNmLE1BQWdDLEVBQ2hDLEtBQWMsRUFDZCxVQUFtQyxFQUFFO0lBRXJDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNaLEdBQUcsQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDdkMsT0FBTztJQUNULENBQUM7SUFDRCxJQUFJLENBQUM7UUFDSCxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUIsR0FBRyxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFDYixHQUFHLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRTtZQUN2QixHQUFHLE9BQU87WUFDVixLQUFLLEVBQUUsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUM7U0FDL0IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIFNoYXJlZCBoZWxwZXIgZm9yIHB1Ymxpc2hpbmcgZXZlbnRzIHRocm91Z2ggTWFzdHJhJ3NcbiAqIGBjdHgud3JpdGVyYC4gQ2VudHJhbGl6ZXMgdGhlIFwidGhlIGRvd25zdHJlYW0gc3RyZWFtIG1heSBhbHJlYWR5XG4gKiBiZSBjbG9zZWQsIGRvbid0IHRha2UgdGhlIHdob2xlIHRvb2wgZG93blwiIHBhdHRlcm4gdGhhdCB0aGVcbiAqIEdlbmllIGFnZW50IGFuZCBjaGFydCB0b29sIGJvdGggbmVlZC5cbiAqXG4gKiBGYWlsdXJlcyBhcmUgbG9nZ2VkIGF0IGB3YXJuYCAoYSBwZXJzaXN0ZW50bHktY2xvc2VkIHdyaXRlciBpc1xuICogdGhlIG1vc3QgbGlrZWx5IGN1bHByaXQgd2hlbiBldmVudHMgZ28gbWlzc2luZyBjbGllbnQtc2lkZSkgYnV0XG4gKiBzd2FsbG93ZWQgc28gYSBjYW5jZWxsZWQgcmVxdWVzdCBvciBhIGNsaWVudCB0aGF0IG5hdmlnYXRlZFxuICogYXdheSBjYW4ndCBjcmFzaCBhIHRvb2wgbWlkLWZsaWdodC5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cblxuaW1wb3J0IHsgZXJyb3IsIGxvZyB9IGZyb20gXCJAZGJ4LXRvb2xzL3NoYXJlZC1jb3JlXCI7XG5pbXBvcnQgdHlwZSB7IE1hc3RyYVdyaXRlciB9IGZyb20gXCJAZGJ4LXRvb2xzL3NoYXJlZC1tYXN0cmFcIjtcblxuLyoqXG4gKiBCZXN0LWVmZm9ydCBgd3JpdGVyLndyaXRlYC4gTm8tb3Agd2hlbiBgd3JpdGVyYCBpcyB1bmRlZmluZWQ7XG4gKiBjYXVnaHQgZXJyb3JzIGFyZSBsb2dnZWQgdmlhIGBsb2cud2FybihcIndyaXRlcjplcnJvclwiLCAuLi4pYFxuICogYWxvbmcgd2l0aCBhbnkgY2FsbGVyLXN1cHBsaWVkIGBjb250ZXh0YCBmaWVsZHMgKGUuZy4gYVxuICogYGNoYXJ0SWRgIG9yIGBtZXNzYWdlSWRgKSBzbyB0aGUgd2FybmluZyBpcyBncmVwcGFibGUgcGVyXG4gKiByZXNvdXJjZS5cbiAqXG4gKiBSZXR1cm5zIHdoZW4gdGhlIHdyaXRlIHJlc29sdmVzIG9yIHJlamVjdHM7IG5ldmVyIHRocm93cy5cbiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHNhZmVXcml0ZShcbiAgbG9nOiBsb2cuTG9nZ2VyLFxuICB3cml0ZXI6IE1hc3RyYVdyaXRlciB8IHVuZGVmaW5lZCxcbiAgY2h1bms6IHVua25vd24sXG4gIGNvbnRleHQ6IFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0ge30sXG4pOiBQcm9taXNlPHZvaWQ+IHtcbiAgaWYgKCF3cml0ZXIpIHtcbiAgICBsb2cuZGVidWcoXCJ3cml0ZXI6bm8td3JpdGVyXCIsIGNvbnRleHQpO1xuICAgIHJldHVybjtcbiAgfVxuICB0cnkge1xuICAgIGF3YWl0IHdyaXRlci53cml0ZShjaHVuayk7XG4gICAgbG9nLmRlYnVnKFwid3JpdGVyOm9rXCIsIGNvbnRleHQpO1xuICB9IGNhdGNoIChlcnIpIHtcbiAgICBsb2cud2FybihcIndyaXRlcjplcnJvclwiLCB7XG4gICAgICAuLi5jb250ZXh0LFxuICAgICAgZXJyb3I6IGVycm9yLmVycm9yTWVzc2FnZShlcnIpLFxuICAgIH0pO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3dyaXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7OztHQVVHO0FBRUgsT0FBTyxFQUFFLEtBQUssRUFBTyxNQUFNLHdCQUF3QixDQUFDO0FBQ3BELE9BQU8sRUFBRSx3QkFBd0IsRUFBeUIsTUFBTSwwQkFBMEIsQ0FBQztBQUczRjs7Ozs7Ozs7O0dBU0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUNyQyxHQUFlLEVBQ2YsTUFBc0MsRUFDdEMsVUFBOEIsRUFDOUIsS0FBdUIsRUFDdkIsVUFBbUMsRUFBRTtJQUVyQyxJQUFJLENBQUMsTUFBTSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDM0IsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUN2QyxPQUFPO0lBQ1QsQ0FBQztJQUNELElBQUksQ0FBQztRQUNILE1BQU0sTUFBTSxDQUFDLE1BQU0sQ0FBQztZQUNsQixJQUFJLEVBQUUsd0JBQXdCO1lBQzlCLElBQUksRUFBRSxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUU7U0FDNUIsQ0FBQyxDQUFDO1FBQ0gsR0FBRyxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFDYixHQUFHLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRTtZQUN2QixHQUFHLE9BQU87WUFDVixLQUFLLEVBQUUsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUM7U0FDL0IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIFNoYXJlZCBoZWxwZXIgZm9yIHB1Ymxpc2hpbmcgR2VuaWUgcHJvZ3Jlc3MgdGhyb3VnaCBNYXN0cmEncyBuYXRpdmVcbiAqIGBjdHgud3JpdGVyLmN1c3RvbSgpYCBkYXRhLXBhcnQgc3VyZmFjZS5cbiAqXG4gKiBGYWlsdXJlcyBhcmUgbG9nZ2VkIGF0IGB3YXJuYCAoYSBwZXJzaXN0ZW50bHktY2xvc2VkIHdyaXRlciBpc1xuICogdGhlIG1vc3QgbGlrZWx5IGN1bHByaXQgd2hlbiBldmVudHMgZ28gbWlzc2luZyBjbGllbnQtc2lkZSkgYnV0XG4gKiBzd2FsbG93ZWQgc28gYSBjYW5jZWxsZWQgcmVxdWVzdCBvciBhIGNsaWVudCB0aGF0IG5hdmlnYXRlZFxuICogYXdheSBjYW4ndCBjcmFzaCBhIHRvb2wgbWlkLWZsaWdodC5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cblxuaW1wb3J0IHsgZXJyb3IsIGxvZyB9IGZyb20gXCJAZGJ4LXRvb2xzL3NoYXJlZC1jb3JlXCI7XG5pbXBvcnQgeyBHRU5JRV9QUk9HUkVTU19QQVJUX1RZUEUsIHR5cGUgR2VuaWVXcml0ZXJFdmVudCB9IGZyb20gXCJAZGJ4LXRvb2xzL3NoYXJlZC1tYXN0cmFcIjtcbmltcG9ydCB0eXBlIHsgVG9vbEV4ZWN1dGlvbkNvbnRleHQgfSBmcm9tIFwiQG1hc3RyYS9jb3JlL3Rvb2xzXCI7XG5cbi8qKlxuICogQmVzdC1lZmZvcnQgbmF0aXZlIGN1c3RvbSBwcm9ncmVzcyB3cml0ZS4gTm8tb3Agd2hlbiB0aGUgd3JpdGVyIG9yIG93bmluZ1xuICogdG9vbCBjYWxsIGlkIGlzIHVuYXZhaWxhYmxlO1xuICogY2F1Z2h0IGVycm9ycyBhcmUgbG9nZ2VkIHZpYSBgbG9nLndhcm4oXCJ3cml0ZXI6ZXJyb3JcIiwgLi4uKWBcbiAqIGFsb25nIHdpdGggYW55IGNhbGxlci1zdXBwbGllZCBgY29udGV4dGAgZmllbGRzIChlLmcuIGFcbiAqIGBjaGFydElkYCBvciBgbWVzc2FnZUlkYCkgc28gdGhlIHdhcm5pbmcgaXMgZ3JlcHBhYmxlIHBlclxuICogcmVzb3VyY2UuXG4gKlxuICogUmV0dXJucyB3aGVuIHRoZSB3cml0ZSByZXNvbHZlcyBvciByZWplY3RzOyBuZXZlciB0aHJvd3MuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBzYWZlV3JpdGVQcm9ncmVzcyhcbiAgbG9nOiBsb2cuTG9nZ2VyLFxuICB3cml0ZXI6IFRvb2xFeGVjdXRpb25Db250ZXh0W1wid3JpdGVyXCJdLFxuICB0b29sQ2FsbElkOiBzdHJpbmcgfCB1bmRlZmluZWQsXG4gIGV2ZW50OiBHZW5pZVdyaXRlckV2ZW50LFxuICBjb250ZXh0OiBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPiA9IHt9LFxuKTogUHJvbWlzZTx2b2lkPiB7XG4gIGlmICghd3JpdGVyIHx8ICF0b29sQ2FsbElkKSB7XG4gICAgbG9nLmRlYnVnKFwid3JpdGVyOm5vLXdyaXRlclwiLCBjb250ZXh0KTtcbiAgICByZXR1cm47XG4gIH1cbiAgdHJ5IHtcbiAgICBhd2FpdCB3cml0ZXIuY3VzdG9tKHtcbiAgICAgIHR5cGU6IEdFTklFX1BST0dSRVNTX1BBUlRfVFlQRSxcbiAgICAgIGRhdGE6IHsgdG9vbENhbGxJZCwgZXZlbnQgfSxcbiAgICB9KTtcbiAgICBsb2cuZGVidWcoXCJ3cml0ZXI6b2tcIiwgY29udGV4dCk7XG4gIH0gY2F0Y2ggKGVycikge1xuICAgIGxvZy53YXJuKFwid3JpdGVyOmVycm9yXCIsIHtcbiAgICAgIC4uLmNvbnRleHQsXG4gICAgICBlcnJvcjogZXJyb3IuZXJyb3JNZXNzYWdlKGVyciksXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==

package/lib/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/_agent-route-context.ts","../src/agents.ts","../src/chart.ts","../src/config.ts","../src/defaults.ts","../src/filesystems.ts","../src/genie.ts","../src/history.ts","../src/identity.ts","../src/mcp.ts","../src/memory.ts","../src/mlflow.ts","../src/model.ts","../src/monty-sandbox.ts","../src/observability.ts","../src/pagination.ts","../src/plugin.ts","../src/processors.ts","../src/remote-skills.ts","../src/rest.ts","../src/sandbox.ts","../src/server.ts","../src/serving-sanitize.ts","../src/serving.ts","../src/skill-paths.ts","../src/statement.ts","../src/storage-schema.ts","../src/style.ts","../src/summarize.ts","../src/threads.ts","../src/trace-io.ts","../src/validation.ts","../src/workspaces.ts","../src/writer.ts","../index.ts"],"version":"5.9.3"}
+{"root":["../src/_agent-route-context.ts","../src/agents.ts","../src/chart.ts","../src/chat.ts","../src/config.ts","../src/defaults.ts","../src/filesystems.ts","../src/genie.ts","../src/identity.ts","../src/mcp.ts","../src/memory.ts","../src/mlflow.ts","../src/model.ts","../src/monty-sandbox.ts","../src/observability.ts","../src/pagination.ts","../src/plugin.ts","../src/processors.ts","../src/remote-skills.ts","../src/rest.ts","../src/sandbox.ts","../src/server.ts","../src/serving-sanitize.ts","../src/serving.ts","../src/skill-paths.ts","../src/statement.ts","../src/storage-schema.ts","../src/style.ts","../src/summarize.ts","../src/trace-io.ts","../src/validation.ts","../src/workspaces.ts","../src/writer.ts","../index.ts"],"version":"5.9.3"}

package/package.json

@@ -31,27 +31,27 @@
   },
   "dependencies": {
     "@databricks/appkit": "^0.60.0",
-    "@dbx-tools/appkit": "0.6.218",
-    "@dbx-tools/core": "0.6.218",
-    "@dbx-tools/databricks": "0.6.218",
-    "@dbx-tools/fs": "0.6.218",
-    "@dbx-tools/genie": "0.6.218",
-    "@dbx-tools/model": "0.6.218",
-    "@dbx-tools/path": "0.6.218",
-    "@dbx-tools/shared-core": "0.6.218",
-    "@dbx-tools/shared-fs": "0.6.218",
-    "@dbx-tools/shared-genie": "0.6.218",
-    "@dbx-tools/shared-mastra": "0.6.218",
-    "@dbx-tools/shared-model": "0.6.218",
-    "@mastra/ai-sdk": "1.10.3",
-    "@mastra/core": "1.67.0",
-    "@mastra/express": "1.5.11",
-    "@mastra/fastembed": "1.3.1",
-    "@mastra/mcp": "1.18.0",
-    "@mastra/memory": "1.30.0",
-    "@mastra/observability": "1.17.8",
-    "@mastra/otel-bridge": "1.5.8",
-    "@mastra/pg": "1.25.0",
+    "@dbx-tools/appkit": "0.6.219",
+    "@dbx-tools/core": "0.6.219",
+    "@dbx-tools/databricks": "0.6.219",
+    "@dbx-tools/fs": "0.6.219",
+    "@dbx-tools/genie": "0.6.219",
+    "@dbx-tools/model": "0.6.219",
+    "@dbx-tools/path": "0.6.219",
+    "@dbx-tools/shared-core": "0.6.219",
+    "@dbx-tools/shared-fs": "0.6.219",
+    "@dbx-tools/shared-genie": "0.6.219",
+    "@dbx-tools/shared-mastra": "0.6.219",
+    "@dbx-tools/shared-model": "0.6.219",
+    "@mastra/ai-sdk": "1.10.5",
+    "@mastra/core": "1.71.0",
+    "@mastra/express": "1.5.14",
+    "@mastra/fastembed": "1.3.2",
+    "@mastra/mcp": "2.1.0",
+    "@mastra/memory": "1.32.1",
+    "@mastra/observability": "1.18.0",
+    "@mastra/otel-bridge": "1.5.10",
+    "@mastra/pg": "1.27.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@opentelemetry/api": "^1.9.1",
     "@pydantic/monty": "0.0.23",
@@ -73,7 +73,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.6.218",
+  "version": "0.6.219",
   "types": "./lib/index.d.ts",
   "type": "module",
   "exports": {

package/src/agents.ts

@@ -19,7 +19,12 @@ import { ConfigurationError } from "@databricks/appkit";
 import { plugin } from "@dbx-tools/appkit";
 import { fallback } from "@dbx-tools/model";
 import { log, object, string } from "@dbx-tools/shared-core";
-import type { AgentConfig, ToolsInput } from "@mastra/core/agent";
+import type {
+  AgentConfig,
+  AgentExecutionOptions,
+  AgentInstructions,
+  ToolsInput,
+} from "@mastra/core/agent";
 import { Agent } from "@mastra/core/agent";
 import { MASTRA_RESOURCE_ID_KEY } from "@mastra/core/request-context";
 import type { Tool } from "@mastra/core/tools";
@@ -32,7 +37,7 @@ import type { MastraPluginConfig } from "./config.ts";
 import { buildGenieToolkitProvider, resolveGenieSpaces } from "./genie.ts";
 import type { MemoryBuilder } from "./memory.ts";
 import { buildModel } from "./model.ts";
-import { ResultProcessor, stripStaleChartsProcessor } from "./processors.ts";
+import { stripStaleChartsProcessor } from "./processors.ts";
 import { TYPOGRAPHY_RULE } from "./style.ts";
 import { buildSummarizeTool } from "./summarize.ts";
 import { createWorkspace } from "./workspaces.ts";
@@ -155,7 +160,11 @@ function deriveToolId(description: string): string {
  * workspace carries Databricks skill mounts and Databricks Sandbox command
  * execution. An explicit workspace remains the caller's complete override.
  */
-export function createAgent<T extends MastraAgentDefinition>(def: T): T {
+export function createAgent<
+  TRequestContext extends Record<string, unknown> | unknown = unknown,
+  TDefinition extends MastraAgentDefinition<TRequestContext> =
+    MastraAgentDefinition<TRequestContext>,
+>(def: TDefinition): TDefinition {
   if (def.workspace) return { ...def };
   const workspace = createWorkspace();
   markDefaultWorkspace(workspace);
@@ -260,13 +269,27 @@ export type MastraAgentWorkspaceResolver = () => Workspace | undefined;
  * `config.agents` is the `agentId` the client streams against; `name`
  * is purely informational (defaults to the key).
  */
-export interface MastraAgentDefinition {
+export interface MastraAgentDefinition<
+  TRequestContext extends Record<string, unknown> | unknown = unknown,
+> {
   /** Display name used as `Agent.name`. Defaults to the registry key. */
   name?: string;
   /** Optional long-form description; surfaced as `Agent.description`. */
   description?: string;
-  /** System prompt body. */
-  instructions: string;
+  /** Static or request-context-aware system instructions. */
+  instructions: AgentConfig<string, ToolsInput, undefined, TRequestContext>["instructions"];
+  /** Native Mastra schema that validates and types application request context. */
+  requestContextSchema?: AgentConfig<
+    string,
+    ToolsInput,
+    undefined,
+    TRequestContext
+  >["requestContextSchema"];
+  /**
+   * Mastra-native per-call approval gate for this agent's tools. Supports an
+   * async Classifier-backed function; tool-level approval remains authoritative.
+   */
+  requireToolApproval?: AgentExecutionOptions["requireToolApproval"];
   /**
    * Per-agent model override.
    *
@@ -279,7 +302,7 @@ export interface MastraAgentDefinition {
    *   straight through to `Agent.model`. Use this when you need full
    *   control over auth or providerId.
    */
-  model?: AgentConfig["model"] | string;
+  model?: AgentConfig<string, ToolsInput, undefined, TRequestContext>["model"] | string;
   /**
    * Per-agent tool record. Either a plain map or a callback that
    * receives the typed {@link MastraPlugins} sibling-plugin index and
@@ -323,6 +346,9 @@ export interface MastraAgentDefinition {
   workspace?: Workspace | MastraAgentWorkspaceResolver;
 }
 
+/** Type-erased registry member; each definition retains typing at `createAgent`. */
+export type AnyMastraAgentDefinition = MastraAgentDefinition<any>;
+
 /**
  * Distributive `Omit` so unions in `PostgresStoreConfig` /
  * `PgVectorConfig` keep their discriminants after the override types
@@ -433,13 +459,47 @@ function resolveStyleInstructions(config: MastraPluginConfig): string | null {
   return DEFAULT_STYLE_INSTRUCTIONS;
 }
 
+/** Append the style block without narrowing Mastra's native instruction shapes. */
+function appendStyleInstructions(
+  instructions: AgentInstructions,
+  style: string | null,
+): AgentInstructions {
+  if (!style) return instructions;
+  if (typeof instructions === "string") {
+    return `${instructions.trimEnd()}\n\n${style}`;
+  }
+  if (Array.isArray(instructions)) {
+    if (instructions.every((instruction) => typeof instruction === "string")) {
+      return [...instructions, style] as AgentInstructions;
+    }
+    return [...instructions, { role: "system", content: style }] as AgentInstructions;
+  }
+  return [instructions, { role: "system", content: style }] as AgentInstructions;
+}
+
 /**
- * Join an agent's bespoke instructions with the resolved style block.
- * Returns the bespoke text unchanged when the style block is disabled.
+ * Compose static or request-context-aware instructions with the shared style
+ * policy while preserving Mastra's native generic inference.
  */
-function composeInstructions(agentInstructions: string, style: string | null): string {
-  if (!style) return agentInstructions;
-  return `${agentInstructions.trimEnd()}\n\n${style}`;
+function composeInstructions<TRequestContext extends Record<string, unknown> | unknown>(
+  agentInstructions: AgentConfig<string, ToolsInput, undefined, TRequestContext>["instructions"],
+  style: string | null,
+): AgentConfig<string, ToolsInput, undefined, TRequestContext>["instructions"] {
+  if (typeof agentInstructions !== "function") {
+    return appendStyleInstructions(agentInstructions, style) as AgentConfig<
+      string,
+      ToolsInput,
+      undefined,
+      TRequestContext
+    >["instructions"];
+  }
+  return (async (args) =>
+    appendStyleInstructions(await agentInstructions(args), style)) as AgentConfig<
+    string,
+    ToolsInput,
+    undefined,
+    TRequestContext
+  >["instructions"];
 }
 
 /**
@@ -502,7 +562,6 @@ export async function buildAgents(opts: {
   // chartIds from prior assistant tool results into the new
   // turn's `[chart:<id>]` markers. Opt out per-plugin via
   // `config.stripStaleCharts: false`.
-  const outputProcessors = [new ResultProcessor()];
   const inputProcessors = [
     ...(config.stripStaleCharts === false ? [] : [stripStaleChartsProcessor]),
   ];
@@ -536,15 +595,18 @@ export async function buildAgents(opts: {
       // omits it.
       description: def.description?.trim() || defaultAgentDescription(def.name ?? id),
       instructions: composeInstructions(def.instructions, style),
+      ...(def.requestContextSchema ? { requestContextSchema: def.requestContextSchema } : {}),
       model: resolveModel(config, def.model),
       defaultOptions: {
         maxSteps: config.agentMaxSteps ?? DEFAULT_AGENT_MAX_STEPS,
+        ...(def.requireToolApproval !== undefined
+          ? { requireToolApproval: def.requireToolApproval }
+          : {}),
       },
       tools,
       ...(memory ? { memory } : {}),
       ...(workspace ? { workspace } : {}),
       inputProcessors,
-      outputProcessors,
     });
     // Surface the effective default model per agent so operators can
     // see at a glance which endpoint each agent points at without
@@ -642,7 +704,10 @@ function assertApprovalGatedToolsHaveStorage(
  * overrides (`X-Mastra-Model` etc.) and the workspace-catalogue
  * fuzzy match are still applied at runtime.
  */
-function describeAgentDefaultModel(config: MastraPluginConfig, def: MastraAgentDefinition): string {
+function describeAgentDefaultModel(
+  config: MastraPluginConfig,
+  def: AnyMastraAgentDefinition,
+): string {
   const effective = def.model ?? config.defaultModel;
   if (typeof effective === "string") return effective;
   if (effective !== undefined) return "<dynamic>";
@@ -667,13 +732,13 @@ function describeAgentDefaultModel(config: MastraPluginConfig, def: MastraAgentD
  * Omitted or empty inputs fall back to a single built-in analyst so
  * the bare `mastra()` call still mounts a working chat route.
  */
-function resolveDefinitions(config: MastraPluginConfig): Record<string, MastraAgentDefinition> {
+function resolveDefinitions(config: MastraPluginConfig): Record<string, AnyMastraAgentDefinition> {
   const input = config.agents;
   if (!input) return fallbackDefinitions();
 
   if (Array.isArray(input)) {
     if (input.length === 0) return fallbackDefinitions();
-    const out: Record<string, MastraAgentDefinition> = {};
+    const out: Record<string, AnyMastraAgentDefinition> = {};
     input.forEach((def, i) => {
       const key = deriveAgentKey(def, i);
       if (out[key]) {
@@ -687,21 +752,21 @@ function resolveDefinitions(config: MastraPluginConfig): Record<string, MastraAg
     return out;
   }
 
-  // Single-definition shorthand: an agent always has `instructions: string`,
-  // a record-of-agents never has that field directly.
-  if (typeof (input as MastraAgentDefinition).instructions === "string") {
-    const def = input as MastraAgentDefinition;
+  // Single-definition shorthand: an agent owns the required `instructions`
+  // field (static or dynamic); a record-of-agents never owns it directly.
+  if ("instructions" in input) {
+    const def = input as AnyMastraAgentDefinition;
     const key = deriveAgentKey(def);
     return { [key]: def };
   }
 
-  const record = input as Record<string, MastraAgentDefinition>;
+  const record = input as Record<string, AnyMastraAgentDefinition>;
   if (Object.keys(record).length === 0) return fallbackDefinitions();
   return record;
 }
 
 /** Derive a registry id from a definition's `name`, with a fallback. */
-function deriveAgentKey(def: MastraAgentDefinition, index?: number): string {
+function deriveAgentKey(def: AnyMastraAgentDefinition, index?: number): string {
   if (def.name) {
     const slug = string.toIdentifier(def.name);
     if (slug) return slug;
@@ -710,7 +775,7 @@ function deriveAgentKey(def: MastraAgentDefinition, index?: number): string {
 }
 
 /** Built-in fallback registry used when `agents` is omitted / empty. */
-function fallbackDefinitions(): Record<string, MastraAgentDefinition> {
+function fallbackDefinitions(): Record<string, AnyMastraAgentDefinition> {
   return {
     [FALLBACK_AGENT_ID]: {
       name: "Default Agent",
@@ -738,7 +803,7 @@ function fallbackDefinitions(): Record<string, MastraAgentDefinition> {
  */
 function resolveModel(
   config: MastraPluginConfig,
-  override: MastraAgentDefinition["model"],
+  override: AnyMastraAgentDefinition["model"],
 ): AgentConfig["model"] {
   const effective = override ?? config.defaultModel;
   if (effective === undefined) {
@@ -758,7 +823,7 @@ function resolveModel(
  * survives - the caller already knows which agent was registering.
  */
 async function resolveTools(
-  defTools: MastraAgentDefinition["tools"],
+  defTools: AnyMastraAgentDefinition["tools"],
   plugins: MastraPlugins,
   ambientTools: MastraTools,
 ): Promise<MastraTools> {
@@ -768,7 +833,7 @@ async function resolveTools(
 }
 
 function resolveAgentWorkspace(
-  workspace: MastraAgentDefinition["workspace"],
+  workspace: AnyMastraAgentDefinition["workspace"],
 ): Workspace | undefined {
   if (!workspace) return undefined;
   return typeof workspace === "function" ? workspace() : workspace;

package/src/chat.ts

@@ -0,0 +1,20 @@
+/**
+ * Official Mastra AI SDK chat routes for browser-compatible UI streams.
+ *
+ * @module
+ */
+
+import { routes } from "@dbx-tools/shared-mastra";
+import { chatRoute } from "@mastra/ai-sdk";
+
+/** Register the official AI SDK chat stream plus its approval continuation. */
+export function agentChatRoutes() {
+  const path = `${routes.MASTRA_ROUTES.chat}/:agentId` as `${string}:agentId`;
+  return [
+    chatRoute({
+      path,
+      sendReasoning: true,
+      sendSources: true,
+    }),
+  ];
+}

package/src/config.ts

@@ -22,7 +22,7 @@ import type { RequestContext } from "@mastra/core/request-context";
 import { MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from "@mastra/core/request-context";
 import type { PgVectorConfig, PostgresStoreConfig } from "@mastra/pg";
 
-import type { MastraAgentDefinition, MastraTools } from "./agents.ts";
+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";
@@ -252,7 +252,10 @@ export interface MastraPluginConfig extends BasePluginConfig {
    * });
    * ```
    */
-  agents?: Record<string, MastraAgentDefinition> | MastraAgentDefinition | MastraAgentDefinition[];
+  agents?:
+    | Record<string, AnyMastraAgentDefinition>
+    | AnyMastraAgentDefinition
+    | AnyMastraAgentDefinition[];
   /**
    * Ambient tools spread into every registered agent's tools record;
    * per-agent tools win on key collision. Use for a small shared

package/src/genie.ts

@@ -48,10 +48,10 @@ import { plugin } from "@dbx-tools/appkit";
 import { chat, space as genieSpace } from "@dbx-tools/genie";
 import { error, log, string } from "@dbx-tools/shared-core";
 import { genieModel, type GenieMessage } from "@dbx-tools/shared-genie";
-import type { MastraWriter, StartedEvent } from "@dbx-tools/shared-mastra";
+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 } from "@mastra/core/tools";
+import { createTool, type ToolExecutionContext } from "@mastra/core/tools";
 import { z } from "zod";
 
 import type { MastraTools } from "./agents.ts";
@@ -59,7 +59,7 @@ import { chartPlannerRequestSchema, chartToolOutputSchema, prepareChart } from "
 import { MASTRA_USER_KEY, resolveUserKey } from "./config.ts";
 import type { MastraPluginConfig, User } from "./config.ts";
 import { fetchStatementData } from "./statement.ts";
-import { safeWrite } from "./writer.ts";
+import { safeWriteProgress } from "./writer.ts";
 
 const logger = log.logger("mastra/genie");
 
@@ -96,12 +96,7 @@ export type GenieSpacesConfig = Record<string, GenieSpaceConfig | string>;
  * `abortSignal` (for per-call cancellation).
  */
 type ToolExecuteCtx =
-  | {
-      requestContext?: RequestContext;
-      writer?: MastraWriter;
-      abortSignal?: AbortSignal;
-    }
-  | undefined;
+  Pick<ToolExecutionContext, "requestContext" | "writer" | "abortSignal" | "agent"> | undefined;
 
 /**
  * Pull the per-request {@link WorkspaceClient} off the active
@@ -435,6 +430,7 @@ function buildAskGenieTool(opts: {
       const ctx = ctxRaw as ToolExecuteCtx;
       const { client, requestContext } = requireClient(ctx, toolId);
       const writer = ctx?.writer;
+      const toolCallId = ctx?.agent?.toolCallId;
       const signal = ctx?.abortSignal;
       const threadId = requestContext.get(MASTRA_THREAD_ID_KEY) as string | undefined;
 
@@ -475,7 +471,7 @@ function buildAskGenieTool(opts: {
           spaceId,
           content: question,
         };
-        await safeWrite(logger, writer, startedEvent);
+        await safeWriteProgress(logger, writer, toolCallId, startedEvent);
 
         const runTurn = async (): Promise<GenieMessage> => {
           const seedConversationId = conversationId;
@@ -487,7 +483,7 @@ function buildAskGenieTool(opts: {
             ...(signal ? { context: signal } : {}),
           })) {
             if (event.type !== "message") {
-              await safeWrite(logger, writer, event);
+              await safeWriteProgress(logger, writer, toolCallId, event);
             }
             const eventConversationId = event.conversation_id;
             if (eventConversationId) {

package/src/memory.ts

@@ -39,7 +39,7 @@ import { Memory } from "@mastra/memory";
 import { PgVector, PostgresStore } from "@mastra/pg";
 import { Pool, type PoolConfig } from "pg";
 
-import type { MastraAgentDefinition, MastraMemoryConfigOverride } from "./agents.ts";
+import type { AnyMastraAgentDefinition, MastraMemoryConfigOverride } from "./agents.ts";
 import type { MastraPluginConfig } from "./config.ts";
 import { agentStorageSchemaName } from "./storage-schema.ts";
 import { summaryModel, TITLE_INSTRUCTIONS } from "./summarize.ts";
@@ -143,8 +143,8 @@ export async function createServicePrincipalPool(pgConfig: PoolConfig): Promise<
 }
 
 /** Effective per-knob setting after the plugin/agent cascade. */
-type StorageSetting = MastraAgentDefinition["storage"];
-type MemorySetting = MastraAgentDefinition["memory"];
+type StorageSetting = AnyMastraAgentDefinition["storage"];
+type MemorySetting = AnyMastraAgentDefinition["memory"];
 
 /**
  * True when any plugin-level or per-agent setting could need the
@@ -223,7 +223,7 @@ export class MemoryBuilder {
    * vector store enabled - Mastra accepts a missing `memory` field
    * and treats the agent as stateless.
    */
-  forAgent(agentId: string, def: MastraAgentDefinition): Memory | undefined {
+  forAgent(agentId: string, def: AnyMastraAgentDefinition): Memory | undefined {
     const storageSetting = def.storage ?? this.config.storage;
     const memorySetting = def.memory ?? this.config.memory;
 
@@ -368,14 +368,14 @@ function settingNeedsSharedPool(setting: StorageSetting | MemorySetting | undefi
 }
 
 /** Walk the three shapes of `config.agents` into a flat list. */
-function collectAgentDefinitions(config: MastraPluginConfig): MastraAgentDefinition[] {
+function collectAgentDefinitions(config: MastraPluginConfig): AnyMastraAgentDefinition[] {
   const agents = config.agents;
   if (!agents) return [];
   if (Array.isArray(agents)) return agents;
-  if (typeof (agents as MastraAgentDefinition).instructions === "string") {
-    return [agents as MastraAgentDefinition];
+  if ("instructions" in agents) {
+    return [agents as AnyMastraAgentDefinition];
   }
-  return Object.values(agents as Record<string, MastraAgentDefinition>);
+  return Object.values(agents);
 }
 
 /** Fill in a default `id` when the caller didn't supply one. */

package/src/plugin.ts

@@ -76,6 +76,7 @@ import type { Pool } from "pg";
 
 import { buildAgents, FALLBACK_AGENT_ID, type BuiltAgents } from "./agents.ts";
 import { fetchChart } from "./chart.ts";
+import { agentChatRoutes } from "./chat.ts";
 import { attributedUserId, MASTRA_CONFIG_SCHEMA, type MastraPluginConfig } from "./config.ts";
 import {
   chartFetchDefaults,
@@ -85,7 +86,6 @@ import {
   statementDataDefaults,
 } from "./defaults.ts";
 import { collectSpaceSuggestions, resolveGenieSpaces } from "./genie.ts";
-import { historyRoute } from "./history.ts";
 import {
   requestUserId,
   resolveIdentityMode,
@@ -105,7 +105,6 @@ import {
 } from "./server.ts";
 import { resolveServingConfig } from "./serving.ts";
 import { fetchStatementData, STATEMENT_ROW_CAP } from "./statement.ts";
-import { threadsRoute } from "./threads.ts";
 import { attachChatTurnTraceIo } from "./trace-io.ts";
 import { invalidFields } from "./validation.ts";
 
@@ -1122,34 +1121,7 @@ export class MastraPlugin extends Plugin<MastraPluginConfig> {
       app: this.mastraApp,
       mastra: this.mastra,
       prefix: "",
-      customApiRoutes: [
-        // `historyRoute` registers both GET (load) and DELETE
-        // (clear) on the same path, so it returns an array we
-        // splice in.
-        ...historyRoute({
-          path: routes.MASTRA_ROUTES.history,
-          agent: this.built.defaultAgentId,
-        }),
-        // Assert the `:agentId` template type: the per-package build's
-        // NodeNext resolution widens the imported `routes.MASTRA_ROUTES.history`
-        // to `string` (the source/bundler typecheck keeps it a literal),
-        // which would otherwise drop this out of the dynamic-agent
-        // overload and demand a fixed `agent`.
-        ...historyRoute({
-          path: `${routes.MASTRA_ROUTES.history}/:agentId` as `${string}:agentId`,
-        }),
-        // `threadsRoute` registers GET (list the caller's conversation
-        // threads) and DELETE (remove the targeted thread) on the same
-        // path; both the default-agent and dynamic-agent mounts are
-        // spliced in, mirroring the history routes above.
-        ...threadsRoute({
-          path: routes.MASTRA_ROUTES.threads,
-          agent: this.built.defaultAgentId,
-        }),
-        ...threadsRoute({
-          path: `${routes.MASTRA_ROUTES.threads}/:agentId` as `${string}:agentId`,
-        }),
-      ],
+      customApiRoutes: agentChatRoutes(),
     });
     await this.mastraServer.init();
     this.logger.info("ready", {