@dbx-tools/appkit-mastra 0.9.99 → 0.9.105

package/src/workspaces.ts

@@ -15,9 +15,9 @@
 import { createHash } from "node:crypto";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { ConfigurationError, createWorkspaceClient, getExecutionContext } from "@databricks/appkit";
+import { ConfigurationError, createWorkspaceClient } from "@databricks/appkit";
 import type { WorkspaceClient } from "@databricks/appkit";
-import { pluginRegistry } from "@dbx-tools/appkit";
+import { appkit, pluginRegistry } from "@dbx-tools/appkit";
 import {
   filesCache as filesCachePlugin,
   type FilesCacheExports,
@@ -38,15 +38,12 @@ import {
 } from "@dbx-tools/shared-fs";
 import type { RequestContext } from "@mastra/core/request-context";
 import {
-  WORKSPACE_TOOLS,
   Workspace,
   type SkillsResolver,
-  type ToolConfigWithArgsContext,
   type WorkspaceConfig,
   type WorkspaceFilesystem,
   type WorkspaceSandbox,
   type WorkspaceSandboxResolver,
-  type WorkspaceToolConfig,
   type WorkspaceToolsConfig,
 } from "@mastra/core/workspace";
 
@@ -192,8 +189,10 @@ export type WorkspaceSandboxSelection =
   | WorkspaceSandboxResolver;
 
 /** Native Mastra workspace options plus Databricks path shortcuts. */
-export interface DatabricksWorkspaceOptions
-  extends Omit<WorkspaceConfig, "filesystem" | "mounts" | "sandbox" | "skills"> {
+export interface DatabricksWorkspaceOptions extends Omit<
+  WorkspaceConfig,
+  "filesystem" | "mounts" | "sandbox" | "skills"
+> {
   /**
    * Start from {@link DEFAULT_DATABRICKS_WORKSPACE_PATHS}. Defaults to `true`.
    */
@@ -396,48 +395,14 @@ export function resolveDatabricksWorkspacePaths(
 
 /* ---------------------------- private helpers ---------------------------- */
 
-/** Require approval unless a filesystem mutation stays inside a user-owned writable root. */
-function requireApprovalOutsideWritableRoots({
-  args,
-  requestContext,
-}: ToolConfigWithArgsContext): boolean {
-  const inputPath = args.path;
-  if (typeof inputPath !== "string" || !posixPath.isAbsolute(inputPath)) return true;
-  const normalized = posixPath.normalize(inputPath);
-  if (!normalized.ok) return true;
-  if (posixPath.isWithinRoot(SCRATCH_MOUNT, normalized.path)) return false;
-  const emailValue = requestContext[MASTRA_USER_EMAIL_KEY];
-  const email = typeof emailValue === "string" ? stringUtils.trimToNull(emailValue) : undefined;
-  if (!email) return true;
-  return !posixPath.isWithinRoot(personalWorkspacePath(email), normalized.path);
-}
-
 function workspaceTools(configured: WorkspaceToolsConfig | undefined): WorkspaceToolsConfig {
-  const requireApproval: WorkspaceToolConfig =
-    configured?.requireApproval === undefined
-      ? { requireApproval: requireApprovalOutsideWritableRoots }
-      : {};
-  const defaults = {
-    [WORKSPACE_TOOLS.FILESYSTEM.WRITE_FILE]: requireApproval,
-    [WORKSPACE_TOOLS.FILESYSTEM.EDIT_FILE]: requireApproval,
-    [WORKSPACE_TOOLS.FILESYSTEM.AST_EDIT]: requireApproval,
-    [WORKSPACE_TOOLS.FILESYSTEM.DELETE]: requireApproval,
-    [WORKSPACE_TOOLS.FILESYSTEM.MKDIR]: requireApproval,
-  } satisfies WorkspaceToolsConfig;
-  const configuredTools = configured as
-    Readonly<Record<string, WorkspaceToolConfig | undefined>> | undefined;
-  const mergedTools = Object.fromEntries(
-    Object.entries(defaults).map(([name, defaultConfig]) => [
-      name,
-      { ...defaultConfig, ...configuredTools?.[name] },
-    ]),
-  );
   return {
-    ...defaults,
+    enabled: true,
+    requireApproval: false,
     ...configured,
-    ...mergedTools,
   };
 }
+
 function resolveWorkspaceSandbox(
   selection: WorkspaceSandboxSelection | undefined,
   workspaceId: string,
@@ -586,9 +551,7 @@ async function resolveSkillFolderMounts(
       const mount = configured.mount ?? configured.path;
       mounts[mount] = userTempFilesystem(context, configured.path);
       if (configured.readable !== false) {
-        skillPaths.push(
-          ...(configured.skills ?? []).map((path) => mountedSkillPath(mount, path)),
-        );
+        skillPaths.push(...(configured.skills ?? []).map((path) => mountedSkillPath(mount, path)));
       }
       continue;
     }
@@ -712,14 +675,9 @@ async function resolveCacheConfig(
   value: DatabricksWorkspaceCache | undefined,
   context: DatabricksWorkspaceContext,
 ): Promise<
-  | boolean
-  | DatabricksWorkspaceCacheFilter
-  | readonly DatabricksWorkspaceCacheFilter[]
-  | undefined
+  boolean | DatabricksWorkspaceCacheFilter | readonly DatabricksWorkspaceCacheFilter[] | undefined
 > {
-  return typeof value === "function"
-    ? value(context)
-    : value;
+  return typeof value === "function" ? value(context) : value;
 }
 
 function requestContextValues(requestContext: RequestContext | undefined): Record<string, unknown> {
@@ -801,15 +759,7 @@ async function resolveFileCacheOptions(
   return {
     operations,
     filter: (operation, path) =>
-      policies.some((policy) =>
-        cacheFilterMatches(
-          policy,
-          operation,
-          path,
-          requestContext,
-          root,
-        ),
-      ),
+      policies.some((policy) => cacheFilterMatches(policy, operation, path, requestContext, root)),
   };
 }
 
@@ -843,9 +793,7 @@ function buildMountResolvers(
   const resolvers: WorkspaceMountResolver[] = [];
   const pathCount = paths.length;
   if (pathCount > 0) {
-    resolvers.push((context) =>
-      resolveSkillFolderMounts(paths, context, filesCache, cacheConfig),
-    );
+    resolvers.push((context) => resolveSkillFolderMounts(paths, context, filesCache, cacheConfig));
   }
   if (mounts && Object.keys(mounts).length > 0) resolvers.push(() => ({ mounts }));
   resolvers.push(...localMounts);
@@ -929,15 +877,8 @@ async function databricksFilesystem(
     }
   | undefined
 > {
-  const initialClient = workspaceClient.toLegacyWorkspaceClient(client);
   const fs = new DatabricksFileSystem({
-    client: () => {
-      try {
-        return workspaceClient.toLegacyWorkspaceClient(getExecutionContext().client);
-      } catch {
-        return initialClient;
-      }
-    },
+    client: () => workspaceClient.toLegacyWorkspaceClient(requestWorkspaceClient(client)),
     root,
     readOnly,
     createRoot,
@@ -961,6 +902,23 @@ async function databricksFilesystem(
   return undefined;
 }
 
+/** @internal Keep service context from replacing the request-scoped workspace client. */
+export function requestWorkspaceClient(
+  initialClient: WorkspaceClient,
+  executionContext: ReturnType<
+    typeof appkit.tryGetExecutionContext
+  > = appkit.tryGetExecutionContext(),
+): WorkspaceClient {
+  if (
+    executionContext &&
+    "isUserContext" in executionContext &&
+    executionContext.isUserContext === true
+  ) {
+    return executionContext.client;
+  }
+  return initialClient;
+}
+
 function verifyFirstFileSystemAccess<TFileSystem extends FileSystem>(
   filesystem: TFileSystem,
   readProbe: () => Promise<unknown>,

package/lib/src/serving-sanitize.d.ts

@@ -1,6 +0,0 @@
-/**
- * Databricks Model Serving wire repairs shared with the model gateway.
- *
- * @module
- */
-export { applyToolReasoningCompatibility, flattenChoiceDeltaContent, flattenChoiceMessageContent, repairAssistantPrefill, rewriteServingBody, rewriteServingRequest, rewriteServingResponseBody, rewriteServingResponseStream, stripReasoningFromServingMessages, type RewrittenServingRequest, type ServingChatMessage, } from "@dbx-tools/model/serving-wire";

package/lib/src/serving-sanitize.js

@@ -1,7 +0,0 @@
-/**
- * Databricks Model Serving wire repairs shared with the model gateway.
- *
- * @module
- */
-export { applyToolReasoningCompatibility, flattenChoiceDeltaContent, flattenChoiceMessageContent, repairAssistantPrefill, rewriteServingBody, rewriteServingRequest, rewriteServingResponseBody, rewriteServingResponseStream, stripReasoningFromServingMessages, } from "@dbx-tools/model/serving-wire";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmluZy1zYW5pdGl6ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aW5nLXNhbml0aXplLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFFSCxPQUFPLEVBQ0wsK0JBQStCLEVBQy9CLHlCQUF5QixFQUN6QiwyQkFBMkIsRUFDM0Isc0JBQXNCLEVBQ3RCLGtCQUFrQixFQUNsQixxQkFBcUIsRUFDckIsMEJBQTBCLEVBQzFCLDRCQUE0QixFQUM1QixpQ0FBaUMsR0FHbEMsTUFBTSwrQkFBK0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogRGF0YWJyaWNrcyBNb2RlbCBTZXJ2aW5nIHdpcmUgcmVwYWlycyBzaGFyZWQgd2l0aCB0aGUgbW9kZWwgZ2F0ZXdheS5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cblxuZXhwb3J0IHtcbiAgYXBwbHlUb29sUmVhc29uaW5nQ29tcGF0aWJpbGl0eSxcbiAgZmxhdHRlbkNob2ljZURlbHRhQ29udGVudCxcbiAgZmxhdHRlbkNob2ljZU1lc3NhZ2VDb250ZW50LFxuICByZXBhaXJBc3Npc3RhbnRQcmVmaWxsLFxuICByZXdyaXRlU2VydmluZ0JvZHksXG4gIHJld3JpdGVTZXJ2aW5nUmVxdWVzdCxcbiAgcmV3cml0ZVNlcnZpbmdSZXNwb25zZUJvZHksXG4gIHJld3JpdGVTZXJ2aW5nUmVzcG9uc2VTdHJlYW0sXG4gIHN0cmlwUmVhc29uaW5nRnJvbVNlcnZpbmdNZXNzYWdlcyxcbiAgdHlwZSBSZXdyaXR0ZW5TZXJ2aW5nUmVxdWVzdCxcbiAgdHlwZSBTZXJ2aW5nQ2hhdE1lc3NhZ2UsXG59IGZyb20gXCJAZGJ4LXRvb2xzL21vZGVsL3NlcnZpbmctd2lyZVwiO1xuIl19

package/src/serving-sanitize.ts

@@ -1,19 +0,0 @@
-/**
- * Databricks Model Serving wire repairs shared with the model gateway.
- *
- * @module
- */
-
-export {
-  applyToolReasoningCompatibility,
-  flattenChoiceDeltaContent,
-  flattenChoiceMessageContent,
-  repairAssistantPrefill,
-  rewriteServingBody,
-  rewriteServingRequest,
-  rewriteServingResponseBody,
-  rewriteServingResponseStream,
-  stripReasoningFromServingMessages,
-  type RewrittenServingRequest,
-  type ServingChatMessage,
-} from "@dbx-tools/model/serving-wire";