@mastra/core 1.16.0-alpha.2 → 1.16.0-alpha.3

package/dist/{chunk-L53XY7WT.js → chunk-WEKILIGZ.js}

@@ -1,4 +1,4 @@
-import { createTool } from './chunk-55W2K42G.js';
+import { createTool } from './chunk-MLCFE6MR.js';
 import { MastraBase } from './chunk-WCAFTXGK.js';
 import { RegisteredLogger } from './chunk-X2WMFSPB.js';
 import * as nodePath from 'path';
@@ -4994,7 +4994,7 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
   #skillsResolver;
   #searchEngine;
   #validateOnLoad;
-  /** Map of skill name -> full skill data */
+  /** Map of skill name -> array of candidates (supports same-named skills from different sources) */
   #skills = /* @__PURE__ */ new Map();
   /** Whether skills have been discovered */
   #initialized = false;
@@ -5022,28 +5022,91 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
   // ===========================================================================
   async list() {
     await this.#ensureInitialized();
-    return Array.from(this.#skills.values()).map((skill) => ({
-      name: skill.name,
-      description: skill.description,
-      license: skill.license,
-      compatibility: skill.compatibility,
-      metadata: skill.metadata
-    }));
+    const results = [];
+    for (const candidates of this.#skills.values()) {
+      for (const skill of candidates) {
+        results.push({
+          name: skill.name,
+          path: skill.path,
+          description: skill.description,
+          license: skill.license,
+          compatibility: skill.compatibility,
+          metadata: skill.metadata
+        });
+      }
+    }
+    return results;
   }
   async get(name) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(name);
+    const skill = this.#resolveByName(name) ?? this.#resolveByPath(name);
     if (!skill) return null;
     const { indexableContent: _, ...skillData } = skill;
     return skillData;
   }
   async has(name) {
     await this.#ensureInitialized();
-    return this.#skills.has(name);
+    return (this.#resolveByName(name) ?? this.#resolveByPath(name)) !== null;
+  }
+  // ===========================================================================
+  // Skill Resolution (Private)
+  // ===========================================================================
+  /**
+   * Resolve a skill by name with tie-breaking when multiple candidates exist.
+   * Priority: local > managed > external, then alphabetical path.
+   */
+  #resolveByName(name) {
+    const candidates = this.#skills.get(name);
+    if (!candidates || candidates.length === 0) return null;
+    return this.#tieBreak(candidates);
+  }
+  /**
+   * Resolve a skill by exact path (escape hatch for disambiguation).
+   * Searches across all candidate arrays.
+   */
+  #resolveByPath(skillPath) {
+    for (const candidates of this.#skills.values()) {
+      const match = candidates.find((s) => s.path === skillPath);
+      if (match) return match;
+    }
+    return null;
+  }
+  /**
+   * Pick the winning skill from an array of same-named candidates.
+   * When there's only one candidate, returns it directly (no warning).
+   * When there are multiple, applies source-type priority and warns.
+   *
+   * Priority: local (0) > managed (1) > external (2).
+   * Throws if source-type priority can't resolve the tie (e.g., two local skills with same name).
+   */
+  #tieBreak(candidates) {
+    if (candidates.length === 0) return null;
+    if (candidates.length === 1) return candidates[0];
+    const SOURCE_PRIORITY = { local: 0, managed: 1, external: 2 };
+    const sorted = [...candidates].sort((a, b) => {
+      const aPri = SOURCE_PRIORITY[a.source.type] ?? 99;
+      const bPri = SOURCE_PRIORITY[b.source.type] ?? 99;
+      if (aPri !== bPri) return aPri - bPri;
+      return a.path.localeCompare(b.path);
+    });
+    const winner = sorted[0];
+    const runnerUp = sorted[1];
+    if (winner.source.type === runnerUp.source.type) {
+      const paths = sorted.filter((s) => s.source.type === winner.source.type).map((s) => `"${s.path}"`).join(", ");
+      throw new Error(
+        `[WorkspaceSkills] Cannot resolve skill "${winner.name}": multiple ${winner.source.type} skills found at ${paths}. Rename one or move it to a different source type.`
+      );
+    }
+    console.warn(
+      `[WorkspaceSkills] Multiple skills named "${winner.name}" found. Using "${winner.path}" (source: ${winner.source.type}). Other candidates: ${sorted.slice(1).map((s) => `"${s.path}" (${s.source.type})`).join(", ")}`
+    );
+    return winner;
   }
   async refresh() {
-    for (const skill of this.#skills.values()) {
-      await this.#removeSkillFromIndex(skill);
+    for (const candidates of this.#skills.values()) {
+      for (const skill of candidates) {
+        await this.#removeSkillFromIndex(skill);
+      }
     }
     this.#skills.clear();
     this.#initialized = false;
@@ -5078,20 +5141,31 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
     }
     const source = this.#inferSource(skillPath);
     const skill = await this.#parseSkillFile(skillFilePath, dirName, source);
-    const existing = this.#skills.get(skill.name);
-    if (existing) {
-      await this.#removeSkillFromIndex(existing);
+    const candidates = this.#skills.get(skill.name) ?? [];
+    const existingIdx = candidates.findIndex((s) => s.path === skill.path);
+    if (existingIdx >= 0) {
+      await this.#removeSkillFromIndex(candidates[existingIdx]);
+      candidates[existingIdx] = skill;
+    } else {
+      candidates.push(skill);
     }
-    this.#skills.set(skill.name, skill);
+    this.#skills.set(skill.name, candidates);
     await this.#indexSkill(skill);
     this.#lastDiscoveryTime = Date.now();
   }
   async removeSkill(skillName) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(skillName);
+    const skill = this.#resolveByName(skillName) ?? this.#resolveByPath(skillName);
     if (!skill) return;
     await this.#removeSkillFromIndex(skill);
-    this.#skills.delete(skillName);
+    const candidates = this.#skills.get(skill.name);
+    if (candidates) {
+      const idx = candidates.findIndex((s) => s.path === skill.path);
+      if (idx >= 0) candidates.splice(idx, 1);
+      if (candidates.length === 0) {
+        this.#skills.delete(skill.name);
+      }
+    }
     this.#lastDiscoveryTime = Date.now();
   }
   /**
@@ -5129,17 +5203,20 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
     });
     const results = [];
     for (const result of searchResults) {
-      const skillName = result.metadata?.skillName;
+      const skillPath = result.metadata?.skillPath;
       const source = result.metadata?.source;
-      if (!skillName || !source) continue;
-      if (skillNames && !skillNames.includes(skillName)) {
+      if (!skillPath || !source) continue;
+      const skill = this.#resolveByPath(skillPath);
+      if (!skill) continue;
+      if (skillNames && !skillNames.includes(skill.name)) {
         continue;
       }
       if (!includeReferences && source !== "SKILL.md") {
         continue;
       }
       results.push({
-        skillName,
+        skillName: skill.name,
+        skillPath: skill.path,
         source,
         content: result.content,
         score: result.score,
@@ -5155,7 +5232,7 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
   // ===========================================================================
   async getReference(skillName, referencePath) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(skillName);
+    const skill = this.#resolveByName(skillName) ?? this.#resolveByPath(skillName);
     if (!skill) return null;
     const safeRefPath = this.#assertRelativePath(referencePath, "reference");
     const refFilePath = this.#joinPath(skill.path, safeRefPath);
@@ -5171,7 +5248,7 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
   }
   async getScript(skillName, scriptPath) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(skillName);
+    const skill = this.#resolveByName(skillName) ?? this.#resolveByPath(skillName);
     if (!skill) return null;
     const safeScriptPath = this.#assertRelativePath(scriptPath, "script");
     const scriptFilePath = this.#joinPath(skill.path, safeScriptPath);
@@ -5187,7 +5264,7 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
   }
   async getAsset(skillName, assetPath) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(skillName);
+    const skill = this.#resolveByName(skillName) ?? this.#resolveByPath(skillName);
     if (!skill) return null;
     const safeAssetPath = this.#assertRelativePath(assetPath, "asset");
     const assetFilePath = this.#joinPath(skill.path, safeAssetPath);
@@ -5206,17 +5283,17 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
   // ===========================================================================
   async listReferences(skillName) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(skillName);
+    const skill = this.#resolveByName(skillName) ?? this.#resolveByPath(skillName);
     return skill?.references ?? [];
   }
   async listScripts(skillName) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(skillName);
+    const skill = this.#resolveByName(skillName) ?? this.#resolveByPath(skillName);
     return skill?.scripts ?? [];
   }
   async listAssets(skillName) {
     await this.#ensureInitialized();
-    const skill = this.#skills.get(skillName);
+    const skill = this.#resolveByName(skillName) ?? this.#resolveByPath(skillName);
     return skill?.assets ?? [];
   }
   // ===========================================================================
@@ -5247,6 +5324,20 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
     })();
     await this.#initPromise;
   }
+  /**
+   * Add a skill to the candidates map, keyed by name.
+   * Replaces an existing entry at the same path (update case), otherwise appends.
+   */
+  #addToSkillsMap(skill) {
+    const candidates = this.#skills.get(skill.name) ?? [];
+    const idx = candidates.findIndex((s) => s.path === skill.path);
+    if (idx >= 0) {
+      candidates[idx] = skill;
+    } else {
+      candidates.push(skill);
+    }
+    this.#skills.set(skill.name, candidates);
+  }
   /**
    * Discover skills from all skills paths.
    * Uses currently resolved paths (must be set before calling).
@@ -5331,7 +5422,7 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
         if (await this.#source.exists(skillFilePath)) {
           try {
             const skill = await this.#parseSkillFile(skillFilePath, entry.name, source);
-            this.#skills.set(skill.name, skill);
+            this.#addToSkillsMap(skill);
             await this.#indexSkill(skill);
           } catch (error) {
             if (error instanceof Error) {
@@ -5366,7 +5457,7 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
         const dirName = skillDir.split("/").pop() || skillDir;
         try {
           const skill = await this.#parseSkillFile(skillsPath, dirName, source);
-          this.#skills.set(skill.name, skill);
+          this.#addToSkillsMap(skill);
           await this.#indexSkill(skill);
         } catch (error) {
           if (error instanceof Error) {
@@ -5381,7 +5472,7 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
           const dirName = skillsPath.split("/").pop() || skillsPath;
           try {
             const skill = await this.#parseSkillFile(skillFilePath, dirName, source);
-            this.#skills.set(skill.name, skill);
+            this.#addToSkillsMap(skill);
             await this.#indexSkill(skill);
           } catch (error) {
             if (error instanceof Error) {
@@ -5473,8 +5564,10 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
     const parsed = matter(content);
     const frontmatter = parsed.data;
     const body = parsed.content.trim();
+    const skillPath = this.#getParentPath(filePath);
     const metadata = {
       name: frontmatter.name,
+      path: skillPath,
       description: frontmatter.description,
       license: frontmatter.license,
       compatibility: frontmatter.compatibility,
@@ -5487,14 +5580,12 @@ var WorkspaceSkillsImpl = class _WorkspaceSkillsImpl {
 ${validation.errors.join("\n")}`);
       }
     }
-    const skillPath = this.#getParentPath(filePath);
     const references = await this.#discoverFilesInSubdir(skillPath, "references");
     const scripts = await this.#discoverFilesInSubdir(skillPath, "scripts");
     const assets = await this.#discoverFilesInSubdir(skillPath, "assets");
     const indexableContent = await this.#buildIndexableContent(body, skillPath, references);
     return {
       ...metadata,
-      path: skillPath,
       instructions: body,
       source,
       references,
@@ -5572,7 +5663,7 @@ ${validation.errors.join("\n")}`);
    */
   async #removeSkillFromIndex(skill) {
     if (!this.#searchEngine?.remove) return;
-    const ids = [`skill:${skill.name}:SKILL.md`, ...skill.references.map((r) => `skill:${skill.name}:${r}`)];
+    const ids = [`skill:${skill.path}:SKILL.md`, ...skill.references.map((r) => `skill:${skill.path}:${r}`)];
     for (const id of ids) {
       try {
         await this.#searchEngine.remove(id);
@@ -5597,10 +5688,10 @@ ${validation.errors.join("\n")}`);
   async #indexSkill(skill) {
     if (!this.#searchEngine) return;
     await this.#searchEngine.index({
-      id: `skill:${skill.name}:SKILL.md`,
+      id: `skill:${skill.path}:SKILL.md`,
       content: skill.instructions,
       metadata: {
-        skillName: skill.name,
+        skillPath: skill.path,
         source: "SKILL.md"
       }
     });
@@ -5610,10 +5701,10 @@ ${validation.errors.join("\n")}`);
         const rawContent = await this.#source.readFile(fullPath);
         const content = typeof rawContent === "string" ? rawContent : rawContent.toString("utf-8");
         await this.#searchEngine.index({
-          id: `skill:${skill.name}:${refPath}`,
+          id: `skill:${skill.path}:${refPath}`,
           content,
           metadata: {
-            skillName: skill.name,
+            skillPath: skill.path,
             source: `references/${refPath}`
           }
         });
@@ -5628,13 +5719,16 @@ ${validation.errors.join("\n")}`);
     const { topK = 5, skillNames, includeReferences = true } = options;
     const queryLower = query.toLowerCase();
     const results = [];
-    for (const skill of this.#skills.values()) {
+    for (const candidates of this.#skills.values()) {
+      const skill = this.#tieBreak(candidates);
+      if (!skill) continue;
       if (skillNames && !skillNames.includes(skill.name)) {
         continue;
       }
       if (skill.instructions.toLowerCase().includes(queryLower)) {
         results.push({
           skillName: skill.name,
+          skillPath: skill.path,
           source: "SKILL.md",
           content: skill.instructions.substring(0, 200),
           score: 1
@@ -5647,6 +5741,7 @@ ${validation.errors.join("\n")}`);
           if (content && content.toLowerCase().includes(queryLower)) {
             results.push({
               skillName: skill.name,
+              skillPath: skill.path,
               source: `references/${refPath}`,
               content: content.substring(0, 200),
               score: 0.8
@@ -5852,20 +5947,24 @@ function createSkillTools(skills) {
     skill_read: createSkillReadTool(skills)
   };
 }
+async function resolveSkill(skills, identifier) {
+  const skill = await skills.get(identifier);
+  if (skill) return { skill };
+  const allSkills = await skills.list();
+  const skillEntries = allSkills.map((s) => `${s.name} (${s.path})`);
+  return { notFound: `Skill "${identifier}" not found. Available skills: ${skillEntries.join(", ")}` };
+}
 function createSkillTool(skills) {
   const tool = createTool({
     id: "skill",
     description: "Activate a skill to load its full instructions. You should activate skills proactively when they are relevant to the user's request without asking for permission first.",
     inputSchema: z.object({
-      name: z.string().describe("The name of the skill to activate")
+      name: z.string().describe("The name or path of the skill to activate. Use the path when multiple skills share the same name.")
     }),
     execute: async ({ name }) => {
-      const skill = await skills.get(name);
-      if (!skill) {
-        const skillsList = await skills.list();
-        const skillNames = skillsList.map((s) => s.name);
-        return `Skill "${name}" not found. Available skills: ${skillNames.join(", ")}`;
-      }
+      const result = await resolveSkill(skills, name);
+      if ("notFound" in result) return result.notFound;
+      const { skill } = result;
       const parts = [skill.instructions];
       if (skill.references?.length) {
         parts.push(`
@@ -5919,32 +6018,31 @@ function createSkillReadTool(skills) {
     id: "skill_read",
     description: "Read a file from a skill directory (references, scripts, or assets). The path is relative to the skill root.",
     inputSchema: z.object({
-      skillName: z.string().describe("The name of the skill"),
+      skillName: z.string().describe("The name or path of the skill. Use the path when multiple skills share the same name."),
       path: z.string().describe('Path to the file relative to the skill root (e.g. "references/colors.md", "scripts/run.sh")'),
       startLine: z.number().optional().describe("Starting line number (1-indexed). If omitted, starts from the beginning."),
       endLine: z.number().optional().describe("Ending line number (1-indexed, inclusive). If omitted, reads to the end.")
     }),
     execute: async ({ skillName, path: path7, startLine, endLine }) => {
-      if (!await skills.has(skillName)) {
-        return `Skill "${skillName}" not found.`;
-      }
+      const resolved = await resolveSkill(skills, skillName);
+      if ("notFound" in resolved) return resolved.notFound;
+      const resolvedPath = resolved.skill.path;
       let content = null;
-      content = await skills.getReference(skillName, path7);
-      if (content === null) content = await skills.getScript(skillName, path7);
-      if (content === null) content = await skills.getAsset(skillName, path7);
+      content = await skills.getReference(resolvedPath, path7);
+      if (content === null) content = await skills.getScript(resolvedPath, path7);
+      if (content === null) content = await skills.getAsset(resolvedPath, path7);
       if (content === null) {
-        const refs = (await skills.listReferences(skillName)).map((f) => `references/${f}`);
-        const scripts = (await skills.listScripts(skillName)).map((f) => `scripts/${f}`);
-        const assets = (await skills.listAssets(skillName)).map((f) => `assets/${f}`);
-        const allFiles = [...refs, ...scripts, ...assets];
+        const refs = (await skills.listReferences(resolvedPath)).map((f) => `references/${f}`);
+        const scriptsList = (await skills.listScripts(resolvedPath)).map((f) => `scripts/${f}`);
+        const assets = (await skills.listAssets(resolvedPath)).map((f) => `assets/${f}`);
+        const allFiles = [...refs, ...scriptsList, ...assets];
         const fileList = allFiles.length > 0 ? `
 Available files: ${allFiles.join(", ")}` : "";
         return `File "${path7}" not found in skill "${skillName}".${fileList}`;
       }
       const textContent = typeof content === "string" ? content : content.toString("utf-8");
       if (textContent.slice(0, 1e3).includes("\0")) {
-        const skill = await skills.get(skillName);
-        const fullPath = skill ? `${skill.path}/${path7}` : path7;
+        const fullPath = `${resolved.skill.path}/${path7}`;
         const size = typeof content === "string" ? Buffer.byteLength(content) : content.length;
         return `Binary file: ${fullPath} (${size} bytes)`;
       }
@@ -6125,7 +6223,7 @@ var Workspace = class {
    * @example
    * ```typescript
    * const skills = await workspace.skills?.list();
-   * const skill = await workspace.skills?.get('brand-guidelines');
+   * const skill = await workspace.skills?.get('skills/brand-guidelines');
    * const results = await workspace.skills?.search('brand colors');
    * ```
    */
@@ -8001,5 +8099,5 @@ function createWorkspaceTools(workspace) {
 }
 
 export { BM25Index, CompositeFilesystem, CompositeVersionedSkillSource, DirectoryNotEmptyError, DirectoryNotFoundError, FileExistsError, FileNotFoundError, FileReadRequiredError, FilesystemError, FilesystemNotAvailableError, FilesystemNotMountableError, FilesystemNotReadyError, IsDirectoryError, IsolationUnavailableError, LocalFilesystem, LocalSandbox, LocalSkillSource, MastraFilesystem, MastraSandbox, MountError, MountManager, MountNotSupportedError, NotDirectoryError, PermissionError, ProcessHandle, SandboxError, SandboxExecutionError, SandboxFeatureNotSupportedError, SandboxNotAvailableError, SandboxNotReadyError, SandboxProcessManager, SandboxTimeoutError, SearchNotAvailableError, StaleFileError, VersionedSkillSource, WORKSPACE_TOOLS, WORKSPACE_TOOLS_PREFIX, Workspace, WorkspaceError, WorkspaceNotAvailableError, WorkspaceNotReadyError, WorkspaceReadOnlyError, callLifecycle, collectSkillForPublish, createGlobMatcher, createSkillTools, createWorkspaceTools, deleteFileTool, detectIsolation, editFileTool, executeCommandTool, extractGlobBase, fileStatTool, getRecommendedIsolation, getTiktoken, indexContentTool, isGlobPattern, isIsolationAvailable, listFilesTool, matchGlob, mkdirTool, publishSkillFromSource, readFileTool, requireFilesystem, requireSandbox, requireWorkspace, resolveToolConfig, searchTool, writeFileTool };
-//# sourceMappingURL=chunk-L53XY7WT.js.map
-//# sourceMappingURL=chunk-L53XY7WT.js.map
+//# sourceMappingURL=chunk-WEKILIGZ.js.map
+//# sourceMappingURL=chunk-WEKILIGZ.js.map