@dbx-tools/appkit-mastra 0.9.153 → 0.9.157

package/src/telemetry.ts

@@ -20,10 +20,25 @@
 
 import { StringDecoder } from "node:string_decoder";
 
-import { telemetry as appkitTelemetry } from "@dbx-tools/appkit";
-import { getRequestTags } from "@dbx-tools/appkit/request-tags";
-import { environmentUtils, json, log, object, stringUtils } from "@dbx-tools/shared-core";
-import { feedback, thread } from "@dbx-tools/shared-mastra";
+import {
+  USER_TRACE_ATTRIBUTE,
+  registerNativeSpanProcessor,
+  getRequestTags,
+} from "@dbx-tools/appkit";
+import {
+  log,
+  isDatabricksAppEnv,
+  parse,
+  isRecord,
+  trimToNull,
+  USER_EMAIL_HEADER,
+  USER_ID_HEADER,
+} from "@dbx-tools/shared-core";
+import {
+  MLFLOW_TRACE_ID_HEADER,
+  THREAD_ID_HEADER,
+  THREAD_ID_QUERY,
+} from "@dbx-tools/shared-mastra";
 import type { TracingOptions } from "@mastra/core/observability";
 import { MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from "@mastra/core/request-context";
 import {
@@ -40,7 +55,6 @@ import type { ReadableSpan, Span as SdkSpan, SpanProcessor } from "@opentelemetr
 import type express from "express";
 
 import { MASTRA_AUTH_MODE_KEY, MASTRA_USER_EMAIL_KEY, MASTRA_USER_NAME_KEY } from "./config.ts";
-import { USER_EMAIL_HEADER, USER_ID_HEADER } from "./identity.ts";
 import {
   appMlflowTraceInfoConfigured,
   directMlflowTracingActive,
@@ -61,21 +75,6 @@ import {
   MLFLOW_TRACE_TAG_PREFIX,
 } from "./trace-attributes.ts";
 
-export {
-  MLFLOW_AGENT_TAG,
-  MLFLOW_AGENT_TAG_ATTR,
-  APPKIT_AGENT_TRACE_ROOT_ATTR,
-  MLFLOW_GENIE_TAG,
-  MLFLOW_GENIE_TAG_ATTR,
-  MLFLOW_LOCAL_TAG,
-  MLFLOW_LOCAL_TAG_ATTR,
-  MLFLOW_OBO_AUTH_TAG,
-  MLFLOW_OBO_AUTH_TAG_ATTR,
-  MLFLOW_SP_AUTH_TAG,
-  MLFLOW_SP_AUTH_TAG_ATTR,
-  MLFLOW_TRACE_TAG_PREFIX,
-} from "./trace-attributes.ts";
-
 const logger = log.logger("mastra/telemetry");
 
 /** Cap on each payload copied onto a span, so one turn cannot bloat the export. */
@@ -85,7 +84,7 @@ export const TRACE_IO_LIMIT = 8_000;
 const RESPONSE_BODY_LIMIT = TRACE_IO_LIMIT * 4;
 
 /** Tracer scope used only when AppKit did not create a recording HTTP span. */
-const CHAT_TURN_TRACER = "@dbx-tools/appkit-mastra/telemetry";
+const CHAT_TURN_TRACER = "@dbx-tools/appkit-mastra";
 
 /**
  * Mount-relative Mastra agent invoke paths that carry a chat turn body
@@ -115,11 +114,6 @@ export const CHAT_GENIE_USED_ATTR = "appkit.mastra.genie.used";
 export const MLFLOW_SPAN_TYPE_ATTR = "mlflow.spanType";
 /** GenAI semantic-convention operation name, an alternate span-type source. */
 export const GEN_AI_OPERATION_NAME_ATTR = "gen_ai.operation.name";
-/**
- * Root-span user id the MLflow experiment UI's User column reads from OTel
- * traces. Prefer the forwarded email when present so the column is human.
- */
-export const MLFLOW_USER_ATTR = appkitTelemetry.USER_TRACE_ATTRIBUTE;
 /** Root-span session id that enables the MLflow Sessions tab. */
 export const MLFLOW_SESSION_ATTR = "session.id";
 /** Root-span type for a Mastra agent turn. */
@@ -170,25 +164,23 @@ export function stampGenieToolSpan(span: Span | undefined = trace.getActiveSpan(
 }
 
 function requestHeader(req: express.Request, name: string): string | undefined {
-  const fromMethod =
-    typeof req.header === "function" ? stringUtils.trimToNull(req.header(name)) : undefined;
+  const fromMethod = typeof req.header === "function" ? trimToNull(req.header(name)) : undefined;
   if (fromMethod) return fromMethod;
   const raw = req.headers?.[name.toLowerCase()];
   const value = Array.isArray(raw) ? raw[0] : raw;
-  return stringUtils.trimToNull(typeof value === "string" ? value : undefined) ?? undefined;
+  return trimToNull(typeof value === "string" ? value : undefined) ?? undefined;
 }
 
 function requestQuery(req: express.Request, name: string): string | undefined {
   const raw = req.query?.[name];
   const value = Array.isArray(raw) ? raw[0] : raw;
-  return stringUtils.trimToNull(typeof value === "string" ? value : undefined) ?? undefined;
+  return trimToNull(typeof value === "string" ? value : undefined) ?? undefined;
 }
 
 function stampMlflowActor(span: Span, req: express.Request): string | undefined {
   const user = requestHeader(req, USER_EMAIL_HEADER) ?? requestHeader(req, USER_ID_HEADER);
-  if (user) span.setAttribute(MLFLOW_USER_ATTR, user);
-  const session =
-    requestHeader(req, thread.THREAD_ID_HEADER) ?? requestQuery(req, thread.THREAD_ID_QUERY);
+  if (user) span.setAttribute(USER_TRACE_ATTRIBUTE, user);
+  const session = requestHeader(req, THREAD_ID_HEADER) ?? requestQuery(req, THREAD_ID_QUERY);
   if (session) span.setAttribute(MLFLOW_SESSION_ATTR, session);
   return user;
 }
@@ -223,7 +215,7 @@ export function activeChatTracingOptions(
 }
 
 function setChatTraceTag(state: ChatTraceState, name: string, value: ChatTraceTagValue): void {
-  const tag = stringUtils.trimToNull(name);
+  const tag = trimToNull(name);
   if (!tag) return;
   state.tags.set(tag, String(value));
 }
@@ -247,7 +239,7 @@ export function recordActiveTraceTags(
 
 /** Record the first selected model as the active chat trace's `agent` tag. */
 export function recordActiveTraceModel(modelId: string): void {
-  const value = stringUtils.trimToNull(modelId);
+  const value = trimToNull(modelId);
   if (!value) return;
   const state = activeChatTraceState();
   if (!state || state.firstModel) return;
@@ -260,7 +252,7 @@ export function recordActiveTraceModel(modelId: string): void {
 
 /** Record the best resolved user identifier on the active chat trace. */
 export function recordActiveTraceUser(user: string | undefined): void {
-  const value = stringUtils.trimToNull(user);
+  const value = trimToNull(user);
   if (!value) return;
   const state = activeChatTraceState();
   if (state) state.user = value;
@@ -275,7 +267,7 @@ export function recordActiveTraceAuth(auth: "obo" | "service-principal"): void {
 function stampMlflowTraceId(res: express.Response, traceId: string): void {
   if (res.headersSent) return;
   if (!traceId || traceId === INVALID_TRACE_ID) return;
-  res.setHeader(feedback.MLFLOW_TRACE_ID_HEADER, `tr-${traceId}`);
+  res.setHeader(MLFLOW_TRACE_ID_HEADER, `tr-${traceId}`);
 }
 
 /** Return one raw prompt when the request is exactly one text-only user message. */
@@ -283,7 +275,7 @@ export function textOnlyChatInput(messages: unknown): string | undefined {
   if (typeof messages === "string") return messages || undefined;
   if (!Array.isArray(messages) || messages.length !== 1) return undefined;
   const message = messages[0];
-  if (!object.isRecord(message) || message.role !== "user") return undefined;
+  if (!isRecord(message) || message.role !== "user") return undefined;
   if (typeof message.content === "string") return message.content || undefined;
   return textFromParts(message.parts) ?? textFromParts(message.content);
 }
@@ -292,7 +284,7 @@ function textFromParts(value: unknown): string | undefined {
   if (!Array.isArray(value) || value.length === 0) return undefined;
   const text: string[] = [];
   for (const part of value) {
-    if (!object.isRecord(part) || part.type !== "text" || typeof part.text !== "string") {
+    if (!isRecord(part) || part.type !== "text" || typeof part.text !== "string") {
       return undefined;
     }
     text.push(part.text);
@@ -307,13 +299,13 @@ function serialized(value: unknown, limit = TRACE_IO_LIMIT): string {
 
 function sseFrame(line: string): unknown {
   if (!line.startsWith("data:")) return undefined;
-  return json.parse(line.slice(5));
+  return parse(line.slice(5));
 }
 
 function valueUsesGenie(value: unknown, depth = 0): boolean {
   if (depth > 3) return false;
   if (Array.isArray(value)) return value.some((item) => valueUsesGenie(item, depth + 1));
-  if (!object.isRecord(value)) return false;
+  if (!isRecord(value)) return false;
   if (
     value.type === "data-genie-progress" ||
     value.type === "ask_genie_done" ||
@@ -332,11 +324,11 @@ function assistantTextFromSseLine(line: string): string {
 }
 
 function assistantTextFromSseFrame(frame: unknown): string {
-  if (!object.isRecord(frame) || frame.type !== "text-delta") return "";
+  if (!isRecord(frame) || frame.type !== "text-delta") return "";
   const text =
     typeof frame.delta === "string"
       ? frame.delta
-      : object.isRecord(frame.payload)
+      : isRecord(frame.payload)
         ? frame.payload.text
         : undefined;
   return typeof text === "string" ? text : "";
@@ -361,7 +353,7 @@ export function assistantTextFromSse(body: string): string {
 
 /** Read the final assistant text from a non-streaming Mastra response. */
 export function assistantTextFromJson(body: unknown): string {
-  if (!object.isRecord(body) || typeof body.text !== "string") return "";
+  if (!isRecord(body) || typeof body.text !== "string") return "";
   return body.text.slice(0, TRACE_IO_LIMIT);
 }
 
@@ -381,7 +373,7 @@ interface AppMlflowTraceState {
 
 function attributeString(span: ReadableSpan, name: string): string | undefined {
   const value = span.attributes[name];
-  return typeof value === "string" ? (stringUtils.trimToNull(value) ?? undefined) : undefined;
+  return typeof value === "string" ? (trimToNull(value) ?? undefined) : undefined;
 }
 
 function metadataAttribute(key: string): string {
@@ -391,9 +383,9 @@ function metadataAttribute(key: string): string {
 function modelFromSpan(span: ReadableSpan): string | undefined {
   const direct = attributeString(span, GEN_AI_REQUEST_MODEL_ATTR);
   if (direct) return direct;
-  const metadata = json.parse(attributeString(span, MASTRA_MODEL_METADATA_ATTR));
-  return object.isRecord(metadata) && typeof metadata.modelId === "string"
-    ? (stringUtils.trimToNull(metadata.modelId) ?? undefined)
+  const metadata = parse(attributeString(span, MASTRA_MODEL_METADATA_ATTR));
+  return isRecord(metadata) && typeof metadata.modelId === "string"
+    ? (trimToNull(metadata.modelId) ?? undefined)
     : undefined;
 }
 
@@ -425,13 +417,13 @@ function hrTimeMilliseconds(value: readonly [number, number]): number {
 function previewInput(span: ReadableSpan): string | undefined {
   const raw = attributeString(span, MASTRA_AGENT_INPUT_ATTR);
   if (!raw) return undefined;
-  return (textOnlyChatInput(json.parse(raw)) ?? raw).slice(0, TRACE_IO_LIMIT);
+  return (textOnlyChatInput(parse(raw)) ?? raw).slice(0, TRACE_IO_LIMIT);
 }
 
 function previewOutput(span: ReadableSpan): string | undefined {
   const raw = attributeString(span, MASTRA_AGENT_OUTPUT_ATTR);
   if (!raw) return undefined;
-  const parsed = json.parse(raw);
+  const parsed = parse(raw);
   const text = assistantTextFromJson(parsed) || (typeof parsed === "string" ? parsed : raw);
   return text.slice(0, TRACE_IO_LIMIT);
 }
@@ -510,7 +502,7 @@ export async function registerAppMlflowTraceInfoProcessor(): Promise<boolean> {
   if (appMlflowTraceInfoProcessorRegistered) return true;
   if (!appMlflowTraceInfoConfigured()) return false;
   await initializeAppMlflowTraceInfo();
-  await appkitTelemetry.registerNativeSpanProcessor(new AppMlflowTraceInfoSpanProcessor());
+  await registerNativeSpanProcessor(new AppMlflowTraceInfoSpanProcessor());
   appMlflowTraceInfoProcessorRegistered = true;
   return true;
 }
@@ -580,7 +572,7 @@ class AssistantResponseCollector {
   }
 
   private jsonAnswer(): string {
-    return assistantTextFromJson(json.parse(this.body));
+    return assistantTextFromJson(parse(this.body));
   }
 }
 
@@ -677,7 +669,7 @@ export function chatTurnTelemetryMiddleware(
     parentSpanId: target.span.spanContext().spanId,
   };
   const traceRequestTime = Date.now();
-  if (!environmentUtils.isDatabricksAppEnv()) {
+  if (!isDatabricksAppEnv()) {
     setChatTraceTag(traceState, MLFLOW_LOCAL_TAG, true);
   }
   for (const [name, value] of Object.entries(getRequestTags(req))) {
@@ -752,14 +744,16 @@ export function chatTurnTelemetryMiddleware(
     for (const [name, value] of traceState.tags) {
       target.span.setAttribute(`${MLFLOW_TRACE_TAG_PREFIX}${name}`, value);
     }
-    if (traceState.user) target.span.setAttribute(MLFLOW_USER_ATTR, traceState.user);
+    if (traceState.user) {
+      target.span.setAttribute(USER_TRACE_ATTRIBUTE, traceState.user);
+    }
     context.with(trace.setSpan(context.active(), target.span), () => {
       updateActiveMlflowTrace({
         ...(Object.keys(tags).length > 0 ? { tags } : {}),
         ...(traceState.user ? { user: traceState.user } : {}),
       });
     });
-    if (!environmentUtils.isDatabricksAppEnv()) {
+    if (!isDatabricksAppEnv()) {
       persistAppMlflowTraceInfo({
         traceId: traceState.traceId,
         requestTime: traceRequestTime,

package/src/validation.ts

@@ -9,7 +9,7 @@
  *
  * @module
  */
-import { object } from "@dbx-tools/shared-core";
+import { sequence } from "@dbx-tools/shared-core";
 
 /** The subset of a failed parse result these helpers read. */
 export interface SchemaIssues {
@@ -19,8 +19,7 @@ export interface SchemaIssues {
 /** Distinct dot-joined field paths a failed parse flagged. */
 export function invalidFields(error: SchemaIssues): string[] {
   return [
-    ...object
-      .sequence(error.issues)
+    ...sequence(error.issues)
       .map((issue) => issue.path.map(String).join("."))
       .filter(Boolean)
       .distinct(),

package/src/workspaces.ts

@@ -16,16 +16,27 @@ import { createHash } from "node:crypto";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { WorkspaceClient } from "@databricks/appkit";
-import { appkit, pluginRegistry } from "@dbx-tools/appkit";
 import {
-  filesCache as filesCachePlugin,
+  tryGetExecutionContext,
+  type PluginContextLike,
+  instance,
   type FilesCacheExports,
   type FilesCacheScope,
-} from "@dbx-tools/appkit/files-cache";
-import { DatabricksFileSystem, workspaceClient } from "@dbx-tools/databricks";
+  filesCache as filesCachePlugin,
+} from "@dbx-tools/appkit";
+import { DatabricksFileSystem, toLegacyWorkspaceClient } from "@dbx-tools/databricks";
 import { LocalFileSystem } from "@dbx-tools/fs";
-import { find, match, type PathMatchInput } from "@dbx-tools/path";
-import { errorUtils, log, object, stringUtils, token } from "@dbx-tools/shared-core";
+import { type PathMatchInput, findFiles, toPathMatcher } from "@dbx-tools/path";
+import {
+  log,
+  toError,
+  toStableKey,
+  isRecord,
+  trimToNull,
+  toSlug,
+  tokenize,
+  includesAccessTokenScope,
+} from "@dbx-tools/shared-core";
 import {
   fs as sharedFS,
   posixPath,
@@ -34,6 +45,11 @@ import {
   type FileSystemCache,
   type FileSystemCacheOptions,
   MemoryFileSystem,
+  isAbsolute,
+  normalize,
+  normalizeRoot,
+  isWithinRoot,
+  basename,
 } from "@dbx-tools/shared-fs";
 import type { RequestContext } from "@mastra/core/request-context";
 import { createSkill, validateSkillContent, type InlineSkill } from "@mastra/core/skills";
@@ -200,7 +216,7 @@ export interface DatabricksWorkspaceOptions extends Omit<
   /** Filesystem cache filters. Ignored when the AppKit files-cache plugin is absent. */
   cache?: DatabricksWorkspaceCache;
   /** AppKit plugin context used to discover optional sibling capabilities. */
-  pluginContext?: pluginRegistry.PluginContextLike;
+  pluginContext?: PluginContextLike;
   /**
    * Command sandbox. Defaults to Monty. Pass `false` to disable it, or an
    * explicit Mastra sandbox/provider resolver for a remote transport.
@@ -269,7 +285,7 @@ export function databricksWorkspaceConfig(
   const paths = resolveDatabricksWorkspacePaths(options);
   const configuredPaths = paths.length;
   const extraSkillMounts = options.extraSkillMounts ?? [];
-  const filesCache = pluginRegistry.instance(options.pluginContext, filesCachePlugin)?.exports();
+  const filesCache = instance(options.pluginContext, filesCachePlugin)?.exports();
   const configuredCache = options.cache;
   const mountFilesCache = configuredCache === false ? undefined : filesCache;
   const retainFilesystemSource =
@@ -369,7 +385,7 @@ export function databricksWorkspace(options: DatabricksWorkspaceOptions = {}): W
 /** @internal Bind a caller-created Databricks workspace to its AppKit plugin context. */
 export function bindDatabricksWorkspaceContext(
   workspace: Workspace,
-  pluginContext: pluginRegistry.PluginContextLike | undefined,
+  pluginContext: PluginContextLike | undefined,
   excludeSkillNames: readonly string[] = [],
 ): Workspace {
   const options = databricksWorkspaceOptions.get(workspace);
@@ -447,10 +463,7 @@ function sandboxName(selection: WorkspaceSandboxSelection | undefined): string {
  * file API access (`workspace` or `all-apis` on {@link MASTRA_SCOPES_KEY}).
  */
 function hasWorkspaceFileScope(requestContext: RequestContext | undefined): boolean {
-  return token.includesAccessTokenScope(
-    requestContext?.get(MASTRA_SCOPES_KEY),
-    WORKSPACE_FILE_SCOPES,
-  );
+  return includesAccessTokenScope(requestContext?.get(MASTRA_SCOPES_KEY), WORKSPACE_FILE_SCOPES);
 }
 
 /** Resolve the request client and authorization-safe files-cache scope. */
@@ -479,19 +492,19 @@ async function resolveFilesCacheScope(context: DatabricksWorkspaceContext): Prom
 
 /** Join one relative skill path to its actual composite mount path. */
 function mountedSkillPath(mount: string, skillPath: string): string {
-  if (posixPath.isAbsolute(skillPath)) {
+  if (isAbsolute(skillPath)) {
     throw new TypeError(`Skill path must be relative to its mount: ${skillPath}`);
   }
-  const normalized = posixPath.normalize(skillPath);
+  const normalized = normalize(skillPath);
   if (!normalized.ok) {
     throw new TypeError(`Skill path escapes its mount: ${skillPath}`);
   }
-  return posixPath.join(posixPath.normalizeRoot(mount), normalized.path.slice(1));
+  return posixPath.join(normalizeRoot(mount), normalized.path.slice(1));
 }
 
 /** Return whether a Databricks path belongs to the writable Workspace namespace. */
 function isWorkspaceRoot(root: string): boolean {
-  const normalized = posixPath.normalizeRoot(root);
+  const normalized = normalizeRoot(root);
   return normalized === "/Workspace" || normalized.startsWith("/Workspace/");
 }
 
@@ -522,7 +535,7 @@ async function resolveWorkspacePathMounts(
   for (const [index, path] of paths.entries()) {
     const configured = await resolveDatabricksWorkspacePath(path, context);
     if (!configured) continue;
-    if (posixPath.isWithinRoot(SCRATCH_MOUNT, configured.path)) {
+    if (isWithinRoot(SCRATCH_MOUNT, configured.path)) {
       const mount = configured.mount ?? configured.path;
       mounts[mount] = userTempFilesystem(context, configured.path);
       hasWritableMount = true;
@@ -622,7 +635,7 @@ async function resolveSkillFolderFilesystem(
     });
     return undefined;
   }
-  const root = stringUtils.trimToNull(folder.path);
+  const root = trimToNull(folder.path);
   if (!root) return undefined;
   const writable = folder.writable ?? isWorkspaceRoot(root);
   const cacheOptions = cache.fileSystemCache
@@ -660,10 +673,10 @@ function resolveHomePath(
   input: string | undefined,
   requestContext: Record<string, unknown>,
 ): string | undefined {
-  const value = stringUtils.trimToNull(input);
+  const value = trimToNull(input);
   if (!value || (value !== "~" && !value.startsWith("~/"))) return value ?? undefined;
   const emailValue = requestContext[MASTRA_USER_EMAIL_KEY];
-  const email = typeof emailValue === "string" ? stringUtils.trimToNull(emailValue) : undefined;
+  const email = typeof emailValue === "string" ? trimToNull(emailValue) : undefined;
   if (!email) return undefined;
   const home = personalWorkspacePath(email);
   return value === "~" ? home : `${home}/${value.slice(2)}`;
@@ -693,12 +706,12 @@ function cacheFilterMatches(
     const expanded = resolveHomePath(input, requestContext);
     if (!expanded) continue;
     inputs.push(
-      !root || posixPath.isAbsolute(expanded) || expanded.startsWith("**")
+      !root || isAbsolute(expanded) || expanded.startsWith("**")
         ? expanded
-        : `${posixPath.normalizeRoot(root)}/${expanded.replace(/^\.\//, "")}`,
+        : `${normalizeRoot(root)}/${expanded.replace(/^\.\//, "")}`,
     );
   }
-  return inputs.length > 0 && match.toPathMatcher(...inputs)(path);
+  return inputs.length > 0 && toPathMatcher(...inputs)(path);
 }
 
 async function resolveFileCacheOptions(
@@ -715,8 +728,7 @@ async function resolveFileCacheOptions(
     return {
       operations: CACHEABLE_FILESYSTEM_OPERATIONS,
       filter: (operation, path) =>
-        operation !== "readFile" ||
-        roots.some((skillRoot) => posixPath.isWithinRoot(skillRoot, path)),
+        operation !== "readFile" || roots.some((skillRoot) => isWithinRoot(skillRoot, path)),
     };
   }
   const policies = toPolicyArray(resolved);
@@ -746,10 +758,10 @@ function resolveWorkspaceIdentity(options: DatabricksWorkspaceOptions): {
   let id = options.id;
   let name = options.name;
   if (!id) {
-    id = name ? stringUtils.toSlug(name) : "workspace";
+    id = name ? toSlug(name) : "workspace";
   }
   if (!name) {
-    name = Array.from(stringUtils.tokenize(id)).join(" ");
+    name = Array.from(tokenize(id)).join(" ");
   }
   return { id, name };
 }
@@ -788,10 +800,10 @@ function userTempFilesystem(
 ): WorkspaceFilesystem {
   const userKey = resolveUserKey(context.requestContext);
   const digest = createHash("sha256")
-    .update(object.toStableKey({ package: "@dbx-tools/appkit-mastra", userKey }))
+    .update(toStableKey({ package: "@dbx-tools/appkit-mastra", userKey }))
     .digest("hex")
     .slice(0, 16);
-  const normalized = posixPath.normalizeRoot(workspacePath);
+  const normalized = normalizeRoot(workspacePath);
   const relative = normalized === SCRATCH_MOUNT ? "" : normalized.slice(`${SCRATCH_MOUNT}/`.length);
   const source = new LocalFileSystem({
     root: join(tmpdir(), "dbx-tools", "mastra", digest, relative),
@@ -814,7 +826,7 @@ function localSkillMountResolvers(mounts: readonly LocalSkillMount[]): Workspace
     unique.set(`${entry.mountPath}\0${identity}`, entry);
   }
   return [...unique.values()].map((entry) => {
-    const mount = posixPath.normalizeRoot(entry.mountPath);
+    const mount = normalizeRoot(entry.mountPath);
     const filesystem = inMemorySkillFilesystem(entry);
     return async () => {
       const source = await filesystem;
@@ -866,7 +878,7 @@ export async function inlineSkillsFromLocalMounts(
           ...(metadata.compatibility !== undefined
             ? { compatibility: metadata.compatibility }
             : {}),
-          ...(object.isRecord(metadata.metadata) ? { metadata: metadata.metadata } : {}),
+          ...(isRecord(metadata.metadata) ? { metadata: metadata.metadata } : {}),
           ...(Object.keys(references).length > 0 ? { references } : {}),
         }),
       );
@@ -903,7 +915,7 @@ async function loadInMemorySkillFilesystem(mount: LocalSkillMount): Promise<File
     root: "/",
   });
   await memory.init();
-  for await (const relative of find.findFiles("**/*", { cwd: mount.root, nodir: true })) {
+  for await (const relative of findFiles("**/*", { cwd: mount.root, nodir: true })) {
     await memory.writeFile(relative, await source.readFile(relative), { overwrite: true });
   }
   await source.close();
@@ -941,7 +953,7 @@ async function databricksFilesystem(
   | undefined
 > {
   const fs = new DatabricksFileSystem({
-    client: () => workspaceClient.toLegacyWorkspaceClient(requestWorkspaceClient(client)),
+    client: () => toLegacyWorkspaceClient(requestWorkspaceClient(client)),
     root,
     readOnly,
     createRoot,
@@ -959,7 +971,7 @@ async function databricksFilesystem(
     logger.debug("databricks-mount:skipped", {
       root,
       readOnly,
-      error: errorUtils.toError(err),
+      error: toError(err),
     });
   }
   return undefined;
@@ -968,9 +980,7 @@ async function databricksFilesystem(
 /** @internal Keep service context from replacing the request-scoped workspace client. */
 export function requestWorkspaceClient(
   initialClient: WorkspaceClient,
-  executionContext: ReturnType<
-    typeof appkit.tryGetExecutionContext
-  > = appkit.tryGetExecutionContext(),
+  executionContext: ReturnType<typeof tryGetExecutionContext> = tryGetExecutionContext(),
 ): WorkspaceClient {
   if (
     executionContext &&
@@ -1008,7 +1018,7 @@ function verifyFirstFileSystemAccess<TFileSystem extends FileSystem>(
       readCheck = undefined;
       logger.debug("databricks-mount:read-check-failed", {
         root,
-        error: errorUtils.toError(error),
+        error: toError(error),
       });
       throw error;
     }
@@ -1039,7 +1049,7 @@ function verifyFirstFileSystemAccess<TFileSystem extends FileSystem>(
             if (!writeVerified) {
               logger.debug("databricks-mount:write-check-failed", {
                 root,
-                error: errorUtils.toError(error),
+                error: toError(error),
               });
             }
             throw error;
@@ -1132,7 +1142,7 @@ async function resolveDistinctSkillPaths(
     try {
       const entries = await filesystem.readdir(path);
       if (entries.some((entry) => entry.type === "file" && entry.name === "SKILL.md")) {
-        const name = posixPath.basename(path);
+        const name = basename(path);
         if (!excludedSkillNames.has(name) && !selected.has(name)) selected.set(name, path);
         continue;
       }
@@ -1149,7 +1159,7 @@ async function resolveDistinctSkillPaths(
     } catch (error) {
       logger.debug("skill-path:skipped", {
         path,
-        error: errorUtils.toError(error),
+        error: toError(error),
       });
     }
   }

package/src/writer.ts

@@ -10,7 +10,7 @@
  * @module
  */
 
-import { errorUtils, log } from "@dbx-tools/shared-core";
+import { toError, type Logger } from "@dbx-tools/shared-core";
 import { GENIE_PROGRESS_PART_TYPE, type GenieWriterEvent } from "@dbx-tools/shared-mastra";
 import type { ToolExecutionContext } from "@mastra/core/tools";
 
@@ -25,7 +25,7 @@ import type { ToolExecutionContext } from "@mastra/core/tools";
  * Returns when the write resolves or rejects; never throws.
  */
 export async function safeWriteProgress(
-  log: log.Logger,
+  log: Logger,
   writer: ToolExecutionContext["writer"],
   toolCallId: string | undefined,
   event: GenieWriterEvent,
@@ -44,7 +44,7 @@ export async function safeWriteProgress(
   } catch (err) {
     log.warn("writer:error", {
       ...context,
-      error: errorUtils.toError(err),
+      error: toError(err),
     });
   }
 }