@dbx-tools/appkit-mastra 0.1.97 → 0.1.99

package/dist/index.js

@@ -881,7 +881,12 @@ const ASSISTANT_WORKSPACE_SKILLS_MOUNT = "/workspace_skills";
 /** Composite mount for the caller's `/.assistant/skills` tree. */
 const ASSISTANT_USER_SKILLS_MOUNT = "/workspace_user_skills";
 /** OAuth scopes that gate Databricks workspace file mounts. */
-const WORKSPACE_FILE_SCOPES = ["workspace", "all-apis"];
+const WORKSPACE_FILE_SCOPES = [
+	"workspace",
+	"workspace.workspace",
+	"all-apis"
+];
+const log$8 = logUtils.logger("mastra/workspaces");
 /**
 * Create a Mastra {@link Workspace} with per-request Databricks mounts.
 *
@@ -907,15 +912,27 @@ function createWorkspace(options = {}) {
 	const { id, name } = resolveWorkspaceIdentity(options);
 	const resolvers = buildMountResolvers(options);
 	const skills = options.skills ?? (resolvers.length > 0 ? buildWorkspaceSkillsResolver(resolvers) : void 0);
+	const checkSkillFileMtime = options.checkSkillFileMtime ?? options.assistantSkills !== false;
+	const bm25 = options.bm25 !== false;
+	log$8.debug("workspace:create", {
+		id,
+		name,
+		resolverCount: resolvers.length,
+		assistantSkills: options.assistantSkills !== false,
+		customMountResolvers: options.mounts?.length ?? 0,
+		customSkillsResolver: Boolean(options.skills),
+		checkSkillFileMtime,
+		bm25
+	});
 	return new Workspace({
 		id,
 		name,
 		filesystem: (context) => resolveWorkspaceFilesystem(resolvers, context),
 		...skills ? {
 			skills,
-			checkSkillFileMtime: options.checkSkillFileMtime ?? options.assistantSkills !== false
+			checkSkillFileMtime
 		} : {},
-		...options.bm25 !== false ? { bm25: true } : {}
+		bm25
 	});
 }
 /**
@@ -943,18 +960,39 @@ function hasWorkspaceFileScope(requestContext) {
 function resolveAssistantSkillsMounts(context) {
 	const mounts = {};
 	const requestContext = context.requestContext;
-	if (!shouldMountAssistantSkills(requestContext)) return {
-		mounts,
-		skillPaths: []
-	};
-	const client = requestContext.get(MASTRA_USER_KEY)?.executionContext.client;
-	if (!client) return {
-		mounts,
-		skillPaths: []
-	};
+	if (!shouldMountAssistantSkills(requestContext)) {
+		log$8.debug("assistant-skills:skipped", {
+			reason: !requestContext ? "no-request-context" : "missing-workspace-scope",
+			nodeEnv: process.env.NODE_ENV,
+			scopes: context.requestContext?.get(MASTRA_SCOPES_KEY)
+		});
+		return {
+			mounts,
+			skillPaths: []
+		};
+	}
+	const user = requestContext.get(MASTRA_USER_KEY);
+	const client = user?.executionContext.client;
+	if (!client) {
+		log$8.debug("assistant-skills:skipped", {
+			reason: "missing-obo-client",
+			userId: user?.id
+		});
+		return {
+			mounts,
+			skillPaths: []
+		};
+	}
 	mounts[ASSISTANT_WORKSPACE_SKILLS_MOUNT] = readOnlyDatabricksFilesystem(client, ASSISTANT_SHARED_SKILLS_PATH);
 	const email = resolveScopedEmail(requestContext);
 	if (email) mounts[ASSISTANT_USER_SKILLS_MOUNT] = readOnlyDatabricksFilesystem(client, userAssistantSkillsPath(email));
+	log$8.debug("assistant-skills:mounted", {
+		sharedPath: ASSISTANT_SHARED_SKILLS_PATH,
+		sharedMount: ASSISTANT_WORKSPACE_SKILLS_MOUNT,
+		userMount: email ? ASSISTANT_USER_SKILLS_MOUNT : void 0,
+		userPath: email ? userAssistantSkillsPath(email) : void 0,
+		mountKeys: Object.keys(mounts)
+	});
 	return {
 		mounts,
 		skillPaths: Object.keys(mounts)
@@ -980,6 +1018,12 @@ function buildMountResolvers(options) {
 	const { assistantSkills = true, mounts } = options;
 	if (assistantSkills) resolvers.push(resolveAssistantSkillsMounts);
 	if (mounts?.length) resolvers.push(...mounts);
+	log$8.debug("mounts:resolvers", {
+		assistantSkills,
+		builtInResolver: assistantSkills,
+		customResolverCount: mounts?.length ?? 0,
+		totalResolverCount: resolvers.length
+	});
 	return resolvers;
 }
 /**
@@ -1012,11 +1056,20 @@ function readOnlyDatabricksFilesystem(client, basePath) {
 async function resolveWorkspaceContribution(resolvers, context) {
 	const mounts = {};
 	const skillPaths = [];
-	for (const resolver of resolvers) {
+	for (const [index, resolver] of resolvers.entries()) {
 		const contribution = await resolver(context);
+		log$8.debug("mounts:resolver", {
+			index,
+			mountKeys: Object.keys(contribution.mounts),
+			skillPaths: contribution.skillPaths ?? []
+		});
 		Object.assign(mounts, contribution.mounts);
 		if (contribution.skillPaths?.length) skillPaths.push(...contribution.skillPaths);
 	}
+	log$8.debug("mounts:merged", {
+		mountKeys: Object.keys(mounts),
+		skillPaths
+	});
 	return {
 		mounts,
 		skillPaths
@@ -1030,7 +1083,12 @@ async function resolveWorkspaceContribution(resolvers, context) {
 */
 async function resolveWorkspaceFilesystem(resolvers, context) {
 	const { mounts } = await resolveWorkspaceContribution(resolvers, context);
-	if (Object.keys(mounts).length === 0) return emptyFilesystem();
+	const mountKeys = Object.keys(mounts);
+	if (mountKeys.length === 0) {
+		log$8.debug("filesystem:empty", { hasRequestContext: Boolean(context.requestContext) });
+		return emptyFilesystem();
+	}
+	log$8.debug("filesystem:composite", { mountKeys });
 	return new CompositeFilesystem({ mounts });
 }
 /**
@@ -1040,6 +1098,7 @@ async function resolveWorkspaceFilesystem(resolvers, context) {
 function buildWorkspaceSkillsResolver(resolvers) {
 	return async (context) => {
 		const { skillPaths } = await resolveWorkspaceContribution(resolvers, context);
+		log$8.debug("skills:resolved", { skillPaths });
 		return skillPaths ?? [];
 	};
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dbx-tools/appkit-mastra",
-  "version": "0.1.97",
+  "version": "0.1.99",
   "dependencies": {
     "@databricks/sdk-experimental": "^0.17.0",
-    "@dbx-tools/appkit-mastra-shared": "0.1.97",
-    "@dbx-tools/genie": "0.1.97",
-    "@dbx-tools/genie-shared": "0.1.97",
-    "@dbx-tools/model": "0.1.97",
-    "@dbx-tools/shared": "0.1.97",
+    "@dbx-tools/appkit-mastra-shared": "0.1.99",
+    "@dbx-tools/genie": "0.1.99",
+    "@dbx-tools/genie-shared": "0.1.99",
+    "@dbx-tools/model": "0.1.99",
+    "@dbx-tools/shared": "0.1.99",
     "@mastra/ai-sdk": "^1.6.0",
     "@mastra/core": "^1.47.0",
     "@mastra/express": "^1.4.2",