@dbx-tools/appkit-mastra 0.9.153 → 0.9.157

package/src/chart.ts

@@ -29,17 +29,23 @@
 
 import { AppKitError, CacheManager, ExecutionError } from "@databricks/appkit";
 import {
-  asyncUtils,
-  errorUtils,
-  hash,
-  json,
   log,
-  object,
-  stringUtils,
   type BrandContext,
+  sleep,
+  toError,
+  id,
+  parseRecord,
+  toNumber,
+  toDescription,
 } from "@dbx-tools/shared-core";
-import { markers, wire, type Chart, type ChartResult } from "@dbx-tools/shared-mastra";
-import { model } from "@dbx-tools/shared-model";
+import {
+  type Chart,
+  type ChartResult,
+  formatMarker,
+  ChartTypeSchema,
+  ChartSchema,
+} from "@dbx-tools/shared-mastra";
+import { ModelClass } from "@dbx-tools/shared-model";
 import { Agent } from "@mastra/core/agent";
 import type { RequestContext } from "@mastra/core/request-context";
 import { createTool } from "@mastra/core/tools";
@@ -108,17 +114,17 @@ const chartDataPointSchema = z
       if (v === null || v === undefined) return null;
       if (typeof v === "number") return Number.isFinite(v) ? v : null;
       if (typeof v === "string") {
-        return object.toNumber(v) ?? null;
+        return toNumber(v) ?? null;
       }
       // Scatter `[x, y]` or heatmap `[xIndex, yIndex, value]`. Coerce
       // stringified components; reject if any component is non-finite.
       if (Array.isArray(v) && (v.length === 2 || v.length === 3)) {
-        const nums = v.map((c) => object.toNumber(c));
+        const nums = v.map((c) => toNumber(c));
         return nums.every((n) => n !== undefined) ? nums : null;
       }
       if (typeof v === "object" && v !== null && "value" in v) {
         const obj = v as { name?: unknown; value: unknown };
-        const val = object.toNumber(obj.value);
+        const val = toNumber(obj.value);
         if (val === undefined) return null;
         // Coerce numeric / boolean / nullish names to strings so a
         // pie slice keyed on a year (`2024`) or category id is
@@ -163,13 +169,13 @@ const seriesMarkTypeSchema = z
  * across charts.
  */
 export const chartPlanSchema = z.object({
-  chartType: wire.ChartTypeSchema,
+  chartType: ChartTypeSchema,
   title: z
     .string()
     .nullable()
     .default(null)
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         Short title shown above the chart. Use null to fall back to the
         \`title\` argument the caller passed in.
       `),
@@ -179,7 +185,7 @@ export const chartPlanSchema = z.object({
     .nullable()
     .default(null)
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         Axis label for the primary (usually bottom / value) axis.
         Used for bar / horizontalBar / line / area / combo / waterfall
         / scatter / heatmap; use null for pie / funnel / treemap / radar.
@@ -190,7 +196,7 @@ export const chartPlanSchema = z.object({
     .nullable()
     .default(null)
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         Axis label for the secondary (usually left) axis. Used for
         bar / horizontalBar / line / area / combo / waterfall /
         scatter / heatmap; use null for pie / funnel / treemap / radar.
@@ -201,7 +207,7 @@ export const chartPlanSchema = z.object({
     .nullable()
     .default(null)
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         Primary category labels. For \`bar\` / \`horizontalBar\` /
         \`line\` / \`area\` / \`combo\` / \`waterfall\`: one label per
         data point. For \`heatmap\`: x-axis categories. For \`radar\`:
@@ -215,7 +221,7 @@ export const chartPlanSchema = z.object({
     .nullable()
     .default(null)
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         Y-axis (row) labels for \`heatmap\`. Use null when the
         row labels come from the series names, which is the preferred
         way to build a heatmap. Use null for every other chart type.
@@ -225,7 +231,7 @@ export const chartPlanSchema = z.object({
     .array(
       z.object({
         name: z.string().describe(
-          stringUtils.toDescription(`
+          toDescription(`
             Legend name for this series.
           `),
         ),
@@ -238,7 +244,7 @@ export const chartPlanSchema = z.object({
             "Which y-axis to bind (0 = left, 1 = right). Use on `combo` when series have different units or scales; use null otherwise.",
           ),
         data: z.array(chartDataPointSchema).describe(
-          stringUtils.toDescription(`
+          toDescription(`
             Data points. For category charts (\`bar\` / \`horizontalBar\`
             / \`line\` / \`area\` / \`combo\` / \`waterfall\` / \`radar\`),
             an array of numbers aligned to \`categories\`; for
@@ -254,7 +260,7 @@ export const chartPlanSchema = z.object({
     )
     .default([])
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         One or more series to plot. Required for every chart type
         except \`custom\`, which carries its series inside \`option\`.
         Slice charts (\`pie\` / \`funnel\` / \`treemap\`) and
@@ -268,7 +274,7 @@ export const chartPlanSchema = z.object({
     .nullable()
     .default(null)
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         Required for \`custom\`; use null for every other chart type. A
         COMPLETE Echarts option, as a JSON object encoded in a string:
         \`series\` (each with its own \`type\` and that series' own data
@@ -294,7 +300,7 @@ type ChartPlanInput = z.input<typeof chartPlanSchema>;
  */
 export const chartPlannerRequestSchema = z.object({
   title: z.string().describe(
-    stringUtils.toDescription(`
+    toDescription(`
         Concise title shown above the chart (e.g. "Top 10 SKUs by Revenue").
       `),
   ),
@@ -302,7 +308,7 @@ export const chartPlannerRequestSchema = z.object({
     .string()
     .optional()
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         One-line intent the chart-planner uses when picking a chart type
         and axis encodings (e.g. "compare quarterly revenue across
         regions", "highlight the steep drop after position 5"). Not shown
@@ -314,7 +320,7 @@ export const chartPlannerRequestSchema = z.object({
     .nonempty("Data must contain at least one row")
     .readonly()
     .describe(
-      stringUtils.toDescription(`
+      toDescription(`
         Tabular dataset to chart. One object per row, keyed by column
         name. Values may be strings, numbers, booleans, or null. The
         chart-planner decides which columns are categories vs. numeric
@@ -334,7 +340,7 @@ export type ChartPlannerRequest = z.infer<typeof chartPlannerRequestSchema>;
  * cache by id, while the model gets the exact opaque token to copy into prose
  * and has no reason to invent or retype a UUID.
  */
-export const chartToolOutputSchema = wire.ChartSchema.pick({ chartId: true }).extend({
+export const chartToolOutputSchema = ChartSchema.pick({ chartId: true }).extend({
   marker: z
     .string()
     .describe(
@@ -355,7 +361,7 @@ export type ChartToolOutput = z.infer<typeof chartToolOutputSchema>;
  * the schema by construction.
  */
 function formatChartTypePicker(): string {
-  return wire.ChartTypeSchema.options
+  return ChartTypeSchema.options
     .map((opt) => `\`${opt.value}\` for ${opt.description ?? ""}`)
     .join("; ");
 }
@@ -364,7 +370,7 @@ function formatChartTypePicker(): string {
  * System prompt for the inner chart-planning agent. Tuned for a
  * fast-tier model (Haiku, GPT-5-mini, Gemini Flash Lite).
  */
-const CHART_PLANNER_INSTRUCTIONS = stringUtils.toDescription(`
+const CHART_PLANNER_INSTRUCTIONS = toDescription(`
   You design Apache Echarts visualizations. The user gives you a
   tabular dataset (rows of objects) plus a title and an optional
   description of the intent. You produce a small chart plan (chart
@@ -453,7 +459,7 @@ function getPlannerAgent(config: MastraPluginConfig): Agent {
       description: "Picks chart type and axis encodings for a dataset.",
       instructions: CHART_PLANNER_INSTRUCTIONS,
       model: ({ requestContext }) =>
-        buildModel(config, requestContext, { modelClass: model.ModelClass.ChatFast }),
+        buildModel(config, requestContext, { modelClass: ModelClass.ChatFast }),
     });
     plannerAgents.set(config, agent);
   }
@@ -472,7 +478,7 @@ async function runChartPlanner(
 ): Promise<ChartResult> {
   const { title, description, data } = request;
   const { requestContext, abortSignal } = options;
-  const prompt = stringUtils.toDescription({
+  const prompt = toDescription({
     Title: title,
     ...(description ? { Description: description } : {}),
     "Dataset (JSON, one row per object)": JSON.stringify(data, null, 2),
@@ -516,7 +522,7 @@ async function writeChart(entry: Chart, userKey: string): Promise<void> {
   } catch (err) {
     logger.warn("write-error", {
       chartId: entry.chartId,
-      error: errorUtils.toError(err),
+      error: toError(err),
     });
   }
 }
@@ -534,7 +540,7 @@ async function readChart(chartId: string, userKey: string): Promise<Chart | unde
   } catch (err) {
     logger.warn("read-error", {
       chartId,
-      error: errorUtils.toError(err),
+      error: toError(err),
     });
     return undefined;
   }
@@ -594,13 +600,13 @@ export interface PrepareChartOptions {
  *   - on data / planner failure:    `{ chartId, error }`
  */
 export async function prepareChart(opts: PrepareChartOptions): Promise<ChartToolOutput> {
-  const chartId = hash.id();
+  const chartId = id();
   await writeChart({ chartId }, opts.userKey);
   logger.debug("queued", { chartId });
   // Fire-and-forget. Failures land in the cache as `error` entries;
   // never escape into an unhandled rejection.
   void runPrepareChart(chartId, opts);
-  return { chartId, marker: markers.formatMarker("chart", chartId) };
+  return { chartId, marker: formatMarker("chart", chartId) };
 }
 
 async function runPrepareChart(chartId: string, opts: PrepareChartOptions): Promise<void> {
@@ -629,7 +635,7 @@ async function runPrepareChart(chartId: string, opts: PrepareChartOptions): Prom
       elapsedMs: Date.now() - startedAt,
     });
   } catch (err) {
-    logger.warn("error", { chartId, error: errorUtils.toError(err) });
+    logger.warn("error", { chartId, error: toError(err) });
     // The entry's `error` is rendered in the chat, so only an AppKitError's
     // own message travels; anything else could carry upstream provider detail.
     const errText = err instanceof AppKitError ? err.message : CHART_FAILED_MESSAGE;
@@ -694,7 +700,7 @@ export async function fetchChart(
     if (last.result !== undefined || last.error !== undefined) return last;
     const remaining = deadline - Date.now();
     if (remaining <= 0) return last;
-    await asyncUtils.sleep(Math.min(intervalMs, remaining), options.signal);
+    await sleep(Math.min(intervalMs, remaining), options.signal);
   }
 }
 
@@ -958,7 +964,7 @@ export function planToEchartsOption(
     // note on `chartDataPointSchema`). A malformed string costs one chart.
     // Nothing here is eval'd; a string-valued Echarts formatter is a
     // template, not code.
-    const option = json.parseRecord(plan.option);
+    const option = parseRecord(plan.option);
     if (!option) {
       throw new Error('chartType "custom" needs an `option` holding a JSON object');
     }
@@ -1199,7 +1205,7 @@ export function planToEchartsOption(
 export function buildRenderDataTool(config: MastraPluginConfig) {
   return createTool({
     id: "render_data",
-    description: stringUtils.toDescription([
+    description: toDescription([
       `
         Submit a tabular dataset for inline rendering as a chart in
         the user's view. Pass a title, the raw rows (array of objects

package/src/chat.ts

@@ -4,12 +4,12 @@
  * @module
  */
 
-import { errorUtils, log, object } from "@dbx-tools/shared-core";
-import { routes } from "@dbx-tools/shared-mastra";
+import { log, toError, errorMessage, isRecord } from "@dbx-tools/shared-core";
 import {
+  MASTRA_ROUTES,
   isStaleMastraResumeError,
   STALE_MASTRA_RESUME_STREAM_TEXT,
-} from "@dbx-tools/shared-mastra/resume";
+} from "@dbx-tools/shared-mastra";
 import { handleChatStream, toAISdkStream } from "@mastra/ai-sdk";
 import { isEventedAgent } from "@mastra/core/agent/durable";
 import { registerApiRoute } from "@mastra/core/server";
@@ -37,16 +37,14 @@ function latestUserText(value: unknown): string | undefined {
   if (!Array.isArray(value)) return undefined;
   for (let index = value.length - 1; index >= 0; index -= 1) {
     const message = value[index];
-    if (!object.isRecord(message) || message.role !== "user") continue;
+    if (!isRecord(message) || message.role !== "user") continue;
     if (typeof message.content === "string" && message.content.trim()) {
       return message.content.trim();
     }
     if (!Array.isArray(message.parts)) continue;
     const text = message.parts
       .flatMap((part) =>
-        object.isRecord(part) && part.type === "text" && typeof part.text === "string"
-          ? [part.text]
-          : [],
+        isRecord(part) && part.type === "text" && typeof part.text === "string" ? [part.text] : [],
       )
       .join("\n")
       .trim();
@@ -58,11 +56,11 @@ function latestUserText(value: unknown): string | undefined {
 /** Register detached chat, durable observation, and explicit abort routes. */
 export function agentChatRoutes(config: MastraPluginConfig = {}) {
   const followUps = resolveFollowUpSuggestionsConfig(config.followUpSuggestions);
-  const chatPath = `${routes.MASTRA_ROUTES.chat}/:agentId` as `${string}:agentId`;
+  const chatPath = `${MASTRA_ROUTES.chat}/:agentId` as `${string}:agentId`;
   const runPath =
-    `${routes.MASTRA_ROUTES.chat}/:agentId${routes.MASTRA_ROUTES.runs}/:runId` as `${string}:agentId${string}:runId`;
+    `${MASTRA_ROUTES.chat}/:agentId${MASTRA_ROUTES.runs}/:runId` as `${string}:agentId${string}:runId`;
   const abortPath =
-    `${runPath}${routes.MASTRA_ROUTES.abort}` as `${string}:agentId${string}:runId${string}`;
+    `${runPath}${MASTRA_ROUTES.abort}` as `${string}:agentId${string}:runId${string}`;
   return [
     registerApiRoute(chatPath, {
       method: "POST",
@@ -180,9 +178,9 @@ export function agentChatRoutes(config: MastraPluginConfig = {}) {
 function serializeChatStreamError(error: unknown): string {
   if (isStaleMastraResumeError(error)) {
     logger.warn("ignored stale mastra resume", {
-      error: errorUtils.toError(error),
+      error: toError(error),
     });
     return STALE_MASTRA_RESUME_STREAM_TEXT;
   }
-  return errorUtils.errorMessage(error);
+  return errorMessage(error);
 }

package/src/config.ts

@@ -15,9 +15,9 @@
  */
 
 import { getExecutionContext, type BasePluginConfig, type ConfigSchema } from "@databricks/appkit";
-import { appkit } from "@dbx-tools/appkit";
+import { type ExecutionContextLike, type IdentityMode, IDENTITY_MODES } from "@dbx-tools/appkit";
 import type { BrandContext } from "@dbx-tools/shared-core";
-import type { FeedbackModeOption } from "@dbx-tools/shared-mastra/feedback";
+import type { FeedbackModeOption } from "@dbx-tools/shared-mastra";
 import type { AgentConfig } from "@mastra/core/agent";
 import type { RequestContext } from "@mastra/core/request-context";
 import { MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from "@mastra/core/request-context";
@@ -31,7 +31,6 @@ import type { PgVectorConfig, PostgresStoreConfig } from "@mastra/pg";
 
 import type { AnyMastraAgentDefinition, MastraTools } from "./agents.ts";
 import type { GenieSpacesConfig } from "./genie.ts";
-import { IDENTITY_MODES, type MastraIdentityMode } from "./identity.ts";
 import type { LocalSkillMount, RemoteSkillsOption } from "./remote-skills.ts";
 
 /**
@@ -101,14 +100,14 @@ export const TRACE_REQUEST_CONTEXT_KEYS: readonly string[] = [
 /** AppKit execution context plus the canonical user id. */
 export interface User {
   id: string;
-  executionContext: appkit.ExecutionContextLike;
+  executionContext: ExecutionContextLike;
 }
 
 /**
  * Canonical identity for an AppKit execution context: the OBO user id on a
  * user-scoped call, the service principal id otherwise.
  */
-export function executionContextUserId(context: appkit.ExecutionContextLike): string {
+export function executionContextUserId(context: ExecutionContextLike): string {
   return "userId" in context ? context.userId : context.serviceUserId;
 }
 
@@ -128,7 +127,7 @@ export function executionContextUserId(context: appkit.ExecutionContextLike): st
  * renders as an expired chart.
  */
 export function attributedUserId(
-  executionContext: appkit.ExecutionContextLike,
+  executionContext: ExecutionContextLike,
   forwardedUserId?: string,
 ): string {
   if ("isUserContext" in executionContext) return executionContextUserId(executionContext);
@@ -241,15 +240,15 @@ export interface MastraPluginConfig extends BasePluginConfig {
   /** AI SDK provider-options namespace. Defaults to `"openai"`; no env fallback. */
   providerId?: string;
   /**
-   * PostgresStore for Mastra threads/messages. `true` captures the
-   * `lakebase` plugin's existing service-principal pool; an object opens a
-   * separately configured store.
+   * PostgresStore for Mastra threads/messages. `true` derives a dedicated,
+   * lifecycle-isolated service-principal pool from the `lakebase` plugin; an
+   * object opens a separately configured store.
    */
   storage?: boolean | PostgresStoreConfig;
   /**
-   * PgVector store for Mastra memory recall. `true` captures the
-   * `lakebase` plugin's existing service-principal pool; an object opens a
-   * separately configured store.
+   * PgVector store for Mastra memory recall. `true` derives a dedicated,
+   * lifecycle-isolated service-principal pool from the `lakebase` plugin; an
+   * object opens a separately configured store.
    */
   memory?: boolean | MastraMemoryConfig;
   /**
@@ -640,7 +639,7 @@ export interface MastraPluginConfig extends BasePluginConfig {
    * mastra({ genieIdentity: "auto", genieSpaces: { default: spaceId } });
    * ```
    */
-  genieIdentity?: MastraIdentityMode;
+  genieIdentity?: IdentityMode;
   /**
    * Optional brand context applied to charts produced by the built-in
    * `render_data` / `prepare_chart` tools. When set, the chart planner's
@@ -716,12 +715,12 @@ export const MASTRA_CONFIG_SCHEMA: ConfigSchema = {
     storage: {
       type: ["boolean", "object"],
       description:
-        "PostgresStore for Mastra threads / messages. `true` captures the `lakebase` plugin's existing service-principal pool; an object opens a separately configured store. Auto-enabled when the `lakebase` plugin is registered.",
+        "PostgresStore for Mastra threads / messages. `true` derives a dedicated lifecycle-isolated service-principal pool from the `lakebase` plugin; an object opens a separately configured store. Auto-enabled when the `lakebase` plugin is registered.",
     },
     memory: {
       type: ["boolean", "object"],
       description:
-        "PgVector store for Mastra semantic recall. `true` captures the `lakebase` plugin's existing service-principal pool; an object opens a separately configured store. Auto-enabled when the `lakebase` plugin is registered.",
+        "PgVector store for Mastra semantic recall. `true` derives a dedicated lifecycle-isolated service-principal pool from the `lakebase` plugin; an object opens a separately configured store. Auto-enabled when the `lakebase` plugin is registered.",
     },
     codeMode: {
       type: ["boolean", "string", "object"],

package/src/evaluation.ts

@@ -5,7 +5,7 @@
  */
 
 import type { DriveResult, EvalDriver } from "@databricks/appkit/beta";
-import { errorUtils, hash, object } from "@dbx-tools/shared-core";
+import { errorMessage, id, isRecord } from "@dbx-tools/shared-core";
 import type { Agent } from "@mastra/core/agent";
 import type { RequestContext } from "@mastra/core/request-context";
 
@@ -29,7 +29,7 @@ export function createMastraEvalDriver(
 ): EvalDriver {
   const resourceId = options.resourceId ?? `eval:${agent.id}`;
   const requestContextFactory = options.createRequestContext ?? createRequestContext;
-  let threadId = hash.id();
+  let threadId = id();
 
   return {
     async send(message, sendOptions): Promise<DriveResult> {
@@ -41,13 +41,11 @@ export function createMastraEvalDriver(
           ...(sendOptions?.signal ? { abortSignal: sendOptions.signal } : {}),
         });
         const toolCallDetails = result.toolCalls.map((call) => {
-          const payload: Record<string, unknown> = object.isRecord(call.payload)
-            ? call.payload
-            : {};
+          const payload: Record<string, unknown> = isRecord(call.payload) ? call.payload : {};
           const args = payload.args;
           return {
             name: String(payload.toolName ?? ""),
-            args: object.isRecord(args) ? args : {},
+            args: isRecord(args) ? args : {},
           };
         });
         return {
@@ -60,7 +58,7 @@ export function createMastraEvalDriver(
         };
       } catch (caught) {
         return {
-          reply: errorUtils.errorMessage(caught),
+          reply: errorMessage(caught),
           toolCalls: [],
           toolCallDetails: [],
           succeeded: false,
@@ -69,7 +67,7 @@ export function createMastraEvalDriver(
       }
     },
     reset() {
-      threadId = hash.id();
+      threadId = id();
     },
   };
 }

package/src/feedback-mode.ts

@@ -5,7 +5,7 @@
  */
 
 import { ConfigurationError } from "@databricks/appkit";
-import type { FeedbackMode, FeedbackModeOption } from "@dbx-tools/shared-mastra/feedback";
+import type { FeedbackMode, FeedbackModeOption } from "@dbx-tools/shared-mastra";
 
 /** Runtime availability used by automatic feedback selection. */
 export interface FeedbackAvailability {

package/src/filesystems.ts

@@ -9,8 +9,8 @@
  * @module
  */
 
-import { localFS } from "@dbx-tools/fs";
-import { FileSystemError, posixPath } from "@dbx-tools/shared-fs";
+import { scratchFS } from "@dbx-tools/fs";
+import { FileSystemError, dirname, normalize } from "@dbx-tools/shared-fs";
 import type {
   FileEntry as SharedFileEntry,
   FileStat as SharedFileStat,
@@ -292,7 +292,7 @@ export class MastraFileSystemAdapter extends MastraFilesystem {
 
   /** When Mastra asks for non-recursive writes, require the parent directory. */
   private async assertParentExists(inputPath: string): Promise<void> {
-    const parent = posixPath.dirname(normalizeWorkspacePath(inputPath));
+    const parent = dirname(normalizeWorkspacePath(inputPath));
     if (parent === "/" || (await this.fs.exists(parent))) return;
     throw new DirectoryNotFoundError(parent);
   }
@@ -343,7 +343,7 @@ export class MountedCompositeFilesystem extends CompositeFilesystem {
 
 /** Fresh writable local temp mount on a root unique to this call. */
 export function scratchFilesystem(): MastraFileSystemAdapter {
-  return filesystems(localFS.scratchFS("mastra"));
+  return filesystems(scratchFS("mastra"));
 }
 
 /** Map a shared-fs error code onto the matching Mastra filesystem error. */
@@ -397,6 +397,6 @@ function toMastraStat(stat: SharedFileStat, inputPath: string): FileStat {
  * and a mount should not fail a listing over a stray segment.
  */
 function normalizeWorkspacePath(inputPath: string): string {
-  const result = posixPath.normalize(inputPath);
+  const result = normalize(inputPath);
   return result.ok ? result.path : "/";
 }

package/src/follow-up-suggestions.ts

@@ -4,13 +4,13 @@
  * @module
  */
 
-import { asyncUtils, errorUtils, log, object, stringUtils } from "@dbx-tools/shared-core";
+import { log, combineAbortSignals, isRecord, toError, toDescription } from "@dbx-tools/shared-core";
 import {
   FOLLOW_UP_SUGGESTIONS_PART_TYPE,
   type FollowUpSuggestionsPartData,
   FollowUpSuggestionsPartDataSchema,
-} from "@dbx-tools/shared-mastra/wire";
-import { model } from "@dbx-tools/shared-model";
+} from "@dbx-tools/shared-mastra";
+import { ModelClass } from "@dbx-tools/shared-model";
 import { Agent } from "@mastra/core/agent";
 import type { MessageList } from "@mastra/core/agent/message-list";
 import type { MastraModelConfig } from "@mastra/core/llm";
@@ -25,7 +25,7 @@ import { buildModel } from "./model.ts";
 import { TYPOGRAPHY_RULE } from "./style.ts";
 
 const logger = log.logger("mastra/follow-up-suggestions");
-const FOLLOW_UP_MODEL_CLASS = model.ModelClass.ChatFast;
+const FOLLOW_UP_MODEL_CLASS = ModelClass.ChatFast;
 const DEFAULT_QUESTION_LIMIT = 3;
 const MAX_QUESTION_LIMIT = 10;
 const DEFAULT_TIMEOUT_MS = 10_000;
@@ -195,8 +195,8 @@ function acceptedQuestions(
 }
 
 function toolActivityValue(value: unknown): Record<string, unknown> | undefined {
-  if (!object.isRecord(value)) return undefined;
-  return object.isRecord(value.payload) ? value.payload : value;
+  if (!isRecord(value)) return undefined;
+  return isRecord(value.payload) ? value.payload : value;
 }
 
 function toolActivityName(value: Record<string, unknown>): string | undefined {
@@ -244,8 +244,8 @@ export async function suggestFollowUps(
   const settings = resolveFollowUpSuggestionsConfig(config.followUpSuggestions);
   if (!settings || settings.mode === "genie") return [];
   const timeout = AbortSignal.timeout(settings.timeoutMs);
-  const abortSignal = asyncUtils.combineAbortSignals(options.abortSignal, timeout);
-  const prompt = stringUtils.toDescription({
+  const abortSignal = combineAbortSignals(options.abortSignal, timeout);
+  const prompt = toDescription({
     "User message": options.userText,
     "Assistant answer": options.answer,
     ...(options.turnContext ? { "Turn tool data": options.turnContext } : {}),
@@ -264,7 +264,7 @@ export async function suggestFollowUps(
     return acceptedQuestions(parsed.questions, options, settings.limit);
   } catch (error) {
     if (!options.abortSignal?.aborted) {
-      logger.warn("generation-failed", { error: errorUtils.errorMessage(error) });
+      logger.warn("generation-failed", { error: toError(error) });
     }
     return [];
   }