agentinit 1.16.1 → 1.17.0

package/dist/cli.js

@@ -16945,6 +16945,13 @@ var init_marketplaceRegistry = __esm(() => {
   CUSTOM_MARKETPLACE_CACHE_TTL_MS = 3600000;
 });
 
+// dist/types/skills.js
+var SHARED_SKILLS_TARGET_ID, SHARED_SKILLS_TARGET_NAME;
+var init_skills = __esm(() => {
+  SHARED_SKILLS_TARGET_ID = "agents";
+  SHARED_SKILLS_TARGET_NAME = "AGENTS.md ecosystem";
+});
+
 // dist/core/mcpFilter.js
 class MCPFilter {
   static filterForAgent(agent, servers) {
@@ -18518,7 +18525,7 @@ var init_pluginManager = __esm(() => {
 });
 
 // dist/core/skillsManager.js
-import {resolve as resolve8, join as join5, relative as relative3} from "path";
+import {resolve as resolve8, join as join5, relative as relative3, basename as basename3, dirname as dirname3} from "path";
 import {promises as fs24} from "fs";
 import {homedir as homedir5, tmpdir} from "os";
 import {execFile} from "child_process";
@@ -18526,6 +18533,7 @@ import {promisify} from "util";
 
 class SkillsManager {
   agentManager;
+  preparedSourceContexts = new Map;
   constructor(agentManager3) {
     this.agentManager = agentManager3 || new AgentManager;
   }
@@ -18533,15 +18541,9 @@ class SkillsManager {
     if (source.startsWith(".") || source.startsWith("/") || source.startsWith("~")) {
       return { type: "local", path: source };
     }
-    if (source.startsWith("https://github.com/") || source.startsWith("http://github.com/")) {
-      const url = source.replace(/\.git$/, "");
-      const match = url.match(/github\.com\/([^/]+)\/([^/]+)/);
-      return {
-        type: "github",
-        url: `https://github.com/${match?.[1]}/${match?.[2]}.git`,
-        owner: match?.[1],
-        repo: match?.[2]
-      };
+    const githubUrlSource = this.parseGitHubHttpSource(source);
+    if (githubUrlSource) {
+      return githubUrlSource;
     }
     if (source.startsWith("git@") || source.endsWith(".git")) {
       return { type: "github", url: source };
@@ -18556,6 +18558,10 @@ class SkillsManager {
         pluginName: source
       };
     }
+    const githubShorthandSource = this.parseGitHubShorthandSource(source);
+    if (githubShorthandSource?.subpath) {
+      return githubShorthandSource;
+    }
     const marketplacePrefixMatch = source.match(/^([a-zA-Z0-9._-]+)\/(.+)$/);
     if (marketplacePrefixMatch) {
       const [, marketplaceId, pluginName] = marketplacePrefixMatch;
@@ -18567,14 +18573,8 @@ class SkillsManager {
         };
       }
     }
-    if (/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/.test(source)) {
-      const [owner, repo] = source.split("/");
-      return {
-        type: "github",
-        url: `https://github.com/${owner}/${repo}.git`,
-        owner,
-        repo
-      };
+    if (githubShorthandSource) {
+      return githubShorthandSource;
     }
     return { type: "local", path: source };
   }
@@ -18613,6 +18613,54 @@ class SkillsManager {
       implicitSkills: []
     };
   }
+  parseGitHubHttpSource(source) {
+    if (!source.startsWith("https://github.com/") && !source.startsWith("http://github.com/")) {
+      return null;
+    }
+    try {
+      const parsedUrl = new URL(source);
+      const segments = parsedUrl.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+      if (segments.length < 2) {
+        return null;
+      }
+      const [owner, rawRepo, ...rest] = segments;
+      const repo = rawRepo?.replace(/\.git$/, "");
+      if (!owner || !repo) {
+        return null;
+      }
+      let subpath;
+      if (rest[0] === "tree" || rest[0] === "blob") {
+        if (rest.length > 2) {
+          subpath = rest.slice(2).join("/");
+        }
+      } else if (rest.length > 0) {
+        subpath = rest.join("/");
+      }
+      return {
+        type: "github",
+        url: `https://github.com/${owner}/${repo}.git`,
+        owner,
+        repo,
+        ...subpath ? { subpath } : {}
+      };
+    } catch {
+      return null;
+    }
+  }
+  parseGitHubShorthandSource(source) {
+    const githubShorthandMatch = source.match(/^([a-zA-Z0-9._-]+)\/([a-zA-Z0-9._-]+)(?:\/(.+))?$/);
+    if (!githubShorthandMatch) {
+      return null;
+    }
+    const [, owner, repo, subpath] = githubShorthandMatch;
+    return {
+      type: "github",
+      url: `https://github.com/${owner}/${repo}.git`,
+      owner,
+      repo,
+      ...subpath ? { subpath } : {}
+    };
+  }
   async parseSkillMd(filePath) {
     const content = await readFileIfExists(filePath);
     if (!content)
@@ -18628,7 +18676,7 @@ class SkillsManager {
     }
   }
   async discoverSkills(repoPath) {
-    const skills = [];
+    const skills2 = [];
     const seen = new Set;
     for (const searchDir of SKILL_SEARCH_DIRS) {
       const fullDir = resolve8(repoPath, searchDir);
@@ -18639,7 +18687,7 @@ class SkillsManager {
         const parsed = await this.parseSkillMd(directSkillMd);
         if (parsed && !seen.has(parsed.name)) {
           seen.add(parsed.name);
-          skills.push({ ...parsed, path: resolve8(fullDir) });
+          skills2.push({ ...parsed, path: resolve8(fullDir) });
         }
       }
       const directSkillMdLower = join5(fullDir, "skill.md");
@@ -18647,7 +18695,7 @@ class SkillsManager {
         const parsed = await this.parseSkillMd(directSkillMdLower);
         if (parsed && !seen.has(parsed.name)) {
           seen.add(parsed.name);
-          skills.push({ ...parsed, path: resolve8(fullDir) });
+          skills2.push({ ...parsed, path: resolve8(fullDir) });
         }
       }
       if (!await isDirectory(fullDir))
@@ -18665,11 +18713,11 @@ class SkillsManager {
         const parsed = await this.parseSkillMd(skillFile);
         if (parsed && !seen.has(parsed.name)) {
           seen.add(parsed.name);
-          skills.push({ ...parsed, path: entryPath });
+          skills2.push({ ...parsed, path: entryPath });
         }
       }
     }
-    return skills;
+    return skills2;
   }
   async cloneRepo(url) {
     const tempDir = await fs24.mkdtemp(join5(tmpdir(), "agentinit-skills-"));
@@ -18732,13 +18780,55 @@ class SkillsManager {
       warnings
     };
   }
-  async discoverFromSource(source, projectPath, options2 = {}) {
+  async cleanupTempDir(tempDir) {
+    if (!tempDir) {
+      return;
+    }
+    await fs24.rm(tempDir, { recursive: true, force: true }).catch(() => {
+    });
+  }
+  async resolveDiscoveryRoot(repoPath, source, sourceLabel) {
+    const resolvedRepoPath = resolve8(repoPath);
+    if (source.type !== "github" || !source.subpath) {
+      return resolvedRepoPath;
+    }
+    const discoveryRoot = resolve8(resolvedRepoPath, source.subpath);
+    if (!this.isWithinPath(resolvedRepoPath, discoveryRoot)) {
+      throw new Error(`Invalid GitHub source path "${source.subpath}" in ${sourceLabel}`);
+    }
+    if (!await fileExists(discoveryRoot)) {
+      throw new Error(`Source path not found in repository: ${sourceLabel}`);
+    }
+    const [realRepoPath, realDiscoveryRoot] = await Promise.all([
+      resolveRealPathOrSelf(resolvedRepoPath),
+      resolveRealPathOrSelf(discoveryRoot)
+    ]);
+    if (!this.isWithinPath(realRepoPath, realDiscoveryRoot)) {
+      throw new Error(`Invalid GitHub source path "${source.subpath}" in ${sourceLabel}`);
+    }
+    if (await isDirectory(realDiscoveryRoot)) {
+      return realDiscoveryRoot;
+    }
+    if (basename3(realDiscoveryRoot).toLowerCase() === "skill.md") {
+      return dirname3(realDiscoveryRoot);
+    }
+    throw new Error(`GitHub source must reference a skill directory or SKILL.md: ${sourceLabel}`);
+  }
+  async loadDiscoveredSkillsContext(source, projectPath, options2 = {}) {
     const request = this.resolveSourceRequest(source, options2);
     const resolved = request.source;
     let tempDir = null;
+    const cleanup = async () => {
+      await this.cleanupTempDir(tempDir);
+      tempDir = null;
+    };
     try {
       if (resolved.type === "marketplace") {
-        return await this.discoverMarketplaceSkills(resolved, projectPath);
+        const discovered = await this.discoverMarketplaceSkills(resolved, projectPath);
+        return {
+          ...discovered,
+          cleanup
+        };
       }
       let repoPath;
       if (resolved.type === "github") {
@@ -18753,30 +18843,71 @@ class SkillsManager {
           throw this.getMissingLocalPathError(source, repoPath);
         }
       }
-      let skills = await this.discoverSkills(repoPath);
+      const discoveryRoot = await this.resolveDiscoveryRoot(repoPath, resolved, source);
+      let skills2 = await this.discoverSkills(discoveryRoot);
       let pluginWarnings = [];
-      if (skills.length === 0) {
-        const pluginBackedSkills = await this.discoverPortablePluginSkills(repoPath, source, resolved, projectPath);
+      if (skills2.length === 0) {
+        const pluginBackedSkills = await this.discoverPortablePluginSkills(discoveryRoot, source, resolved, projectPath);
         if (pluginBackedSkills) {
-          skills = pluginBackedSkills.skills;
+          skills2 = pluginBackedSkills.skills;
           pluginWarnings = pluginBackedSkills.warnings;
         }
       }
       if (request.implicitSkills.length > 0) {
         const names = new Set(request.implicitSkills.map((skill) => skill.toLowerCase()));
-        skills = skills.filter((skill) => names.has(skill.name.toLowerCase()));
+        skills2 = skills2.filter((skill) => names.has(skill.name.toLowerCase()));
       }
       const warnings = [
         ...pluginWarnings,
         ...request.implicitSkills.length > 0 ? [`Resolved "${source}" from the default skills catalog ${DEFAULT_SKILLS_CATALOG.owner}/${DEFAULT_SKILLS_CATALOG.repo}. Use "./${source}" for a local path.`] : []
       ];
-      return { skills, warnings };
+      return { skills: skills2, warnings, cleanup };
+    } catch (error) {
+      await cleanup();
+      throw error;
+    }
+  }
+  async discoverFromSource(source, projectPath, options2 = {}) {
+    const context = await this.loadDiscoveredSkillsContext(source, projectPath, options2);
+    try {
+      return {
+        skills: context.skills,
+        warnings: context.warnings
+      };
     } finally {
-      if (tempDir) {
-        await fs24.rm(tempDir, { recursive: true, force: true }).catch(() => {
-        });
-      }
+      await context.cleanup();
+    }
+  }
+  getPreparedSourceKey(source, projectPath, from) {
+    return `${projectPath}\n${from || ""}\n${source}`;
+  }
+  async storePreparedSourceContext(source, projectPath, from, context) {
+    const key = this.getPreparedSourceKey(source, projectPath, from);
+    const existing = this.preparedSourceContexts.get(key);
+    this.preparedSourceContexts.set(key, context);
+    if (existing && existing !== context) {
+      await existing.cleanup();
+    }
+  }
+  takePreparedSourceContext(source, projectPath, from) {
+    const key = this.getPreparedSourceKey(source, projectPath, from);
+    const existing = this.preparedSourceContexts.get(key) || null;
+    if (existing) {
+      this.preparedSourceContexts.delete(key);
     }
+    return existing;
+  }
+  async prepareSource(source, projectPath, options2 = {}) {
+    const context = await this.loadDiscoveredSkillsContext(source, projectPath, options2);
+    await this.storePreparedSourceContext(source, projectPath, options2.from, context);
+    return {
+      skills: context.skills,
+      warnings: context.warnings
+    };
+  }
+  async discardPreparedSource(source, projectPath, options2 = {}) {
+    const context = this.takePreparedSourceContext(source, projectPath, options2.from);
+    await context?.cleanup();
   }
   async getTargetAgents(projectPath, options2) {
     if (options2.agents && options2.agents.length > 0) {
@@ -18905,6 +19036,27 @@ class SkillsManager {
     }
     return plan;
   }
+  async installSkillToCanonicalStore(skillPath, skillName, projectPath, options2 = {}) {
+    const plan = this.getCanonicalInstallPlan(skillName, projectPath, options2);
+    await this.cleanAndCreateDirectory(plan.path);
+    await this.copyDir(skillPath, plan.path);
+    return plan;
+  }
+  async installSkillFromContentToCanonicalStore(skillName, skillContent, projectPath, options2 = {}) {
+    const plan = this.getCanonicalInstallPlan(skillName, projectPath, options2);
+    await this.cleanAndCreateDirectory(plan.path);
+    await fs24.writeFile(join5(plan.path, "SKILL.md"), skillContent, "utf8");
+    return plan;
+  }
+  getCanonicalInstallPlan(skillName, projectPath, options2 = {}) {
+    const normalizedSkillName = this.normalizeSkillName(skillName);
+    const canonicalPath = this.resolveInstallPath(this.getCanonicalSkillsDir(projectPath, options2.global ?? false), normalizedSkillName);
+    return {
+      path: canonicalPath,
+      canonicalPath,
+      mode: "symlink"
+    };
+  }
   normalizeSkillName(skillName) {
     const normalized = skillName.trim();
     if (!normalized) {
@@ -18940,58 +19092,76 @@ class SkillsManager {
     await fs24.cp(src, dest, { recursive: true, dereference: true });
   }
   async addFromSource(source, projectPath, options2 = {}) {
-    const discovered = await this.discoverFromSource(source, projectPath, {
+    const context = this.takePreparedSourceContext(source, projectPath, options2.from) || await this.loadDiscoveredSkillsContext(source, projectPath, {
       ...options2.from !== undefined ? { from: options2.from } : {}
     });
-    let skills = discovered.skills;
-    if (skills.length === 0) {
-      return { installed: [], skipped: [], warnings: discovered.warnings };
-    }
-    if (options2.skills && options2.skills.length > 0) {
-      const names = new Set(options2.skills.map((skill) => skill.toLowerCase()));
-      skills = skills.filter((skill) => names.has(skill.name.toLowerCase()));
-    }
-    const agents = await this.getTargetAgents(projectPath, options2);
-    if (agents.length === 0) {
-      return {
-        installed: [],
-        skipped: skills.map((skill) => ({ skill, reason: "No target agents found" })),
-        warnings: discovered.warnings
-      };
-    }
-    const result = { installed: [], skipped: [], warnings: discovered.warnings };
-    const installableAgents = [];
-    for (const agent of agents) {
-      if (!agent.supportsSkills()) {
-        for (const skill of skills) {
-          result.skipped.push({ skill, reason: `${agent.name} does not support skills` });
+    try {
+      let skills2 = context.skills;
+      if (skills2.length === 0) {
+        return { installed: [], skipped: [], warnings: context.warnings };
+      }
+      if (options2.skills && options2.skills.length > 0) {
+        const names = new Set(options2.skills.map((skill) => skill.toLowerCase()));
+        skills2 = skills2.filter((skill) => names.has(skill.name.toLowerCase()));
+      }
+      const installToSharedStore = options2.agents?.includes(SHARED_SKILLS_TARGET_ID) ?? false;
+      const agents = await this.getTargetAgents(projectPath, options2);
+      if (agents.length === 0 && !installToSharedStore) {
+        return {
+          installed: [],
+          skipped: skills2.map((skill) => ({ skill, reason: "No target agents found" })),
+          warnings: context.warnings
+        };
+      }
+      const result = { installed: [], skipped: [], warnings: context.warnings };
+      const installableAgents = [];
+      if (installToSharedStore) {
+        for (const skill of skills2) {
+          try {
+            const installOptions = {
+              ...options2.global !== undefined ? { global: options2.global } : {}
+            };
+            const installed = skill.generatedContent ? await this.installSkillFromContentToCanonicalStore(skill.name, skill.generatedContent, projectPath, installOptions) : await this.installSkillToCanonicalStore(skill.path, skill.name, projectPath, installOptions);
+            result.installed.push({ skill, agent: SHARED_SKILLS_TARGET_ID, ...installed });
+          } catch (error) {
+            result.skipped.push({ skill, reason: error.message });
+          }
         }
-        continue;
       }
-      const skillsDir = agent.getSkillsDir(projectPath, options2.global);
-      if (!skillsDir) {
-        for (const skill of skills) {
-          result.skipped.push({ skill, reason: `No skills directory for ${agent.name}` });
+      for (const agent of agents) {
+        if (!agent.supportsSkills()) {
+          for (const skill of skills2) {
+            result.skipped.push({ skill, reason: `${agent.name} does not support skills` });
+          }
+          continue;
         }
-        continue;
+        const skillsDir = agent.getSkillsDir(projectPath, options2.global);
+        if (!skillsDir) {
+          for (const skill of skills2) {
+            result.skipped.push({ skill, reason: `No skills directory for ${agent.name}` });
+          }
+          continue;
+        }
+        installableAgents.push(agent);
       }
-      installableAgents.push(agent);
-    }
-    for (const skill of skills) {
-      for (const agent of installableAgents) {
-        try {
-          const installOptions = {
-            ...options2.global !== undefined ? { global: options2.global } : {},
-            ...options2.copy !== undefined ? { copy: options2.copy } : {}
-          };
-          const installed = skill.generatedContent ? await this.installSkillFromContentForAgent(skill.name, skill.generatedContent, agent, projectPath, installOptions) : await this.installSkillForAgent(skill.path, skill.name, agent, projectPath, installOptions);
-          result.installed.push({ skill, agent: agent.id, ...installed });
-        } catch (error) {
-          result.skipped.push({ skill, reason: error.message });
+      for (const skill of skills2) {
+        for (const agent of installableAgents) {
+          try {
+            const installOptions = {
+              ...options2.global !== undefined ? { global: options2.global } : {},
+              ...options2.copy !== undefined ? { copy: options2.copy } : {}
+            };
+            const installed = skill.generatedContent ? await this.installSkillFromContentForAgent(skill.name, skill.generatedContent, agent, projectPath, installOptions) : await this.installSkillForAgent(skill.path, skill.name, agent, projectPath, installOptions);
+            result.installed.push({ skill, agent: agent.id, ...installed });
+          } catch (error) {
+            result.skipped.push({ skill, reason: error.message });
+          }
         }
       }
+      return result;
+    } finally {
+      await context.cleanup();
     }
-    return result;
   }
   async listInstalled(projectPath, options2 = {}) {
     const agents = await this.getTargetAgents(projectPath, options2);
@@ -19053,6 +19223,43 @@ class SkillsManager {
         }
       }
     }
+    const includeSharedTarget = !options2.agents || options2.agents.includes(SHARED_SKILLS_TARGET_ID);
+    if (includeSharedTarget) {
+      const scopes = options2.global ? ["global"] : ["project", "global"];
+      const referencedCanonicalPaths = new Set(installed.map((entry) => entry.canonicalPath).filter((value) => !!value).map((value) => resolve8(value)));
+      for (const scope of scopes) {
+        const canonicalDir = this.getCanonicalSkillsDir(projectPath, scope === "global");
+        if (!await fileExists(canonicalDir))
+          continue;
+        const entries = await listFiles(canonicalDir);
+        for (const entry of entries) {
+          const entryPath = join5(canonicalDir, entry);
+          if (!await isDirectory(entryPath))
+            continue;
+          const resolvedEntryPath = resolve8(entryPath);
+          if (referencedCanonicalPaths.has(resolvedEntryPath))
+            continue;
+          const skillMdPath = join5(entryPath, "SKILL.md");
+          const skillMdPathLower = join5(entryPath, "skill.md");
+          const skillFile = await fileExists(skillMdPath) ? skillMdPath : await fileExists(skillMdPathLower) ? skillMdPathLower : null;
+          if (!skillFile)
+            continue;
+          const parsed = await this.parseSkillMd(skillFile);
+          if (!parsed)
+            continue;
+          installed.push({
+            name: parsed.name,
+            description: parsed.description,
+            path: entryPath,
+            canonicalPath: resolvedEntryPath,
+            agent: SHARED_SKILLS_TARGET_ID,
+            scope,
+            isSymlink: false,
+            mode: "symlink"
+          });
+        }
+      }
+    }
     return installed;
   }
   async remove(skillNames, projectPath, options2 = {}) {
@@ -19063,11 +19270,19 @@ class SkillsManager {
     const skipped = [];
     const namesLower = new Set(skillNames.map((n) => n.toLowerCase()));
     const targetAgentIds = new Set(agents.map((agent) => agent.id));
+    if (options2.agents?.includes(SHARED_SKILLS_TARGET_ID) || options2.agents === undefined) {
+      targetAgentIds.add(SHARED_SKILLS_TARGET_ID);
+    }
     const installed = await this.listInstalledForAgents(projectPath, allAgents, options2);
-    const scopedInstalled = installed.filter((entry) => options2.global ? entry.scope === "global" : entry.scope === "project");
+    const sharedTargetInstalled = options2.agents?.includes(SHARED_SKILLS_TARGET_ID) ? await this.listInstalledForAgents(projectPath, [], options2) : [];
+    const installedEntries = Array.from(new Map([...installed, ...sharedTargetInstalled].map((entry) => [
+      `${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`,
+      entry
+    ])).values());
+    const scopedInstalled = installedEntries.filter((entry) => options2.global ? entry.scope === "global" : entry.scope === "project");
     const targetedEntries = scopedInstalled.filter((entry) => targetAgentIds.has(entry.agent) && namesLower.has(entry.name.toLowerCase()));
     const targetedKeys = new Set(targetedEntries.map((entry) => `${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`));
-    const remainingEntries = installed.filter((entry) => !targetedKeys.has(`${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`));
+    const remainingEntries = installedEntries.filter((entry) => !targetedKeys.has(`${entry.agent}:${entry.scope}:${entry.path}:${entry.name}`));
     const removedPaths = new Set;
     const removedCanonicalPaths = new Set;
     for (const entry of targetedEntries) {
@@ -19127,6 +19342,7 @@ var init_skillsManager = __esm(() => {
   init_fs();
   init_agentManager();
   init_marketplaceRegistry();
+  init_skills();
   execFileAsync = promisify(execFile);
   DEFAULT_SKILLS_CATALOG = {
     owner: "vercel-labs",
@@ -30951,7 +31167,7 @@ ${content}
 // dist/core/managedState.js
 init_fs();
 import {promises as fs28} from "fs";
-import {dirname as dirname3, join as join6, relative as relative4, resolve as resolve10} from "path";
+import {dirname as dirname4, join as join6, relative as relative4, resolve as resolve10} from "path";
 var toPosixPath = function(value) {
   return value.replace(/\\/g, "/");
 };
@@ -30976,10 +31192,10 @@ async function copyDirectory(src, dest) {
       await copyDirectory(srcPath, destPath);
     } else if (entry.isSymbolicLink()) {
       const target = await fs28.readlink(srcPath);
-      await fs28.mkdir(dirname3(destPath), { recursive: true });
+      await fs28.mkdir(dirname4(destPath), { recursive: true });
       await fs28.symlink(target, destPath);
     } else {
-      await fs28.mkdir(dirname3(destPath), { recursive: true });
+      await fs28.mkdir(dirname4(destPath), { recursive: true });
       await fs28.copyFile(srcPath, destPath);
     }
   }
@@ -30989,7 +31205,7 @@ async function copyPath(src, dest) {
   if (!type2) {
     return;
   }
-  await fs28.mkdir(dirname3(dest), { recursive: true });
+  await fs28.mkdir(dirname4(dest), { recursive: true });
   if (type2 === "symlink") {
     const target = await fs28.readlink(src);
     await fs28.symlink(target, dest);
@@ -31125,7 +31341,7 @@ class ManagedStateStore {
         if (!options2.dryRun) {
           await fs28.rm(absolutePath, { recursive: true, force: true }).catch(() => {
           });
-          await fs28.mkdir(dirname3(absolutePath), { recursive: true });
+          await fs28.mkdir(dirname4(absolutePath), { recursive: true });
           await fs28.symlink(backupLinkTarget, absolutePath);
         }
         summary.restored++;
@@ -31507,11 +31723,11 @@ class MCPParser {
 // dist/constants/mcp.js
 import {readFileSync as readFileSync2} from "fs";
 import {fileURLToPath} from "url";
-import {dirname as dirname4, join as join7} from "path";
+import {dirname as dirname5, join as join7} from "path";
 var getPackageVersion = function() {
   try {
     const __filename2 = fileURLToPath(import.meta.url);
-    const __dirname2 = dirname4(__filename2);
+    const __dirname2 = dirname5(__filename2);
     const packageJsonPath = join7(__dirname2, "../../package.json");
     const packageJson = JSON.parse(readFileSync2(packageJsonPath, "utf-8"));
     return packageJson.version || "1.0.0";
@@ -31543,11 +31759,11 @@ import {readFileSync as readFileSync4} from "fs";
 
 // dist/core/rulesTemplateLoader.js
 var toml = __toESM(require_toml(), 1);
-import {resolve as resolve11, dirname as dirname5} from "path";
+import {resolve as resolve11, dirname as dirname6} from "path";
 import {fileURLToPath as fileURLToPath2} from "url";
 import {readFileSync as readFileSync3, readdirSync, existsSync as existsSync2} from "fs";
 var __filename2 = fileURLToPath2(import.meta.url);
-var __dirname2 = dirname5(__filename2);
+var __dirname2 = dirname6(__filename2);
 
 class RulesTemplateLoader {
   templatesPath;
@@ -39783,7 +39999,7 @@ class MCPVerifier {
 
 // dist/core/gitignoreManager.js
 import {promises as fs31} from "fs";
-import {dirname as dirname6, join as join8} from "path";
+import {dirname as dirname7, join as join8} from "path";
 var normalizeIgnorePath = function(projectPath, value) {
   const relative6 = value.startsWith(projectPath) ? value.slice(projectPath.length + 1) : value;
   const normalized = relative6.replace(/\\/g, "/").replace(/^\/+/, "");
@@ -39851,7 +40067,7 @@ async function updateManagedIgnoreFile(projectPath, paths5, options2 = {}) {
     existingContent = "";
   }
   const updatedContent = updateManagedBlock(existingContent, normalizedPaths);
-  await fs31.mkdir(dirname6(ignoreFilePath), { recursive: true });
+  await fs31.mkdir(dirname7(ignoreFilePath), { recursive: true });
   await fs31.writeFile(ignoreFilePath, updatedContent, "utf8");
   return ignoreFilePath;
 }
@@ -39893,10 +40109,10 @@ var END_MARKER = "# END AgentInit Generated Files";
 init_agentManager();
 init_skillsManager();
 init_fs();
-import {dirname as dirname7, join as join9} from "path";
+import {dirname as dirname8, join as join9} from "path";
 async function discoverProjectSkills(projectPath, skillsManager4) {
   const sources = [];
-  const skills = new Map;
+  const skills2 = new Map;
   for (const sourceDir of PROJECT_SKILL_SOURCE_DIRS) {
     const absoluteSourceDir = join9(projectPath, sourceDir);
     if (!await fileExists(absoluteSourceDir)) {
@@ -39906,23 +40122,23 @@ async function discoverProjectSkills(projectPath, skillsManager4) {
     const discovered = await skillsManager4.discoverSkills(absoluteSourceDir);
     for (const skill of discovered) {
       const key = skill.name.toLowerCase();
-      if (!skills.has(key)) {
-        skills.set(key, skill);
+      if (!skills2.has(key)) {
+        skills2.set(key, skill);
       }
     }
   }
   return {
     sources,
-    skills: [...skills.values()]
+    skills: [...skills2.values()]
   };
 }
 async function applyProjectSkills(projectPath, targetAgentIds, managedState2, options2 = {}) {
   const agentManager6 = new AgentManager;
   const skillsManager4 = new SkillsManager(agentManager6);
-  const { sources, skills } = await discoverProjectSkills(projectPath, skillsManager4);
+  const { sources, skills: skills2 } = await discoverProjectSkills(projectPath, skillsManager4);
   const installed = [];
   const skipped = [];
-  if (skills.length === 0) {
+  if (skills2.length === 0) {
     return {
       discovered: 0,
       sources,
@@ -39933,22 +40149,22 @@ async function applyProjectSkills(projectPath, targetAgentIds, managedState2, op
   const targetAgents = targetAgentIds.map((id) => agentManager6.getAgentById(id)).filter((agent) => !!agent);
   if (targetAgents.length === 0) {
     return {
-      discovered: skills.length,
+      discovered: skills2.length,
       sources,
       installed,
-      skipped: skills.map((skill) => ({ skill, reason: "No target agents found" }))
+      skipped: skills2.map((skill) => ({ skill, reason: "No target agents found" }))
     };
   }
   for (const agent of targetAgents) {
     if (!agent.supportsSkills()) {
-      for (const skill of skills) {
+      for (const skill of skills2) {
         skipped.push({ skill, reason: `${agent.name} does not support skills` });
       }
       continue;
     }
     const skillsDir = agent.getSkillsDir(projectPath, false);
     if (!skillsDir) {
-      for (const skill of skills) {
+      for (const skill of skills2) {
         skipped.push({ skill, reason: `No skills directory for ${agent.name}` });
       }
       continue;
@@ -39959,7 +40175,7 @@ async function applyProjectSkills(projectPath, targetAgentIds, managedState2, op
       continue;
     if (!agent.getSkillsDir(projectPath, false))
       continue;
-    for (const skill of skills) {
+    for (const skill of skills2) {
       try {
         const installOptions = {
           ...options2.copy !== undefined ? { copy: options2.copy } : {}
@@ -39971,7 +40187,7 @@ async function applyProjectSkills(projectPath, targetAgentIds, managedState2, op
             await managedState2.trackGeneratedPath(generatedPath, {
               kind: "directory",
               source: "skills",
-              ignorePath: `${dirname7(generatedPath)}/`
+              ignorePath: `${dirname8(generatedPath)}/`
             });
           }
         }
@@ -39983,7 +40199,7 @@ async function applyProjectSkills(projectPath, targetAgentIds, managedState2, op
     }
   }
   return {
-    discovered: skills.length,
+    discovered: skills2.length,
     sources,
     installed,
     skipped
@@ -40985,10 +41201,11 @@ import {relative as relative7, resolve as resolve12} from "path";
 init_skillsManager();
 init_marketplaceRegistry();
 init_agentManager();
+init_skills();
 function registerSkillsCommand(program2) {
   const marketplaceHelp = getMarketplaceIds().join(", ");
-  const skills = program2.command("skills").description("Manage agent skills");
-  skills.command("add <source>").description("Add skills from a marketplace, GitHub repo, or local path").option("--from <marketplace>", `Marketplace source override (available: ${marketplaceHelp})`).option("-g, --global", "Install skills globally").option("-a, --agent <agents...>", "Target specific agent(s)").option("-s, --skill <names...>", "Install only specific skills by name").option("-l, --list", "List available skills from the source without installing").option("--copy", "Copy skill files instead of symlinking").option("-y, --yes", "Skip prompts and auto-detect project-configured agents only").action(async (source, options2) => {
+  const skills3 = program2.command("skills").description("Manage agent skills");
+  skills3.command("add <source>").description("Add skills from a marketplace, GitHub repo, or local path").option("--from <marketplace>", `Marketplace source override (available: ${marketplaceHelp})`).option("-g, --global", "Install skills globally").option("-a, --agent <agents...>", "Target specific agent(s)").option("-s, --skill <names...>", "Install only specific skills by name").option("-l, --list", "List available skills from the source without installing").option("--copy", "Copy skill files instead of symlinking").option("-y, --yes", "Skip prompts and auto-detect project-configured agents only").action(async (source, options2) => {
     logger.titleBox("AgentInit  Skills");
     const agentManager9 = new AgentManager;
     const skillsManager5 = new SkillsManager(agentManager9);
@@ -41006,6 +41223,17 @@ function registerSkillsCommand(program2) {
       }
       return;
     }
+    const verifySpinner = ora("Verifying skill source...").start();
+    try {
+      await skillsManager5.prepareSource(source, process.cwd(), {
+        from: options2.from
+      });
+      verifySpinner.stop();
+    } catch (error) {
+      verifySpinner.fail("Failed to verify skill source");
+      logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
+      return;
+    }
     let targetAgents = options2.agent;
     let targetGlobal = options2.global;
     if (!targetAgents && !options2.yes) {
@@ -41014,6 +41242,9 @@ function registerSkillsCommand(program2) {
         global: options2.global
       });
       if (selection?.aborted) {
+        await skillsManager5.discardPreparedSource(source, process.cwd(), {
+          from: options2.from
+        });
         return;
       }
       if (selection?.agents && selection.agents.length > 0) {
@@ -41038,7 +41269,7 @@ function registerSkillsCommand(program2) {
       logger.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
   });
-  skills.command("list").alias("ls").description("List installed skills").option("-g, --global", "List only global skills").option("-a, --agent <agents...>", "Filter by specific agent(s)").action(async (options2) => {
+  skills3.command("list").alias("ls").description("List installed skills").option("-g, --global", "List only global skills").option("-a, --agent <agents...>", "Filter by specific agent(s)").action(async (options2) => {
     logger.titleBox("AgentInit  Skills");
     const agentManager9 = new AgentManager;
     const skillsManager5 = new SkillsManager(agentManager9);
@@ -41067,7 +41298,7 @@ function registerSkillsCommand(program2) {
       if (skill.mode === "symlink") {
         existing.mode = "symlink";
       }
-      existing.agents.add(agentManager9.getAgentById(skill.agent)?.name || skill.agent);
+      existing.agents.add(formatSkillTargetName(agentManager9, skill.agent));
       bySkill.set(key, existing);
     }
     for (const skill of bySkill.values()) {
@@ -41078,7 +41309,7 @@ function registerSkillsCommand(program2) {
       logger.info(`    Agents: ${[...skill.agents].join(", ")}`);
     }
   });
-  skills.command("remove [names...]").alias("rm").description("Remove installed skills by name").option("-g, --global", "Remove from global scope").option("-a, --agent <agents...>", "Target specific agent(s)").option("-y, --yes", "Skip confirmation prompts").action(async (names, options2) => {
+  skills3.command("remove [names...]").alias("rm").description("Remove installed skills by name").option("-g, --global", "Remove from global scope").option("-a, --agent <agents...>", "Target specific agent(s)").option("-y, --yes", "Skip confirmation prompts").action(async (names, options2) => {
     logger.titleBox("AgentInit  Skills");
     if (!names || names.length === 0) {
       if (!options2.yes) {
@@ -41162,9 +41393,9 @@ async function resolveInteractiveSkillTargets(skillsManager5, agentManager9, sou
     instructions: false,
     min: 1,
     choices: availableGroups.map((group) => ({
-      title: `${group.displayDir} -> ${group.agentNames.join(", ")}${formatCompatibleAgents(group)}`,
+      title: formatSkillGroupTitle(group),
       ...group.description ? { description: group.description } : {},
-      value: group.agents.map((agent) => agent.id),
+      value: group.kind === "canonical-shared" ? [SHARED_SKILLS_TARGET_ID] : group.agents.map((agent) => agent.id),
       selected: shouldPreselectSkillGroup(group, installGlobal, detectedGroups.length > 0, recommendedAgentId)
     }))
   });
@@ -41213,15 +41444,23 @@ var buildSkillGroups = function(agents, projectPath, global3) {
     existing.push(agent);
     dirToAgents.set(skillsDir, existing);
   }
-  return Array.from(dirToAgents.entries()).map(([dir, groupedAgents]) => ({
-    dir,
-    displayDir: formatSkillsDir(projectPath, dir),
-    agents: groupedAgents,
-    agentNames: groupedAgents.map((agent) => agent.name),
-    compatibleAgents: [],
-    compatibleAgentNames: [],
-    kind: "native"
-  }));
+  return Array.from(dirToAgents.entries()).map(([dir, groupedAgents]) => {
+    const canonicalShared = resolve12(dir) === getCanonicalSkillsDirForScope(projectPath, !!global3) && groupedAgents.every((agent) => agent.getProjectSkillsStandard() === "agents");
+    return {
+      dir,
+      displayDir: formatSkillsDir(projectPath, dir),
+      agents: groupedAgents,
+      agentNames: groupedAgents.map((agent) => agent.name),
+      compatibleAgents: [],
+      compatibleAgentNames: [],
+      ...canonicalShared ? {
+        description: `Install only into the shared AGENTS.md store. Compatible tools: ${groupedAgents.map((agent) => agent.name).join(", ")}.`,
+        kind: "canonical-shared"
+      } : {
+        kind: "native"
+      }
+    };
+  });
 };
 var prependCanonicalGlobalGroup = function(agentManager9, projectPath, groups) {
   const canonicalDir = getCanonicalGlobalSkillsDir();
@@ -41236,7 +41475,7 @@ var prependCanonicalGlobalGroup = function(agentManager9, projectPath, groups) {
     return [
       {
         ...existingCanonical,
-        description: existingCanonical.description || "Canonical shared skills store for the open AGENTS.md ecosystem.",
+        description: existingCanonical.description || `Install only into the shared AGENTS.md store. Compatible tools: ${existingCanonical.agentNames.join(", ")}.`,
         kind: "canonical-shared"
       },
       ...remaining
@@ -41250,7 +41489,7 @@ var prependCanonicalGlobalGroup = function(agentManager9, projectPath, groups) {
       agentNames: sharedAgents.map((agent) => agent.name),
       compatibleAgents: [],
       compatibleAgentNames: [],
-      description: "Canonical shared skills store for the open AGENTS.md ecosystem.",
+      description: `Install only into the shared AGENTS.md store. Compatible tools: ${sharedAgents.map((agent) => agent.name).join(", ")}.`,
       kind: "canonical-shared"
     },
     ...groups.map((group) => {
@@ -41288,12 +41527,15 @@ var formatPromptPath = function(path) {
 var getCanonicalGlobalSkillsDir = function() {
   return resolve12(homedir6(), ".agents/skills");
 };
+var getCanonicalSkillsDirForScope = function(projectPath, global3) {
+  return global3 ? getCanonicalGlobalSkillsDir() : resolve12(projectPath, ".agents/skills");
+};
 var getCanonicalGlobalSkillsDisplayPath = function() {
   return formatPromptPath(getCanonicalGlobalSkillsDir());
 };
 var describeGlobalSkillGroup = function(group) {
   if (group.kind === "canonical-shared") {
-    return group.description;
+    return group.description || `Install only into the shared AGENTS.md store. Compatible tools: ${group.agentNames.join(", ")}.`;
   }
   if (group.agents.every((agent) => agent.getProjectSkillsStandard() === "agents")) {
     return `Native agent directory linked to ${getCanonicalGlobalSkillsDisplayPath()} when symlinks are used.`;
@@ -41303,6 +41545,18 @@ var describeGlobalSkillGroup = function(group) {
   }
   return;
 };
+var formatSkillGroupTitle = function(group) {
+  if (group.kind === "canonical-shared") {
+    return `${group.displayDir} -> ${SHARED_SKILLS_TARGET_NAME}`;
+  }
+  return `${group.displayDir} -> ${group.agentNames.join(", ")}${formatCompatibleAgents(group)}`;
+};
+var formatSkillTargetName = function(agentManager9, agentId) {
+  if (agentId === SHARED_SKILLS_TARGET_ID) {
+    return SHARED_SKILLS_TARGET_NAME;
+  }
+  return agentManager9.getAgentById(agentId)?.name || agentId;
+};
 var shouldPreselectSkillGroup = function(group, installGlobal, hasDetectedGroups, recommendedAgentId) {
   const includesRecommendedAgent = !!recommendedAgentId && group.agents.some((agent) => agent.id === recommendedAgentId);
   if (!installGlobal) {
@@ -41355,18 +41609,18 @@ var buildSkillsAddCommand = function(source, from, extraArgs) {
   args.push(...extraArgs);
   return args.join(" ");
 };
-var displayDiscoveredSkills = function(skills, warnings) {
-  if (skills.length === 0) {
+var displayDiscoveredSkills = function(skills3, warnings) {
+  if (skills3.length === 0) {
     logger.info("No skills found in the source.");
     for (const warning of warnings) {
       logger.warn(warning);
     }
     return;
   }
-  logger.info(`Found ${green(String(skills.length))} skill(s):\n`);
+  logger.info(`Found ${green(String(skills3.length))} skill(s):\n`);
   logger.info("  Name                Description");
   logger.info("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-  for (const skill of skills) {
+  for (const skill of skills3) {
     const name = skill.name.padEnd(18);
     logger.info(`  ${green(name)}  ${skill.description}`);
   }
@@ -41407,7 +41661,7 @@ var displayInstallResult = function(result, spinner, agentManager9, skillsManage
       agents: new Set,
       skills: new Set
     };
-    existing.agents.add(agentManager9.getAgentById(item.agent)?.name || item.agent);
+    existing.agents.add(formatSkillTargetName(agentManager9, item.agent));
     existing.skills.add(item.skill.name);
     byPath.set(path, existing);
   }
@@ -42228,7 +42482,7 @@ function registerRulesCommand(program2) {
 // dist/commands/plugins.js
 var import_prompts3 = __toESM(require_prompts3(), 1);
 import {homedir as homedir7} from "os";
-import {dirname as dirname8, relative as relative8, resolve as resolve13} from "path";
+import {dirname as dirname9, relative as relative8, resolve as resolve13} from "path";
 init_pluginManager();
 init_agentManager();
 init_marketplaceRegistry();
@@ -42616,7 +42870,7 @@ var renderPluginWarnings = function(previewOrResult, projectPath) {
 var renderInstalledComponents = function(result, agentManager12, projectPath) {
   const skillGroups = new Map;
   for (const item of result.skills.installed) {
-    const targetDir = dirname8(item.path);
+    const targetDir = dirname9(item.path);
     const existing = skillGroups.get(targetDir) || { agents: new Set, skillNames: new Set };
     existing.agents.add(item.agent);
     existing.skillNames.add(item.name);