@dbx-tools/ui-mastra 0.9.153 → 0.9.157

package/src/react/mastra-chat.tsx

@@ -1,7 +1,7 @@
-import { errorUtils, hash, log } from "@dbx-tools/shared-core";
-import { isStaleMastraResumeError } from "@dbx-tools/shared-mastra/resume";
+import { getAuthStatus } from "@dbx-tools/shared-auth";
+import { hash, log, toError } from "@dbx-tools/shared-core";
+import { isStaleMastraResumeError } from "@dbx-tools/shared-mastra";
 import type { ReasoningEffort } from "@dbx-tools/shared-model";
-import { getAuthStatus } from "@dbx-tools/ui/auth/react";
 import { useBrand } from "@dbx-tools/ui/branding/react";
 import type { RequestContext } from "@mastra/client-js";
 import type { FileUIPart, UIMessage } from "ai";
@@ -660,7 +660,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
           }
           logger.warn("chat stream disconnected; reconnecting to background run", {
             runId,
-            error: errorUtils.toError(initialError),
+            error: toError(initialError),
           });
           const messagesBeforeReplay = getSession(threadId).messages;
           writeMessages(
@@ -705,7 +705,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
         if (getSession(threadId).runToken !== token) return;
         if (isStaleMastraResumeError(caught)) {
           logger.warn("ignored stale mastra resume", {
-            error: errorUtils.toError(caught),
+            error: toError(caught),
           });
           updateSession(threadId, (session) => {
             if (session.runToken !== token) return session;
@@ -725,11 +725,11 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
           return;
         }
         logger.error("stream error", {
-          error: errorUtils.toError(caught),
+          error: toError(caught),
         });
         updateSession(threadId, (session) => ({
           ...session,
-          error: errorUtils.toError(caught),
+          error: toError(caught),
           status: "error",
           abortController: session.abortController === controller ? null : session.abortController,
           runId: runIdRef.current,
@@ -905,7 +905,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
           .catch((error: unknown) => {
             logger.warn("failed to abort background run", {
               runId: current.runId,
-              error: errorUtils.toError(error),
+              error: toError(error),
             });
           });
       }
@@ -948,7 +948,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
               .catch((error: unknown) => {
                 logger.warn("failed to observe interrupted background run", {
                   runId,
-                  error: errorUtils.toError(error),
+                  error: toError(error),
                 });
               })
           : undefined;
@@ -962,7 +962,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
               .catch((error: unknown) => {
                 logger.warn("failed to abort interrupted background run", {
                   runId,
-                  error: errorUtils.toError(error),
+                  error: toError(error),
                 });
               })
           : undefined;
@@ -1105,7 +1105,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
       logger.info("history cleared", { threadId });
     } catch (error) {
       logger.error("history clear error", {
-        error: errorUtils.toError(error),
+        error: toError(error),
       });
     }
     resetSession(threadId, true);
@@ -1164,7 +1164,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
       } catch (error) {
         logger.error("thread delete error", {
           threadId,
-          error: errorUtils.toError(error),
+          error: toError(error),
         });
         setRemovedThreadIds((prev) => {
           if (!prev.has(threadId)) return prev;
@@ -1207,7 +1207,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
       } catch (error) {
         logger.error("thread rename error", {
           threadId,
-          error: errorUtils.toError(error),
+          error: toError(error),
         });
         setRenamedThreads((prev) => {
           if (!(threadId in prev)) return prev;
@@ -1250,11 +1250,11 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
       .catch((error: unknown) => {
         logger.error("regenerate cleanup error", {
           threadId,
-          error: errorUtils.toError(error),
+          error: toError(error),
         });
         updateSession(threadId, (session) => ({
           ...session,
-          error: errorUtils.toError(error),
+          error: toError(error),
           status: "error",
         }));
       });
@@ -1321,7 +1321,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
       } catch (error) {
         logger.error("conversation export error", {
           format,
-          error: errorUtils.toError(error),
+          error: toError(error),
         });
       }
     },
@@ -1343,7 +1343,7 @@ export const useMastraChat = <TValues extends Record<string, unknown> = Record<s
       } catch (error) {
         logger.error("message export error", {
           format,
-          error: errorUtils.toError(error),
+          error: toError(error),
         });
       }
     },

package/src/react/suggestion-pills.tsx

@@ -1,4 +1,4 @@
-import { Button, cn } from "@dbx-tools/ui/react";
+import { Button, cn } from "@databricks/appkit-ui/react";
 
 // Shared rendering for suggested questions. Both the initial starter
 // suggestions (above the composer when the transcript is empty) and

package/src/react/suggestions.ts

@@ -2,7 +2,7 @@ import {
   FOLLOW_UP_SUGGESTIONS_PART_TYPE,
   FollowUpSuggestionsPartDataSchema,
   type FollowUpSuggestionMode,
-} from "@dbx-tools/shared-mastra/wire";
+} from "@dbx-tools/shared-mastra";
 import type { UIMessage } from "ai";
 import type { ToolEvent, ToolProgress } from "./types.ts";
 

package/src/react/thread-sidebar.tsx

@@ -6,7 +6,7 @@ import {
   TooltipContent,
   TooltipTrigger,
   cn,
-} from "@dbx-tools/ui/react";
+} from "@databricks/appkit-ui/react";
 import {
   Loader2Icon,
   MessageSquarePlusIcon,

package/src/react/thread-tabs.tsx

@@ -7,7 +7,7 @@ import {
   TooltipContent,
   TooltipTrigger,
   cn,
-} from "@dbx-tools/ui/react";
+} from "@databricks/appkit-ui/react";
 import { HistoryIcon, Loader2Icon, PlusIcon, XIcon } from "lucide-react";
 import { type ReactNode, useEffect, useRef, useState } from "react";
 import { ThreadSidebar, type ThreadSidebarProps } from "./thread-sidebar.tsx";

package/src/react/tool-pill.tsx

@@ -1,15 +1,13 @@
-import { json, stringUtils } from "@dbx-tools/shared-core";
-import { genieModel } from "@dbx-tools/shared-genie";
 import {
   Collapsible,
   CollapsibleContent,
   CollapsibleTrigger,
-  detectCodeLanguage,
-  JsonBlock,
-  RecordPreview,
   Spinner,
   cn,
-} from "@dbx-tools/ui/react";
+} from "@databricks/appkit-ui/react";
+import { parse, toLabel, capitalize } from "@dbx-tools/shared-core";
+import { humanizeStatus } from "@dbx-tools/shared-genie";
+import { detectCodeLanguage, JsonBlock, RecordPreview } from "@dbx-tools/ui/react";
 import { CheckIcon, ChevronDownIcon, XIcon } from "lucide-react";
 import { SourceBlock, ToolMarkdown } from "./markdown.tsx";
 import type { ToolEvent, ToolProgress } from "./types.ts";
@@ -49,7 +47,7 @@ export const humanizeToolName = (toolName: string): string => {
   const label = toolName.startsWith(MASTRA_WORKSPACE_TOOL_PREFIX)
     ? toolName.slice(MASTRA_WORKSPACE_TOOL_PREFIX.length)
     : toolName;
-  return stringUtils.toLabel(label);
+  return toLabel(label);
 };
 
 /**
@@ -69,7 +67,7 @@ const runningLabelFor = (event: ToolEvent): string => {
     .reverse()
     .find((p): p is Extract<ToolProgress, { type: "status" }> => p.type === "status");
   return latest
-    ? stringUtils.capitalize(genieModel.humanizeStatus(latest.status))
+    ? capitalize(humanizeStatus(latest.status))
     : `Calling ${humanizeToolName(event.toolName)}`;
 };
 
@@ -393,7 +391,7 @@ export function structuredToolPayload(value: unknown): unknown | undefined {
   if (typeof value !== "string") return undefined;
   const trimmed = value.trim();
   if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return undefined;
-  const parsed = json.parse(trimmed);
+  const parsed = parse(trimmed);
   return typeof parsed === "object" && parsed !== null ? parsed : undefined;
 }
 

package/src/react/types.ts

@@ -1,11 +1,9 @@
-import type { FollowUpSuggestionMode, ToolProgressEvent } from "@dbx-tools/shared-mastra/wire";
+import type { FollowUpSuggestionMode, ToolProgressEvent } from "@dbx-tools/shared-mastra";
 import type { ReasoningEffort, ServingEndpointSummary } from "@dbx-tools/shared-model";
 import type { FileUIPart, UIMessage } from "ai";
 import type { ReactNode } from "react";
 import type { ExportFormat } from "../support/export.ts";
 
-export type { ExportFormat } from "../support/export.ts";
-
 // Public types for the chat UI: the controlled `ChatView` props plus
 // the supporting tool-event / approval shapes a host transport feeds
 // it. Kept dependency-free of the components so both the presentational

package/src/react/use-chat-thread-query.ts

@@ -0,0 +1,27 @@
+import { useCallback } from "react";
+import { useSearchParams } from "react-router-dom";
+import type { ThreadIdChangeReason } from "./mastra-chat.tsx";
+
+const DEFAULT_THREAD_PARAMETER = "thread";
+
+/** Bind Mastra's active thread to one URL search parameter. */
+export function useChatThreadQuery(parameter = DEFAULT_THREAD_PARAMETER) {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const threadId = searchParams.get(parameter)?.trim() || undefined;
+  const onThreadIdChange = useCallback(
+    (nextThreadId: string, reason: ThreadIdChangeReason) => {
+      setSearchParams(
+        (current) => {
+          if (current.get(parameter) === nextThreadId) return current;
+          const next = new URLSearchParams(current);
+          next.set(parameter, nextThreadId);
+          return next;
+        },
+        { replace: reason === "hydrate" || reason === "missing" || reason === "delete" },
+      );
+    },
+    [parameter, setSearchParams],
+  );
+
+  return { threadId, onThreadIdChange };
+}

package/src/support/chart-option.ts

@@ -27,7 +27,7 @@
  *
  * @module
  */
-import { object } from "@dbx-tools/shared-core";
+import { isRecord } from "@dbx-tools/shared-core";
 import type { ChartChrome } from "./chart-theme.ts";
 
 /** Compact SI formatter shared across every value-axis tick. */
@@ -52,7 +52,7 @@ function compactAxisLabel(value: number): string {
 /** A permissive record view of an option node we patch field-by-field. */
 type Obj = Record<string, unknown>;
 
-const isObj = object.isRecord;
+const isObj = isRecord;
 
 /** True when `title` (object or array) carries any non-empty `text`. */
 function hasTitleText(title: unknown): boolean {

package/src/support/chart-theme.ts

@@ -20,7 +20,7 @@
  *
  * @module
  */
-import { object } from "@dbx-tools/shared-core";
+import { deepEqual } from "@dbx-tools/shared-core";
 import { type RefObject, useEffect, useState } from "react";
 
 /**
@@ -122,7 +122,7 @@ export function useChartChrome(ref: RefObject<Element | null>): ChartChrome | un
   useEffect(() => {
     const read = () => {
       const next = resolveChartChrome(ref.current);
-      setChrome((prev) => (object.deepEqual(prev, next) ? prev : next));
+      setChrome((prev) => (deepEqual(prev, next) ? prev : next));
     };
     read();
     const observer = new MutationObserver(read);

package/src/support/export.ts

@@ -23,8 +23,8 @@
  * @module
  */
 
-import { stringUtils } from "@dbx-tools/shared-core";
-import { markers, type Chart, type StatementData } from "@dbx-tools/shared-mastra";
+import { capitalize, toLabel, toSlugWithOptions, escapeHtml } from "@dbx-tools/shared-core";
+import { type Chart, type StatementData, parseMarkers, isUuid } from "@dbx-tools/shared-mastra";
 import type { UIMessage } from "ai";
 import type { EChartsCoreOption } from "echarts";
 import { normalizeChartOption } from "./chart-option.ts";
@@ -199,15 +199,15 @@ type Segment =
 function splitSegments(text: string): Segment[] {
   const segments: Segment[] = [];
   let last = 0;
-  for (const marker of markers.parseMarkers(text)) {
+  for (const marker of parseMarkers(text)) {
     if (marker.start > last) {
       segments.push({ kind: "text", text: text.slice(last, marker.start) });
     }
-    if (markers.isUuid(marker.id) && marker.type === "chart") {
+    if (isUuid(marker.id) && marker.type === "chart") {
       segments.push({ kind: "chart", id: marker.id });
-    } else if (markers.isUuid(marker.id) && marker.type === "data") {
+    } else if (isUuid(marker.id) && marker.type === "data") {
       segments.push({ kind: "data", id: marker.id });
-    } else if (markers.isUuid(marker.id) && marker.type === "visualization") {
+    } else if (isUuid(marker.id) && marker.type === "visualization") {
       segments.push({ kind: "visualization", id: marker.id });
     }
     last = marker.end;
@@ -232,7 +232,7 @@ export function messageText(message: UIMessage): string {
 function roleLabel(role: UIMessage["role"], userLabel: string): string {
   if (role === "user") return userLabel;
   if (role === "assistant") return "Assistant";
-  return stringUtils.capitalize(role);
+  return capitalize(role);
 }
 
 /* --------------------------------- HTML ---------------------------------- */
@@ -345,7 +345,7 @@ async function dataTableHtml(
 ): Promise<string | null> {
   const data = await safeStatement(resolver, id, visualization);
   if (!data || data.rows.length === 0) return null;
-  const head = data.columns.map((c) => `<th>${escapeHtml(stringUtils.toLabel(c))}</th>`).join("");
+  const head = data.columns.map((c) => `<th>${escapeHtml(toLabel(c))}</th>`).join("");
   const body = data.rows
     .map(
       (row) =>
@@ -417,7 +417,7 @@ async function dataTableMarkdown(
 ): Promise<string | null> {
   const data = await safeStatement(resolver, id, visualization);
   if (!data || data.rows.length === 0) return null;
-  const header = `| ${data.columns.map((c) => mdCell(stringUtils.toLabel(c))).join(" | ")} |`;
+  const header = `| ${data.columns.map((c) => mdCell(toLabel(c))).join(" | ")} |`;
   const sep = `| ${data.columns.map(() => "---").join(" | ")} |`;
   const rows = data.rows.map(
     (row) => `| ${data.columns.map((c) => mdCell(cellText(row[c]))).join(" | ")} |`,
@@ -462,12 +462,9 @@ function mdCell(value: string): string {
   return value.replace(/\|/g, "\\|").replace(/\r?\n/g, " ");
 }
 
-/** Escape HTML-significant characters (from the shared string utils). */
-const escapeHtml = stringUtils.escapeHtml;
-
 /** Turn a title into a safe, lowercase filename stem. */
 function slugify(value: string): string {
-  return stringUtils.toSlugWithOptions({ maxLength: 60 }, value) || "conversation";
+  return toSlugWithOptions({ maxLength: 60 }, value) || "conversation";
 }
 
 /**

package/src/support/genie-client.ts

@@ -1,4 +1,13 @@
-import { routes, wire, type MastraClientConfig } from "@dbx-tools/shared-mastra";
+import {
+  type MastraClientConfig,
+  genieRoutePath,
+  MASTRA_ROUTES,
+  GENIE_CONVERSATION_PART_TYPE,
+  GenieConversationPartDataSchema,
+  MastraSuggestionsResponseSchema,
+  GenieThreadsResponseSchema,
+  GenieThreadMessagesResponseSchema,
+} from "@dbx-tools/shared-mastra";
 import type {
   ListAgentSuspendedRunsResponse,
   ListMemoryThreadMessagesResponse,
@@ -44,7 +53,7 @@ export class GenieChatClient extends MastraPluginClient {
   }
 
   #url(...parts: string[]): string {
-    return `${this.basePath}${routes.genieRoutePath(this.alias, ...parts)}`;
+    return `${this.basePath}${genieRoutePath(this.alias, ...parts)}`;
   }
 
   async #delete(url: string, signal?: AbortSignal): Promise<void> {
@@ -72,7 +81,7 @@ export class GenieChatClient extends MastraPluginClient {
     const conversationId =
       params.threadId && this.#conversations.has(params.threadId) ? params.threadId : undefined;
     const response = await this.uiStream({
-      path: this.#url(routes.MASTRA_ROUTES.chat),
+      path: this.#url(MASTRA_ROUTES.chat),
       chatId: params.threadId ?? params.runId,
       messages: userMessage ? [userMessage] : [],
       body: {
@@ -87,8 +96,8 @@ export class GenieChatClient extends MastraPluginClient {
     const stream = response.stream.pipeThrough(
       new TransformStream<UIMessageChunk, UIMessageChunk>({
         transform: (chunk, controller) => {
-          if (chunk.type === wire.GENIE_CONVERSATION_PART_TYPE) {
-            const data = wire.GenieConversationPartDataSchema.safeParse(chunk.data);
+          if (chunk.type === GENIE_CONVERSATION_PART_TYPE) {
+            const data = GenieConversationPartDataSchema.safeParse(chunk.data);
             if (data.success) {
               resolved = data.data.conversationId;
               this.#conversations.add(resolved);
@@ -122,8 +131,8 @@ export class GenieChatClient extends MastraPluginClient {
   /** Starter questions for this client's Genie space. */
   override async suggestions(_agentId?: string, signal?: AbortSignal): Promise<string[]> {
     const payload = await this.getJson(
-      this.#url(routes.MASTRA_ROUTES.suggestions),
-      wire.MastraSuggestionsResponseSchema,
+      this.#url(MASTRA_ROUTES.suggestions),
+      MastraSuggestionsResponseSchema,
       signal,
     );
     return payload.questions;
@@ -134,8 +143,8 @@ export class GenieChatClient extends MastraPluginClient {
     options: { signal?: AbortSignal } = {},
   ): Promise<ListMemoryThreadsResponse> {
     const payload = await this.getJson(
-      this.#url(routes.MASTRA_ROUTES.threads),
-      wire.GenieThreadsResponseSchema,
+      this.#url(MASTRA_ROUTES.threads),
+      GenieThreadsResponseSchema,
       options.signal,
     );
     for (const thread of payload.threads) this.#conversations.add(thread.id);
@@ -169,8 +178,8 @@ export class GenieChatClient extends MastraPluginClient {
     let messages: UIMessage[] = [];
     if (page === 0) {
       const payload = await this.getJson(
-        this.#url(routes.MASTRA_ROUTES.threads, options.threadId, routes.MASTRA_ROUTES.messages),
-        wire.GenieThreadMessagesResponseSchema,
+        this.#url(MASTRA_ROUTES.threads, options.threadId, MASTRA_ROUTES.messages),
+        GenieThreadMessagesResponseSchema,
         options.signal,
       );
       messages = await validateUIMessages({ messages: payload.messages });
@@ -195,7 +204,7 @@ export class GenieChatClient extends MastraPluginClient {
     options: { signal?: AbortSignal } = {},
   ): Promise<void> {
     if (!this.#conversations.has(threadId)) return;
-    await this.#delete(this.#url(routes.MASTRA_ROUTES.threads, threadId), options.signal);
+    await this.#delete(this.#url(MASTRA_ROUTES.threads, threadId), options.signal);
     this.#conversations.delete(threadId);
   }
 
@@ -224,7 +233,7 @@ export class GenieChatClient extends MastraPluginClient {
     );
     for (const genieId of genieIds) {
       await this.#delete(
-        this.#url(routes.MASTRA_ROUTES.threads, threadId, routes.MASTRA_ROUTES.messages, genieId),
+        this.#url(MASTRA_ROUTES.threads, threadId, MASTRA_ROUTES.messages, genieId),
         options.signal,
       );
     }

package/src/support/mastra-client.ts

@@ -1,10 +1,6 @@
-import { errorUtils } from "@dbx-tools/shared-core";
+import { usePluginClientConfig } from "@databricks/appkit-ui/react";
+import { toError } from "@dbx-tools/shared-core";
 import {
-  feedback,
-  override,
-  routes,
-  thread,
-  wire,
   type Chart,
   type DefaultModelResponse,
   type MastraClientConfig,
@@ -12,9 +8,20 @@ import {
   type MastraFeedbackResponse,
   type MastraMlflowExperimentResponse,
   type StatementData,
+  type FeedbackMode,
+  MastraFeedbackResponseSchema,
+  MastraMlflowExperimentResponseSchema,
+  MODEL_OVERRIDE_HEADER,
+  MASTRA_ROUTES,
+  THREAD_ID_HEADER,
+  MastraRunAbortResponseSchema,
+  ServingEndpointsResponseSchema,
+  DefaultModelResponseSchema,
+  MastraSuggestionsResponseSchema,
+  ChartSchema,
+  StatementDataSchema,
 } from "@dbx-tools/shared-mastra";
 import type { ReasoningEffort, ServingEndpointSummary } from "@dbx-tools/shared-model";
-import { usePluginClientConfig } from "@dbx-tools/ui/react";
 import {
   MastraClient,
   type ListAgentSuspendedRunsResponse,
@@ -80,7 +87,7 @@ export class MastraPluginClient extends MastraClient {
   /** Registered agent ids, surfaced for pickers. */
   readonly agents: readonly string[];
   /** Resolved feedback destination published by the server. */
-  readonly feedbackMode: feedback.FeedbackMode;
+  readonly feedbackMode: FeedbackMode;
   /**
    * Whether the agents run their Databricks calls as the app service principal
    * rather than on-behalf-of the signed-in user. When `true` the chat works for
@@ -131,8 +138,8 @@ export class MastraPluginClient extends MastraClient {
    */
   #routingHeaders(routing: { threadId?: string; model?: string }): Record<string, string> {
     const headers: Record<string, string> = {};
-    if (routing.threadId) headers[thread.THREAD_ID_HEADER] = routing.threadId;
-    if (routing.model) headers[override.MODEL_OVERRIDE_HEADER] = routing.model;
+    if (routing.threadId) headers[THREAD_ID_HEADER] = routing.threadId;
+    if (routing.model) headers[MODEL_OVERRIDE_HEADER] = routing.model;
     return headers;
   }
 
@@ -232,7 +239,7 @@ export class MastraPluginClient extends MastraClient {
     signal?: AbortSignal;
   }): Promise<MastraStreamResponse> {
     return this.uiStream({
-      path: `${this.basePath}${routes.MASTRA_ROUTES.chat}/${encodeURIComponent(params.agentId)}`,
+      path: `${this.basePath}${MASTRA_ROUTES.chat}/${encodeURIComponent(params.agentId)}`,
       chatId: params.threadId ?? params.runId,
       messages: params.messages,
       body: {
@@ -256,7 +263,7 @@ export class MastraPluginClient extends MastraClient {
     signal?: AbortSignal;
   }): Promise<MastraStreamResponse> {
     return this.#uiReconnect({
-      path: `${this.basePath}${routes.MASTRA_ROUTES.chat}/${encodeURIComponent(params.agentId)}${routes.MASTRA_ROUTES.runs}/${encodeURIComponent(params.runId)}`,
+      path: `${this.basePath}${MASTRA_ROUTES.chat}/${encodeURIComponent(params.agentId)}${MASTRA_ROUTES.runs}/${encodeURIComponent(params.runId)}`,
       chatId: params.runId,
       routing: params,
       signal: params.signal,
@@ -273,11 +280,11 @@ export class MastraPluginClient extends MastraClient {
     const origin = typeof window !== "undefined" ? window.location.origin : "http://localhost";
     const response = await this.#mutateJson(
       new URL(
-        `${this.basePath}${routes.MASTRA_ROUTES.chat}/${encodeURIComponent(params.agentId)}${routes.MASTRA_ROUTES.runs}/${encodeURIComponent(params.runId)}${routes.MASTRA_ROUTES.abort}`,
+        `${this.basePath}${MASTRA_ROUTES.chat}/${encodeURIComponent(params.agentId)}${MASTRA_ROUTES.runs}/${encodeURIComponent(params.runId)}${MASTRA_ROUTES.abort}`,
         origin,
       ).toString(),
       "POST",
-      wire.MastraRunAbortResponseSchema,
+      MastraRunAbortResponseSchema,
       {
         headers: this.#routingHeaders({ threadId: params.threadId }),
         signal: params.signal,
@@ -333,7 +340,7 @@ export class MastraPluginClient extends MastraClient {
     },
   ): Promise<MastraStreamResponse> {
     return this.uiStream({
-      path: `${this.basePath}${routes.MASTRA_ROUTES.chat}/${encodeURIComponent(agentId)}`,
+      path: `${this.basePath}${MASTRA_ROUTES.chat}/${encodeURIComponent(agentId)}`,
       chatId: params.threadId ?? params.runId,
       messages: [],
       body: {
@@ -358,8 +365,8 @@ export class MastraPluginClient extends MastraClient {
    */
   async models(signal?: AbortSignal): Promise<ServingEndpointSummary[]> {
     const payload = await this.getJson(
-      `${this.basePath}${routes.MASTRA_ROUTES.models}`,
-      wire.ServingEndpointsResponseSchema,
+      `${this.basePath}${MASTRA_ROUTES.models}`,
+      ServingEndpointsResponseSchema,
       signal,
     );
     return payload.endpoints;
@@ -382,8 +389,8 @@ export class MastraPluginClient extends MastraClient {
   /** Fetch the complete resolved default-model descriptor for an agent. */
   async defaultModelDetails(agentId?: string, signal?: AbortSignal): Promise<DefaultModelResponse> {
     const payload = await this.getJson(
-      this.#agentScoped(routes.MASTRA_ROUTES.defaultModel, agentId),
-      wire.DefaultModelResponseSchema,
+      this.#agentScoped(MASTRA_ROUTES.defaultModel, agentId),
+      DefaultModelResponseSchema,
       signal,
     );
     return payload;
@@ -396,8 +403,8 @@ export class MastraPluginClient extends MastraClient {
    */
   async suggestions(agentId?: string, signal?: AbortSignal): Promise<string[]> {
     const payload = await this.getJson(
-      this.#agentScoped(routes.MASTRA_ROUTES.suggestions, agentId),
-      wire.MastraSuggestionsResponseSchema,
+      this.#agentScoped(MASTRA_ROUTES.suggestions, agentId),
+      MastraSuggestionsResponseSchema,
       signal,
     );
     return payload.questions;
@@ -512,9 +519,9 @@ export class MastraPluginClient extends MastraClient {
    */
   async feedback(input: MastraFeedbackRequest): Promise<MastraFeedbackResponse> {
     return this.#mutateJson(
-      `${this.basePath}${routes.MASTRA_ROUTES.feedback}`,
+      `${this.basePath}${MASTRA_ROUTES.feedback}`,
       "POST",
-      feedback.MastraFeedbackResponseSchema,
+      MastraFeedbackResponseSchema,
       { body: input },
     );
   }
@@ -526,8 +533,8 @@ export class MastraPluginClient extends MastraClient {
    */
   async mlflowExperiment(signal?: AbortSignal): Promise<MastraMlflowExperimentResponse> {
     return this.getJson(
-      `${this.basePath}${routes.MASTRA_ROUTES.mlflowExperiment}`,
-      feedback.MastraMlflowExperimentResponseSchema,
+      `${this.basePath}${MASTRA_ROUTES.mlflowExperiment}`,
+      MastraMlflowExperimentResponseSchema,
       signal,
     );
   }
@@ -540,7 +547,7 @@ export class MastraPluginClient extends MastraClient {
    * resolves to `undefined` so the slot renders nothing.
    */
   chart(id: string, signal?: AbortSignal): Promise<Chart | undefined> {
-    return this.#embed("chart", id, wire.ChartSchema.parse, signal);
+    return this.#embed("chart", id, ChartSchema.parse, signal);
   }
 
   /**
@@ -550,12 +557,12 @@ export class MastraPluginClient extends MastraClient {
    * `undefined`.
    */
   statement(id: string, signal?: AbortSignal): Promise<StatementData | undefined> {
-    return this.#embed("data", id, wire.StatementDataSchema.parse, signal);
+    return this.#embed("data", id, StatementDataSchema.parse, signal);
   }
 
   /** Resolve AppKit UI visualization data for a direct Genie statement. */
   visualization(id: string, signal?: AbortSignal): Promise<StatementData | undefined> {
-    return this.#embed("visualization", id, wire.StatementDataSchema.parse, signal);
+    return this.#embed("visualization", id, StatementDataSchema.parse, signal);
   }
 
   /**
@@ -638,7 +645,7 @@ export class MastraPluginClient extends MastraClient {
     parse: (raw: unknown) => T,
     signal?: AbortSignal,
   ): Promise<T | undefined> {
-    const url = `${this.basePath}${routes.MASTRA_ROUTES.embed}/${encodeURIComponent(
+    const url = `${this.basePath}${MASTRA_ROUTES.embed}/${encodeURIComponent(
       type,
     )}/${encodeURIComponent(id)}`;
     const init: RequestInit = { credentials: "include" };
@@ -792,7 +799,7 @@ export const useMastraModels = (
       })
       .catch((e: unknown) => {
         if (controller.signal.aborted) return;
-        setError(errorUtils.toError(e));
+        setError(toError(e));
       })
       .finally(() => {
         if (!controller.signal.aborted) setLoading(false);
@@ -960,7 +967,7 @@ export const useMastraThreads = (
       })
       .catch((e: unknown) => {
         if (controller.signal.aborted || (e as { name?: string }).name === "AbortError") return;
-        setError(errorUtils.toError(e));
+        setError(toError(e));
         setThreads([]);
       })
       .finally(() => {
@@ -1125,7 +1132,7 @@ function useByIdFetch<T>(
       })
       .catch((e: unknown) => {
         if (cancelled) return;
-        setError(errorUtils.toError(e));
+        setError(toError(e));
         setLoading(false);
       });
 

package/src/support/thread-sessions.ts

@@ -2,8 +2,6 @@ import type { RequestContext } from "@mastra/client-js";
 import type { UIMessage } from "ai";
 import type { ChatStatus, MessageFeedback, PendingApproval, QueuedSteer } from "../react/types.ts";
 
-export type { QueuedSteer } from "../react/types.ts";
-
 /** A queued steer plus the application context captured when it was submitted. */
 export type SessionQueuedSteer = QueuedSteer & {
   requestContext?: RequestContext;