@dbx-tools/appkit-mastra 0.6.223 → 0.6.225

package/src/pagination.ts

@@ -9,7 +9,11 @@
 
 import { object } from "@dbx-tools/shared-core";
 
-/** Bounds for {@link clampPerPage}. */
+/**
+ * Bounds for {@link clampPerPage}.
+ *
+ * @deprecated Use the native `@mastra/client-js` memory API pagination inputs.
+ */
 export interface PerPageBounds {
   /** Page size used for empty / non-positive / non-numeric inputs. */
   fallback: number;
@@ -17,7 +21,11 @@ export interface PerPageBounds {
   max: number;
 }
 
-/** Coerce / clamp a `perPage` value, falling back to `bounds.fallback`. */
+/**
+ * Coerce / clamp a `perPage` value, falling back to `bounds.fallback`.
+ *
+ * @deprecated Use the native `@mastra/client-js` memory API pagination inputs.
+ */
 export function clampPerPage(value: number | undefined, bounds: PerPageBounds): number {
   if (value === undefined || Number.isNaN(value)) return bounds.fallback;
   const n = Math.trunc(value);
@@ -29,6 +37,8 @@ export function clampPerPage(value: number | undefined, bounds: PerPageBounds):
  * Coerce a Hono query value into a non-negative integer. Returns
  * `undefined` for empty / non-numeric / negative inputs so the caller
  * can apply its built-in defaults.
+ *
+ * @deprecated Use the native `@mastra/client-js` memory API pagination inputs.
  */
 export function parseIntParam(value: string | undefined): number | undefined {
   const n = object.toNumber(value);

package/src/plugin.ts

@@ -95,6 +95,7 @@ import {
 import { buildMcpServer, type ResolvedMcp } from "./mcp.ts";
 import { createMemoryBuilder, createServicePrincipalPool, needsLakebase } from "./memory.ts";
 import { logFeedback, resolveFeedbackEnabled } from "./mlflow.ts";
+import { resolveDefaultModelId } from "./model.ts";
 import { buildObservability } from "./observability.ts";
 import { provisionRemoteSkills } from "./remote-skills.ts";
 import {
@@ -149,8 +150,8 @@ const STATEMENT_CACHE_NAMESPACE = "mastra:statement";
  *       agents: createAgent({
  *         name: "analyst",
  *         instructions: "You answer questions about revenue and returns.",
- *         tools(plugins) {
- *           return { ...plugins.genie?.toolkit() };
+ *         async tools(plugins) {
+ *           return { ...(await plugins.genie?.toolkit()) };
  *         },
  *       }),
  *     }),
@@ -506,16 +507,12 @@ export class MastraPlugin extends Plugin<MastraPluginConfig> {
       },
     });
 
-    // `GET /default-model` (and `/default-model/:agentId`) reports the static
-    // serving-endpoint an agent falls back to when the client pins no model,
-    // so the picker can label its default option with the model's humanized
-    // name. Agent-scoped via the optional `/:agentId` suffix (URL symmetry
-    // with the history / threads / suggestions routes), defaulting to the
-    // default agent. `model` / `displayName` are null when the agent has no
-    // static default (a dynamic, call-time model); an unknown agent id is a
-    // 404, matching the history / threads routes. Reads only in-memory build
-    // state, so it needs no OBO scoping. Registered before the catch-all,
-    // same as `/models`.
+    // `GET /default-model` (and `/default-model/:agentId`) reports what an
+    // unpinned turn will use. A configured string is returned directly; an
+    // automatic default resolves the highest-ranked currently available GPT
+    // (or general chat fallback) from the same OBO-scoped live catalogue as
+    // `/models`; a custom dynamic resolver remains null because it is call-time
+    // application code.
     const handleDefaultModel = async (
       req: express.Request,
       res: express.Response,
@@ -526,11 +523,20 @@ export class MastraPlugin extends Plugin<MastraPluginConfig> {
         return;
       }
       const agentId = requested ?? this.built?.defaultAgentId ?? FALLBACK_AGENT_ID;
-      const raw = this.built?.defaultModels[agentId];
-      // `"<dynamic>"` (a call-time function) has no fixed id to advertise.
-      const model = raw && raw !== "<dynamic>" ? raw : null;
-      // Return the humanized label too, so the picker shows a friendly name on
-      // load without waiting on the `/models` catalogue (no raw-id flash).
+      const intent = this.built?.defaultModels[agentId];
+      let model: string | null = null;
+      if (intent?.kind === "configured") {
+        model = intent.model;
+      } else if (intent?.kind === "auto") {
+        const result = await this.scopedSelf(req).listModelsResult();
+        if (!result.ok) {
+          this.sendFailure(res, result, "default-model", MODEL_CATALOGUE_FAILED_MESSAGE);
+          return;
+        }
+        if (result.data.length > 0) {
+          model = resolveDefaultModelId(this.config, result.data);
+        }
+      }
       res.json({
         agentId,
         model,
@@ -1210,8 +1216,8 @@ function parseStatementLimit(raw: unknown): number | undefined {
  *       agents: {
  *         analyst: createAgent({
  *           instructions: "You answer questions about sales.",
- *           tools(plugins) {
- *             return { ...plugins.genie?.toolkit() };
+ *           async tools(plugins) {
+ *             return { ...(await plugins.genie?.toolkit()) };
  *           },
  *         }),
  *         helper: createAgent({ instructions: "You explain the analyst's answers." }),

package/src/serving-sanitize.ts

@@ -21,8 +21,8 @@
  * @module
  */
 
-import { json, string } from "@dbx-tools/shared-core";
 import { chatToolReasoningEffort, ReasoningEffort } from "@dbx-tools/model-rs";
+import { json, string } from "@dbx-tools/shared-core";
 import {
   type ChatMessage,
   type ChatRole,

package/lib/src/_agent-route-context.d.ts

@@ -1,46 +0,0 @@
-/**
- * Shared agent binding and request-context resolution for Mastra custom routes.
- *
- * @module
- */
-import type { Agent } from "@mastra/core/agent";
-import { type RequestContext } from "@mastra/core/request-context";
-import type { ContextWithMastra } from "@mastra/core/server";
-/** Fixed-agent or dynamic `:agentId` binding accepted by custom agent routes. */
-export type AgentRouteOptions = {
-    path: `${string}:agentId${string}`;
-    agent?: never;
-} | {
-    path: string;
-    agent: string;
-};
-/** Validated route path and optional fixed agent binding. */
-export interface ResolvedAgentRouteOptions {
-    path: string;
-    fixedAgent: string | undefined;
-}
-/** Resolve and validate a fixed or dynamic agent route declaration. */
-export declare function resolveAgentRouteOptions(options: AgentRouteOptions, field: string): ResolvedAgentRouteOptions;
-interface ResolvedAgentRequestContext {
-    agentId: string;
-    agent: Agent;
-    requestContext: RequestContext;
-    resourceId: string;
-}
-interface AgentRequestContextError {
-    error: Response;
-}
-interface ResolveAgentRequestContextOptions {
-    fixedAgent?: string;
-    threadId?: "optional" | "required";
-}
-/** Resolve an agent plus the caller-scoped Mastra request context. */
-export declare function resolveAgentRequestContext(context: ContextWithMastra, options: ResolveAgentRequestContextOptions & {
-    threadId: "required";
-}): (ResolvedAgentRequestContext & {
-    threadId: string;
-}) | AgentRequestContextError;
-export declare function resolveAgentRequestContext(context: ContextWithMastra, options?: ResolveAgentRequestContextOptions): (ResolvedAgentRequestContext & {
-    threadId?: string;
-}) | AgentRequestContextError;
-export {};

package/lib/src/_agent-route-context.js

@@ -1,47 +0,0 @@
-/**
- * Shared agent binding and request-context resolution for Mastra custom routes.
- *
- * @module
- */
-import { ValidationError } from "@databricks/appkit";
-import { MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY, } from "@mastra/core/request-context";
-/** Resolve and validate a fixed or dynamic agent route declaration. */
-export function resolveAgentRouteOptions(options, field) {
-    const fixedAgent = "agent" in options ? options.agent : undefined;
-    if (!fixedAgent && !options.path.includes(":agentId")) {
-        throw ValidationError.invalidValue(field, options.path, "a path containing `:agentId`, or an explicit `agent`");
-    }
-    return { path: options.path, fixedAgent };
-}
-export function resolveAgentRequestContext(context, options = {}) {
-    const mastra = context.get("mastra");
-    const requestContext = context.get("requestContext");
-    const agentId = options.fixedAgent ?? context.req.param("agentId");
-    if (!agentId) {
-        return { error: context.json({ error: "agentId is required" }, 400) };
-    }
-    const agent = mastra.getAgentById(agentId);
-    if (!agent) {
-        return { error: context.json({ error: `Unknown agent "${agentId}"` }, 404) };
-    }
-    const resourceId = requestContext.get(MASTRA_RESOURCE_ID_KEY);
-    if (!resourceId) {
-        return {
-            error: context.json({ error: "resource id missing from request context" }, 400),
-        };
-    }
-    const threadId = requestContext.get(MASTRA_THREAD_ID_KEY);
-    if (options.threadId === "required" && !threadId) {
-        return {
-            error: context.json({ error: "thread id missing from request context" }, 400),
-        };
-    }
-    return {
-        agentId,
-        agent,
-        requestContext,
-        resourceId,
-        ...(threadId ? { threadId } : {}),
-    };
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2FnZW50LXJvdXRlLWNvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvX2FnZW50LXJvdXRlLWNvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7R0FJRztBQUVILE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVyRCxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLG9CQUFvQixHQUVyQixNQUFNLDhCQUE4QixDQUFDO0FBYXRDLHVFQUF1RTtBQUN2RSxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLE9BQTBCLEVBQzFCLEtBQWE7SUFFYixNQUFNLFVBQVUsR0FBRyxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDbEUsSUFBSSxDQUFDLFVBQVUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7UUFDdEQsTUFBTSxlQUFlLENBQUMsWUFBWSxDQUNoQyxLQUFLLEVBQ0wsT0FBTyxDQUFDLElBQUksRUFDWixzREFBc0QsQ0FDdkQsQ0FBQztJQUNKLENBQUM7SUFDRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFDNUMsQ0FBQztBQTJCRCxNQUFNLFVBQVUsMEJBQTBCLENBQ3hDLE9BQTBCLEVBQzFCLFVBQTZDLEVBQUU7SUFFL0MsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNyQyxNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDckQsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLFVBQVUsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNuRSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUscUJBQXFCLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUFDO0lBQ3hFLENBQUM7SUFDRCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzNDLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNYLE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssRUFBRSxrQkFBa0IsT0FBTyxHQUFHLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUFDO0lBQy9FLENBQUM7SUFDRCxNQUFNLFVBQVUsR0FBRyxjQUFjLENBQUMsR0FBRyxDQUFDLHNCQUFzQixDQUF1QixDQUFDO0lBQ3BGLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNoQixPQUFPO1lBQ0wsS0FBSyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsMENBQTBDLEVBQUUsRUFBRSxHQUFHLENBQUM7U0FDaEYsQ0FBQztJQUNKLENBQUM7SUFDRCxNQUFNLFFBQVEsR0FBRyxjQUFjLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUF1QixDQUFDO0lBQ2hGLElBQUksT0FBTyxDQUFDLFFBQVEsS0FBSyxVQUFVLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNqRCxPQUFPO1lBQ0wsS0FBSyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsd0NBQXdDLEVBQUUsRUFBRSxHQUFHLENBQUM7U0FDOUUsQ0FBQztJQUNKLENBQUM7SUFDRCxPQUFPO1FBQ0wsT0FBTztRQUNQLEtBQUs7UUFDTCxjQUFjO1FBQ2QsVUFBVTtRQUNWLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztLQUNsQyxDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogU2hhcmVkIGFnZW50IGJpbmRpbmcgYW5kIHJlcXVlc3QtY29udGV4dCByZXNvbHV0aW9uIGZvciBNYXN0cmEgY3VzdG9tIHJvdXRlcy5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cblxuaW1wb3J0IHsgVmFsaWRhdGlvbkVycm9yIH0gZnJvbSBcIkBkYXRhYnJpY2tzL2FwcGtpdFwiO1xuaW1wb3J0IHR5cGUgeyBBZ2VudCB9IGZyb20gXCJAbWFzdHJhL2NvcmUvYWdlbnRcIjtcbmltcG9ydCB7XG4gIE1BU1RSQV9SRVNPVVJDRV9JRF9LRVksXG4gIE1BU1RSQV9USFJFQURfSURfS0VZLFxuICB0eXBlIFJlcXVlc3RDb250ZXh0LFxufSBmcm9tIFwiQG1hc3RyYS9jb3JlL3JlcXVlc3QtY29udGV4dFwiO1xuaW1wb3J0IHR5cGUgeyBDb250ZXh0V2l0aE1hc3RyYSB9IGZyb20gXCJAbWFzdHJhL2NvcmUvc2VydmVyXCI7XG5cbi8qKiBGaXhlZC1hZ2VudCBvciBkeW5hbWljIGA6YWdlbnRJZGAgYmluZGluZyBhY2NlcHRlZCBieSBjdXN0b20gYWdlbnQgcm91dGVzLiAqL1xuZXhwb3J0IHR5cGUgQWdlbnRSb3V0ZU9wdGlvbnMgPVxuICB7IHBhdGg6IGAke3N0cmluZ306YWdlbnRJZCR7c3RyaW5nfWA7IGFnZW50PzogbmV2ZXIgfSB8IHsgcGF0aDogc3RyaW5nOyBhZ2VudDogc3RyaW5nIH07XG5cbi8qKiBWYWxpZGF0ZWQgcm91dGUgcGF0aCBhbmQgb3B0aW9uYWwgZml4ZWQgYWdlbnQgYmluZGluZy4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgUmVzb2x2ZWRBZ2VudFJvdXRlT3B0aW9ucyB7XG4gIHBhdGg6IHN0cmluZztcbiAgZml4ZWRBZ2VudDogc3RyaW5nIHwgdW5kZWZpbmVkO1xufVxuXG4vKiogUmVzb2x2ZSBhbmQgdmFsaWRhdGUgYSBmaXhlZCBvciBkeW5hbWljIGFnZW50IHJvdXRlIGRlY2xhcmF0aW9uLiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVBZ2VudFJvdXRlT3B0aW9ucyhcbiAgb3B0aW9uczogQWdlbnRSb3V0ZU9wdGlvbnMsXG4gIGZpZWxkOiBzdHJpbmcsXG4pOiBSZXNvbHZlZEFnZW50Um91dGVPcHRpb25zIHtcbiAgY29uc3QgZml4ZWRBZ2VudCA9IFwiYWdlbnRcIiBpbiBvcHRpb25zID8gb3B0aW9ucy5hZ2VudCA6IHVuZGVmaW5lZDtcbiAgaWYgKCFmaXhlZEFnZW50ICYmICFvcHRpb25zLnBhdGguaW5jbHVkZXMoXCI6YWdlbnRJZFwiKSkge1xuICAgIHRocm93IFZhbGlkYXRpb25FcnJvci5pbnZhbGlkVmFsdWUoXG4gICAgICBmaWVsZCxcbiAgICAgIG9wdGlvbnMucGF0aCxcbiAgICAgIFwiYSBwYXRoIGNvbnRhaW5pbmcgYDphZ2VudElkYCwgb3IgYW4gZXhwbGljaXQgYGFnZW50YFwiLFxuICAgICk7XG4gIH1cbiAgcmV0dXJuIHsgcGF0aDogb3B0aW9ucy5wYXRoLCBmaXhlZEFnZW50IH07XG59XG5cbmludGVyZmFjZSBSZXNvbHZlZEFnZW50UmVxdWVzdENvbnRleHQge1xuICBhZ2VudElkOiBzdHJpbmc7XG4gIGFnZW50OiBBZ2VudDtcbiAgcmVxdWVzdENvbnRleHQ6IFJlcXVlc3RDb250ZXh0O1xuICByZXNvdXJjZUlkOiBzdHJpbmc7XG59XG5cbmludGVyZmFjZSBBZ2VudFJlcXVlc3RDb250ZXh0RXJyb3Ige1xuICBlcnJvcjogUmVzcG9uc2U7XG59XG5cbmludGVyZmFjZSBSZXNvbHZlQWdlbnRSZXF1ZXN0Q29udGV4dE9wdGlvbnMge1xuICBmaXhlZEFnZW50Pzogc3RyaW5nO1xuICB0aHJlYWRJZD86IFwib3B0aW9uYWxcIiB8IFwicmVxdWlyZWRcIjtcbn1cblxuLyoqIFJlc29sdmUgYW4gYWdlbnQgcGx1cyB0aGUgY2FsbGVyLXNjb3BlZCBNYXN0cmEgcmVxdWVzdCBjb250ZXh0LiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVBZ2VudFJlcXVlc3RDb250ZXh0KFxuICBjb250ZXh0OiBDb250ZXh0V2l0aE1hc3RyYSxcbiAgb3B0aW9uczogUmVzb2x2ZUFnZW50UmVxdWVzdENvbnRleHRPcHRpb25zICYgeyB0aHJlYWRJZDogXCJyZXF1aXJlZFwiIH0sXG4pOiAoUmVzb2x2ZWRBZ2VudFJlcXVlc3RDb250ZXh0ICYgeyB0aHJlYWRJZDogc3RyaW5nIH0pIHwgQWdlbnRSZXF1ZXN0Q29udGV4dEVycm9yO1xuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVBZ2VudFJlcXVlc3RDb250ZXh0KFxuICBjb250ZXh0OiBDb250ZXh0V2l0aE1hc3RyYSxcbiAgb3B0aW9ucz86IFJlc29sdmVBZ2VudFJlcXVlc3RDb250ZXh0T3B0aW9ucyxcbik6IChSZXNvbHZlZEFnZW50UmVxdWVzdENvbnRleHQgJiB7IHRocmVhZElkPzogc3RyaW5nIH0pIHwgQWdlbnRSZXF1ZXN0Q29udGV4dEVycm9yO1xuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVBZ2VudFJlcXVlc3RDb250ZXh0KFxuICBjb250ZXh0OiBDb250ZXh0V2l0aE1hc3RyYSxcbiAgb3B0aW9uczogUmVzb2x2ZUFnZW50UmVxdWVzdENvbnRleHRPcHRpb25zID0ge30sXG4pOiAoUmVzb2x2ZWRBZ2VudFJlcXVlc3RDb250ZXh0ICYgeyB0aHJlYWRJZD86IHN0cmluZyB9KSB8IEFnZW50UmVxdWVzdENvbnRleHRFcnJvciB7XG4gIGNvbnN0IG1hc3RyYSA9IGNvbnRleHQuZ2V0KFwibWFzdHJhXCIpO1xuICBjb25zdCByZXF1ZXN0Q29udGV4dCA9IGNvbnRleHQuZ2V0KFwicmVxdWVzdENvbnRleHRcIik7XG4gIGNvbnN0IGFnZW50SWQgPSBvcHRpb25zLmZpeGVkQWdlbnQgPz8gY29udGV4dC5yZXEucGFyYW0oXCJhZ2VudElkXCIpO1xuICBpZiAoIWFnZW50SWQpIHtcbiAgICByZXR1cm4geyBlcnJvcjogY29udGV4dC5qc29uKHsgZXJyb3I6IFwiYWdlbnRJZCBpcyByZXF1aXJlZFwiIH0sIDQwMCkgfTtcbiAgfVxuICBjb25zdCBhZ2VudCA9IG1hc3RyYS5nZXRBZ2VudEJ5SWQoYWdlbnRJZCk7XG4gIGlmICghYWdlbnQpIHtcbiAgICByZXR1cm4geyBlcnJvcjogY29udGV4dC5qc29uKHsgZXJyb3I6IGBVbmtub3duIGFnZW50IFwiJHthZ2VudElkfVwiYCB9LCA0MDQpIH07XG4gIH1cbiAgY29uc3QgcmVzb3VyY2VJZCA9IHJlcXVlc3RDb250ZXh0LmdldChNQVNUUkFfUkVTT1VSQ0VfSURfS0VZKSBhcyBzdHJpbmcgfCB1bmRlZmluZWQ7XG4gIGlmICghcmVzb3VyY2VJZCkge1xuICAgIHJldHVybiB7XG4gICAgICBlcnJvcjogY29udGV4dC5qc29uKHsgZXJyb3I6IFwicmVzb3VyY2UgaWQgbWlzc2luZyBmcm9tIHJlcXVlc3QgY29udGV4dFwiIH0sIDQwMCksXG4gICAgfTtcbiAgfVxuICBjb25zdCB0aHJlYWRJZCA9IHJlcXVlc3RDb250ZXh0LmdldChNQVNUUkFfVEhSRUFEX0lEX0tFWSkgYXMgc3RyaW5nIHwgdW5kZWZpbmVkO1xuICBpZiAob3B0aW9ucy50aHJlYWRJZCA9PT0gXCJyZXF1aXJlZFwiICYmICF0aHJlYWRJZCkge1xuICAgIHJldHVybiB7XG4gICAgICBlcnJvcjogY29udGV4dC5qc29uKHsgZXJyb3I6IFwidGhyZWFkIGlkIG1pc3NpbmcgZnJvbSByZXF1ZXN0IGNvbnRleHRcIiB9LCA0MDApLFxuICAgIH07XG4gIH1cbiAgcmV0dXJuIHtcbiAgICBhZ2VudElkLFxuICAgIGFnZW50LFxuICAgIHJlcXVlc3RDb250ZXh0LFxuICAgIHJlc291cmNlSWQsXG4gICAgLi4uKHRocmVhZElkID8geyB0aHJlYWRJZCB9IDoge30pLFxuICB9O1xufVxuIl19

package/src/_agent-route-context.ts

@@ -1,100 +0,0 @@
-/**
- * Shared agent binding and request-context resolution for Mastra custom routes.
- *
- * @module
- */
-
-import { ValidationError } from "@databricks/appkit";
-import type { Agent } from "@mastra/core/agent";
-import {
-  MASTRA_RESOURCE_ID_KEY,
-  MASTRA_THREAD_ID_KEY,
-  type RequestContext,
-} from "@mastra/core/request-context";
-import type { ContextWithMastra } from "@mastra/core/server";
-
-/** Fixed-agent or dynamic `:agentId` binding accepted by custom agent routes. */
-export type AgentRouteOptions =
-  { path: `${string}:agentId${string}`; agent?: never } | { path: string; agent: string };
-
-/** Validated route path and optional fixed agent binding. */
-export interface ResolvedAgentRouteOptions {
-  path: string;
-  fixedAgent: string | undefined;
-}
-
-/** Resolve and validate a fixed or dynamic agent route declaration. */
-export function resolveAgentRouteOptions(
-  options: AgentRouteOptions,
-  field: string,
-): ResolvedAgentRouteOptions {
-  const fixedAgent = "agent" in options ? options.agent : undefined;
-  if (!fixedAgent && !options.path.includes(":agentId")) {
-    throw ValidationError.invalidValue(
-      field,
-      options.path,
-      "a path containing `:agentId`, or an explicit `agent`",
-    );
-  }
-  return { path: options.path, fixedAgent };
-}
-
-interface ResolvedAgentRequestContext {
-  agentId: string;
-  agent: Agent;
-  requestContext: RequestContext;
-  resourceId: string;
-}
-
-interface AgentRequestContextError {
-  error: Response;
-}
-
-interface ResolveAgentRequestContextOptions {
-  fixedAgent?: string;
-  threadId?: "optional" | "required";
-}
-
-/** Resolve an agent plus the caller-scoped Mastra request context. */
-export function resolveAgentRequestContext(
-  context: ContextWithMastra,
-  options: ResolveAgentRequestContextOptions & { threadId: "required" },
-): (ResolvedAgentRequestContext & { threadId: string }) | AgentRequestContextError;
-export function resolveAgentRequestContext(
-  context: ContextWithMastra,
-  options?: ResolveAgentRequestContextOptions,
-): (ResolvedAgentRequestContext & { threadId?: string }) | AgentRequestContextError;
-export function resolveAgentRequestContext(
-  context: ContextWithMastra,
-  options: ResolveAgentRequestContextOptions = {},
-): (ResolvedAgentRequestContext & { threadId?: string }) | AgentRequestContextError {
-  const mastra = context.get("mastra");
-  const requestContext = context.get("requestContext");
-  const agentId = options.fixedAgent ?? context.req.param("agentId");
-  if (!agentId) {
-    return { error: context.json({ error: "agentId is required" }, 400) };
-  }
-  const agent = mastra.getAgentById(agentId);
-  if (!agent) {
-    return { error: context.json({ error: `Unknown agent "${agentId}"` }, 404) };
-  }
-  const resourceId = requestContext.get(MASTRA_RESOURCE_ID_KEY) as string | undefined;
-  if (!resourceId) {
-    return {
-      error: context.json({ error: "resource id missing from request context" }, 400),
-    };
-  }
-  const threadId = requestContext.get(MASTRA_THREAD_ID_KEY) as string | undefined;
-  if (options.threadId === "required" && !threadId) {
-    return {
-      error: context.json({ error: "thread id missing from request context" }, 400),
-    };
-  }
-  return {
-    agentId,
-    agent,
-    requestContext,
-    resourceId,
-    ...(threadId ? { threadId } : {}),
-  };
-}