@mastra/factory 0.25.0 → 0.26.0-alpha.1

package/dist/workspace.js

@@ -10,12 +10,13 @@ import { repositoryDirectoryName } from "./sandbox/workdir.js";
 import { createEnvironmentSetupHook, createSessionSetupHook, evictSessionSandbox, getSessionSandbox, hasFailedSetupCommand, recordFailedSetupCommand, resolveSessionWorkdir } from "./sandbox/session-sandbox.js";
 import { clearSessionEnvironment, recordSessionEnvironment, setSessionEnvironmentNote } from "./session/environment-state-processor.js";
 import { LocalSkillSource, Workspace } from "@mastra/core/workspace";
+import { DEFAULT_CONFIG_DIR } from "@mastra/code-sdk/constants";
 import { existsSync } from "fs";
 import path, { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { SandboxFilesystem } from "@mastra/code-sdk/agents/sandbox-filesystem";
 import { MASTRACODE_WORKSPACE_TOOLS } from "@mastra/code-sdk/agents/tool-availability";
-import { DEFAULT_CONFIG_DIR } from "@mastra/code-sdk/constants";
+import { InlineSkillSource } from "@mastra/core/skills";
 // src/workspace.ts
 const WORKSPACE_ID_PREFIX = "mfw";
 const bundleDirectory = dirname(fileURLToPath(import.meta.url));
@@ -24,14 +25,17 @@ const BUNDLED_FACTORY_SKILLS_PATH = [bundledFactorySkillsPath, join(bundleDirect
 /**
 * Resolve the consumer repo's local Factory skills root, if any. Checked in
 * addition to the bundled skills so projects can add (or override) Factory
-* skills without patching the installed package. Candidates cover the cwd
-* variants the dev server runs with (`repo root`, `--dir src/mastra` which
-* runs with cwd `src/mastra/public`), then the platform build output when
-* the server runs from its parent directory.
+* skills without patching the installed package. Skills live in
+* `src/mastra/factory-skills`; `src/mastra/public/factory-skills` is the older
+* location and still works. Candidates cover the cwd variants the dev server
+* runs with (`repo root`, `mastra dev` which runs with cwd `src/mastra/public`),
+* then the platform build output when the server runs from its parent directory.
 */
 function resolveLocalFactorySkillsPath(cwd = process.cwd()) {
 	return [
+		join(cwd, "src", "mastra", "factory-skills"),
 		join(cwd, "src", "mastra", "public", "factory-skills"),
+		...path.basename(cwd) === "public" ? [join(cwd, "..", "factory-skills")] : [],
 		join(cwd, "public", "factory-skills"),
 		join(cwd, "factory-skills"),
 		join(cwd, "output", "factory-skills")
@@ -76,18 +80,57 @@ async function rescanFactorySkills(skills) {
 	rescannedOutsideResolver.set(skills, pending.catch(() => {}));
 	await pending;
 }
+/**
+* Serves `createSkill()` skills under mount-relative paths (`<name>/SKILL.md`),
+* the layout the other Factory skill layers use.
+*/
+var CodeSkillSource = class {
+	#inline;
+	#names;
+	constructor(skills) {
+		this.#inline = new InlineSkillSource([...skills]);
+		this.#names = skills.map((skill) => skill.name);
+	}
+	#inlinePath(relativePath) {
+		return `inline/${relativePath.split(path.sep).join("/")}`;
+	}
+	async exists(relativePath) {
+		if (relativePath === "") return this.#names.length > 0;
+		return this.#inline.exists(this.#inlinePath(relativePath));
+	}
+	stat(relativePath) {
+		return this.#inline.stat(this.#inlinePath(relativePath));
+	}
+	readFile(relativePath) {
+		return this.#inline.readFile(this.#inlinePath(relativePath));
+	}
+	async readdir(relativePath) {
+		if (relativePath === "") return this.#names.map((name) => ({
+			name,
+			type: "directory"
+		}));
+		return this.#inline.readdir(this.#inlinePath(relativePath));
+	}
+};
 var FactorySkillSource = class {
 	fallback;
 	isReviewSession;
 	#bundledSource = new LocalSkillSource({ basePath: BUNDLED_FACTORY_SKILLS_PATH });
 	#localSource;
+	#codeSource;
 	#fallbackSkillRoots;
-	constructor(fallback, fallbackSkillRoots, localSkillsPath = resolveLocalFactorySkillsPath(), isReviewSession = () => Promise.resolve(true)) {
+	constructor(fallback, fallbackSkillRoots, localSkillsPath = resolveLocalFactorySkillsPath(), isReviewSession = () => Promise.resolve(true), codeSkills = []) {
 		this.fallback = fallback;
 		this.isReviewSession = isReviewSession;
 		this.#localSource = localSkillsPath ? new LocalSkillSource({ basePath: localSkillsPath }) : void 0;
+		this.#codeSource = codeSkills.length > 0 ? new CodeSkillSource(codeSkills) : void 0;
 		this.#fallbackSkillRoots = new Set(fallbackSkillRoots.map((skillPath) => path.normalize(skillPath)));
 	}
+	/** A code skill owns its whole directory, so a same-named folder skill never mixes in files. */
+	async #ownedByCode(relativePath) {
+		const skillName = relativePath.split(path.sep)[0];
+		return !!skillName && !!this.#codeSource && await this.#codeSource.exists(skillName);
+	}
 	#isFactoryPath(skillPath) {
 		const normalized = path.normalize(skillPath);
 		return normalized === FACTORY_SKILLS_MOUNT || normalized.startsWith(`${FACTORY_SKILLS_MOUNT}${path.sep}`);
@@ -101,8 +144,9 @@ var FactorySkillSource = class {
 		if (!skillName || !REVIEW_ONLY_FACTORY_SKILLS.has(skillName)) return false;
 		return !await this.isReviewSession();
 	}
-	/** Pick the layer serving this mount-relative path: local wins when it has the entry. */
+	/** Pick the layer serving this mount-relative path: code skills, then local entries, then bundled. */
 	async #layerFor(relativePath) {
+		if (await this.#ownedByCode(relativePath)) return this.#codeSource;
 		if (this.#localSource && await this.#localSource.exists(relativePath)) return this.#localSource;
 		return this.#bundledSource;
 	}
@@ -110,6 +154,7 @@ var FactorySkillSource = class {
 		if (!this.#isFactoryPath(skillPath)) return this.fallback.exists(skillPath);
 		const relative = this.#factoryPath(skillPath);
 		if (await this.#isHiddenReviewPath(relative)) return false;
+		if (await this.#ownedByCode(relative)) return this.#codeSource.exists(relative);
 		if (this.#localSource && await this.#localSource.exists(relative)) return true;
 		return this.#bundledSource.exists(relative);
 	}
@@ -129,12 +174,18 @@ var FactorySkillSource = class {
 		if (this.#isFactoryPath(skillPath)) {
 			const relative = this.#factoryPath(skillPath);
 			if (await this.#isHiddenReviewPath(relative)) throw skillSourceEnoent(skillPath);
+			if (relative !== "" && await this.#ownedByCode(relative)) return this.#codeSource.readdir(relative);
 			const [bundledExists, localExists] = await Promise.all([this.#bundledSource.exists(relative), this.#localSource?.exists(relative) ?? Promise.resolve(false)]);
-			if (!bundledExists && !localExists) throw skillSourceEnoent(skillPath);
-			const [bundledEntries, localEntries] = await Promise.all([bundledExists ? this.#bundledSource.readdir(relative) : [], localExists ? this.#localSource.readdir(relative) : []]);
+			if (!bundledExists && !localExists && !(relative === "" && this.#codeSource)) throw skillSourceEnoent(skillPath);
+			const [bundledEntries, localEntries, codeEntries] = await Promise.all([
+				bundledExists ? this.#bundledSource.readdir(relative) : [],
+				localExists ? this.#localSource.readdir(relative) : [],
+				relative === "" && this.#codeSource ? this.#codeSource.readdir("") : []
+			]);
 			const merged = /* @__PURE__ */ new Map();
 			for (const entry of bundledEntries) merged.set(entry.name, entry);
 			for (const entry of localEntries) merged.set(entry.name, entry);
+			for (const entry of codeEntries) merged.set(entry.name, entry);
 			const entries = [...merged.values()];
 			if (relative !== "" || await this.isReviewSession()) return entries;
 			return entries.filter((entry) => !REVIEW_ONLY_FACTORY_SKILLS.has(entry.name));
@@ -147,12 +198,13 @@ var FactorySkillSource = class {
 		return entries;
 	}
 	/**
-	* Names the Factory mount serves: bundled skills plus the app's local skills.
+	* Names the Factory mount serves: bundled skills plus the app's code and local skills.
 	* Repository skills with these names are hidden so they cannot collide with
 	* Factory's copy. Recomputed per scan so skill refreshes pick up local changes.
 	*/
 	async #reservedNames() {
 		const reserved = new Set(FACTORY_SKILL_NAMES);
+		for (const entry of await this.#codeSource?.readdir("") ?? []) reserved.add(entry.name);
 		if (!this.#localSource) return reserved;
 		try {
 			for (const entry of await this.#localSource.readdir("")) if (entry.type === "directory") reserved.add(entry.name);
@@ -206,11 +258,11 @@ var UnmaterializedAwareSkillSource = class {
 		return this.fallback.realpath ? this.fallback.realpath(skillPath) : Promise.resolve(skillPath);
 	}
 };
-function createFactorySkillExtension(isReviewSession) {
+function createFactorySkillExtension(isReviewSession, codeSkills) {
 	return {
 		id: "web-factory",
 		paths: [FACTORY_SKILLS_MOUNT],
-		createSource: (fallback, fallbackSkillRoots) => new FactorySkillSource(fallback, fallbackSkillRoots, resolveLocalFactorySkillsPath(), isReviewSession)
+		createSource: (fallback, fallbackSkillRoots) => new FactorySkillSource(fallback, fallbackSkillRoots, resolveLocalFactorySkillsPath(), isReviewSession, codeSkills)
 	};
 }
 function isActiveReviewBinding(runBinding, orgId) {
@@ -558,7 +610,7 @@ function createWorkspaceFactory(options = {}) {
 				return false;
 			}
 		};
-		const effectiveSkillExtension = skillExtension ?? createFactorySkillExtension(() => (skillReviewChecks.get(workspaceId) ?? isReviewSession)());
+		const effectiveSkillExtension = skillExtension ?? createFactorySkillExtension(() => (skillReviewChecks.get(workspaceId) ?? isReviewSession)(), options.skills ?? []);
 		const extensionId = effectiveSkillExtension ? `-${effectiveSkillExtension.id}` : "";
 		const workspaceId = `${WORKSPACE_ID_PREFIX}-${projectRepository.id}-${session.id}${extensionId}`;
 		const workspaceGeneration = workspaceRegistry.generation(session.sessionId);
@@ -1007,6 +1059,6 @@ function createWorkspaceFactory(options = {}) {
 	};
 	return (context) => timed("workspace.resolve", () => resolve(context));
 }
-export { BUNDLED_FACTORY_SKILLS_PATH, FACTORY_SKILL_NAMES, FactorySkillSource, FactoryWorkspaceRegistry, REVIEW_ONLY_FACTORY_SKILLS, createWorkspaceFactory, environmentSandboxContext, rescanFactorySkills, resolveLocalFactorySkillsPath, resolveProjectEnvironment };
+export { BUNDLED_FACTORY_SKILLS_PATH, FACTORY_SKILLS_MOUNT, FACTORY_SKILL_NAMES, FactorySkillSource, FactoryWorkspaceRegistry, REVIEW_ONLY_FACTORY_SKILLS, createWorkspaceFactory, environmentSandboxContext, rescanFactorySkills, resolveLocalFactorySkillsPath, resolveProjectEnvironment };
 
 //# sourceMappingURL=workspace.js.map