@dbx-tools/appkit-mastra 0.9.153 → 0.9.157

package/src/remote-skills.ts

@@ -44,24 +44,32 @@ import { mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises"
 import { createRequire } from "node:module";
 import { dirname, join, posix } from "node:path";
 import type { WorkspaceClient } from "@databricks/appkit";
-import { appkit } from "@dbx-tools/appkit";
+import { tryGetExecutionContext } from "@dbx-tools/appkit";
 import type { WorkspaceClientLike } from "@dbx-tools/appkit";
-import { flushCache, getOrSet, projectCache } from "@dbx-tools/cache/cache";
-import { exec } from "@dbx-tools/core";
-import { DatabricksFileSystem, workspaceClient } from "@dbx-tools/databricks";
-import { localFS, type LocalFileSystem } from "@dbx-tools/fs";
-import { find } from "@dbx-tools/path";
+import { flushCache, getOrSet, projectCache } from "@dbx-tools/cache";
+import { spawn } from "@dbx-tools/core";
+import { DatabricksFileSystem, toLegacyWorkspaceClient } from "@dbx-tools/databricks";
+import { type LocalFileSystem, tmpFS, rebuildFS, scratchFS } from "@dbx-tools/fs";
+import { findFiles } from "@dbx-tools/path";
 import {
-  asyncUtils,
-  errorUtils,
   hash,
-  json,
   log,
-  net,
-  object,
-  stringUtils,
+  mapConcurrent,
+  toError,
+  errorMessage,
+  fnvHash,
+  parse,
+  type UrlLike,
+  urlBuilder,
+  isOneOrMany,
+  isRecord,
+  toDate,
+  parseList,
+  trimToNull,
+  toSlug,
+  trimToUndefined,
+  OneOrMany,
 } from "@dbx-tools/shared-core";
-import type { OneOrMany } from "@dbx-tools/shared-core";
 import { MemoryFileSystem, type FileSystem } from "@dbx-tools/shared-fs";
 
 import { ORGANIZATION_SKILLS_PATH, personalSkillsPath } from "./skill-paths.ts";
@@ -161,7 +169,7 @@ interface AiToolsManifest {
  */
 export interface RemoteSkillSourceOptions {
   /** `"aitools"`, a GitHub shorthand, a git / GitLab URL, or a download URL. */
-  source: net.UrlLike | AiToolsSource;
+  source: UrlLike | AiToolsSource;
   /** Stable virtual mount name under `/.skills`; generated from the source when omitted. */
   name?: string;
   /** Install only these skill names from the source. */
@@ -191,7 +199,7 @@ export interface RemoteSkillSourceOptions {
  * (string / `URL` / `{ url }`), or a {@link RemoteSkillSourceOptions} bag with
  * per-source policy.
  */
-export type RemoteSkillSource = net.UrlLike | AiToolsSource | RemoteSkillSourceOptions;
+export type RemoteSkillSource = UrlLike | AiToolsSource | RemoteSkillSourceOptions;
 
 /**
  * The workspace `remoteSkills` option: one source, a non-empty list of them, or
@@ -316,13 +324,13 @@ export function normalizeRemoteSkillsOption(
   const bag = isProvisionOptions(option) ? option : undefined;
   const sources = toSourceList(bag ? bag.sources : (option as RemoteSkillSource));
   // An empty list is the same as no configuration at all.
-  if (!object.isOneOrMany(sources)) return undefined;
+  if (!isOneOrMany(sources)) return undefined;
   return { ...bag, sources };
 }
 
 /** A `sources`-bearing bag is the top-level options shape, not a single source. */
 function isProvisionOptions(value: unknown): value is ProvisionRemoteSkillsOptions {
-  return object.isRecord(value) && "sources" in value;
+  return isRecord(value) && "sources" in value;
 }
 
 /** One source or many, as a plain array. A source is never itself an array. */
@@ -341,7 +349,7 @@ function toSourceOptions(source: RemoteSkillSource): NormalizedSource {
 }
 
 /** A {@link net.UrlLike} as the plain string the staging paths work with. */
-function toSourceString(source: net.UrlLike): string {
+function toSourceString(source: UrlLike): string {
   if (typeof source === "string") return source;
   return source instanceof URL ? source.toString() : source.url;
 }
@@ -361,11 +369,11 @@ function isAiToolsSource(source: string): boolean {
  * not what a success produces.
  */
 function cachePolicy(sourceOptions: NormalizedSource): RemoteSkillCacheEntry["policy"] {
-  const skills = stringUtils.parseList(sourceOptions.skills);
+  const skills = parseList(sourceOptions.skills);
   const policy = {
     ...(skills.length > 0 ? { skills: [...skills].sort() } : {}),
     ...(sourceOptions.experimental === true ? { experimental: true } : {}),
-    ...(stringUtils.trimToNull(sourceOptions.ref) ? { ref: sourceOptions.ref!.trim() } : {}),
+    ...(trimToNull(sourceOptions.ref) ? { ref: sourceOptions.ref!.trim() } : {}),
   };
   return Object.keys(policy).length > 0 ? policy : undefined;
 }
@@ -378,7 +386,7 @@ function cachePolicy(sourceOptions: NormalizedSource): RemoteSkillCacheEntry["po
  * The skill list is sorted first so a reordered array is still the same key.
  */
 function cacheKey(sourceOptions: NormalizedSource): string {
-  return hash.fnvHash(
+  return fnvHash(
     JSON.stringify({ source: sourceOptions.source, policy: cachePolicy(sourceOptions) ?? null }),
   );
 }
@@ -386,10 +394,10 @@ function cacheKey(sourceOptions: NormalizedSource): string {
 /** Stable virtual workspace path for one locally provisioned source. */
 function localSkillMountPath(sourceOptions: NormalizedSource, key: string): string {
   if (isAiToolsSource(sourceOptions.source)) return AITOOLS_SKILLS_MOUNT;
-  const configuredName = stringUtils.trimToNull(sourceOptions.name);
+  const configuredName = trimToNull(sourceOptions.name);
   const identifier = configuredName
-    ? stringUtils.toSlug(configuredName)
-    : stringUtils.toSlug(remoteSourceIdentifier(sourceOptions.source)) || "source";
+    ? toSlug(configuredName)
+    : toSlug(remoteSourceIdentifier(sourceOptions.source)) || "source";
   if (!identifier) {
     throw new Error(
       `remote skill source name must contain letters or numbers: "${configuredName}"`,
@@ -400,7 +408,7 @@ function localSkillMountPath(sourceOptions: NormalizedSource, key: string): stri
 
 /** Human-readable source portion used by generated virtual mount identifiers. */
 function remoteSourceIdentifier(source: string): string {
-  const url = net.urlBuilder(source);
+  const url = urlBuilder(source);
   if (!url) return source;
   const path = url.pathname.replace(/\.(git|md|zip|tar|tgz|gz)$/i, "");
   return `${url.hostname}-${path}`;
@@ -431,11 +439,11 @@ async function readMetadata(fs: FileSystem): Promise<RemoteSkillsMetadata | unde
   try {
     if (!(await fs.exists(METADATA_FILE))) return undefined;
     const raw = await fs.readFile(METADATA_FILE, { encoding: "utf8" });
-    const parsed = json.parse(raw, undefined) as RemoteSkillsMetadata | undefined;
-    if (!object.isRecord(parsed) || parsed.version !== METADATA_VERSION) return undefined;
-    return object.isRecord(parsed.sources) ? parsed : undefined;
+    const parsed = parse(raw, undefined) as RemoteSkillsMetadata | undefined;
+    if (!isRecord(parsed) || parsed.version !== METADATA_VERSION) return undefined;
+    return isRecord(parsed.sources) ? parsed : undefined;
   } catch (err) {
-    logger.debug("cache:unreadable", { error: errorUtils.toError(err) });
+    logger.debug("cache:unreadable", { error: toError(err) });
     return undefined;
   }
 }
@@ -449,7 +457,7 @@ async function readMetadata(fs: FileSystem): Promise<RemoteSkillsMetadata | unde
  */
 function isFresh(entry: RemoteSkillCacheEntry, ttlMs: number): boolean {
   if (ttlMs <= 0 || !Array.isArray(entry.skills)) return false;
-  const downloadedAt = object.toDate(entry.downloadedAt);
+  const downloadedAt = toDate(entry.downloadedAt);
   if (!downloadedAt) return false;
   const age = Date.now() - downloadedAt.getTime();
   return age >= 0 && age < ttlMs;
@@ -476,7 +484,7 @@ async function writeMetadata(
 
 /** The stable local tree a source is rebuilt into, keyed by {@link cacheKey}. */
 function localSkillsFS(key: string): LocalFileSystem {
-  return localFS.tmpFS(`${LOCAL_SKILLS_DIR}/${key}`);
+  return tmpFS(`${LOCAL_SKILLS_DIR}/${key}`);
 }
 
 /**
@@ -501,7 +509,7 @@ export async function provisionRemoteSkills(
   const sources = (Array.isArray(options.sources) ? options.sources : [options.sources]).map(
     toSourceOptions,
   );
-  const client = options.client ?? appkit.tryGetExecutionContext()?.client;
+  const client = options.client ?? tryGetExecutionContext()?.client;
   // Probed rather than assumed: an identity that cannot write the workspace
   // tree falls back to the local one instead of failing startup. The probe also
   // creates the root, which the first cache READ needs - `copySkillDirs` would
@@ -612,13 +620,13 @@ export async function provisionRemoteSkills(
       } catch (err) {
         if (failOnError) {
           throw new Error(
-            `failed to provision remote skill source "${sourceOptions.source}": ${errorUtils.errorMessage(err)}`,
-            { cause: errorUtils.toError(err) },
+            `failed to provision remote skill source "${sourceOptions.source}": ${errorMessage(err)}`,
+            { cause: toError(err) },
           );
         }
         logger.warn("source:skipped", {
           source: sourceOptions.source,
-          error: errorUtils.toError(err),
+          error: toError(err),
         });
       }
     }
@@ -677,7 +685,7 @@ async function cachedAiToolsTree(
 async function serializeSkillDirs(dirs: readonly StagedSkillDir[]): Promise<CachedSkillFile[]> {
   const files: CachedSkillFile[] = [];
   for (const dir of dirs) {
-    for await (const relative of find.findFiles("**/*", {
+    for await (const relative of findFiles("**/*", {
       cwd: dir.absolutePath,
       nodir: true,
     })) {
@@ -784,7 +792,7 @@ async function openWritableWorkspace(
   client: WorkspaceClient,
 ): Promise<DatabricksFileSystem | undefined> {
   const fs = new DatabricksFileSystem({
-    client: workspaceClient.toLegacyWorkspaceClient(client),
+    client: toLegacyWorkspaceClient(client),
     root: basePath,
     readOnly: false,
     createRoot: true,
@@ -795,7 +803,7 @@ async function openWritableWorkspace(
   } catch (err) {
     logger.warn("destination:unwritable", {
       destination: basePath,
-      error: errorUtils.toError(err),
+      error: toError(err),
     });
     return undefined;
   }
@@ -809,8 +817,8 @@ function resolveDatabricksBasePath(
   client: WorkspaceClientLike | undefined,
 ): string | undefined {
   if (!client) return undefined;
-  if (options.databricksBasePath) return stringUtils.trimToUndefined(options.databricksBasePath);
-  const email = stringUtils.trimToNull(options.userEmail);
+  if (options.databricksBasePath) return trimToUndefined(options.databricksBasePath);
+  const email = trimToNull(options.userEmail);
   // A named user targets their personal Assistant tree (the "save a skill"
   // target); otherwise the shared workspace Assistant tree, which the built-in
   // Assistant-skills mount already scans.
@@ -849,13 +857,13 @@ async function stageAiTools(
   options: ProvisionRemoteSkillsOptions,
 ): Promise<string> {
   const maxBytes = resolveMaxBytes(sourceOptions, options);
-  const ref = stringUtils.trimToNull(sourceOptions.ref) ?? AITOOLS_REF;
-  const manifest = json.parse(
+  const ref = trimToNull(sourceOptions.ref) ?? AITOOLS_REF;
+  const manifest = parse(
     (await download(aiToolsRawUrl(ref, "manifest.json"), maxBytes)).toString("utf8"),
     undefined,
   ) as AiToolsManifest | undefined;
 
-  const wanted = new Set(stringUtils.parseList(sourceOptions.skills));
+  const wanted = new Set(parseList(sourceOptions.skills));
   const selected = Object.entries(manifest?.skills ?? {}).filter(([name, entry]) =>
     wanted.size > 0
       ? wanted.has(name)
@@ -871,7 +879,7 @@ async function stageAiTools(
       path: join(target, name, ...file.split("/")),
     })),
   );
-  await asyncUtils.mapConcurrent(
+  await mapConcurrent(
     files,
     async (item) => {
       const body = await download(item.url, maxBytes);
@@ -911,12 +919,12 @@ async function stageViaSkillsCli(
     "--copy",
     "-y",
   ];
-  for (const skill of stringUtils.parseList(sourceOptions.skills)) {
+  for (const skill of parseList(sourceOptions.skills)) {
     args.push("--skill", skill);
   }
-  if (stringUtils.parseList(sourceOptions.skills).length === 0) args.push("--skill", "*");
+  if (parseList(sourceOptions.skills).length === 0) args.push("--skill", "*");
 
-  const result = await exec.spawn(cli.command, args, {
+  const result = await spawn(cli.command, args, {
     cwd: target,
     stdout: "capture",
     stderr: "capture",
@@ -956,14 +964,14 @@ async function stageViaFetch(
   target: string,
   options: ProvisionRemoteSkillsOptions,
 ): Promise<string> {
-  const url = net.urlBuilder(sourceOptions.source);
+  const url = urlBuilder(sourceOptions.source);
   if (!url) {
     throw new Error(
       `source "${sourceOptions.source}" is not a URL and the optional "skills" package is not installed`,
     );
   }
   const buffer = await download(url.toString(), resolveMaxBytes(sourceOptions, options));
-  const name = stringUtils.toSlug(deriveSkillName(url.toString())) || "remote-skill";
+  const name = toSlug(deriveSkillName(url.toString())) || "remote-skill";
   const skillDir = join(target, name);
   await mkdir(skillDir, { recursive: true });
   await writeFile(join(skillDir, "SKILL.md"), buffer);
@@ -983,8 +991,8 @@ async function download(url: string, maxBytes: number): Promise<Buffer> {
   const response = await fetch(url, {
     signal: AbortSignal.timeout(DEFAULT_DOWNLOAD_TIMEOUT_MS),
   }).catch((err) => {
-    throw new Error(`download failed (${url}): ${errorUtils.errorMessage(err)}`, {
-      cause: errorUtils.toError(err),
+    throw new Error(`download failed (${url}): ${errorMessage(err)}`, {
+      cause: toError(err),
     });
   });
   if (!response.ok) {
@@ -999,7 +1007,7 @@ async function download(url: string, maxBytes: number): Promise<Buffer> {
 
 /** Derive a skill directory name from a download URL's last path segment. */
 function deriveSkillName(urlString: string): string {
-  const url = net.urlBuilder(urlString);
+  const url = urlBuilder(urlString);
   const last = url?.pathname.split("/").filter(Boolean).pop() ?? "";
   return last.replace(/\.(md|zip|tar|tgz|gz)$/i, "");
 }
@@ -1039,7 +1047,7 @@ async function collectSkillDirs(root: string): Promise<StagedSkillDir[]> {
 async function copySkillDirs(destination: FileSystem, dirs: StagedSkillDir[]): Promise<void> {
   await destination.init();
   for (const dir of dirs) {
-    for await (const relative of find.findFiles("**/*", {
+    for await (const relative of findFiles("**/*", {
       cwd: dir.absolutePath,
       nodir: true,
     })) {
@@ -1070,7 +1078,7 @@ async function persistLocally(
   dirs: StagedSkillDir[],
   record: RemoteSkillCacheEntry,
 ): Promise<string> {
-  const stable = await localFS.rebuildFS(`${LOCAL_SKILLS_DIR}/${key}`, async (scratch) => {
+  const stable = await rebuildFS(`${LOCAL_SKILLS_DIR}/${key}`, async (scratch) => {
     await copySkillDirs(scratch, dirs);
     await writeMetadata(scratch, key, record);
   });
@@ -1083,7 +1091,7 @@ async function persistLocally(
  * the {@link FileSystem} API.
  */
 async function initializedScratch(prefix: string): Promise<LocalFileSystem> {
-  const scratch = localFS.scratchFS(prefix);
+  const scratch = scratchFS(prefix);
   await scratch.init();
   return scratch;
 }

package/src/rest.ts

@@ -10,11 +10,11 @@
  * @module
  */
 
-import { appkit } from "@dbx-tools/appkit";
-import { json } from "@dbx-tools/shared-core";
+import { type WorkspaceClientLike } from "@dbx-tools/appkit";
+import { parse } from "@dbx-tools/shared-core";
 
 /** Workspace client carried on an AppKit execution context. */
-type WorkspaceClient = appkit.WorkspaceClientLike;
+type WorkspaceClient = WorkspaceClientLike;
 
 /** Request options for {@link databricksFetch}. */
 export interface DatabricksFetchInit {
@@ -62,5 +62,5 @@ export async function readResponseText(res: Response): Promise<string> {
 /** Parse a response body as JSON, returning `{}` on empty / invalid bodies. */
 export async function readResponseJson(res: Response): Promise<unknown> {
   const text = await readResponseText(res);
-  return json.parse<unknown>(text, {});
+  return parse<unknown>(text, {});
 }

package/src/server.ts

@@ -6,9 +6,24 @@
  */
 
 import { getExecutionContext } from "@databricks/appkit";
-import { errorUtils, hash, http, log, object, stringUtils, token } from "@dbx-tools/shared-core";
-import { feedback, thread } from "@dbx-tools/shared-mastra";
-import { isStaleMastraResumeError } from "@dbx-tools/shared-mastra/resume";
+import { requestUserEmail, requestUserId } from "@dbx-tools/appkit";
+import {
+  log,
+  toError,
+  id,
+  parseCookies,
+  type Logger,
+  sequence,
+  toIdentifierWithOptions,
+  trimToNull,
+  getAccessTokenScopes,
+} from "@dbx-tools/shared-core";
+import {
+  MLFLOW_TRACE_ID_HEADER,
+  THREAD_ID_HEADER,
+  THREAD_ID_QUERY,
+  isStaleMastraResumeError,
+} from "@dbx-tools/shared-mastra";
 import {
   MASTRA_RESOURCE_ID_KEY,
   MASTRA_THREAD_ID_KEY,
@@ -34,7 +49,6 @@ import {
   FOLLOW_UP_RUN_ID_KEY,
   FOLLOW_UP_USER_TEXT_KEY,
 } from "./follow-up-suggestions.ts";
-import { requestUserEmail, requestUserId } from "./identity.ts";
 import { initializeRequestMlflowTraceInfo } from "./mlflow.ts";
 import { MASTRA_ORIGIN_KEY } from "./request-context.ts";
 import {
@@ -198,7 +212,7 @@ export async function createRequestContext(
   // Stamped AFTER the user so an explicit resource id wins over the ambient
   // identity `stampRequestContextUser` defaulted to.
   if (options.resourceId) requestContext.set(MASTRA_RESOURCE_ID_KEY, options.resourceId);
-  requestContext.set(MASTRA_REQUEST_ID_KEY, options.requestId ?? hash.id());
+  requestContext.set(MASTRA_REQUEST_ID_KEY, options.requestId ?? id());
   return requestContext;
 }
 
@@ -208,7 +222,7 @@ export async function createRequestContext(
  * session cookie (`appkit_<plugin-name>_session_id`).
  */
 export class MastraServer extends ExpressMastraServer {
-  private log: log.Logger;
+  private log: Logger;
   /**
    * Whether to stamp the MLflow trace-id header on responses.
    */
@@ -299,7 +313,7 @@ export class MastraServer extends ExpressMastraServer {
     if (requestContext.get(MASTRA_REQUEST_ID_KEY)) return;
     const headerValue = req.headers["x-request-id"];
     const upstream = Array.isArray(headerValue) ? headerValue[0] : headerValue;
-    const requestId = upstream?.trim() || hash.id();
+    const requestId = upstream?.trim() || id();
     requestContext.set(MASTRA_REQUEST_ID_KEY, requestId);
     res.setHeader("X-Request-Id", requestId);
   }
@@ -310,9 +324,7 @@ export class MastraServer extends ExpressMastraServer {
    */
   configureRequestContextScopes(req: express.Request, requestContext: RequestContext) {
     const scopes = [
-      ...object
-        .sequence(token.getAccessTokenScopes(req), token.getAccessTokenScopes(req, "authorization"))
-        .distinct(),
+      ...sequence(getAccessTokenScopes(req), getAccessTokenScopes(req, "authorization")).distinct(),
     ];
     requestContext.set(MASTRA_SCOPES_KEY, scopes);
   }
@@ -332,10 +344,10 @@ export class MastraServer extends ExpressMastraServer {
    */
   configureMlflowTraceId(res: express.Response) {
     if (!this.mlflowFeedback || res.headersSent) return;
-    if (res.getHeader(feedback.MLFLOW_TRACE_ID_HEADER)) return;
+    if (res.getHeader(MLFLOW_TRACE_ID_HEADER)) return;
     const traceId = trace.getActiveSpan()?.spanContext().traceId;
     if (!traceId || traceId === INVALID_TRACE_ID) return;
-    res.setHeader(feedback.MLFLOW_TRACE_ID_HEADER, `tr-${traceId}`);
+    res.setHeader(MLFLOW_TRACE_ID_HEADER, `tr-${traceId}`);
   }
 
   /**
@@ -367,8 +379,8 @@ export class MastraServer extends ExpressMastraServer {
       requestContext.set(MASTRA_THREAD_ID_KEY, requested);
       return;
     }
-    const cookies = http.parseCookies(req.headers.cookie);
-    const cookieName = stringUtils.toIdentifierWithOptions(
+    const cookies = parseCookies(req.headers.cookie);
+    const cookieName = toIdentifierWithOptions(
       { delimiter: "_", distinct: true },
       "appkit",
       this.config.name!,
@@ -376,7 +388,7 @@ export class MastraServer extends ExpressMastraServer {
     );
     let sessionId = cookies[cookieName];
     if (!sessionId) {
-      sessionId = hash.id();
+      sessionId = id();
       res.cookie(cookieName, sessionId, {
         httpOnly: true,
         sameSite: "lax",
@@ -394,11 +406,11 @@ export class MastraServer extends ExpressMastraServer {
    * back to the session cookie.
    */
   private readRequestedThreadId(req: express.Request): string | null {
-    const headerValue = req.headers[thread.THREAD_ID_HEADER];
-    const queryValue = req.query[thread.THREAD_ID_QUERY];
+    const headerValue = req.headers[THREAD_ID_HEADER];
+    const queryValue = req.query[THREAD_ID_QUERY];
     return (
-      stringUtils.trimToNull(Array.isArray(headerValue) ? headerValue[0] : headerValue) ??
-      stringUtils.trimToNull(Array.isArray(queryValue) ? queryValue[0] : queryValue)
+      trimToNull(Array.isArray(headerValue) ? headerValue[0] : headerValue) ??
+      trimToNull(Array.isArray(queryValue) ? queryValue[0] : queryValue)
     );
   }
 
@@ -526,7 +538,7 @@ export function attachStaleResumeRecovery(app: express.Express): void {
       }
       logger.warn("ignored stale mastra resume", {
         path: req.path,
-        error: errorUtils.toError(error),
+        error: toError(error),
       });
       if (res.headersSent) {
         res.end();

package/src/serving.ts

@@ -11,9 +11,13 @@
  * @module
  */
 
-import { modelCatalog } from "@dbx-tools/model";
-import { stringUtils } from "@dbx-tools/shared-core";
-import { override } from "@dbx-tools/shared-mastra";
+import { DEFAULT_MODEL_CACHE_TTL_MS, DEFAULT_FUZZY_THRESHOLD } from "@dbx-tools/model";
+import { firstNonEmpty } from "@dbx-tools/shared-core";
+import {
+  MODEL_OVERRIDE_HEADER,
+  MODEL_OVERRIDE_QUERY,
+  MODEL_OVERRIDE_BODY_FIELDS,
+} from "@dbx-tools/shared-mastra";
 
 import type { MastraPluginConfig } from "./config.ts";
 
@@ -55,20 +59,19 @@ export interface ModelOverrideRequest {
 export function extractModelOverride(req: ModelOverrideRequest): string | null {
   const headers = req.headers;
   if (headers) {
-    const headerVal = stringUtils.firstNonEmpty(
-      headers[override.MODEL_OVERRIDE_HEADER] ??
-        headers[override.MODEL_OVERRIDE_HEADER.toLowerCase()],
+    const headerVal = firstNonEmpty(
+      headers[MODEL_OVERRIDE_HEADER] ?? headers[MODEL_OVERRIDE_HEADER.toLowerCase()],
     );
     if (headerVal) return headerVal;
   }
   if (req.query) {
-    const queryVal = stringUtils.firstNonEmpty(req.query[override.MODEL_OVERRIDE_QUERY]);
+    const queryVal = firstNonEmpty(req.query[MODEL_OVERRIDE_QUERY]);
     if (queryVal) return queryVal;
   }
   if (req.body && typeof req.body === "object") {
     const record = req.body as Record<string, unknown>;
-    for (const field of override.MODEL_OVERRIDE_BODY_FIELDS) {
-      const bodyVal = stringUtils.firstNonEmpty(record[field]);
+    for (const field of MODEL_OVERRIDE_BODY_FIELDS) {
+      const bodyVal = firstNonEmpty(record[field]);
       if (bodyVal) return bodyVal;
     }
   }
@@ -93,8 +96,8 @@ export function resolveServingConfig(config: MastraPluginConfig): {
   fallbacks: readonly string[];
 } {
   return {
-    ttlMs: config.modelCacheTtlMs ?? modelCatalog.DEFAULT_MODEL_CACHE_TTL_MS,
-    threshold: config.modelFuzzyThreshold ?? modelCatalog.DEFAULT_FUZZY_THRESHOLD,
+    ttlMs: config.modelCacheTtlMs ?? DEFAULT_MODEL_CACHE_TTL_MS,
+    threshold: config.modelFuzzyThreshold ?? DEFAULT_FUZZY_THRESHOLD,
     fuzzy: config.modelFuzzyMatch !== false,
     allowOverride: config.modelOverride !== false,
     fallbacks: config.defaultModelFallbacks ?? [],

package/src/statement.ts

@@ -20,9 +20,13 @@
  */
 
 import type { WorkspaceClient } from "@databricks/appkit";
-import { databricks } from "@dbx-tools/appkit";
-import { object } from "@dbx-tools/shared-core";
-import { wire, type GenieDatasetData, type GenieVisualizationData } from "@dbx-tools/shared-mastra";
+import { toContext } from "@dbx-tools/appkit";
+import { toNumber } from "@dbx-tools/shared-core";
+import {
+  type GenieDatasetData,
+  type GenieVisualizationData,
+  GenieVisualizationDataSchema,
+} from "@dbx-tools/shared-mastra";
 
 /**
  * Hard server-side cap on rows returned by the
@@ -45,7 +49,7 @@ export const STATEMENT_ROW_CAP = 500;
  */
 function coerceCell(cell: string | null): unknown {
   if (cell === null) return null;
-  return object.toNumber(cell, { separators: false, percent: false }) ?? cell;
+  return toNumber(cell, { separators: false, percent: false }) ?? cell;
 }
 
 type StatementResponse = Awaited<ReturnType<WorkspaceClient["statementExecution"]["getStatement"]>>;
@@ -55,7 +59,7 @@ async function fetchStatementResponse(
   statementId: string,
   signal?: AbortSignal,
 ): Promise<StatementResponse> {
-  const context = signal ? databricks.toContext(signal) : undefined;
+  const context = signal ? toContext(signal) : undefined;
   return client.statementExecution.getStatement({ statement_id: statementId }, context);
 }
 
@@ -79,7 +83,7 @@ function normalizedStatementData(response: StatementResponse, limit?: number): G
 
 function visualizationData(response: StatementResponse, limit?: number): GenieVisualizationData {
   const dataArray = (response.result?.data_array ?? []) as Array<Array<string | null>>;
-  return wire.GenieVisualizationDataSchema.parse({
+  return GenieVisualizationDataSchema.parse({
     manifest: {
       schema: {
         columns: (response.manifest?.schema?.columns ?? []).map((column) => ({

package/src/storage-schema.ts

@@ -8,7 +8,7 @@
  * @module
  */
 
-import { stringUtils } from "@dbx-tools/shared-core";
+import { toIdentifierWithOptions } from "@dbx-tools/shared-core";
 
 const SCHEMA_PREFIX = "mastra_";
 const MAX_PG_IDENTIFIER_LEN = 63;
@@ -19,7 +19,7 @@ const MAX_PG_IDENTIFIER_LEN = 63;
  */
 export function agentStorageSchemaName(agentId: string): string {
   const maxSlugLen = MAX_PG_IDENTIFIER_LEN - SCHEMA_PREFIX.length;
-  const slug = stringUtils.toIdentifierWithOptions(
+  const slug = toIdentifierWithOptions(
     {
       delimiter: "_",
       maxLength: maxSlugLen,
@@ -30,7 +30,7 @@ export function agentStorageSchemaName(agentId: string): string {
   );
   const body =
     slug ||
-    stringUtils.toIdentifierWithOptions(
+    toIdentifierWithOptions(
       {
         delimiter: "_",
         maxLength: maxSlugLen,

package/src/summarize.ts

@@ -19,8 +19,8 @@
  * @module
  */
 
-import { stringUtils } from "@dbx-tools/shared-core";
-import { model } from "@dbx-tools/shared-model";
+import { toDescription } from "@dbx-tools/shared-core";
+import { ModelClass } from "@dbx-tools/shared-model";
 import { Agent } from "@mastra/core/agent";
 import type { MastraModelConfig } from "@mastra/core/llm";
 import type { RequestContext } from "@mastra/core/request-context";
@@ -32,7 +32,7 @@ import { buildModel } from "./model.ts";
 import { TYPOGRAPHY_RULE } from "./style.ts";
 
 /** Fast / small chat tier used for both titling and summaries. */
-const SUMMARY_MODEL_CLASS = model.ModelClass.ChatFast;
+const SUMMARY_MODEL_CLASS = ModelClass.ChatFast;
 
 /** System prompt for the summarizer agent (and the `summarize` tool). */
 const SUMMARIZER_INSTRUCTIONS = [
@@ -136,7 +136,7 @@ export async function summarizeText(
   options: SummarizeOptions = {},
 ): Promise<string> {
   const { instructions, maxWords, requestContext, abortSignal } = options;
-  const prompt = stringUtils.toDescription({
+  const prompt = toDescription({
     ...(instructions ? { Guidance: instructions } : {}),
     ...(maxWords !== undefined ? { "Max length (words)": String(maxWords) } : {}),
     Text: text,