@dbx-tools/appkit-mastra 0.1.28 → 0.1.29

package/package.json

@@ -9,13 +9,13 @@
     }
   },
   "name": "@dbx-tools/appkit-mastra",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "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.29",
+    "@dbx-tools/genie": "0.1.29",
+    "@dbx-tools/genie-shared": "0.1.29",
+    "@dbx-tools/shared": "0.1.29",
     "@mastra/ai-sdk": "^1",
     "@mastra/core": "^1",
     "@mastra/express": "^1",

package/src/agents.ts

@@ -26,6 +26,7 @@ import type { MemoryBuilder } from "./memory.js";
 import { buildModel, FALLBACK_MODEL_IDS } from "./model.js";
 import { stripStaleChartsProcessor } from "./processors/strip-stale-charts.js";
 import { buildRenderDataTool } from "./chart.js";
+import { ResultProcessor } from "./processor.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/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/plugin.ts

@@ -54,10 +54,6 @@ 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,
@@ -69,6 +65,7 @@ import {
   isStatementNotFoundError,
   STATEMENT_ROW_CAP,
 } from "./statement.js";
+import { ResultProcessor } from "./processor.js";
 
 const GENIE_MANIFEST = appkitUtils.data(genie).plugin.manifest;
 const LAKEBASE_MANIFEST = appkitUtils.data(lakebase).plugin.manifest;
@@ -311,11 +308,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 +494,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,52 @@
+import type {
+  Processor,
+  ProcessAPIErrorArgs,
+  ProcessAPIErrorResult,
+  ProcessOutputStreamArgs,
+} from "@mastra/core/processors";
+import type { ChunkType } from "@mastra/core/workflows";
+
+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;
+  }
+}