@dbx-tools/appkit-mastra 0.1.28 → 0.1.30

package/index.ts

@@ -10,30 +10,30 @@
  * is the right surface for browser bundles and `usePluginClientConfig`
  * consumers.
  */
-export * from "./src/plugin.js";
 export * from "@dbx-tools/appkit-mastra-shared";
-export * from "./src/config.js";
 export * from "./src/agents.js";
 export * from "./src/chart.js";
+export * from "./src/config.js";
 export * from "./src/genie.js";
-export * from "./src/tools/email.js";
 export {
-  clearServingEndpointsCache,
-  extractModelOverride,
-  listServingEndpoints,
+  FALLBACK_MODEL_IDS,
+  MODEL_CATALOG,
+  ModelTier,
+  modelForTier,
+  modelsForTier,
+} from "./src/model.js";
+export * from "./src/plugin.js";
+export {
   MASTRA_MODEL_OVERRIDE_KEY,
   MODEL_OVERRIDE_BODY_FIELDS,
   MODEL_OVERRIDE_HEADER,
   MODEL_OVERRIDE_QUERY,
+  clearServingEndpointsCache,
+  extractModelOverride,
+  listServingEndpoints,
   resolveModelId,
-  type ResolvedModel,
   type ResolveModelOptions,
+  type ResolvedModel,
   type ServingEndpointSummary,
 } from "./src/serving.js";
-export {
-  FALLBACK_MODEL_IDS,
-  MODEL_CATALOG,
-  modelForTier,
-  modelsForTier,
-  ModelTier,
-} from "./src/model.js";
+export * from "./src/tools/email.js";

package/package.json

@@ -9,13 +9,13 @@
     }
   },
   "name": "@dbx-tools/appkit-mastra",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "dependencies": {
     "@databricks/sdk-experimental": "^0.17",
-    "@dbx-tools/appkit-mastra-shared": "0.1.28",
-    "@dbx-tools/genie": "0.1.28",
-    "@dbx-tools/genie-shared": "0.1.28",
-    "@dbx-tools/shared": "0.1.28",
+    "@dbx-tools/appkit-mastra-shared": "0.1.30",
+    "@dbx-tools/genie": "0.1.30",
+    "@dbx-tools/genie-shared": "0.1.30",
+    "@dbx-tools/shared": "0.1.30",
     "@mastra/ai-sdk": "^1",
     "@mastra/core": "^1",
     "@mastra/express": "^1",

package/src/agents.ts

@@ -14,18 +14,19 @@
  */
 
 import { appkitUtils, logUtils, stringUtils } from "@dbx-tools/shared";
-import { Agent } from "@mastra/core/agent";
 import type { AgentConfig, ToolsInput } from "@mastra/core/agent";
-import { createTool } from "@mastra/core/tools";
+import { Agent } from "@mastra/core/agent";
 import type { Tool } from "@mastra/core/tools";
+import { createTool } from "@mastra/core/tools";
 import type { PgVectorConfig, PostgresStoreConfig } from "@mastra/pg";
 
+import { buildRenderDataTool } from "./chart.js";
 import type { MastraPluginConfig } from "./config.js";
 import { buildGenieToolkitProvider, resolveGenieSpaces } from "./genie.js";
 import type { MemoryBuilder } from "./memory.js";
 import { buildModel, FALLBACK_MODEL_IDS } from "./model.js";
+import { ResultProcessor } from "./processor.js";
 import { stripStaleChartsProcessor } from "./processors/strip-stale-charts.js";
-import { buildRenderDataTool } from "./chart.js";
 
 /**
  * Tool record accepted by every Mastra `Agent.tools` field and by the
@@ -433,6 +434,7 @@ 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];
   const agents: Record<string, Agent> = {};
@@ -451,7 +453,8 @@ export async function buildAgents(opts: {
       },
       tools,
       ...(memory ? { memory } : {}),
-      ...(inputProcessors.length > 0 ? { inputProcessors } : {}),
+      inputProcessors,
+      outputProcessors,
     });
     // Surface the effective default model per agent so operators can
     // see at a glance which endpoint each agent points at without

package/src/chart.ts

@@ -39,7 +39,7 @@ import { createTool } from "@mastra/core/tools";
 import { z } from "zod";
 
 import type { MastraPluginConfig } from "./config.js";
-import { buildModel, ModelTier, modelForTier } from "./model.js";
+import { buildModel, modelForTier, ModelTier } from "./model.js";
 
 const log = logUtils.logger("mastra/chart");
 

package/src/genie.ts

@@ -36,13 +36,13 @@
 
 import { CacheManager, genie } from "@databricks/appkit";
 import { ApiError, HttpError, WorkspaceClient } from "@databricks/sdk-experimental";
-import { genieEventChat } from "@dbx-tools/genie";
-import { type GenieMessage } from "@dbx-tools/genie-shared";
 import {
   ChartSchema,
   type MinimalWriter,
   type StartedEvent,
 } from "@dbx-tools/appkit-mastra-shared";
+import { genieEventChat } from "@dbx-tools/genie";
+import { type GenieMessage } from "@dbx-tools/genie-shared";
 import {
   apiUtils,
   appkitUtils,

package/src/history.ts

@@ -16,6 +16,11 @@
  * session-cookie logic stays the single source of truth in `server.ts`.
  */
 
+import type {
+  MastraClearHistoryResponse,
+  MastraHistoryResponse,
+  MastraHistoryUIMessage,
+} from "@dbx-tools/appkit-mastra-shared";
 import { commonUtils, logUtils } from "@dbx-tools/shared";
 import { toAISdkV5Messages } from "@mastra/ai-sdk/ui";
 import type { Agent } from "@mastra/core/agent";
@@ -24,13 +29,8 @@ import {
   MASTRA_RESOURCE_ID_KEY,
   MASTRA_THREAD_ID_KEY,
 } from "@mastra/core/request-context";
-import { registerApiRoute } from "@mastra/core/server";
 import type { ContextWithMastra } from "@mastra/core/server";
-import type {
-  MastraClearHistoryResponse,
-  MastraHistoryResponse,
-  MastraHistoryUIMessage,
-} from "@dbx-tools/appkit-mastra-shared";
+import { registerApiRoute } from "@mastra/core/server";
 
 const log = logUtils.logger("mastra/history");
 
@@ -237,9 +237,7 @@ export function historyRoute(options: HistoryRouteOptions) {
         error: c.json({ error: "thread id missing from request context" }, 400),
       } as const;
     }
-    const resourceId = requestContext.get(MASTRA_RESOURCE_ID_KEY) as
-      | string
-      | undefined;
+    const resourceId = requestContext.get(MASTRA_RESOURCE_ID_KEY) as string | undefined;
     return { agentId, agent, threadId, resourceId } as const;
   };
 

package/src/memory.ts

@@ -35,10 +35,7 @@ import { PgVector, PostgresStore } from "@mastra/pg";
 import { randomUUID } from "node:crypto";
 import type { Pool } from "pg";
 
-import type {
-  MastraAgentDefinition,
-  MastraMemoryConfigOverride,
-} from "./agents.js";
+import type { MastraAgentDefinition, MastraMemoryConfigOverride } from "./agents.js";
 import type { MastraPluginConfig } from "./config.js";
 
 const log = logUtils.logger("mastra/memory");
@@ -63,8 +60,7 @@ export function needsLakebase(config: MastraPluginConfig): boolean {
   if (settingNeedsSharedPool(config.memory)) return true;
   const defs = collectAgentDefinitions(config);
   return defs.some(
-    (d) =>
-      settingNeedsSharedPool(d.storage) || settingNeedsSharedPool(d.memory),
+    (d) => settingNeedsSharedPool(d.storage) || settingNeedsSharedPool(d.memory),
   );
 }
 
@@ -169,9 +165,7 @@ export class MemoryBuilder {
       ...(vector ? { vector, embedder: fastembed } : {}),
       options: {
         lastMessages: 10,
-        ...(vector
-          ? { semanticRecall: { topK: 3, messageRange: 2 } }
-          : {}),
+        ...(vector ? { semanticRecall: { topK: 3, messageRange: 2 } } : {}),
       },
     });
   }
@@ -280,9 +274,7 @@ function settingNeedsSharedPool(
 }
 
 /** Walk the three shapes of `config.agents` into a flat list. */
-function collectAgentDefinitions(
-  config: MastraPluginConfig,
-): MastraAgentDefinition[] {
+function collectAgentDefinitions(config: MastraPluginConfig): MastraAgentDefinition[] {
   const agents = config.agents;
   if (!agents) return [];
   if (Array.isArray(agents)) return agents;

package/src/model.ts

@@ -25,12 +25,7 @@
  * the input verbatim and let Databricks return the canonical error.
  */
 
-import {
-  commonUtils,
-  logUtils,
-  netUtils,
-  stringUtils,
-} from "@dbx-tools/shared";
+import { commonUtils, logUtils, netUtils, stringUtils } from "@dbx-tools/shared";
 import type { MastraModelConfig } from "@mastra/core/llm";
 import type { RequestContext } from "@mastra/core/request-context";
 
@@ -390,7 +385,7 @@ const setupFetchInterceptor = commonUtils.memoize((): void => {
   const log = logUtils.logger("mastra/llm");
   const original = globalThis.fetch.bind(globalThis);
   globalThis.fetch = (async (input, init) => {
-    const url = netUtils.parseUrl(input);
+    const url = netUtils.urlBuilder(input);
     if (
       !url ||
       !url.pathname.startsWith(SERVING_ENDPOINTS_PATH_PREFIX) ||

package/src/observability.ts

@@ -76,9 +76,7 @@ export async function buildObservability(
   options?: BuildObservabilityOptions,
 ): Promise<Observability | undefined> {
   const serviceName =
-    options?.serviceName ??
-    (await projectUtils.name()) ??
-    DEFAULT_SERVICE_NAME;
+    options?.serviceName ?? (await projectUtils.name()) ?? DEFAULT_SERVICE_NAME;
   const requestContextKeys = [
     ...(options?.requestContextKeys ?? TRACE_REQUEST_CONTEXT_KEYS),
   ];

package/src/plugin.ts

@@ -37,27 +37,23 @@ import {
   type PluginManifest,
   type ResourceRequirement,
 } from "@databricks/appkit";
-import { appkitUtils, commonUtils, logUtils } from "@dbx-tools/shared";
+import { appkitUtils, logUtils } from "@dbx-tools/shared";
 import { chatRoute } from "@mastra/ai-sdk";
 import type { Agent } from "@mastra/core/agent";
 import { Mastra } from "@mastra/core/mastra";
 import express from "express";
 
-import { buildAgents, FALLBACK_AGENT_ID, type BuiltAgents } from "./agents.js";
 import type {
   MastraClientConfig,
   StatementData,
 } from "@dbx-tools/appkit-mastra-shared";
+import { buildAgents, FALLBACK_AGENT_ID, type BuiltAgents } from "./agents.js";
 import { fetchChart } from "./chart.js";
 import type { MastraPluginConfig } from "./config.js";
 import { historyRoute } from "./history.js";
 import { createMemoryBuilder, needsLakebase } from "./memory.js";
 import { buildObservability } from "./observability.js";
 import { attachRoutePatchMiddleware, MastraServer } from "./server.js";
-import {
-  installStreamEventInterceptor,
-  type StreamFrameInterceptor,
-} from "./intercept.js";
 import {
   clearServingEndpointsCache,
   listServingEndpoints,
@@ -311,11 +307,6 @@ export class MastraPlugin extends Plugin<MastraPluginConfig> {
 
     router.use("", (req, res, next) => {
       if (!this.mastraApp) return res.status(503).end();
-      // Run each Mastra `/stream` SSE frame through the interceptor
-      // (keep / rewrite / drop). Only engages on a
-      // `200 text/event-stream` body, so the JSON routes above and any
-      // error response are untouched.
-      installStreamEventInterceptor(res, interceptStreamFrame);
       return this.userScopedSelf(req).mastraApp!(req, res, next);
     });
   }
@@ -502,36 +493,4 @@ function parseStatementLimit(raw: unknown): number | undefined {
   return Math.floor(n);
 }
 
-/**
- * {@link StreamFrameInterceptor} for Mastra `/stream` responses.
- *
- * Removes large, redundant payloads from terminal `step-finish`,
- * `finish`, and `tool-result` frames before they reach the browser.
- * These frames often repeat information already delivered incrementally
- * via streamed text and tool events, including full tool outputs,
- * accumulated responses, message history, SQL results, chart data, and
- * other large result payloads.
- *
- * The interceptor deletes heavyweight payload properties
- * (`output`, `messages`, `response`, and `result`) while preserving the
- * event envelope and lifecycle metadata required by the client.
- *
- * Deletion is key based, so streams that do not contain these
- * fields are passed through unchanged.
- */
-const interceptStreamFrame: StreamFrameInterceptor = (chunk) => {
-  if (!commonUtils.isRecord(chunk)) return true;
-  if (!["step-finish", "finish", "tool-result"].find((type) => type === chunk.type))
-    return true;
-  const payload = chunk.payload;
-  if (!commonUtils.isRecord(payload)) return true;
-  const trimmedPayload = commonUtils.deleteKeys(payload, [
-    "output",
-    "messages",
-    "response",
-    "result",
-  ]);
-  return trimmedPayload ? { replace: chunk } : true;
-};
-
 export const mastra = toPlugin(MastraPlugin);

package/src/processor.ts

@@ -0,0 +1,46 @@
+import type { Processor } from "@mastra/core/processors";
+
+export class ResultProcessor implements Processor {
+  id = "result-processor";
+
+  // Tell Mastra to also route tool/data parts to this processor method
+  processDataParts = true;
+
+  async processOutputStream({ part }: { part: any }): Promise<any | null> {
+    // 1. Guard clause: Ensure the chunk is a valid object
+    if (!part || typeof part !== "object") {
+      return part;
+    }
+
+    // 2. Filter for the targeted frame types
+    const targetedTypes = ["step-finish", "finish", "tool-result", "data-tool-agent"];
+    if (!targetedTypes.includes(part.type)) {
+      return part; // Return unchanged to pass-through
+    }
+
+    // 3. Check for the presence of a payload object
+    const payload = part.payload;
+    if (!payload || typeof payload !== "object") {
+      return part;
+    }
+
+    // 4. Safely delete the unwanted keys from the payload reference
+    const keysToDelete = ["output", "messages", "response", "result"];
+    for (const key of keysToDelete) {
+      if (key in payload) {
+        const value = payload[key];
+        if (typeof value === "object") {
+          payload[key] = {};
+        } else if (Array.isArray(value)) {
+          payload[key] = [];
+        } else {
+          delete payload[key];
+        }
+      }
+    }
+
+    // 5. Return the modified part object. Mastra handles re-serialization
+    // for the outbound SSE client stream automatically.
+    return part;
+  }
+}

package/src/processors/strip-stale-charts.ts

@@ -24,10 +24,7 @@
  */
 
 import { logUtils } from "@dbx-tools/shared";
-import type {
-  InputProcessor,
-  ProcessInputArgs,
-} from "@mastra/core/processors";
+import type { InputProcessor, ProcessInputArgs } from "@mastra/core/processors";
 
 const log = logUtils.logger("mastra/processor/strip-stale-charts");
 
@@ -76,13 +73,10 @@ export const stripStaleChartsProcessor: InputProcessor = {
         // the chartId there is the model's outgoing claim, not
         // anything it could re-reference; only `result` carries
         // ids that subsequent turns might copy.
-        if (
-          (part as { type?: unknown }).type !== "tool-invocation"
-        ) {
+        if ((part as { type?: unknown }).type !== "tool-invocation") {
           continue;
         }
-        const inv = (part as { toolInvocation?: { result?: unknown } })
-          .toolInvocation;
+        const inv = (part as { toolInvocation?: { result?: unknown } }).toolInvocation;
         if (!inv || inv.result === undefined) continue;
         const before = inv.result;
         const after = stripChartIds(before);

package/src/tools/email.ts

@@ -33,41 +33,55 @@ import { z } from "zod";
 const log = logUtils.logger("mastra/tool/send-email");
 
 const emailInputSchema = z.object({
-  to: z.string().describe(stringUtils.toDescription(`
+  to: z.string().describe(
+    stringUtils.toDescription(`
     Single recipient email address (e.g. "alice@example.com"). For
     multiple recipients, comma-separate them yourself.
-  `)),
-  subject: z.string().describe(stringUtils.toDescription(`
+  `),
+  ),
+  subject: z.string().describe(
+    stringUtils.toDescription(`
     Subject line.
-  `)),
-  body: z.string().describe(stringUtils.toDescription(`
+  `),
+  ),
+  body: z.string().describe(
+    stringUtils.toDescription(`
     Email body. Plain text or markdown; the renderer downstream decides
     which to honour. Be specific - the recipient may not have any
     context the model has from prior chat turns.
-  `)),
+  `),
+  ),
   cc: z
     .array(z.string())
     .optional()
-    .describe(stringUtils.toDescription(`
+    .describe(
+      stringUtils.toDescription(`
       Optional CC recipients.
-    `)),
+    `),
+    ),
   bcc: z
     .array(z.string())
     .optional()
-    .describe(stringUtils.toDescription(`
+    .describe(
+      stringUtils.toDescription(`
       Optional BCC recipients.
-    `)),
+    `),
+    ),
 });
 
 const emailOutputSchema = z.object({
-  sent: z.boolean().describe(stringUtils.toDescription(`
+  sent: z.boolean().describe(
+    stringUtils.toDescription(`
     True when the email was dispatched. The current implementation
     always returns true after console-logging the would-be email; swap
     in a real provider to make this meaningful.
-  `)),
-  recipient: z.string().describe(stringUtils.toDescription(`
+  `),
+  ),
+  recipient: z.string().describe(
+    stringUtils.toDescription(`
     Echo of the \`to\` field for confirmation.
-  `)),
+  `),
+  ),
 });
 
 /** Options accepted by {@link buildEmailTool}. */
@@ -123,9 +137,7 @@ export function buildEmailTool(opts: BuildEmailToolOptions = {}) {
     outputSchema: emailOutputSchema,
     requireApproval: true,
     execute: async (input) => {
-      const { to, subject, body, cc, bcc } = input as z.infer<
-        typeof emailInputSchema
-      >;
+      const { to, subject, body, cc, bcc } = input as z.infer<typeof emailInputSchema>;
       // Default behaviour: dump the email to the server console so
       // demos can see the gate fire end-to-end without a real
       // provider. Replace by passing `opts.send`.