rulesync 7.0.0 → 7.1.0

package/dist/index.js

@@ -106,7 +106,7 @@ var logger = new Logger();
 
 // src/lib/fetch.ts
 import { Semaphore } from "es-toolkit/promise";
-import { join as join107 } from "path";
+import { join as join108 } from "path";
 
 // src/constants/rulesync-paths.ts
 import { join } from "path";
@@ -123,9 +123,15 @@ var RULESYNC_AIIGNORE_RELATIVE_FILE_PATH = join(RULESYNC_RELATIVE_DIR_PATH, ".ai
 var RULESYNC_IGNORE_RELATIVE_FILE_PATH = ".rulesyncignore";
 var RULESYNC_OVERVIEW_FILE_NAME = "overview.md";
 var RULESYNC_SKILLS_RELATIVE_DIR_PATH = join(RULESYNC_RELATIVE_DIR_PATH, "skills");
+var RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH = join(
+  RULESYNC_SKILLS_RELATIVE_DIR_PATH,
+  ".curated"
+);
+var RULESYNC_SOURCES_LOCK_RELATIVE_FILE_PATH = "rulesync.lock";
 var RULESYNC_MCP_FILE_NAME = "mcp.json";
 var RULESYNC_HOOKS_FILE_NAME = "hooks.json";
 var MAX_FILE_SIZE = 10 * 1024 * 1024;
+var FETCH_CONCURRENCY_LIMIT = 10;
 
 // src/features/commands/commands-processor.ts
 import { basename as basename16, join as join18 } from "path";
@@ -298,10 +304,11 @@ var FeatureProcessor = class {
   }
   /**
    * Once converted to rulesync/tool files, write them to the filesystem.
-   * Returns the number of files written.
+   * Returns the count and paths of files written.
    */
   async writeAiFiles(aiFiles) {
     let changedCount = 0;
+    const changedPaths = [];
     for (const aiFile of aiFiles) {
       const filePath = aiFile.getFilePath();
       const contentWithNewline = addTrailingNewline(aiFile.getFileContent());
@@ -315,8 +322,9 @@ var FeatureProcessor = class {
         await writeFileContent(filePath, contentWithNewline);
       }
       changedCount++;
+      changedPaths.push(aiFile.getRelativePathFromCwd());
     }
-    return changedCount;
+    return { count: changedCount, paths: changedPaths };
   }
   async removeAiFiles(aiFiles) {
     for (const aiFile of aiFiles) {
@@ -1656,7 +1664,7 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
       const result = GeminiCliCommandFrontmatterSchema.safeParse(parsed);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in Gemini CLI command file: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join13(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
       return {
@@ -1664,7 +1672,10 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
         description: result.data.description || ""
       };
     } catch (error) {
-      throw new Error(`Failed to parse TOML command file: ${error}`, { cause: error });
+      throw new Error(
+        `Failed to parse TOML command file (${join13(this.relativeDirPath, this.relativeFilePath)}): ${error}`,
+        { cause: error }
+      );
     }
   }
   getBody() {
@@ -2419,7 +2430,7 @@ var CommandsProcessor = class extends FeatureProcessor {
         (path4) => RulesyncCommand.fromFile({ relativeFilePath: basename16(path4) })
       )
     );
-    logger.info(`Successfully loaded ${rulesyncCommands.length} rulesync commands`);
+    logger.debug(`Successfully loaded ${rulesyncCommands.length} rulesync commands`);
     return rulesyncCommands;
   }
   /**
@@ -2443,7 +2454,7 @@ var CommandsProcessor = class extends FeatureProcessor {
           global: this.global
         })
       ).filter((cmd) => cmd.isDeletable());
-      logger.info(`Successfully loaded ${toolCommands2.length} ${paths.relativeDirPath} commands`);
+      logger.debug(`Successfully loaded ${toolCommands2.length} ${paths.relativeDirPath} commands`);
       return toolCommands2;
     }
     const toolCommands = await Promise.all(
@@ -2455,7 +2466,7 @@ var CommandsProcessor = class extends FeatureProcessor {
         })
       )
     );
-    logger.info(`Successfully loaded ${toolCommands.length} ${paths.relativeDirPath} commands`);
+    logger.debug(`Successfully loaded ${toolCommands.length} ${paths.relativeDirPath} commands`);
     return toolCommands;
   }
   /**
@@ -2792,10 +2803,7 @@ var ClaudecodeHooks = class _ClaudecodeHooks extends ToolHooks {
   }) {
     const paths = _ClaudecodeHooks.getSettablePaths({ global });
     const filePath = join20(baseDir, paths.relativeDirPath, paths.relativeFilePath);
-    const fileContent = await readOrInitializeFileContent(
-      filePath,
-      JSON.stringify({ hooks: {} }, null, 2)
-    );
+    const fileContent = await readFileContentOrNull(filePath) ?? '{"hooks":{}}';
     return new _ClaudecodeHooks({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
@@ -2842,9 +2850,12 @@ var ClaudecodeHooks = class _ClaudecodeHooks extends ToolHooks {
     try {
       settings = JSON.parse(this.getFileContent());
     } catch (error) {
-      throw new Error(`Failed to parse Claude hooks content: ${formatError(error)}`, {
-        cause: error
-      });
+      throw new Error(
+        `Failed to parse Claude hooks content in ${join20(this.getRelativeDirPath(), this.getRelativeFilePath())}: ${formatError(error)}`,
+        {
+          cause: error
+        }
+      );
     }
     const hooks = claudeHooksToCanonical(settings.hooks);
     return this.toRulesyncHooksDefault({
@@ -3067,10 +3078,7 @@ var FactorydroidHooks = class _FactorydroidHooks extends ToolHooks {
   }) {
     const paths = _FactorydroidHooks.getSettablePaths({ global });
     const filePath = join22(baseDir, paths.relativeDirPath, paths.relativeFilePath);
-    const fileContent = await readOrInitializeFileContent(
-      filePath,
-      JSON.stringify({ hooks: {} }, null, 2)
-    );
+    const fileContent = await readFileContentOrNull(filePath) ?? '{"hooks":{}}';
     return new _FactorydroidHooks({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
@@ -3117,9 +3125,12 @@ var FactorydroidHooks = class _FactorydroidHooks extends ToolHooks {
     try {
       settings = JSON.parse(this.getFileContent());
     } catch (error) {
-      throw new Error(`Failed to parse Factory Droid hooks content: ${formatError(error)}`, {
-        cause: error
-      });
+      throw new Error(
+        `Failed to parse Factory Droid hooks content in ${join22(this.getRelativeDirPath(), this.getRelativeFilePath())}: ${formatError(error)}`,
+        {
+          cause: error
+        }
+      );
     }
     const hooks = factorydroidHooksToCanonical(settings.hooks);
     return this.toRulesyncHooksDefault({
@@ -3372,7 +3383,9 @@ var HooksProcessor = class extends FeatureProcessor {
         })
       ];
     } catch (error) {
-      logger.error(`Failed to load Rulesync hooks file: ${formatError(error)}`);
+      logger.error(
+        `Failed to load Rulesync hooks file (${RULESYNC_HOOKS_RELATIVE_FILE_PATH}): ${formatError(error)}`
+      );
       return [];
     }
   }
@@ -3389,7 +3402,7 @@ var HooksProcessor = class extends FeatureProcessor {
           global: this.global
         });
         const list = toolHooks2.isDeletable?.() !== false ? [toolHooks2] : [];
-        logger.info(
+        logger.debug(
           `Successfully loaded ${list.length} ${this.toolTarget} hooks files for deletion`
         );
         return list;
@@ -3399,7 +3412,7 @@ var HooksProcessor = class extends FeatureProcessor {
         validate: true,
         global: this.global
       });
-      logger.info(`Successfully loaded 1 ${this.toolTarget} hooks file`);
+      logger.debug(`Successfully loaded 1 ${this.toolTarget} hooks file`);
       return [toolHooks];
     } catch (error) {
       const msg = `Failed to load hooks files for tool target: ${this.toolTarget}: ${formatError(error)}`;
@@ -4463,7 +4476,9 @@ var IgnoreProcessor = class extends FeatureProcessor {
     try {
       return [await RulesyncIgnore.fromFile()];
     } catch (error) {
-      logger.error(`Failed to load rulesync files: ${formatError(error)}`);
+      logger.error(
+        `Failed to load rulesync ignore file (${RULESYNC_AIIGNORE_RELATIVE_FILE_PATH}): ${formatError(error)}`
+      );
       return [];
     }
   }
@@ -4489,7 +4504,7 @@ var IgnoreProcessor = class extends FeatureProcessor {
       const toolIgnores = await this.loadToolIgnores();
       return toolIgnores;
     } catch (error) {
-      const errorMessage = `Failed to load tool files: ${formatError(error)}`;
+      const errorMessage = `Failed to load tool files for ${this.toolTarget}: ${formatError(error)}`;
       if (error instanceof Error && error.message.includes("no such file or directory")) {
         logger.debug(errorMessage);
       } else {
@@ -4754,10 +4769,7 @@ var ClaudecodeMcp = class _ClaudecodeMcp extends ToolMcp {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const fileContent = await readOrInitializeFileContent(
-      join38(baseDir, paths.relativeDirPath, paths.relativeFilePath),
-      JSON.stringify({ mcpServers: {} }, null, 2)
-    );
+    const fileContent = await readFileContentOrNull(join38(baseDir, paths.relativeDirPath, paths.relativeFilePath)) ?? '{"mcpServers":{}}';
     const json = JSON.parse(fileContent);
     const newJson = { ...json, mcpServers: json.mcpServers ?? {} };
     return new _ClaudecodeMcp({
@@ -5310,10 +5322,7 @@ var GeminiCliMcp = class _GeminiCliMcp extends ToolMcp {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const fileContent = await readOrInitializeFileContent(
-      join44(baseDir, paths.relativeDirPath, paths.relativeFilePath),
-      JSON.stringify({ mcpServers: {} }, null, 2)
-    );
+    const fileContent = await readFileContentOrNull(join44(baseDir, paths.relativeDirPath, paths.relativeFilePath)) ?? '{"mcpServers":{}}';
     const json = JSON.parse(fileContent);
     const newJson = { ...json, mcpServers: json.mcpServers ?? {} };
     return new _GeminiCliMcp({
@@ -5468,10 +5477,7 @@ var KiloMcp = class _KiloMcp extends ToolMcp {
     validate = true
   }) {
     const paths = this.getSettablePaths();
-    const fileContent = await readOrInitializeFileContent(
-      join46(baseDir, paths.relativeDirPath, paths.relativeFilePath),
-      JSON.stringify({ mcpServers: {} }, null, 2)
-    );
+    const fileContent = await readFileContentOrNull(join46(baseDir, paths.relativeDirPath, paths.relativeFilePath)) ?? '{"mcpServers":{}}';
     return new _KiloMcp({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
@@ -5540,10 +5546,7 @@ var KiroMcp = class _KiroMcp extends ToolMcp {
     validate = true
   }) {
     const paths = this.getSettablePaths();
-    const fileContent = await readOrInitializeFileContent(
-      join47(baseDir, paths.relativeDirPath, paths.relativeFilePath),
-      JSON.stringify({ mcpServers: {} }, null, 2)
-    );
+    const fileContent = await readFileContentOrNull(join47(baseDir, paths.relativeDirPath, paths.relativeFilePath)) ?? '{"mcpServers":{}}';
     return new _KiroMcp({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
@@ -5714,10 +5717,7 @@ var OpencodeMcp = class _OpencodeMcp extends ToolMcp {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const fileContent = await readOrInitializeFileContent(
-      join48(baseDir, paths.relativeDirPath, paths.relativeFilePath),
-      JSON.stringify({ mcp: {} }, null, 2)
-    );
+    const fileContent = await readFileContentOrNull(join48(baseDir, paths.relativeDirPath, paths.relativeFilePath)) ?? '{"mcp":{}}';
     const json = JSON.parse(fileContent);
     const newJson = { ...json, mcp: json.mcp ?? {} };
     return new _OpencodeMcp({
@@ -6045,7 +6045,9 @@ var McpProcessor = class extends FeatureProcessor {
     try {
       return [await RulesyncMcp.fromFile({})];
     } catch (error) {
-      logger.error(`Failed to load a Rulesync MCP file: ${formatError(error)}`);
+      logger.error(
+        `Failed to load a Rulesync MCP file (${RULESYNC_MCP_RELATIVE_FILE_PATH}): ${formatError(error)}`
+      );
       return [];
     }
   }
@@ -6067,7 +6069,7 @@ var McpProcessor = class extends FeatureProcessor {
           global: this.global
         });
         const toolMcps2 = toolMcp.isDeletable() ? [toolMcp] : [];
-        logger.info(`Successfully loaded ${toolMcps2.length} ${this.toolTarget} MCP files`);
+        logger.debug(`Successfully loaded ${toolMcps2.length} ${this.toolTarget} MCP files`);
         return toolMcps2;
       }
       const toolMcps = [
@@ -6077,7 +6079,7 @@ var McpProcessor = class extends FeatureProcessor {
           global: this.global
         })
       ];
-      logger.info(`Successfully loaded ${toolMcps.length} ${this.toolTarget} MCP files`);
+      logger.debug(`Successfully loaded ${toolMcps.length} ${this.toolTarget} MCP files`);
       return toolMcps;
     } catch (error) {
       const errorMessage = `Failed to load MCP files for tool target: ${this.toolTarget}: ${formatError(error)}`;
@@ -6137,7 +6139,7 @@ var McpProcessor = class extends FeatureProcessor {
 
 // src/features/rules/rules-processor.ts
 import { encode } from "@toon-format/toon";
-import { basename as basename23, join as join106, relative as relative4 } from "path";
+import { basename as basename24, join as join107, relative as relative4 } from "path";
 import { z as z48 } from "zod/mini";
 
 // src/constants/general.ts
@@ -6600,7 +6602,7 @@ var FactorydroidSkill = class _FactorydroidSkill extends SimulatedSkill {
 };
 
 // src/features/skills/skills-processor.ts
-import { basename as basename18, join as join69 } from "path";
+import { basename as basename19, join as join70 } from "path";
 import { z as z33 } from "zod/mini";
 
 // src/types/dir-feature-processor.ts
@@ -6628,6 +6630,7 @@ var DirFeatureProcessor = class {
    */
   async writeAiDirs(aiDirs) {
     let changedCount = 0;
+    const changedPaths = [];
     for (const aiDir of aiDirs) {
       const dirPath = aiDir.getDirPath();
       let dirHasChanges = false;
@@ -6658,19 +6661,23 @@ var DirFeatureProcessor = class {
       if (!dirHasChanges) {
         continue;
       }
+      const relativeDir = aiDir.getRelativePathFromCwd();
       if (this.dryRun) {
         logger.info(`[DRY RUN] Would create directory: ${dirPath}`);
         if (mainFile) {
           logger.info(`[DRY RUN] Would write: ${join55(dirPath, mainFile.name)}`);
+          changedPaths.push(join55(relativeDir, mainFile.name));
         }
         for (const file of otherFiles) {
           logger.info(`[DRY RUN] Would write: ${join55(dirPath, file.relativeFilePathToDirPath)}`);
+          changedPaths.push(join55(relativeDir, file.relativeFilePathToDirPath));
         }
       } else {
         await ensureDir(dirPath);
         if (mainFile && mainFileContent) {
           const mainFilePath = join55(dirPath, mainFile.name);
           await writeFileContent(mainFilePath, mainFileContent);
+          changedPaths.push(join55(relativeDir, mainFile.name));
         }
         for (const [i, file] of otherFiles.entries()) {
           const filePath = join55(dirPath, file.relativeFilePathToDirPath);
@@ -6681,11 +6688,12 @@ var DirFeatureProcessor = class {
             );
           }
           await writeFileContent(filePath, content);
+          changedPaths.push(join55(relativeDir, file.relativeFilePathToDirPath));
         }
       }
       changedCount++;
     }
-    return changedCount;
+    return { count: changedCount, paths: changedPaths };
   }
   async removeAiDirs(aiDirs) {
     for (const aiDir of aiDirs) {
@@ -6782,7 +6790,7 @@ var RulesyncSkill = class _RulesyncSkill extends AiDir {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join56(this.relativeDirPath, this.dirName)}`);
     }
     const result = RulesyncSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -6883,7 +6891,7 @@ var AgentsSkillsSkill = class _AgentsSkillsSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join57(this.relativeDirPath, this.dirName)}`);
     }
     const result = AgentsSkillsSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -7047,7 +7055,7 @@ var AntigravitySkill = class _AntigravitySkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join58(this.relativeDirPath, this.dirName)}`);
     }
     const result = AntigravitySkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -7206,7 +7214,7 @@ var ClaudecodeSkill = class _ClaudecodeSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join59(this.relativeDirPath, this.dirName)}`);
     }
     const result = ClaudecodeSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -7375,7 +7383,7 @@ var CodexCliSkill = class _CodexCliSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join60(this.relativeDirPath, this.dirName)}`);
     }
     const result = CodexCliSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -7545,7 +7553,7 @@ var CopilotSkill = class _CopilotSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join61(this.relativeDirPath, this.dirName)}`);
     }
     const result = CopilotSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -7708,7 +7716,7 @@ var CursorSkill = class _CursorSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join62(this.relativeDirPath, this.dirName)}`);
     }
     const result = CursorSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -7867,7 +7875,7 @@ var GeminiCliSkill = class _GeminiCliSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join63(this.relativeDirPath, this.dirName)}`);
     }
     const result = GeminiCliSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -8026,7 +8034,7 @@ var KiloSkill = class _KiloSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join64(this.relativeDirPath, this.dirName)}`);
     }
     const result = KiloSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -8204,7 +8212,7 @@ var KiroSkill = class _KiroSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join65(this.relativeDirPath, this.dirName)}`);
     }
     const result = KiroSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -8381,7 +8389,7 @@ var OpenCodeSkill = class _OpenCodeSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join66(this.relativeDirPath, this.dirName)}`);
     }
     const result = OpenCodeSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -8546,7 +8554,7 @@ var ReplitSkill = class _ReplitSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join67(this.relativeDirPath, this.dirName)}`);
     }
     const result = ReplitSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -8705,7 +8713,7 @@ var RooSkill = class _RooSkill extends ToolSkill {
   }
   getFrontmatter() {
     if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
+      throw new Error(`Frontmatter is not defined in ${join68(this.relativeDirPath, this.dirName)}`);
     }
     const result = RooSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
     return result;
@@ -8836,6 +8844,23 @@ var RooSkill = class _RooSkill extends ToolSkill {
   }
 };
 
+// src/features/skills/skills-utils.ts
+import { basename as basename18, join as join69 } from "path";
+async function getLocalSkillDirNames(baseDir) {
+  const skillsDir = join69(baseDir, RULESYNC_SKILLS_RELATIVE_DIR_PATH);
+  const names = /* @__PURE__ */ new Set();
+  if (!await directoryExists(skillsDir)) {
+    return names;
+  }
+  const dirPaths = await findFilesByGlobs(join69(skillsDir, "*"), { type: "dir" });
+  for (const dirPath of dirPaths) {
+    const name = basename18(dirPath);
+    if (name === basename18(RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH)) continue;
+    names.add(name);
+  }
+  return names;
+}
+
 // src/features/skills/skills-processor.ts
 var skillsProcessorToolTargetTuple = [
   "agentsmd",
@@ -9037,19 +9062,46 @@ var SkillsProcessor = class extends DirFeatureProcessor {
   /**
    * Implementation of abstract method from DirFeatureProcessor
    * Load and parse rulesync skill directories from .rulesync/skills/ directory
+   * and also from .rulesync/skills/.curated/ for remote skills.
+   * Local skills take precedence over curated skills with the same name.
    */
   async loadRulesyncDirs() {
-    const paths = RulesyncSkill.getSettablePaths();
-    const rulesyncSkillsDirPath = join69(this.baseDir, paths.relativeDirPath);
-    const dirPaths = await findFilesByGlobs(join69(rulesyncSkillsDirPath, "*"), { type: "dir" });
-    const dirNames = dirPaths.map((path4) => basename18(path4));
-    const rulesyncSkills = await Promise.all(
-      dirNames.map(
+    const localDirNames = [...await getLocalSkillDirNames(this.baseDir)];
+    const localSkills = await Promise.all(
+      localDirNames.map(
         (dirName) => RulesyncSkill.fromDir({ baseDir: this.baseDir, dirName, global: this.global })
       )
     );
-    logger.info(`Successfully loaded ${rulesyncSkills.length} rulesync skills`);
-    return rulesyncSkills;
+    const localSkillNames = new Set(localDirNames);
+    const curatedDirPath = join70(this.baseDir, RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH);
+    let curatedSkills = [];
+    if (await directoryExists(curatedDirPath)) {
+      const curatedDirPaths = await findFilesByGlobs(join70(curatedDirPath, "*"), { type: "dir" });
+      const curatedDirNames = curatedDirPaths.map((path4) => basename19(path4));
+      const nonConflicting = curatedDirNames.filter((name) => {
+        if (localSkillNames.has(name)) {
+          logger.debug(`Skipping curated skill "${name}": local skill takes precedence.`);
+          return false;
+        }
+        return true;
+      });
+      const curatedRelativeDirPath = RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH;
+      curatedSkills = await Promise.all(
+        nonConflicting.map(
+          (dirName) => RulesyncSkill.fromDir({
+            baseDir: this.baseDir,
+            relativeDirPath: curatedRelativeDirPath,
+            dirName,
+            global: this.global
+          })
+        )
+      );
+    }
+    const allSkills = [...localSkills, ...curatedSkills];
+    logger.debug(
+      `Successfully loaded ${allSkills.length} rulesync skills (${localSkills.length} local, ${curatedSkills.length} curated)`
+    );
+    return allSkills;
   }
   /**
    * Implementation of abstract method from DirFeatureProcessor
@@ -9058,9 +9110,9 @@ var SkillsProcessor = class extends DirFeatureProcessor {
   async loadToolDirs() {
     const factory = this.getFactory(this.toolTarget);
     const paths = factory.class.getSettablePaths({ global: this.global });
-    const skillsDirPath = join69(this.baseDir, paths.relativeDirPath);
-    const dirPaths = await findFilesByGlobs(join69(skillsDirPath, "*"), { type: "dir" });
-    const dirNames = dirPaths.map((path4) => basename18(path4));
+    const skillsDirPath = join70(this.baseDir, paths.relativeDirPath);
+    const dirPaths = await findFilesByGlobs(join70(skillsDirPath, "*"), { type: "dir" });
+    const dirNames = dirPaths.map((path4) => basename19(path4));
     const toolSkills = await Promise.all(
       dirNames.map(
         (dirName) => factory.class.fromDir({
@@ -9070,15 +9122,15 @@ var SkillsProcessor = class extends DirFeatureProcessor {
         })
       )
     );
-    logger.info(`Successfully loaded ${toolSkills.length} ${paths.relativeDirPath} skills`);
+    logger.debug(`Successfully loaded ${toolSkills.length} ${paths.relativeDirPath} skills`);
     return toolSkills;
   }
   async loadToolDirsToDelete() {
     const factory = this.getFactory(this.toolTarget);
     const paths = factory.class.getSettablePaths({ global: this.global });
-    const skillsDirPath = join69(this.baseDir, paths.relativeDirPath);
-    const dirPaths = await findFilesByGlobs(join69(skillsDirPath, "*"), { type: "dir" });
-    const dirNames = dirPaths.map((path4) => basename18(path4));
+    const skillsDirPath = join70(this.baseDir, paths.relativeDirPath);
+    const dirPaths = await findFilesByGlobs(join70(skillsDirPath, "*"), { type: "dir" });
+    const dirNames = dirPaths.map((path4) => basename19(path4));
     const toolSkills = dirNames.map(
       (dirName) => factory.class.forDeletion({
         baseDir: this.baseDir,
@@ -9087,7 +9139,7 @@ var SkillsProcessor = class extends DirFeatureProcessor {
         global: this.global
       })
     );
-    logger.info(
+    logger.debug(
       `Successfully loaded ${toolSkills.length} ${paths.relativeDirPath} skills for deletion`
     );
     return toolSkills;
@@ -9139,10 +9191,10 @@ var SkillsProcessor = class extends DirFeatureProcessor {
 };
 
 // src/features/subagents/agentsmd-subagent.ts
-import { join as join71 } from "path";
+import { join as join72 } from "path";
 
 // src/features/subagents/simulated-subagent.ts
-import { basename as basename19, join as join70 } from "path";
+import { basename as basename20, join as join71 } from "path";
 import { z as z34 } from "zod/mini";
 
 // src/features/subagents/tool-subagent.ts
@@ -9198,7 +9250,7 @@ var SimulatedSubagent = class extends ToolSubagent {
       const result = SimulatedSubagentFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join70(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join71(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -9249,7 +9301,7 @@ var SimulatedSubagent = class extends ToolSubagent {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join70(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join71(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -9259,7 +9311,7 @@ var SimulatedSubagent = class extends ToolSubagent {
     relativeFilePath,
     validate = true
   }) {
-    const filePath = join70(baseDir, this.getSettablePaths().relativeDirPath, relativeFilePath);
+    const filePath = join71(baseDir, this.getSettablePaths().relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = SimulatedSubagentFrontmatterSchema.safeParse(frontmatter);
@@ -9269,7 +9321,7 @@ var SimulatedSubagent = class extends ToolSubagent {
     return {
       baseDir,
       relativeDirPath: this.getSettablePaths().relativeDirPath,
-      relativeFilePath: basename19(relativeFilePath),
+      relativeFilePath: basename20(relativeFilePath),
       frontmatter: result.data,
       body: content.trim(),
       validate
@@ -9295,7 +9347,7 @@ var SimulatedSubagent = class extends ToolSubagent {
 var AgentsmdSubagent = class _AgentsmdSubagent extends SimulatedSubagent {
   static getSettablePaths() {
     return {
-      relativeDirPath: join71(".agents", "subagents")
+      relativeDirPath: join72(".agents", "subagents")
     };
   }
   static async fromFile(params) {
@@ -9318,11 +9370,11 @@ var AgentsmdSubagent = class _AgentsmdSubagent extends SimulatedSubagent {
 };
 
 // src/features/subagents/codexcli-subagent.ts
-import { join as join72 } from "path";
+import { join as join73 } from "path";
 var CodexCliSubagent = class _CodexCliSubagent extends SimulatedSubagent {
   static getSettablePaths() {
     return {
-      relativeDirPath: join72(".codex", "subagents")
+      relativeDirPath: join73(".codex", "subagents")
     };
   }
   static async fromFile(params) {
@@ -9345,11 +9397,11 @@ var CodexCliSubagent = class _CodexCliSubagent extends SimulatedSubagent {
 };
 
 // src/features/subagents/factorydroid-subagent.ts
-import { join as join73 } from "path";
+import { join as join74 } from "path";
 var FactorydroidSubagent = class _FactorydroidSubagent extends SimulatedSubagent {
   static getSettablePaths(_options) {
     return {
-      relativeDirPath: join73(".factory", "droids")
+      relativeDirPath: join74(".factory", "droids")
     };
   }
   static async fromFile(params) {
@@ -9372,11 +9424,11 @@ var FactorydroidSubagent = class _FactorydroidSubagent extends SimulatedSubagent
 };
 
 // src/features/subagents/geminicli-subagent.ts
-import { join as join74 } from "path";
+import { join as join75 } from "path";
 var GeminiCliSubagent = class _GeminiCliSubagent extends SimulatedSubagent {
   static getSettablePaths() {
     return {
-      relativeDirPath: join74(".gemini", "subagents")
+      relativeDirPath: join75(".gemini", "subagents")
     };
   }
   static async fromFile(params) {
@@ -9399,11 +9451,11 @@ var GeminiCliSubagent = class _GeminiCliSubagent extends SimulatedSubagent {
 };
 
 // src/features/subagents/roo-subagent.ts
-import { join as join75 } from "path";
+import { join as join76 } from "path";
 var RooSubagent = class _RooSubagent extends SimulatedSubagent {
   static getSettablePaths() {
     return {
-      relativeDirPath: join75(".roo", "subagents")
+      relativeDirPath: join76(".roo", "subagents")
     };
   }
   static async fromFile(params) {
@@ -9426,15 +9478,15 @@ var RooSubagent = class _RooSubagent extends SimulatedSubagent {
 };
 
 // src/features/subagents/subagents-processor.ts
-import { basename as basename22, join as join82 } from "path";
+import { basename as basename23, join as join83 } from "path";
 import { z as z41 } from "zod/mini";
 
 // src/features/subagents/claudecode-subagent.ts
-import { join as join77 } from "path";
+import { join as join78 } from "path";
 import { z as z36 } from "zod/mini";
 
 // src/features/subagents/rulesync-subagent.ts
-import { basename as basename20, join as join76 } from "path";
+import { basename as basename21, join as join77 } from "path";
 import { z as z35 } from "zod/mini";
 var RulesyncSubagentFrontmatterSchema = z35.looseObject({
   targets: z35._default(RulesyncTargetsSchema, ["*"]),
@@ -9448,7 +9500,7 @@ var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
     const parseResult = RulesyncSubagentFrontmatterSchema.safeParse(frontmatter);
     if (!parseResult.success && rest.validate !== false) {
       throw new Error(
-        `Invalid frontmatter in ${join76(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(parseResult.error)}`
+        `Invalid frontmatter in ${join77(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(parseResult.error)}`
       );
     }
     const parsedFrontmatter = parseResult.success ? { ...frontmatter, ...parseResult.data } : { ...frontmatter, targets: frontmatter?.targets ?? ["*"] };
@@ -9481,7 +9533,7 @@ var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join76(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join77(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -9490,14 +9542,14 @@ var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
     relativeFilePath
   }) {
     const fileContent = await readFileContent(
-      join76(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, relativeFilePath)
+      join77(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, relativeFilePath)
     );
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = RulesyncSubagentFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(`Invalid frontmatter in ${relativeFilePath}: ${formatError(result.error)}`);
     }
-    const filename = basename20(relativeFilePath);
+    const filename = basename21(relativeFilePath);
     return new _RulesyncSubagent({
       baseDir: process.cwd(),
       relativeDirPath: this.getSettablePaths().relativeDirPath,
@@ -9525,7 +9577,7 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
       const result = ClaudecodeSubagentFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join77(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join78(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -9537,7 +9589,7 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
   }
   static getSettablePaths(_options = {}) {
     return {
-      relativeDirPath: join77(".claude", "agents")
+      relativeDirPath: join78(".claude", "agents")
     };
   }
   getFrontmatter() {
@@ -9584,7 +9636,9 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
     };
     const result = ClaudecodeSubagentFrontmatterSchema.safeParse(rawClaudecodeFrontmatter);
     if (!result.success) {
-      throw new Error(`Invalid claudecode subagent frontmatter: ${formatError(result.error)}`);
+      throw new Error(
+        `Invalid claudecode subagent frontmatter in ${rulesyncSubagent.getRelativeFilePath()}: ${formatError(result.error)}`
+      );
     }
     const claudecodeFrontmatter = result.data;
     const body = rulesyncSubagent.getBody();
@@ -9611,7 +9665,7 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join77(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join78(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -9629,7 +9683,7 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const filePath = join77(baseDir, paths.relativeDirPath, relativeFilePath);
+    const filePath = join78(baseDir, paths.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = ClaudecodeSubagentFrontmatterSchema.safeParse(frontmatter);
@@ -9664,7 +9718,7 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
 };
 
 // src/features/subagents/copilot-subagent.ts
-import { join as join78 } from "path";
+import { join as join79 } from "path";
 import { z as z37 } from "zod/mini";
 var REQUIRED_TOOL = "agent/runSubagent";
 var CopilotSubagentFrontmatterSchema = z37.looseObject({
@@ -9690,7 +9744,7 @@ var CopilotSubagent = class _CopilotSubagent extends ToolSubagent {
       const result = CopilotSubagentFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join78(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join79(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -9702,7 +9756,7 @@ var CopilotSubagent = class _CopilotSubagent extends ToolSubagent {
   }
   static getSettablePaths(_options = {}) {
     return {
-      relativeDirPath: join78(".github", "agents")
+      relativeDirPath: join79(".github", "agents")
     };
   }
   getFrontmatter() {
@@ -9776,7 +9830,7 @@ var CopilotSubagent = class _CopilotSubagent extends ToolSubagent {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join78(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join79(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -9794,7 +9848,7 @@ var CopilotSubagent = class _CopilotSubagent extends ToolSubagent {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const filePath = join78(baseDir, paths.relativeDirPath, relativeFilePath);
+    const filePath = join79(baseDir, paths.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = CopilotSubagentFrontmatterSchema.safeParse(frontmatter);
@@ -9830,7 +9884,7 @@ var CopilotSubagent = class _CopilotSubagent extends ToolSubagent {
 };
 
 // src/features/subagents/cursor-subagent.ts
-import { join as join79 } from "path";
+import { join as join80 } from "path";
 import { z as z38 } from "zod/mini";
 var CursorSubagentFrontmatterSchema = z38.looseObject({
   name: z38.string(),
@@ -9844,7 +9898,7 @@ var CursorSubagent = class _CursorSubagent extends ToolSubagent {
       const result = CursorSubagentFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join79(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join80(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -9856,7 +9910,7 @@ var CursorSubagent = class _CursorSubagent extends ToolSubagent {
   }
   static getSettablePaths(_options = {}) {
     return {
-      relativeDirPath: join79(".cursor", "agents")
+      relativeDirPath: join80(".cursor", "agents")
     };
   }
   getFrontmatter() {
@@ -9923,7 +9977,7 @@ var CursorSubagent = class _CursorSubagent extends ToolSubagent {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join79(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join80(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -9941,7 +9995,7 @@ var CursorSubagent = class _CursorSubagent extends ToolSubagent {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const filePath = join79(baseDir, paths.relativeDirPath, relativeFilePath);
+    const filePath = join80(baseDir, paths.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = CursorSubagentFrontmatterSchema.safeParse(frontmatter);
@@ -9977,7 +10031,7 @@ var CursorSubagent = class _CursorSubagent extends ToolSubagent {
 };
 
 // src/features/subagents/kiro-subagent.ts
-import { join as join80 } from "path";
+import { join as join81 } from "path";
 import { z as z39 } from "zod/mini";
 var KiroCliSubagentJsonSchema = z39.looseObject({
   name: z39.string(),
@@ -10005,7 +10059,7 @@ var KiroSubagent = class _KiroSubagent extends ToolSubagent {
   }
   static getSettablePaths(_options = {}) {
     return {
-      relativeDirPath: join80(".kiro", "agents")
+      relativeDirPath: join81(".kiro", "agents")
     };
   }
   getBody() {
@@ -10085,7 +10139,7 @@ var KiroSubagent = class _KiroSubagent extends ToolSubagent {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const filePath = join80(baseDir, paths.relativeDirPath, relativeFilePath);
+    const filePath = join81(baseDir, paths.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     return new _KiroSubagent({
       baseDir,
@@ -10114,11 +10168,11 @@ var KiroSubagent = class _KiroSubagent extends ToolSubagent {
 };
 
 // src/features/subagents/opencode-subagent.ts
-import { basename as basename21, join as join81 } from "path";
+import { basename as basename22, join as join82 } from "path";
 import { z as z40 } from "zod/mini";
 var OpenCodeSubagentFrontmatterSchema = z40.looseObject({
   description: z40.string(),
-  mode: z40.literal("subagent"),
+  mode: z40.optional(z40._default(z40.string(), "subagent")),
   name: z40.optional(z40.string())
 });
 var OpenCodeSubagent = class _OpenCodeSubagent extends ToolSubagent {
@@ -10129,7 +10183,7 @@ var OpenCodeSubagent = class _OpenCodeSubagent extends ToolSubagent {
       const result = OpenCodeSubagentFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join81(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join82(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -10143,7 +10197,7 @@ var OpenCodeSubagent = class _OpenCodeSubagent extends ToolSubagent {
     global = false
   } = {}) {
     return {
-      relativeDirPath: global ? join81(".config", "opencode", "agent") : join81(".opencode", "agent")
+      relativeDirPath: global ? join82(".config", "opencode", "agent") : join82(".opencode", "agent")
     };
   }
   getFrontmatter() {
@@ -10156,7 +10210,7 @@ var OpenCodeSubagent = class _OpenCodeSubagent extends ToolSubagent {
     const { description, mode, name, ...opencodeSection } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["*"],
-      name: name ?? basename21(this.getRelativeFilePath(), ".md"),
+      name: name ?? basename22(this.getRelativeFilePath(), ".md"),
       description,
       opencode: { mode, ...opencodeSection }
     };
@@ -10209,7 +10263,7 @@ var OpenCodeSubagent = class _OpenCodeSubagent extends ToolSubagent {
     return {
       success: false,
       error: new Error(
-        `Invalid frontmatter in ${join81(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+        `Invalid frontmatter in ${join82(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
       )
     };
   }
@@ -10226,7 +10280,7 @@ var OpenCodeSubagent = class _OpenCodeSubagent extends ToolSubagent {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    const filePath = join81(baseDir, paths.relativeDirPath, relativeFilePath);
+    const filePath = join82(baseDir, paths.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = OpenCodeSubagentFrontmatterSchema.safeParse(frontmatter);
@@ -10437,7 +10491,7 @@ var SubagentsProcessor = class extends FeatureProcessor {
    * Load and parse rulesync subagent files from .rulesync/subagents/ directory
    */
   async loadRulesyncFiles() {
-    const subagentsDir = join82(this.baseDir, RulesyncSubagent.getSettablePaths().relativeDirPath);
+    const subagentsDir = join83(this.baseDir, RulesyncSubagent.getSettablePaths().relativeDirPath);
     const dirExists = await directoryExists(subagentsDir);
     if (!dirExists) {
       logger.debug(`Rulesync subagents directory not found: ${subagentsDir}`);
@@ -10449,10 +10503,10 @@ var SubagentsProcessor = class extends FeatureProcessor {
       logger.debug(`No markdown files found in rulesync subagents directory: ${subagentsDir}`);
       return [];
     }
-    logger.info(`Found ${mdFiles.length} subagent files in ${subagentsDir}`);
+    logger.debug(`Found ${mdFiles.length} subagent files in ${subagentsDir}`);
     const rulesyncSubagents = [];
     for (const mdFile of mdFiles) {
-      const filepath = join82(subagentsDir, mdFile);
+      const filepath = join83(subagentsDir, mdFile);
       try {
         const rulesyncSubagent = await RulesyncSubagent.fromFile({
           relativeFilePath: mdFile,
@@ -10461,7 +10515,7 @@ var SubagentsProcessor = class extends FeatureProcessor {
         rulesyncSubagents.push(rulesyncSubagent);
         logger.debug(`Successfully loaded subagent: ${mdFile}`);
       } catch (error) {
-        logger.warn(`Failed to load subagent file ${filepath}:`, error);
+        logger.warn(`Failed to load subagent file ${filepath}: ${formatError(error)}`);
         continue;
       }
     }
@@ -10469,7 +10523,7 @@ var SubagentsProcessor = class extends FeatureProcessor {
       logger.debug(`No valid subagents found in ${subagentsDir}`);
       return [];
     }
-    logger.info(`Successfully loaded ${rulesyncSubagents.length} rulesync subagents`);
+    logger.debug(`Successfully loaded ${rulesyncSubagents.length} rulesync subagents`);
     return rulesyncSubagents;
   }
   /**
@@ -10482,30 +10536,32 @@ var SubagentsProcessor = class extends FeatureProcessor {
     const factory = this.getFactory(this.toolTarget);
     const paths = factory.class.getSettablePaths({ global: this.global });
     const subagentFilePaths = await findFilesByGlobs(
-      join82(this.baseDir, paths.relativeDirPath, factory.meta.filePattern)
+      join83(this.baseDir, paths.relativeDirPath, factory.meta.filePattern)
     );
     if (forDeletion) {
       const toolSubagents2 = subagentFilePaths.map(
         (path4) => factory.class.forDeletion({
           baseDir: this.baseDir,
           relativeDirPath: paths.relativeDirPath,
-          relativeFilePath: basename22(path4),
+          relativeFilePath: basename23(path4),
           global: this.global
         })
       ).filter((subagent) => subagent.isDeletable());
-      logger.info(`Successfully loaded ${toolSubagents2.length} ${paths.relativeDirPath} subagents`);
+      logger.debug(
+        `Successfully loaded ${toolSubagents2.length} ${paths.relativeDirPath} subagents`
+      );
       return toolSubagents2;
     }
     const toolSubagents = await Promise.all(
       subagentFilePaths.map(
         (path4) => factory.class.fromFile({
           baseDir: this.baseDir,
-          relativeFilePath: basename22(path4),
+          relativeFilePath: basename23(path4),
           global: this.global
         })
       )
     );
-    logger.info(`Successfully loaded ${toolSubagents.length} ${paths.relativeDirPath} subagents`);
+    logger.debug(`Successfully loaded ${toolSubagents.length} ${paths.relativeDirPath} subagents`);
     return toolSubagents;
   }
   /**
@@ -10545,13 +10601,13 @@ var SubagentsProcessor = class extends FeatureProcessor {
 };
 
 // src/features/rules/agentsmd-rule.ts
-import { join as join85 } from "path";
+import { join as join86 } from "path";
 
 // src/features/rules/tool-rule.ts
-import { join as join84 } from "path";
+import { join as join85 } from "path";
 
 // src/features/rules/rulesync-rule.ts
-import { join as join83 } from "path";
+import { join as join84 } from "path";
 import { z as z42 } from "zod/mini";
 var RulesyncRuleFrontmatterSchema = z42.object({
   root: z42.optional(z42.boolean()),
@@ -10598,7 +10654,7 @@ var RulesyncRule = class _RulesyncRule extends RulesyncFile {
     const parseResult = RulesyncRuleFrontmatterSchema.safeParse(frontmatter);
     if (!parseResult.success && rest.validate !== false) {
       throw new Error(
-        `Invalid frontmatter in ${join83(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(parseResult.error)}`
+        `Invalid frontmatter in ${join84(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(parseResult.error)}`
       );
     }
     const parsedFrontmatter = parseResult.success ? parseResult.data : { ...frontmatter, targets: frontmatter.targets ?? ["*"] };
@@ -10633,7 +10689,7 @@ var RulesyncRule = class _RulesyncRule extends RulesyncFile {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join83(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join84(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -10642,7 +10698,7 @@ var RulesyncRule = class _RulesyncRule extends RulesyncFile {
     relativeFilePath,
     validate = true
   }) {
-    const filePath = join83(
+    const filePath = join84(
       process.cwd(),
       this.getSettablePaths().recommended.relativeDirPath,
       relativeFilePath
@@ -10726,7 +10782,7 @@ var ToolRule = class extends ToolFile {
       };
     }
     if (!nonRootPath) {
-      throw new Error("nonRootPath is not set");
+      throw new Error(`nonRootPath is not set for ${rulesyncRule.getRelativeFilePath()}`);
     }
     return {
       baseDir,
@@ -10744,7 +10800,7 @@ var ToolRule = class extends ToolFile {
     rulesyncRule,
     validate = true,
     rootPath = { relativeDirPath: ".", relativeFilePath: "AGENTS.md" },
-    nonRootPath = { relativeDirPath: join84(".agents", "memories") }
+    nonRootPath = { relativeDirPath: join85(".agents", "memories") }
   }) {
     const params = this.buildToolRuleParamsDefault({
       baseDir,
@@ -10755,7 +10811,7 @@ var ToolRule = class extends ToolFile {
     });
     const rulesyncFrontmatter = rulesyncRule.getFrontmatter();
     if (!rulesyncFrontmatter.root && rulesyncFrontmatter.agentsmd?.subprojectPath) {
-      params.relativeDirPath = join84(rulesyncFrontmatter.agentsmd.subprojectPath);
+      params.relativeDirPath = join85(rulesyncFrontmatter.agentsmd.subprojectPath);
       params.relativeFilePath = "AGENTS.md";
     }
     return params;
@@ -10804,7 +10860,7 @@ var ToolRule = class extends ToolFile {
   }
 };
 function buildToolPath(toolDir, subDir, excludeToolDir) {
-  return excludeToolDir ? subDir : join84(toolDir, subDir);
+  return excludeToolDir ? subDir : join85(toolDir, subDir);
 }
 
 // src/features/rules/agentsmd-rule.ts
@@ -10833,8 +10889,8 @@ var AgentsMdRule = class _AgentsMdRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "AGENTS.md";
-    const relativePath = isRoot ? "AGENTS.md" : join85(".agents", "memories", relativeFilePath);
-    const fileContent = await readFileContent(join85(baseDir, relativePath));
+    const relativePath = isRoot ? "AGENTS.md" : join86(".agents", "memories", relativeFilePath);
+    const fileContent = await readFileContent(join86(baseDir, relativePath));
     return new _AgentsMdRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -10889,7 +10945,7 @@ var AgentsMdRule = class _AgentsMdRule extends ToolRule {
 };
 
 // src/features/rules/antigravity-rule.ts
-import { join as join86 } from "path";
+import { join as join87 } from "path";
 import { z as z43 } from "zod/mini";
 var AntigravityRuleFrontmatterSchema = z43.looseObject({
   trigger: z43.optional(
@@ -11048,7 +11104,7 @@ var AntigravityRule = class _AntigravityRule extends ToolRule {
       const result = AntigravityRuleFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join86(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join87(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -11072,7 +11128,7 @@ var AntigravityRule = class _AntigravityRule extends ToolRule {
     relativeFilePath,
     validate = true
   }) {
-    const filePath = join86(
+    const filePath = join87(
       baseDir,
       this.getSettablePaths().nonRoot.relativeDirPath,
       relativeFilePath
@@ -11213,7 +11269,7 @@ var AntigravityRule = class _AntigravityRule extends ToolRule {
 };
 
 // src/features/rules/augmentcode-legacy-rule.ts
-import { join as join87 } from "path";
+import { join as join88 } from "path";
 var AugmentcodeLegacyRule = class _AugmentcodeLegacyRule extends ToolRule {
   toRulesyncRule() {
     const rulesyncFrontmatter = {
@@ -11274,8 +11330,8 @@ var AugmentcodeLegacyRule = class _AugmentcodeLegacyRule extends ToolRule {
   }) {
     const settablePaths = this.getSettablePaths();
     const isRoot = relativeFilePath === settablePaths.root.relativeFilePath;
-    const relativePath = isRoot ? settablePaths.root.relativeFilePath : join87(settablePaths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join87(baseDir, relativePath));
+    const relativePath = isRoot ? settablePaths.root.relativeFilePath : join88(settablePaths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join88(baseDir, relativePath));
     return new _AugmentcodeLegacyRule({
       baseDir,
       relativeDirPath: isRoot ? settablePaths.root.relativeDirPath : settablePaths.nonRoot.relativeDirPath,
@@ -11304,7 +11360,7 @@ var AugmentcodeLegacyRule = class _AugmentcodeLegacyRule extends ToolRule {
 };
 
 // src/features/rules/augmentcode-rule.ts
-import { join as join88 } from "path";
+import { join as join89 } from "path";
 var AugmentcodeRule = class _AugmentcodeRule extends ToolRule {
   toRulesyncRule() {
     return this.toRulesyncRuleDefault();
@@ -11336,7 +11392,7 @@ var AugmentcodeRule = class _AugmentcodeRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join88(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join89(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     const { body: content } = parseFrontmatter(fileContent);
     return new _AugmentcodeRule({
@@ -11372,7 +11428,7 @@ var AugmentcodeRule = class _AugmentcodeRule extends ToolRule {
 };
 
 // src/features/rules/claudecode-legacy-rule.ts
-import { join as join89 } from "path";
+import { join as join90 } from "path";
 var ClaudecodeLegacyRule = class _ClaudecodeLegacyRule extends ToolRule {
   static getSettablePaths({
     global,
@@ -11407,7 +11463,7 @@ var ClaudecodeLegacyRule = class _ClaudecodeLegacyRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join89(baseDir, paths.root.relativeDirPath, relativePath2)
+        join90(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _ClaudecodeLegacyRule({
         baseDir,
@@ -11419,10 +11475,10 @@ var ClaudecodeLegacyRule = class _ClaudecodeLegacyRule extends ToolRule {
       });
     }
     if (!paths.nonRoot) {
-      throw new Error("nonRoot path is not set");
+      throw new Error(`nonRoot path is not set for ${relativeFilePath}`);
     }
-    const relativePath = join89(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join89(baseDir, relativePath));
+    const relativePath = join90(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join90(baseDir, relativePath));
     return new _ClaudecodeLegacyRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -11481,7 +11537,7 @@ var ClaudecodeLegacyRule = class _ClaudecodeLegacyRule extends ToolRule {
 };
 
 // src/features/rules/claudecode-rule.ts
-import { join as join90 } from "path";
+import { join as join91 } from "path";
 import { z as z44 } from "zod/mini";
 var ClaudecodeRuleFrontmatterSchema = z44.object({
   paths: z44.optional(z44.array(z44.string()))
@@ -11516,7 +11572,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
       const result = ClaudecodeRuleFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join90(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join91(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -11544,7 +11600,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
     const isRoot = relativeFilePath === paths.root.relativeFilePath;
     if (isRoot) {
       const fileContent2 = await readFileContent(
-        join90(baseDir, paths.root.relativeDirPath, paths.root.relativeFilePath)
+        join91(baseDir, paths.root.relativeDirPath, paths.root.relativeFilePath)
       );
       return new _ClaudecodeRule({
         baseDir,
@@ -11557,15 +11613,15 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
       });
     }
     if (!paths.nonRoot) {
-      throw new Error("nonRoot path is not set");
+      throw new Error(`nonRoot path is not set for ${relativeFilePath}`);
     }
-    const relativePath = join90(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join90(baseDir, relativePath));
+    const relativePath = join91(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join91(baseDir, relativePath));
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = ClaudecodeRuleFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(
-        `Invalid frontmatter in ${join90(baseDir, relativePath)}: ${formatError(result.error)}`
+        `Invalid frontmatter in ${join91(baseDir, relativePath)}: ${formatError(result.error)}`
       );
     }
     return new _ClaudecodeRule({
@@ -11624,7 +11680,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
       });
     }
     if (!paths.nonRoot) {
-      throw new Error("nonRoot path is not set");
+      throw new Error(`nonRoot path is not set for ${rulesyncRule.getRelativeFilePath()}`);
     }
     return new _ClaudecodeRule({
       baseDir,
@@ -11672,7 +11728,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join90(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join91(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -11692,7 +11748,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
 };
 
 // src/features/rules/cline-rule.ts
-import { join as join91 } from "path";
+import { join as join92 } from "path";
 import { z as z45 } from "zod/mini";
 var ClineRuleFrontmatterSchema = z45.object({
   description: z45.string()
@@ -11738,7 +11794,7 @@ var ClineRule = class _ClineRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join91(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join92(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _ClineRule({
       baseDir,
@@ -11764,7 +11820,7 @@ var ClineRule = class _ClineRule extends ToolRule {
 };
 
 // src/features/rules/codexcli-rule.ts
-import { join as join92 } from "path";
+import { join as join93 } from "path";
 var CodexcliRule = class _CodexcliRule extends ToolRule {
   static getSettablePaths({
     global,
@@ -11799,7 +11855,7 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join92(baseDir, paths.root.relativeDirPath, relativePath2)
+        join93(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _CodexcliRule({
         baseDir,
@@ -11811,10 +11867,10 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
       });
     }
     if (!paths.nonRoot) {
-      throw new Error("nonRoot path is not set");
+      throw new Error(`nonRoot path is not set for ${relativeFilePath}`);
     }
-    const relativePath = join92(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join92(baseDir, relativePath));
+    const relativePath = join93(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join93(baseDir, relativePath));
     return new _CodexcliRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -11873,7 +11929,7 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
 };
 
 // src/features/rules/copilot-rule.ts
-import { join as join93 } from "path";
+import { join as join94 } from "path";
 import { z as z46 } from "zod/mini";
 var CopilotRuleFrontmatterSchema = z46.object({
   description: z46.optional(z46.string()),
@@ -11899,7 +11955,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
       const result = CopilotRuleFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join93(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join94(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -11981,11 +12037,11 @@ var CopilotRule = class _CopilotRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "copilot-instructions.md";
-    const relativePath = isRoot ? join93(
+    const relativePath = isRoot ? join94(
       this.getSettablePaths().root.relativeDirPath,
       this.getSettablePaths().root.relativeFilePath
-    ) : join93(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join93(baseDir, relativePath));
+    ) : join94(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join94(baseDir, relativePath));
     if (isRoot) {
       return new _CopilotRule({
         baseDir,
@@ -12001,7 +12057,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
     const result = CopilotRuleFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(
-        `Invalid frontmatter in ${join93(baseDir, relativeFilePath)}: ${formatError(result.error)}`
+        `Invalid frontmatter in ${join94(baseDir, relativeFilePath)}: ${formatError(result.error)}`
       );
     }
     return new _CopilotRule({
@@ -12041,7 +12097,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join93(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join94(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -12061,7 +12117,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
 };
 
 // src/features/rules/cursor-rule.ts
-import { join as join94 } from "path";
+import { join as join95 } from "path";
 import { z as z47 } from "zod/mini";
 var CursorRuleFrontmatterSchema = z47.object({
   description: z47.optional(z47.string()),
@@ -12083,7 +12139,7 @@ var CursorRule = class _CursorRule extends ToolRule {
       const result = CursorRuleFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join94(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join95(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -12200,13 +12256,13 @@ var CursorRule = class _CursorRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join94(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join95(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     const { frontmatter, body: content } = _CursorRule.parseCursorFrontmatter(fileContent);
     const result = CursorRuleFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(
-        `Invalid frontmatter in ${join94(baseDir, relativeFilePath)}: ${formatError(result.error)}`
+        `Invalid frontmatter in ${join95(baseDir, relativeFilePath)}: ${formatError(result.error)}`
       );
     }
     return new _CursorRule({
@@ -12243,7 +12299,7 @@ var CursorRule = class _CursorRule extends ToolRule {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join94(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join95(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -12263,7 +12319,7 @@ var CursorRule = class _CursorRule extends ToolRule {
 };
 
 // src/features/rules/factorydroid-rule.ts
-import { join as join95 } from "path";
+import { join as join96 } from "path";
 var FactorydroidRule = class _FactorydroidRule extends ToolRule {
   constructor({ fileContent, root, ...rest }) {
     super({
@@ -12303,8 +12359,8 @@ var FactorydroidRule = class _FactorydroidRule extends ToolRule {
     const paths = this.getSettablePaths({ global });
     const isRoot = relativeFilePath === paths.root.relativeFilePath;
     if (isRoot) {
-      const relativePath2 = join95(paths.root.relativeDirPath, paths.root.relativeFilePath);
-      const fileContent2 = await readFileContent(join95(baseDir, relativePath2));
+      const relativePath2 = join96(paths.root.relativeDirPath, paths.root.relativeFilePath);
+      const fileContent2 = await readFileContent(join96(baseDir, relativePath2));
       return new _FactorydroidRule({
         baseDir,
         relativeDirPath: paths.root.relativeDirPath,
@@ -12315,10 +12371,10 @@ var FactorydroidRule = class _FactorydroidRule extends ToolRule {
       });
     }
     if (!paths.nonRoot) {
-      throw new Error("nonRoot path is not set");
+      throw new Error(`nonRoot path is not set for ${relativeFilePath}`);
     }
-    const relativePath = join95(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join95(baseDir, relativePath));
+    const relativePath = join96(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join96(baseDir, relativePath));
     return new _FactorydroidRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -12377,7 +12433,7 @@ var FactorydroidRule = class _FactorydroidRule extends ToolRule {
 };
 
 // src/features/rules/geminicli-rule.ts
-import { join as join96 } from "path";
+import { join as join97 } from "path";
 var GeminiCliRule = class _GeminiCliRule extends ToolRule {
   static getSettablePaths({
     global,
@@ -12412,7 +12468,7 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join96(baseDir, paths.root.relativeDirPath, relativePath2)
+        join97(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _GeminiCliRule({
         baseDir,
@@ -12424,10 +12480,10 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
       });
     }
     if (!paths.nonRoot) {
-      throw new Error("nonRoot path is not set");
+      throw new Error(`nonRoot path is not set for ${relativeFilePath}`);
     }
-    const relativePath = join96(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join96(baseDir, relativePath));
+    const relativePath = join97(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join97(baseDir, relativePath));
     return new _GeminiCliRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -12486,7 +12542,7 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
 };
 
 // src/features/rules/junie-rule.ts
-import { join as join97 } from "path";
+import { join as join98 } from "path";
 var JunieRule = class _JunieRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -12505,8 +12561,8 @@ var JunieRule = class _JunieRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "guidelines.md";
-    const relativePath = isRoot ? "guidelines.md" : join97(".junie", "memories", relativeFilePath);
-    const fileContent = await readFileContent(join97(baseDir, relativePath));
+    const relativePath = isRoot ? "guidelines.md" : join98(".junie", "memories", relativeFilePath);
+    const fileContent = await readFileContent(join98(baseDir, relativePath));
     return new _JunieRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -12561,7 +12617,7 @@ var JunieRule = class _JunieRule extends ToolRule {
 };
 
 // src/features/rules/kilo-rule.ts
-import { join as join98 } from "path";
+import { join as join99 } from "path";
 var KiloRule = class _KiloRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -12576,7 +12632,7 @@ var KiloRule = class _KiloRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join98(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join99(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _KiloRule({
       baseDir,
@@ -12628,7 +12684,7 @@ var KiloRule = class _KiloRule extends ToolRule {
 };
 
 // src/features/rules/kiro-rule.ts
-import { join as join99 } from "path";
+import { join as join100 } from "path";
 var KiroRule = class _KiroRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -12643,7 +12699,7 @@ var KiroRule = class _KiroRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join99(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join100(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _KiroRule({
       baseDir,
@@ -12697,7 +12753,7 @@ var KiroRule = class _KiroRule extends ToolRule {
 };
 
 // src/features/rules/opencode-rule.ts
-import { join as join100 } from "path";
+import { join as join101 } from "path";
 var OpenCodeRule = class _OpenCodeRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -12716,8 +12772,8 @@ var OpenCodeRule = class _OpenCodeRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "AGENTS.md";
-    const relativePath = isRoot ? "AGENTS.md" : join100(".opencode", "memories", relativeFilePath);
-    const fileContent = await readFileContent(join100(baseDir, relativePath));
+    const relativePath = isRoot ? "AGENTS.md" : join101(".opencode", "memories", relativeFilePath);
+    const fileContent = await readFileContent(join101(baseDir, relativePath));
     return new _OpenCodeRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -12772,7 +12828,7 @@ var OpenCodeRule = class _OpenCodeRule extends ToolRule {
 };
 
 // src/features/rules/qwencode-rule.ts
-import { join as join101 } from "path";
+import { join as join102 } from "path";
 var QwencodeRule = class _QwencodeRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -12791,8 +12847,8 @@ var QwencodeRule = class _QwencodeRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "QWEN.md";
-    const relativePath = isRoot ? "QWEN.md" : join101(".qwen", "memories", relativeFilePath);
-    const fileContent = await readFileContent(join101(baseDir, relativePath));
+    const relativePath = isRoot ? "QWEN.md" : join102(".qwen", "memories", relativeFilePath);
+    const fileContent = await readFileContent(join102(baseDir, relativePath));
     return new _QwencodeRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -12844,7 +12900,7 @@ var QwencodeRule = class _QwencodeRule extends ToolRule {
 };
 
 // src/features/rules/replit-rule.ts
-import { join as join102 } from "path";
+import { join as join103 } from "path";
 var ReplitRule = class _ReplitRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -12862,11 +12918,11 @@ var ReplitRule = class _ReplitRule extends ToolRule {
     const paths = this.getSettablePaths();
     const isRoot = relativeFilePath === paths.root.relativeFilePath;
     if (!isRoot) {
-      throw new Error("ReplitRule only supports root rules");
+      throw new Error(`ReplitRule only supports root rules: ${relativeFilePath}`);
     }
     const relativePath = paths.root.relativeFilePath;
     const fileContent = await readFileContent(
-      join102(baseDir, paths.root.relativeDirPath, relativePath)
+      join103(baseDir, paths.root.relativeDirPath, relativePath)
     );
     return new _ReplitRule({
       baseDir,
@@ -12885,7 +12941,7 @@ var ReplitRule = class _ReplitRule extends ToolRule {
     const paths = this.getSettablePaths();
     const isRoot = rulesyncRule.getFrontmatter().root ?? false;
     if (!isRoot) {
-      throw new Error("ReplitRule only supports root rules");
+      throw new Error(`ReplitRule only supports root rules: ${rulesyncRule.getRelativeFilePath()}`);
     }
     return new _ReplitRule(
       this.buildToolRuleParamsDefault({
@@ -12932,7 +12988,7 @@ var ReplitRule = class _ReplitRule extends ToolRule {
 };
 
 // src/features/rules/roo-rule.ts
-import { join as join103 } from "path";
+import { join as join104 } from "path";
 var RooRule = class _RooRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -12947,7 +13003,7 @@ var RooRule = class _RooRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join103(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join104(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _RooRule({
       baseDir,
@@ -13016,7 +13072,7 @@ var RooRule = class _RooRule extends ToolRule {
 };
 
 // src/features/rules/warp-rule.ts
-import { join as join104 } from "path";
+import { join as join105 } from "path";
 var WarpRule = class _WarpRule extends ToolRule {
   constructor({ fileContent, root, ...rest }) {
     super({
@@ -13042,8 +13098,8 @@ var WarpRule = class _WarpRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === this.getSettablePaths().root.relativeFilePath;
-    const relativePath = isRoot ? this.getSettablePaths().root.relativeFilePath : join104(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join104(baseDir, relativePath));
+    const relativePath = isRoot ? this.getSettablePaths().root.relativeFilePath : join105(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join105(baseDir, relativePath));
     return new _WarpRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : ".warp",
@@ -13098,7 +13154,7 @@ var WarpRule = class _WarpRule extends ToolRule {
 };
 
 // src/features/rules/windsurf-rule.ts
-import { join as join105 } from "path";
+import { join as join106 } from "path";
 var WindsurfRule = class _WindsurfRule extends ToolRule {
   static getSettablePaths(_options = {}) {
     return {
@@ -13113,7 +13169,7 @@ var WindsurfRule = class _WindsurfRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join105(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join106(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _WindsurfRule({
       baseDir,
@@ -13499,7 +13555,7 @@ var RulesProcessor = class extends FeatureProcessor {
     }).relativeDirPath;
     return this.skills.filter((skill) => skillClass.isTargetedByRulesyncSkill(skill)).map((skill) => {
       const frontmatter = skill.getFrontmatter();
-      const relativePath = join106(toolRelativeDirPath, skill.getDirName(), SKILL_FILE_NAME);
+      const relativePath = join107(toolRelativeDirPath, skill.getDirName(), SKILL_FILE_NAME);
       return {
         name: frontmatter.name,
         description: frontmatter.description,
@@ -13610,8 +13666,8 @@ var RulesProcessor = class extends FeatureProcessor {
    * Load and parse rulesync rule files from .rulesync/rules/ directory
    */
   async loadRulesyncFiles() {
-    const rulesyncBaseDir = join106(this.baseDir, RULESYNC_RULES_RELATIVE_DIR_PATH);
-    const files = await findFilesByGlobs(join106(rulesyncBaseDir, "**", "*.md"));
+    const rulesyncBaseDir = join107(this.baseDir, RULESYNC_RULES_RELATIVE_DIR_PATH);
+    const files = await findFilesByGlobs(join107(rulesyncBaseDir, "**", "*.md"));
     logger.debug(`Found ${files.length} rulesync files`);
     const rulesyncRules = await Promise.all(
       files.map((file) => {
@@ -13624,7 +13680,9 @@ var RulesProcessor = class extends FeatureProcessor {
     );
     const rootRules = rulesyncRules.filter((rule) => rule.getFrontmatter().root);
     if (rootRules.length > 1) {
-      throw new Error("Multiple root rulesync rules found");
+      throw new Error(
+        `Multiple root rulesync rules found: ${rootRules.map((r) => join107(r.getRelativeDirPath(), r.getRelativeFilePath())).join(", ")}`
+      );
     }
     if (rootRules.length === 0 && rulesyncRules.length > 0) {
       logger.warn(
@@ -13633,21 +13691,25 @@ var RulesProcessor = class extends FeatureProcessor {
     }
     const localRootRules = rulesyncRules.filter((rule) => rule.getFrontmatter().localRoot);
     if (localRootRules.length > 1) {
-      throw new Error("Multiple localRoot rules found. Only one rule can have localRoot: true");
+      throw new Error(
+        `Multiple localRoot rules found: ${localRootRules.map((r) => join107(r.getRelativeDirPath(), r.getRelativeFilePath())).join(", ")}. Only one rule can have localRoot: true`
+      );
     }
     if (localRootRules.length > 0 && rootRules.length === 0) {
-      throw new Error("localRoot: true requires a root: true rule to exist");
+      throw new Error(
+        `localRoot: true requires a root: true rule to exist (found in ${localRootRules.map((r) => join107(r.getRelativeDirPath(), r.getRelativeFilePath())).join(", ")})`
+      );
     }
     if (this.global) {
       const nonRootRules = rulesyncRules.filter((rule) => !rule.getFrontmatter().root);
       if (nonRootRules.length > 0) {
         logger.warn(
-          `${nonRootRules.length} non-root rulesync rules found, but it's in global mode, so ignoring them`
+          `${nonRootRules.length} non-root rulesync rules found, but it's in global mode, so ignoring them: ${nonRootRules.map((r) => join107(r.getRelativeDirPath(), r.getRelativeFilePath())).join(", ")}`
         );
       }
       if (localRootRules.length > 0) {
         logger.warn(
-          `${localRootRules.length} localRoot rules found, but localRoot is not supported in global mode, ignoring them`
+          `${localRootRules.length} localRoot rules found, but localRoot is not supported in global mode, ignoring them: ${localRootRules.map((r) => join107(r.getRelativeDirPath(), r.getRelativeFilePath())).join(", ")}`
         );
       }
       return rootRules;
@@ -13669,7 +13731,7 @@ var RulesProcessor = class extends FeatureProcessor {
           return [];
         }
         const rootFilePaths = await findFilesByGlobs(
-          join106(
+          join107(
             this.baseDir,
             settablePaths.root.relativeDirPath ?? ".",
             settablePaths.root.relativeFilePath
@@ -13680,7 +13742,7 @@ var RulesProcessor = class extends FeatureProcessor {
             (filePath) => factory.class.forDeletion({
               baseDir: this.baseDir,
               relativeDirPath: settablePaths.root?.relativeDirPath ?? ".",
-              relativeFilePath: basename23(filePath),
+              relativeFilePath: basename24(filePath),
               global: this.global
             })
           ).filter((rule) => rule.isDeletable());
@@ -13689,7 +13751,7 @@ var RulesProcessor = class extends FeatureProcessor {
           rootFilePaths.map(
             (filePath) => factory.class.fromFile({
               baseDir: this.baseDir,
-              relativeFilePath: basename23(filePath),
+              relativeFilePath: basename24(filePath),
               global: this.global
             })
           )
@@ -13707,13 +13769,13 @@ var RulesProcessor = class extends FeatureProcessor {
           return [];
         }
         const localRootFilePaths = await findFilesByGlobs(
-          join106(this.baseDir, settablePaths.root.relativeDirPath ?? ".", "CLAUDE.local.md")
+          join107(this.baseDir, settablePaths.root.relativeDirPath ?? ".", "CLAUDE.local.md")
         );
         return localRootFilePaths.map(
           (filePath) => factory.class.forDeletion({
             baseDir: this.baseDir,
             relativeDirPath: settablePaths.root?.relativeDirPath ?? ".",
-            relativeFilePath: basename23(filePath),
+            relativeFilePath: basename24(filePath),
             global: this.global
           })
         ).filter((rule) => rule.isDeletable());
@@ -13723,9 +13785,9 @@ var RulesProcessor = class extends FeatureProcessor {
         if (!settablePaths.nonRoot) {
           return [];
         }
-        const nonRootBaseDir = join106(this.baseDir, settablePaths.nonRoot.relativeDirPath);
+        const nonRootBaseDir = join107(this.baseDir, settablePaths.nonRoot.relativeDirPath);
         const nonRootFilePaths = await findFilesByGlobs(
-          join106(nonRootBaseDir, "**", `*.${factory.meta.extension}`)
+          join107(nonRootBaseDir, "**", `*.${factory.meta.extension}`)
         );
         if (forDeletion) {
           return nonRootFilePaths.map((filePath) => {
@@ -13757,7 +13819,7 @@ var RulesProcessor = class extends FeatureProcessor {
       logger.debug(`Found ${nonRootToolRules.length} non-root tool rule files`);
       return [...rootToolRules, ...localRootToolRules, ...nonRootToolRules];
     } catch (error) {
-      logger.error(`Failed to load tool files: ${formatError(error)}`);
+      logger.error(`Failed to load tool files for ${this.toolTarget}: ${formatError(error)}`);
       return [];
     }
   }
@@ -13854,14 +13916,14 @@ s/<command> [arguments]
 This syntax employs a double slash (\`s/\`) to prevent conflicts with built-in slash commands.
 The \`s\` in \`s/\` stands for *simulate*. Because custom slash commands are not built-in, this syntax provides a pseudo way to invoke them.
 
-When users call a custom slash command, you have to look for the markdown file, \`${join106(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, "{command}.md")}\`, then execute the contents of that file as the block of operations.` : "";
+When users call a custom slash command, you have to look for the markdown file, \`${join107(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, "{command}.md")}\`, then execute the contents of that file as the block of operations.` : "";
     const subagentsSection = subagents ? `## Simulated Subagents
 
 Simulated subagents are specialized AI assistants that can be invoked to handle specific types of tasks. In this case, it can be appear something like custom slash commands simply. Simulated subagents can be called by custom slash commands.
 
-When users call a simulated subagent, it will look for the corresponding markdown file, \`${join106(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "{subagent}.md")}\`, and execute its contents as the block of operations.
+When users call a simulated subagent, it will look for the corresponding markdown file, \`${join107(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "{subagent}.md")}\`, and execute its contents as the block of operations.
 
-For example, if the user instructs \`Call planner subagent to plan the refactoring\`, you have to look for the markdown file, \`${join106(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "planner.md")}\`, and execute its contents as the block of operations.` : "";
+For example, if the user instructs \`Call planner subagent to plan the refactoring\`, you have to look for the markdown file, \`${join107(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "planner.md")}\`, and execute its contents as the block of operations.` : "";
     const skillsSection = skills ? this.generateSkillsSection(skills) : "";
     const result = [
       overview,
@@ -13888,61 +13950,56 @@ ${toonContent}`;
   }
 };
 
-// src/types/git-provider.ts
-import { z as z49 } from "zod/mini";
-var ALL_GIT_PROVIDERS = ["github", "gitlab"];
-var GitProviderSchema = z49.enum(ALL_GIT_PROVIDERS);
-
 // src/lib/github-client.ts
 import { RequestError } from "@octokit/request-error";
 import { Octokit } from "@octokit/rest";
 
 // src/types/fetch.ts
-import { z as z51 } from "zod/mini";
+import { z as z50 } from "zod/mini";
 
 // src/types/fetch-targets.ts
-import { z as z50 } from "zod/mini";
+import { z as z49 } from "zod/mini";
 var ALL_FETCH_TARGETS = ["rulesync", ...ALL_TOOL_TARGETS];
-var FetchTargetSchema = z50.enum(ALL_FETCH_TARGETS);
+var FetchTargetSchema = z49.enum(ALL_FETCH_TARGETS);
 
 // src/types/fetch.ts
-var ConflictStrategySchema = z51.enum(["skip", "overwrite"]);
-var GitHubFileTypeSchema = z51.enum(["file", "dir", "symlink", "submodule"]);
-var GitHubFileEntrySchema = z51.looseObject({
-  name: z51.string(),
-  path: z51.string(),
-  sha: z51.string(),
-  size: z51.number(),
+var ConflictStrategySchema = z50.enum(["skip", "overwrite"]);
+var GitHubFileTypeSchema = z50.enum(["file", "dir", "symlink", "submodule"]);
+var GitHubFileEntrySchema = z50.looseObject({
+  name: z50.string(),
+  path: z50.string(),
+  sha: z50.string(),
+  size: z50.number(),
   type: GitHubFileTypeSchema,
-  download_url: z51.nullable(z51.string())
+  download_url: z50.nullable(z50.string())
 });
-var FetchOptionsSchema = z51.looseObject({
-  target: z51.optional(FetchTargetSchema),
-  features: z51.optional(z51.array(z51.enum(ALL_FEATURES_WITH_WILDCARD))),
-  ref: z51.optional(z51.string()),
-  path: z51.optional(z51.string()),
-  output: z51.optional(z51.string()),
-  conflict: z51.optional(ConflictStrategySchema),
-  token: z51.optional(z51.string()),
-  verbose: z51.optional(z51.boolean()),
-  silent: z51.optional(z51.boolean())
+var FetchOptionsSchema = z50.looseObject({
+  target: z50.optional(FetchTargetSchema),
+  features: z50.optional(z50.array(z50.enum(ALL_FEATURES_WITH_WILDCARD))),
+  ref: z50.optional(z50.string()),
+  path: z50.optional(z50.string()),
+  output: z50.optional(z50.string()),
+  conflict: z50.optional(ConflictStrategySchema),
+  token: z50.optional(z50.string()),
+  verbose: z50.optional(z50.boolean()),
+  silent: z50.optional(z50.boolean())
 });
-var FetchFileStatusSchema = z51.enum(["created", "overwritten", "skipped"]);
-var GitHubRepoInfoSchema = z51.looseObject({
-  default_branch: z51.string(),
-  private: z51.boolean()
+var FetchFileStatusSchema = z50.enum(["created", "overwritten", "skipped"]);
+var GitHubRepoInfoSchema = z50.looseObject({
+  default_branch: z50.string(),
+  private: z50.boolean()
 });
-var GitHubReleaseAssetSchema = z51.looseObject({
-  name: z51.string(),
-  browser_download_url: z51.string(),
-  size: z51.number()
+var GitHubReleaseAssetSchema = z50.looseObject({
+  name: z50.string(),
+  browser_download_url: z50.string(),
+  size: z50.number()
 });
-var GitHubReleaseSchema = z51.looseObject({
-  tag_name: z51.string(),
-  name: z51.nullable(z51.string()),
-  prerelease: z51.boolean(),
-  draft: z51.boolean(),
-  assets: z51.array(GitHubReleaseAssetSchema)
+var GitHubReleaseSchema = z50.looseObject({
+  tag_name: z50.string(),
+  name: z50.nullable(z50.string()),
+  prerelease: z50.boolean(),
+  draft: z50.boolean(),
+  assets: z50.array(GitHubReleaseAssetSchema)
 });
 
 // src/lib/github-client.ts
@@ -14110,6 +14167,21 @@ var GitHubClient = class {
       throw error;
     }
   }
+  /**
+   * Resolve a ref (branch, tag, or SHA) to a full commit SHA.
+   */
+  async resolveRefToSha(owner, repo, ref) {
+    try {
+      const { data } = await this.octokit.repos.getCommit({
+        owner,
+        repo,
+        ref
+      });
+      return data.sha;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
   /**
    * Get the latest release from a repository
    */
@@ -14180,96 +14252,60 @@ var GitHubClient = class {
   }
 };
 
-// src/lib/fetch.ts
-var FEATURE_PATHS = {
-  rules: ["rules"],
-  commands: ["commands"],
-  subagents: ["subagents"],
-  skills: ["skills"],
-  ignore: [RULESYNC_AIIGNORE_FILE_NAME],
-  mcp: [RULESYNC_MCP_FILE_NAME],
-  hooks: [RULESYNC_HOOKS_FILE_NAME]
-};
-function isToolTarget(target) {
-  return target !== "rulesync";
-}
-function validateFileSize(relativePath, size) {
-  if (size > MAX_FILE_SIZE) {
-    throw new GitHubClientError(
-      `File "${relativePath}" exceeds maximum size limit (${(size / 1024 / 1024).toFixed(2)}MB > ${MAX_FILE_SIZE / 1024 / 1024}MB)`
-    );
+// src/lib/github-utils.ts
+var MAX_RECURSION_DEPTH = 15;
+async function withSemaphore(semaphore, fn) {
+  await semaphore.acquire();
+  try {
+    return await fn();
+  } finally {
+    semaphore.release();
   }
 }
-async function processFeatureConversion(params) {
-  const { processor, outputDir } = params;
-  const paths = [];
-  const toolFiles = await processor.loadToolFiles();
-  if (toolFiles.length === 0) {
-    return { paths: [] };
+async function listDirectoryRecursive(params) {
+  const { client, owner, repo, path: path4, ref, depth = 0, semaphore } = params;
+  if (depth > MAX_RECURSION_DEPTH) {
+    throw new Error(
+      `Maximum recursion depth (${MAX_RECURSION_DEPTH}) exceeded while listing directory: ${path4}`
+    );
   }
-  const rulesyncFiles = await processor.convertToolFilesToRulesyncFiles(toolFiles);
-  for (const file of rulesyncFiles) {
-    const relativePath = join107(file.getRelativeDirPath(), file.getRelativeFilePath());
-    const outputPath = join107(outputDir, relativePath);
-    await writeFileContent(outputPath, file.getFileContent());
-    paths.push(relativePath);
+  const entries = await withSemaphore(
+    semaphore,
+    () => client.listDirectory(owner, repo, path4, ref)
+  );
+  const files = [];
+  const directories = [];
+  for (const entry of entries) {
+    if (entry.type === "file") {
+      files.push(entry);
+    } else if (entry.type === "dir") {
+      directories.push(entry);
+    }
   }
-  return { paths };
-}
-async function convertFetchedFilesToRulesync(params) {
-  const { tempDir, outputDir, target, features } = params;
-  const convertedPaths = [];
-  const featureConfigs = [
-    {
-      feature: "rules",
-      getTargets: () => RulesProcessor.getToolTargets({ global: false }),
-      createProcessor: () => new RulesProcessor({ baseDir: tempDir, toolTarget: target, global: false })
-    },
-    {
-      feature: "commands",
-      getTargets: () => CommandsProcessor.getToolTargets({ global: false, includeSimulated: false }),
-      createProcessor: () => new CommandsProcessor({ baseDir: tempDir, toolTarget: target, global: false })
-    },
-    {
-      feature: "subagents",
-      getTargets: () => SubagentsProcessor.getToolTargets({ global: false, includeSimulated: false }),
-      createProcessor: () => new SubagentsProcessor({ baseDir: tempDir, toolTarget: target, global: false })
-    },
-    {
-      feature: "ignore",
-      getTargets: () => IgnoreProcessor.getToolTargets(),
-      createProcessor: () => new IgnoreProcessor({ baseDir: tempDir, toolTarget: target })
-    },
-    {
-      feature: "mcp",
-      getTargets: () => McpProcessor.getToolTargets({ global: false }),
-      createProcessor: () => new McpProcessor({ baseDir: tempDir, toolTarget: target, global: false })
-    },
-    {
-      feature: "hooks",
-      getTargets: () => HooksProcessor.getToolTargets({ global: false }),
-      createProcessor: () => new HooksProcessor({ baseDir: tempDir, toolTarget: target, global: false })
-    }
-  ];
-  for (const config of featureConfigs) {
-    if (!features.includes(config.feature)) {
-      continue;
-    }
-    const supportedTargets = config.getTargets();
-    if (!supportedTargets.includes(target)) {
-      continue;
-    }
-    const processor = config.createProcessor();
-    const result = await processFeatureConversion({ processor, outputDir });
-    convertedPaths.push(...result.paths);
-  }
-  if (features.includes("skills")) {
-    logger.debug(
-      "Skills conversion is not yet supported in fetch command. Use import command instead."
-    );
-  }
-  return { converted: convertedPaths.length, convertedPaths };
+  const subResults = await Promise.all(
+    directories.map(
+      (dir) => listDirectoryRecursive({
+        client,
+        owner,
+        repo,
+        path: dir.path,
+        ref,
+        depth: depth + 1,
+        semaphore
+      })
+    )
+  );
+  return [...files, ...subResults.flat()];
 }
+
+// src/types/git-provider.ts
+import { z as z51 } from "zod/mini";
+var ALL_GIT_PROVIDERS = ["github", "gitlab"];
+var GitProviderSchema = z51.enum(ALL_GIT_PROVIDERS);
+
+// src/lib/source-parser.ts
+var GITHUB_HOSTS = /* @__PURE__ */ new Set(["github.com", "www.github.com"]);
+var GITLAB_HOSTS = /* @__PURE__ */ new Set(["gitlab.com", "www.gitlab.com"]);
 function parseSource(source) {
   if (source.startsWith("http://") || source.startsWith("https://")) {
     return parseUrl(source);
@@ -14286,18 +14322,6 @@ function parseSource(source) {
   }
   return { provider: "github", ...parseShorthand(source) };
 }
-var GITHUB_HOSTS = /* @__PURE__ */ new Set(["github.com", "www.github.com"]);
-var GITLAB_HOSTS = /* @__PURE__ */ new Set(["gitlab.com", "www.gitlab.com"]);
-var MAX_RECURSION_DEPTH = 15;
-var FETCH_CONCURRENCY_LIMIT = 10;
-async function withSemaphore(semaphore, fn) {
-  await semaphore.acquire();
-  try {
-    return await fn();
-  } finally {
-    semaphore.release();
-  }
-}
 function parseUrl(url) {
   const urlObj = new URL(url);
   const host = urlObj.hostname.toLowerCase();
@@ -14372,6 +14396,97 @@ function parseShorthand(source) {
     path: path4
   };
 }
+
+// src/lib/fetch.ts
+var FEATURE_PATHS = {
+  rules: ["rules"],
+  commands: ["commands"],
+  subagents: ["subagents"],
+  skills: ["skills"],
+  ignore: [RULESYNC_AIIGNORE_FILE_NAME],
+  mcp: [RULESYNC_MCP_FILE_NAME],
+  hooks: [RULESYNC_HOOKS_FILE_NAME]
+};
+function isToolTarget(target) {
+  return target !== "rulesync";
+}
+function validateFileSize(relativePath, size) {
+  if (size > MAX_FILE_SIZE) {
+    throw new GitHubClientError(
+      `File "${relativePath}" exceeds maximum size limit (${(size / 1024 / 1024).toFixed(2)}MB > ${MAX_FILE_SIZE / 1024 / 1024}MB)`
+    );
+  }
+}
+async function processFeatureConversion(params) {
+  const { processor, outputDir } = params;
+  const paths = [];
+  const toolFiles = await processor.loadToolFiles();
+  if (toolFiles.length === 0) {
+    return { paths: [] };
+  }
+  const rulesyncFiles = await processor.convertToolFilesToRulesyncFiles(toolFiles);
+  for (const file of rulesyncFiles) {
+    const relativePath = join108(file.getRelativeDirPath(), file.getRelativeFilePath());
+    const outputPath = join108(outputDir, relativePath);
+    await writeFileContent(outputPath, file.getFileContent());
+    paths.push(relativePath);
+  }
+  return { paths };
+}
+async function convertFetchedFilesToRulesync(params) {
+  const { tempDir, outputDir, target, features } = params;
+  const convertedPaths = [];
+  const featureConfigs = [
+    {
+      feature: "rules",
+      getTargets: () => RulesProcessor.getToolTargets({ global: false }),
+      createProcessor: () => new RulesProcessor({ baseDir: tempDir, toolTarget: target, global: false })
+    },
+    {
+      feature: "commands",
+      getTargets: () => CommandsProcessor.getToolTargets({ global: false, includeSimulated: false }),
+      createProcessor: () => new CommandsProcessor({ baseDir: tempDir, toolTarget: target, global: false })
+    },
+    {
+      feature: "subagents",
+      getTargets: () => SubagentsProcessor.getToolTargets({ global: false, includeSimulated: false }),
+      createProcessor: () => new SubagentsProcessor({ baseDir: tempDir, toolTarget: target, global: false })
+    },
+    {
+      feature: "ignore",
+      getTargets: () => IgnoreProcessor.getToolTargets(),
+      createProcessor: () => new IgnoreProcessor({ baseDir: tempDir, toolTarget: target })
+    },
+    {
+      feature: "mcp",
+      getTargets: () => McpProcessor.getToolTargets({ global: false }),
+      createProcessor: () => new McpProcessor({ baseDir: tempDir, toolTarget: target, global: false })
+    },
+    {
+      feature: "hooks",
+      getTargets: () => HooksProcessor.getToolTargets({ global: false }),
+      createProcessor: () => new HooksProcessor({ baseDir: tempDir, toolTarget: target, global: false })
+    }
+  ];
+  for (const config of featureConfigs) {
+    if (!features.includes(config.feature)) {
+      continue;
+    }
+    const supportedTargets = config.getTargets();
+    if (!supportedTargets.includes(target)) {
+      continue;
+    }
+    const processor = config.createProcessor();
+    const result = await processFeatureConversion({ processor, outputDir });
+    convertedPaths.push(...result.paths);
+  }
+  if (features.includes("skills")) {
+    logger.debug(
+      "Skills conversion is not yet supported in fetch command. Use import command instead."
+    );
+  }
+  return { converted: convertedPaths.length, convertedPaths };
+}
 function resolveFeatures(features) {
   if (!features || features.length === 0 || features.includes("*")) {
     return [...ALL_FEATURES];
@@ -14458,7 +14573,7 @@ async function fetchFiles(params) {
       skipped: 0
     };
   }
-  const outputBasePath = join107(baseDir, outputDir);
+  const outputBasePath = join108(baseDir, outputDir);
   for (const { relativePath, size } of filesToFetch) {
     checkPathTraversal({
       relativePath,
@@ -14468,7 +14583,7 @@ async function fetchFiles(params) {
   }
   const results = await Promise.all(
     filesToFetch.map(async ({ remotePath, relativePath }) => {
-      const localPath = join107(outputBasePath, relativePath);
+      const localPath = join108(outputBasePath, relativePath);
       const exists = await fileExists(localPath);
       if (exists && conflictStrategy === "skip") {
         logger.debug(`Skipping existing file: ${relativePath}`);
@@ -14510,7 +14625,7 @@ async function collectFeatureFiles(params) {
   );
   const results = await Promise.all(
     tasks.map(async ({ featurePath }) => {
-      const fullPath = basePath === "." || basePath === "" ? featurePath : join107(basePath, featurePath);
+      const fullPath = basePath === "." || basePath === "" ? featurePath : join108(basePath, featurePath);
       const collected = [];
       try {
         if (featurePath.includes(".")) {
@@ -14563,41 +14678,6 @@ async function collectFeatureFiles(params) {
   );
   return results.flat();
 }
-async function listDirectoryRecursive(params) {
-  const { client, owner, repo, path: path4, ref, depth = 0, semaphore } = params;
-  if (depth > MAX_RECURSION_DEPTH) {
-    throw new Error(
-      `Maximum recursion depth (${MAX_RECURSION_DEPTH}) exceeded while listing directory: ${path4}`
-    );
-  }
-  const entries = await withSemaphore(
-    semaphore,
-    () => client.listDirectory(owner, repo, path4, ref)
-  );
-  const files = [];
-  const directories = [];
-  for (const entry of entries) {
-    if (entry.type === "file") {
-      files.push(entry);
-    } else if (entry.type === "dir") {
-      directories.push(entry);
-    }
-  }
-  const subResults = await Promise.all(
-    directories.map(
-      (dir) => listDirectoryRecursive({
-        client,
-        owner,
-        repo,
-        path: dir.path,
-        ref,
-        depth: depth + 1,
-        semaphore
-      })
-    )
-  );
-  return [...files, ...subResults.flat()];
-}
 async function fetchAndConvertToolFiles(params) {
   const {
     client,
@@ -14645,7 +14725,7 @@ async function fetchAndConvertToolFiles(params) {
           relativePath: toolRelativePath,
           intendedRootDir: tempDir
         });
-        const localPath = join107(tempDir, toolRelativePath);
+        const localPath = join108(tempDir, toolRelativePath);
         const content = await withSemaphore(
           semaphore,
           () => client.getFileContent(parsed.owner, parsed.repo, remotePath, ref)
@@ -14654,7 +14734,7 @@ async function fetchAndConvertToolFiles(params) {
         logger.debug(`Fetched to temp: ${toolRelativePath}`);
       })
     );
-    const outputBasePath = join107(baseDir, outputDir);
+    const outputBasePath = join108(baseDir, outputDir);
     const { converted, convertedPaths } = await convertFetchedFilesToRulesync({
       tempDir,
       outputDir: outputBasePath,
@@ -14665,7 +14745,7 @@ async function fetchAndConvertToolFiles(params) {
       relativePath,
       status: "created"
     }));
-    logger.info(`Converted ${converted} files from ${target} format to rulesync format`);
+    logger.debug(`Converted ${converted} files from ${target} format to rulesync format`);
     return {
       source: `${parsed.owner}/${parsed.repo}`,
       ref,
@@ -14727,7 +14807,7 @@ function mapToToolPath(relativePath, toolPaths) {
   if (relativePath.startsWith("rules/")) {
     const restPath = relativePath.substring("rules/".length);
     if (toolPaths.rules?.nonRoot) {
-      return join107(toolPaths.rules.nonRoot, restPath);
+      return join108(toolPaths.rules.nonRoot, restPath);
     }
   }
   if (toolPaths.rules?.root && relativePath === toolPaths.rules.root) {
@@ -14736,19 +14816,19 @@ function mapToToolPath(relativePath, toolPaths) {
   if (relativePath.startsWith("commands/")) {
     const restPath = relativePath.substring("commands/".length);
     if (toolPaths.commands) {
-      return join107(toolPaths.commands, restPath);
+      return join108(toolPaths.commands, restPath);
     }
   }
   if (relativePath.startsWith("subagents/")) {
     const restPath = relativePath.substring("subagents/".length);
     if (toolPaths.subagents) {
-      return join107(toolPaths.subagents, restPath);
+      return join108(toolPaths.subagents, restPath);
     }
   }
   if (relativePath.startsWith("skills/")) {
     const restPath = relativePath.substring("skills/".length);
     if (toolPaths.skills) {
-      return join107(toolPaths.skills, restPath);
+      return join108(toolPaths.skills, restPath);
     }
   }
   return relativePath;
@@ -14778,7 +14858,7 @@ async function fetchCommand(options) {
     verbose: fetchOptions.verbose ?? false,
     silent: fetchOptions.silent ?? false
   });
-  logger.info(`Fetching files from ${source}...`);
+  logger.debug(`Fetching files from ${source}...`);
   try {
     const summary = await fetchFiles({
       source,
@@ -14801,10 +14881,14 @@ async function fetchCommand(options) {
 
 // src/config/config-resolver.ts
 import { parse as parseJsonc } from "jsonc-parser";
-import { dirname as dirname2, join as join108, resolve as resolve4 } from "path";
+import { dirname as dirname2, join as join109, resolve as resolve4 } from "path";
 
 // src/config/config.ts
-import { optional as optional3, z as z52 } from "zod/mini";
+import { minLength, optional as optional3, z as z52 } from "zod/mini";
+var SourceEntrySchema = z52.object({
+  source: z52.string().check(minLength(1, "source must be a non-empty string")),
+  skills: optional3(z52.array(z52.string()))
+});
 var ConfigParamsSchema = z52.object({
   baseDirs: z52.array(z52.string()),
   targets: RulesyncTargetsSchema,
@@ -14818,7 +14902,9 @@ var ConfigParamsSchema = z52.object({
   simulateSubagents: optional3(z52.boolean()),
   simulateSkills: optional3(z52.boolean()),
   dryRun: optional3(z52.boolean()),
-  check: optional3(z52.boolean())
+  check: optional3(z52.boolean()),
+  // Declarative skill sources
+  sources: optional3(z52.array(SourceEntrySchema))
 });
 var PartialConfigParamsSchema = z52.partial(ConfigParamsSchema);
 var ConfigFileSchema = z52.object({
@@ -14844,6 +14930,7 @@ var Config = class {
   simulateSkills;
   dryRun;
   check;
+  sources;
   constructor({
     baseDirs,
     targets,
@@ -14856,7 +14943,8 @@ var Config = class {
     simulateSubagents,
     simulateSkills,
     dryRun,
-    check
+    check,
+    sources
   }) {
     this.validateConflictingTargets(targets);
     if (dryRun && check) {
@@ -14874,6 +14962,7 @@ var Config = class {
     this.simulateSkills = simulateSkills ?? false;
     this.dryRun = dryRun ?? false;
     this.check = check ?? false;
+    this.sources = sources ?? [];
   }
   validateConflictingTargets(targets) {
     for (const [target1, target2] of CONFLICTING_TARGET_PAIRS) {
@@ -14964,6 +15053,9 @@ var Config = class {
   getCheck() {
     return this.check;
   }
+  getSources() {
+    return this.sources;
+  }
   /**
    * Returns true if either dry-run or check mode is enabled.
    * In both modes, no files should be written.
@@ -14987,7 +15079,8 @@ var getDefaults = () => ({
   simulateSubagents: false,
   simulateSkills: false,
   dryRun: false,
-  check: false
+  check: false,
+  sources: []
 });
 var loadConfigFromFile = async (filePath) => {
   if (!await fileExists(filePath)) {
@@ -15017,7 +15110,8 @@ var mergeConfigs = (baseConfig, localConfig) => {
     simulateSubagents: localConfig.simulateSubagents ?? baseConfig.simulateSubagents,
     simulateSkills: localConfig.simulateSkills ?? baseConfig.simulateSkills,
     dryRun: localConfig.dryRun ?? baseConfig.dryRun,
-    check: localConfig.check ?? baseConfig.check
+    check: localConfig.check ?? baseConfig.check,
+    sources: localConfig.sources ?? baseConfig.sources
   };
 };
 var ConfigResolver = class {
@@ -15039,7 +15133,7 @@ var ConfigResolver = class {
     const validatedConfigPath = resolvePath(configPath, process.cwd());
     const baseConfig = await loadConfigFromFile(validatedConfigPath);
     const configDir = dirname2(validatedConfigPath);
-    const localConfigPath = join108(configDir, RULESYNC_LOCAL_CONFIG_RELATIVE_FILE_PATH);
+    const localConfigPath = join109(configDir, RULESYNC_LOCAL_CONFIG_RELATIVE_FILE_PATH);
     const localConfig = await loadConfigFromFile(localConfigPath);
     const configByFile = mergeConfigs(baseConfig, localConfig);
     const resolvedGlobal = global ?? configByFile.global ?? getDefaults().global;
@@ -15061,7 +15155,8 @@ var ConfigResolver = class {
       simulateSubagents: resolvedSimulateSubagents,
       simulateSkills: resolvedSimulateSkills,
       dryRun: dryRun ?? configByFile.dryRun ?? getDefaults().dryRun,
-      check: check ?? configByFile.check ?? getDefaults().check
+      check: check ?? configByFile.check ?? getDefaults().check,
+      sources: configByFile.sources ?? getDefaults().sources
     };
     return new Config(configParams);
   }
@@ -15082,34 +15177,38 @@ function getBaseDirsInLightOfGlobal({
 
 // src/lib/generate.ts
 import { intersection } from "es-toolkit";
-import { join as join109 } from "path";
+import { join as join110 } from "path";
 async function processFeatureGeneration(params) {
   const { config, processor, toolFiles } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
-  const writtenCount = await processor.writeAiFiles(toolFiles);
-  totalCount += writtenCount;
-  if (writtenCount > 0) hasDiff = true;
+  const writeResult = await processor.writeAiFiles(toolFiles);
+  totalCount += writeResult.count;
+  allPaths.push(...writeResult.paths);
+  if (writeResult.count > 0) hasDiff = true;
   if (config.getDelete()) {
     const existingToolFiles = await processor.loadToolFiles({ forDeletion: true });
     const orphanCount = await processor.removeOrphanAiFiles(existingToolFiles, toolFiles);
     if (orphanCount > 0) hasDiff = true;
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 async function processDirFeatureGeneration(params) {
   const { config, processor, toolDirs } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
-  const writtenCount = await processor.writeAiDirs(toolDirs);
-  totalCount += writtenCount;
-  if (writtenCount > 0) hasDiff = true;
+  const writeResult = await processor.writeAiDirs(toolDirs);
+  totalCount += writeResult.count;
+  allPaths.push(...writeResult.paths);
+  if (writeResult.count > 0) hasDiff = true;
   if (config.getDelete()) {
     const existingToolDirs = await processor.loadToolDirsToDelete();
     const orphanCount = await processor.removeOrphanAiDirs(existingToolDirs, toolDirs);
     if (orphanCount > 0) hasDiff = true;
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 async function processEmptyFeatureGeneration(params) {
   const { config, processor } = params;
@@ -15120,10 +15219,10 @@ async function processEmptyFeatureGeneration(params) {
     const orphanCount = await processor.removeOrphanAiFiles(existingToolFiles, []);
     if (orphanCount > 0) hasDiff = true;
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: [], hasDiff };
 }
 async function checkRulesyncDirExists(params) {
-  return fileExists(join109(params.baseDir, RULESYNC_RELATIVE_DIR_PATH));
+  return fileExists(join110(params.baseDir, RULESYNC_RELATIVE_DIR_PATH));
 }
 async function generate(params) {
   const { config } = params;
@@ -15137,12 +15236,19 @@ async function generate(params) {
   const hasDiff = ignoreResult.hasDiff || mcpResult.hasDiff || commandsResult.hasDiff || subagentsResult.hasDiff || skillsResult.hasDiff || hooksResult.hasDiff || rulesResult.hasDiff;
   return {
     rulesCount: rulesResult.count,
+    rulesPaths: rulesResult.paths,
     ignoreCount: ignoreResult.count,
+    ignorePaths: ignoreResult.paths,
     mcpCount: mcpResult.count,
+    mcpPaths: mcpResult.paths,
     commandsCount: commandsResult.count,
+    commandsPaths: commandsResult.paths,
     subagentsCount: subagentsResult.count,
+    subagentsPaths: subagentsResult.paths,
     skillsCount: skillsResult.count,
+    skillsPaths: skillsResult.paths,
     hooksCount: hooksResult.count,
+    hooksPaths: hooksResult.paths,
     skills: skillsResult.skills,
     hasDiff
   };
@@ -15150,6 +15256,7 @@ async function generate(params) {
 async function generateRulesCore(params) {
   const { config, skills } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
   const toolTargets = intersection(
     config.getTargets(),
@@ -15178,17 +15285,19 @@ async function generateRulesCore(params) {
         toolFiles
       });
       totalCount += result.count;
+      allPaths.push(...result.paths);
       if (result.hasDiff) hasDiff = true;
     }
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 async function generateIgnoreCore(params) {
   const { config } = params;
   if (config.getGlobal()) {
-    return { count: 0, hasDiff: false };
+    return { count: 0, paths: [], hasDiff: false };
   }
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
   for (const toolTarget of intersection(config.getTargets(), IgnoreProcessor.getToolTargets())) {
     if (!config.getFeatures(toolTarget).includes("ignore")) {
@@ -15217,6 +15326,7 @@ async function generateIgnoreCore(params) {
           });
         }
         totalCount += result.count;
+        allPaths.push(...result.paths);
         if (result.hasDiff) hasDiff = true;
       } catch (error) {
         logger.warn(
@@ -15226,11 +15336,12 @@ async function generateIgnoreCore(params) {
       }
     }
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 async function generateMcpCore(params) {
   const { config } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
   const toolTargets = intersection(
     config.getTargets(),
@@ -15255,14 +15366,16 @@ async function generateMcpCore(params) {
         toolFiles
       });
       totalCount += result.count;
+      allPaths.push(...result.paths);
       if (result.hasDiff) hasDiff = true;
     }
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 async function generateCommandsCore(params) {
   const { config } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
   const toolTargets = intersection(
     config.getTargets(),
@@ -15290,14 +15403,16 @@ async function generateCommandsCore(params) {
         toolFiles
       });
       totalCount += result.count;
+      allPaths.push(...result.paths);
       if (result.hasDiff) hasDiff = true;
     }
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 async function generateSubagentsCore(params) {
   const { config } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
   const toolTargets = intersection(
     config.getTargets(),
@@ -15325,14 +15440,16 @@ async function generateSubagentsCore(params) {
         toolFiles
       });
       totalCount += result.count;
+      allPaths.push(...result.paths);
       if (result.hasDiff) hasDiff = true;
     }
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 async function generateSkillsCore(params) {
   const { config } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
   const allSkills = [];
   const toolTargets = intersection(
@@ -15366,14 +15483,16 @@ async function generateSkillsCore(params) {
         toolDirs
       });
       totalCount += result.count;
+      allPaths.push(...result.paths);
       if (result.hasDiff) hasDiff = true;
     }
   }
-  return { count: totalCount, skills: allSkills, hasDiff };
+  return { count: totalCount, paths: allPaths, skills: allSkills, hasDiff };
 }
 async function generateHooksCore(params) {
   const { config } = params;
   let totalCount = 0;
+  const allPaths = [];
   let hasDiff = false;
   const toolTargets = intersection(
     config.getTargets(),
@@ -15406,10 +15525,11 @@ async function generateHooksCore(params) {
         });
       }
       totalCount += result.count;
+      allPaths.push(...result.paths);
       if (result.hasDiff) hasDiff = true;
     }
   }
-  return { count: totalCount, hasDiff };
+  return { count: totalCount, paths: allPaths, hasDiff };
 }
 
 // src/utils/result.ts
@@ -15419,13 +15539,16 @@ function calculateTotalCount(result) {
 
 // src/cli/commands/generate.ts
 function logFeatureResult(params) {
-  const { count, featureName, isPreview, modePrefix } = params;
+  const { count, paths, featureName, isPreview, modePrefix } = params;
   if (count > 0) {
     if (isPreview) {
       logger.info(`${modePrefix} Would write ${count} ${featureName}`);
     } else {
       logger.success(`Written ${count} ${featureName}`);
     }
+    for (const p of paths) {
+      logger.info(`    ${p}`);
+    }
   }
 }
 async function generateCommand(options) {
@@ -15437,73 +15560,80 @@ async function generateCommand(options) {
   const check = config.getCheck();
   const isPreview = config.isPreviewMode();
   const modePrefix = isPreview ? "[DRY RUN]" : "";
-  logger.info("Generating files...");
+  logger.debug("Generating files...");
   if (!await checkRulesyncDirExists({ baseDir: process.cwd() })) {
     logger.error("\u274C .rulesync directory not found. Run 'rulesync init' first.");
     process.exit(1);
   }
-  logger.info(`Base directories: ${config.getBaseDirs().join(", ")}`);
+  logger.debug(`Base directories: ${config.getBaseDirs().join(", ")}`);
   const features = config.getFeatures();
   if (features.includes("ignore")) {
-    logger.info("Generating ignore files...");
+    logger.debug("Generating ignore files...");
   }
   if (features.includes("mcp")) {
-    logger.info("Generating MCP files...");
+    logger.debug("Generating MCP files...");
   }
   if (features.includes("commands")) {
-    logger.info("Generating command files...");
+    logger.debug("Generating command files...");
   }
   if (features.includes("subagents")) {
-    logger.info("Generating subagent files...");
+    logger.debug("Generating subagent files...");
   }
   if (features.includes("skills")) {
-    logger.info("Generating skill files...");
+    logger.debug("Generating skill files...");
   }
   if (features.includes("hooks")) {
-    logger.info("Generating hooks...");
+    logger.debug("Generating hooks...");
   }
   if (features.includes("rules")) {
-    logger.info("Generating rule files...");
+    logger.debug("Generating rule files...");
   }
   const result = await generate({ config });
   logFeatureResult({
     count: result.ignoreCount,
+    paths: result.ignorePaths,
     featureName: "ignore file(s)",
     isPreview,
     modePrefix
   });
   logFeatureResult({
     count: result.mcpCount,
+    paths: result.mcpPaths,
     featureName: "MCP configuration(s)",
     isPreview,
     modePrefix
   });
   logFeatureResult({
     count: result.commandsCount,
+    paths: result.commandsPaths,
     featureName: "command(s)",
     isPreview,
     modePrefix
   });
   logFeatureResult({
     count: result.subagentsCount,
+    paths: result.subagentsPaths,
     featureName: "subagent(s)",
     isPreview,
     modePrefix
   });
   logFeatureResult({
     count: result.skillsCount,
+    paths: result.skillsPaths,
     featureName: "skill(s)",
     isPreview,
     modePrefix
   });
   logFeatureResult({
     count: result.hooksCount,
+    paths: result.hooksPaths,
     featureName: "hooks file(s)",
     isPreview,
     modePrefix
   });
   logFeatureResult({
     count: result.rulesCount,
+    paths: result.rulesPaths,
     featureName: "rule(s)",
     isPreview,
     modePrefix
@@ -15538,10 +15668,12 @@ async function generateCommand(options) {
 }
 
 // src/cli/commands/gitignore.ts
-import { join as join110 } from "path";
+import { join as join111 } from "path";
 var RULESYNC_HEADER = "# Generated by Rulesync";
 var LEGACY_RULESYNC_HEADER = "# Generated by rulesync - AI tool configuration files";
 var RULESYNC_IGNORE_ENTRIES = [
+  // Rulesync curated (fetched) skills
+  ".rulesync/skills/.curated/",
   // AGENTS.md
   "**/AGENTS.md",
   "**/.agents/",
@@ -15686,7 +15818,7 @@ var removeExistingRulesyncEntries = (content) => {
   return result;
 };
 var gitignoreCommand = async () => {
-  const gitignorePath = join110(process.cwd(), ".gitignore");
+  const gitignorePath = join111(process.cwd(), ".gitignore");
   let gitignoreContent = "";
   if (await fileExists(gitignorePath)) {
     gitignoreContent = await readFileContent(gitignorePath);
@@ -15758,7 +15890,7 @@ async function importRulesCore(params) {
     return 0;
   }
   const rulesyncFiles = await rulesProcessor.convertToolFilesToRulesyncFiles(toolFiles);
-  const writtenCount = await rulesProcessor.writeAiFiles(rulesyncFiles);
+  const { count: writtenCount } = await rulesProcessor.writeAiFiles(rulesyncFiles);
   if (config.getVerbose() && writtenCount > 0) {
     logger.success(`Created ${writtenCount} rule files`);
   }
@@ -15785,7 +15917,7 @@ async function importIgnoreCore(params) {
     return 0;
   }
   const rulesyncFiles = await ignoreProcessor.convertToolFilesToRulesyncFiles(toolFiles);
-  const writtenCount = await ignoreProcessor.writeAiFiles(rulesyncFiles);
+  const { count: writtenCount } = await ignoreProcessor.writeAiFiles(rulesyncFiles);
   if (config.getVerbose()) {
     logger.success(`Created ignore files from ${toolFiles.length} tool ignore configurations`);
   }
@@ -15814,7 +15946,7 @@ async function importMcpCore(params) {
     return 0;
   }
   const rulesyncFiles = await mcpProcessor.convertToolFilesToRulesyncFiles(toolFiles);
-  const writtenCount = await mcpProcessor.writeAiFiles(rulesyncFiles);
+  const { count: writtenCount } = await mcpProcessor.writeAiFiles(rulesyncFiles);
   if (config.getVerbose() && writtenCount > 0) {
     logger.success(`Created ${writtenCount} MCP files`);
   }
@@ -15840,7 +15972,7 @@ async function importCommandsCore(params) {
     return 0;
   }
   const rulesyncFiles = await commandsProcessor.convertToolFilesToRulesyncFiles(toolFiles);
-  const writtenCount = await commandsProcessor.writeAiFiles(rulesyncFiles);
+  const { count: writtenCount } = await commandsProcessor.writeAiFiles(rulesyncFiles);
   if (config.getVerbose() && writtenCount > 0) {
     logger.success(`Created ${writtenCount} command files`);
   }
@@ -15866,7 +15998,7 @@ async function importSubagentsCore(params) {
     return 0;
   }
   const rulesyncFiles = await subagentsProcessor.convertToolFilesToRulesyncFiles(toolFiles);
-  const writtenCount = await subagentsProcessor.writeAiFiles(rulesyncFiles);
+  const { count: writtenCount } = await subagentsProcessor.writeAiFiles(rulesyncFiles);
   if (config.getVerbose() && writtenCount > 0) {
     logger.success(`Created ${writtenCount} subagent files`);
   }
@@ -15892,7 +16024,7 @@ async function importSkillsCore(params) {
     return 0;
   }
   const rulesyncDirs = await skillsProcessor.convertToolDirsToRulesyncDirs(toolDirs);
-  const writtenCount = await skillsProcessor.writeAiDirs(rulesyncDirs);
+  const { count: writtenCount } = await skillsProcessor.writeAiDirs(rulesyncDirs);
   if (config.getVerbose() && writtenCount > 0) {
     logger.success(`Created ${writtenCount} skill directories`);
   }
@@ -15923,7 +16055,7 @@ async function importHooksCore(params) {
     return 0;
   }
   const rulesyncFiles = await hooksProcessor.convertToolFilesToRulesyncFiles(toolFiles);
-  const writtenCount = await hooksProcessor.writeAiFiles(rulesyncFiles);
+  const { count: writtenCount } = await hooksProcessor.writeAiFiles(rulesyncFiles);
   if (config.getVerbose() && writtenCount > 0) {
     logger.success(`Created ${writtenCount} hooks file(s)`);
   }
@@ -15946,7 +16078,7 @@ async function importCommand(options) {
     silent: config.getSilent()
   });
   const tool = config.getTargets()[0];
-  logger.info(`Importing files from ${tool}...`);
+  logger.debug(`Importing files from ${tool}...`);
   const result = await importFromTool({ config, tool });
   const totalImported = calculateTotalCount(result);
   if (totalImported === 0) {
@@ -15966,7 +16098,7 @@ async function importCommand(options) {
 }
 
 // src/lib/init.ts
-import { join as join111 } from "path";
+import { join as join112 } from "path";
 async function init() {
   const sampleFiles = await createSampleFiles();
   const configFile = await createConfigFile();
@@ -16156,27 +16288,27 @@ Keep the summary concise and ready to reuse in future tasks.`
   await ensureDir(subagentPaths.relativeDirPath);
   await ensureDir(skillPaths.relativeDirPath);
   await ensureDir(ignorePaths.recommended.relativeDirPath);
-  const ruleFilepath = join111(rulePaths.recommended.relativeDirPath, sampleRuleFile.filename);
+  const ruleFilepath = join112(rulePaths.recommended.relativeDirPath, sampleRuleFile.filename);
   results.push(await writeIfNotExists(ruleFilepath, sampleRuleFile.content));
-  const mcpFilepath = join111(
+  const mcpFilepath = join112(
     mcpPaths.recommended.relativeDirPath,
     mcpPaths.recommended.relativeFilePath
   );
   results.push(await writeIfNotExists(mcpFilepath, sampleMcpFile.content));
-  const commandFilepath = join111(commandPaths.relativeDirPath, sampleCommandFile.filename);
+  const commandFilepath = join112(commandPaths.relativeDirPath, sampleCommandFile.filename);
   results.push(await writeIfNotExists(commandFilepath, sampleCommandFile.content));
-  const subagentFilepath = join111(subagentPaths.relativeDirPath, sampleSubagentFile.filename);
+  const subagentFilepath = join112(subagentPaths.relativeDirPath, sampleSubagentFile.filename);
   results.push(await writeIfNotExists(subagentFilepath, sampleSubagentFile.content));
-  const skillDirPath = join111(skillPaths.relativeDirPath, sampleSkillFile.dirName);
+  const skillDirPath = join112(skillPaths.relativeDirPath, sampleSkillFile.dirName);
   await ensureDir(skillDirPath);
-  const skillFilepath = join111(skillDirPath, SKILL_FILE_NAME);
+  const skillFilepath = join112(skillDirPath, SKILL_FILE_NAME);
   results.push(await writeIfNotExists(skillFilepath, sampleSkillFile.content));
-  const ignoreFilepath = join111(
+  const ignoreFilepath = join112(
     ignorePaths.recommended.relativeDirPath,
     ignorePaths.recommended.relativeFilePath
   );
   results.push(await writeIfNotExists(ignoreFilepath, sampleIgnoreFile.content));
-  const hooksFilepath = join111(hooksPaths.relativeDirPath, hooksPaths.relativeFilePath);
+  const hooksFilepath = join112(hooksPaths.relativeDirPath, hooksPaths.relativeFilePath);
   results.push(await writeIfNotExists(hooksFilepath, sampleHooksFile.content));
   return results;
 }
@@ -16190,7 +16322,7 @@ async function writeIfNotExists(path4, content) {
 
 // src/cli/commands/init.ts
 async function initCommand() {
-  logger.info("Initializing rulesync...");
+  logger.debug("Initializing rulesync...");
   await ensureDir(RULESYNC_RELATIVE_DIR_PATH);
   const result = await init();
   for (const file of result.sampleFiles) {
@@ -16213,19 +16345,447 @@ async function initCommand() {
   logger.info("2. Run 'rulesync generate' to create configuration files");
 }
 
+// src/lib/sources.ts
+import { Semaphore as Semaphore2 } from "es-toolkit/promise";
+import { join as join114, resolve as resolve5, sep } from "path";
+
+// src/lib/sources-lock.ts
+import { createHash } from "crypto";
+import { join as join113 } from "path";
+import { optional as optional4, z as z53 } from "zod/mini";
+var LOCKFILE_VERSION = 1;
+var LockedSkillSchema = z53.object({
+  integrity: z53.string()
+});
+var LockedSourceSchema = z53.object({
+  requestedRef: optional4(z53.string()),
+  resolvedRef: z53.string(),
+  resolvedAt: optional4(z53.string()),
+  skills: z53.record(z53.string(), LockedSkillSchema)
+});
+var SourcesLockSchema = z53.object({
+  lockfileVersion: z53.number(),
+  sources: z53.record(z53.string(), LockedSourceSchema)
+});
+var LegacyLockedSourceSchema = z53.object({
+  resolvedRef: z53.string(),
+  skills: z53.array(z53.string())
+});
+var LegacySourcesLockSchema = z53.object({
+  sources: z53.record(z53.string(), LegacyLockedSourceSchema)
+});
+function migrateLegacyLock(legacy) {
+  const sources = {};
+  for (const [key, entry] of Object.entries(legacy.sources)) {
+    const skills = {};
+    for (const name of entry.skills) {
+      skills[name] = { integrity: "" };
+    }
+    sources[key] = {
+      resolvedRef: entry.resolvedRef,
+      skills
+    };
+  }
+  logger.info(
+    "Migrated legacy sources lockfile to version 1. Run 'rulesync install --update' to populate integrity hashes."
+  );
+  return { lockfileVersion: LOCKFILE_VERSION, sources };
+}
+function createEmptyLock() {
+  return { lockfileVersion: LOCKFILE_VERSION, sources: {} };
+}
+async function readLockFile(params) {
+  const lockPath = join113(params.baseDir, RULESYNC_SOURCES_LOCK_RELATIVE_FILE_PATH);
+  if (!await fileExists(lockPath)) {
+    logger.debug("No sources lockfile found, starting fresh.");
+    return createEmptyLock();
+  }
+  try {
+    const content = await readFileContent(lockPath);
+    const data = JSON.parse(content);
+    const result = SourcesLockSchema.safeParse(data);
+    if (result.success) {
+      return result.data;
+    }
+    const legacyResult = LegacySourcesLockSchema.safeParse(data);
+    if (legacyResult.success) {
+      return migrateLegacyLock(legacyResult.data);
+    }
+    logger.warn(
+      `Invalid sources lockfile format (${RULESYNC_SOURCES_LOCK_RELATIVE_FILE_PATH}). Starting fresh.`
+    );
+    return createEmptyLock();
+  } catch {
+    logger.warn(
+      `Failed to read sources lockfile (${RULESYNC_SOURCES_LOCK_RELATIVE_FILE_PATH}). Starting fresh.`
+    );
+    return createEmptyLock();
+  }
+}
+async function writeLockFile(params) {
+  const lockPath = join113(params.baseDir, RULESYNC_SOURCES_LOCK_RELATIVE_FILE_PATH);
+  const content = JSON.stringify(params.lock, null, 2) + "\n";
+  await writeFileContent(lockPath, content);
+  logger.debug(`Wrote sources lockfile to ${lockPath}`);
+}
+function computeSkillIntegrity(files) {
+  const hash = createHash("sha256");
+  const sorted = files.toSorted((a, b) => a.path.localeCompare(b.path));
+  for (const file of sorted) {
+    hash.update(file.path);
+    hash.update("\0");
+    hash.update(file.content);
+    hash.update("\0");
+  }
+  return `sha256-${hash.digest("hex")}`;
+}
+function normalizeSourceKey(source) {
+  let key = source;
+  for (const prefix of [
+    "https://www.github.com/",
+    "https://github.com/",
+    "http://www.github.com/",
+    "http://github.com/"
+  ]) {
+    if (key.toLowerCase().startsWith(prefix)) {
+      key = key.substring(prefix.length);
+      break;
+    }
+  }
+  if (key.startsWith("github:")) {
+    key = key.substring("github:".length);
+  }
+  key = key.replace(/\/+$/, "");
+  key = key.replace(/\.git$/, "");
+  key = key.toLowerCase();
+  return key;
+}
+function getLockedSource(lock, sourceKey) {
+  const normalized = normalizeSourceKey(sourceKey);
+  for (const [key, value] of Object.entries(lock.sources)) {
+    if (normalizeSourceKey(key) === normalized) {
+      return value;
+    }
+  }
+  return void 0;
+}
+function setLockedSource(lock, sourceKey, entry) {
+  const normalized = normalizeSourceKey(sourceKey);
+  const filteredSources = {};
+  for (const [key, value] of Object.entries(lock.sources)) {
+    if (normalizeSourceKey(key) !== normalized) {
+      filteredSources[key] = value;
+    }
+  }
+  return {
+    lockfileVersion: lock.lockfileVersion,
+    sources: {
+      ...filteredSources,
+      [normalized]: entry
+    }
+  };
+}
+function getLockedSkillNames(entry) {
+  return Object.keys(entry.skills);
+}
+
+// src/lib/sources.ts
+async function resolveAndFetchSources(params) {
+  const { sources, baseDir, options = {} } = params;
+  if (sources.length === 0) {
+    return { fetchedSkillCount: 0, sourcesProcessed: 0 };
+  }
+  if (options.skipSources) {
+    logger.info("Skipping source fetching.");
+    return { fetchedSkillCount: 0, sourcesProcessed: 0 };
+  }
+  let lock = options.updateSources ? createEmptyLock() : await readLockFile({ baseDir });
+  if (options.frozen) {
+    const missingKeys = [];
+    const missingSkills = [];
+    const curatedDir = join114(baseDir, RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH);
+    for (const source of sources) {
+      const locked = getLockedSource(lock, source.source);
+      if (!locked) {
+        missingKeys.push(source.source);
+        continue;
+      }
+      const skillNames = getLockedSkillNames(locked);
+      for (const skillName of skillNames) {
+        if (!await directoryExists(join114(curatedDir, skillName))) {
+          missingSkills.push(`${source.source}:${skillName}`);
+        }
+      }
+    }
+    if (missingKeys.length > 0) {
+      throw new Error(
+        `Frozen install failed: lockfile is missing entries for: ${missingKeys.join(", ")}. Run 'rulesync install' to update the lockfile.`
+      );
+    }
+    if (missingSkills.length > 0) {
+      throw new Error(
+        `Frozen install failed: locked skills missing from disk: ${missingSkills.join(", ")}. Run 'rulesync install' to fetch missing skills.`
+      );
+    }
+  }
+  const originalLockJson = JSON.stringify(lock);
+  const token = GitHubClient.resolveToken(options.token);
+  const client = new GitHubClient({ token });
+  const localSkillNames = await getLocalSkillDirNames(baseDir);
+  let totalSkillCount = 0;
+  const allFetchedSkillNames = /* @__PURE__ */ new Set();
+  for (const sourceEntry of sources) {
+    try {
+      const { skillCount, fetchedSkillNames, updatedLock } = await fetchSource({
+        sourceEntry,
+        client,
+        baseDir,
+        lock,
+        localSkillNames,
+        alreadyFetchedSkillNames: allFetchedSkillNames,
+        updateSources: options.updateSources ?? false
+      });
+      lock = updatedLock;
+      totalSkillCount += skillCount;
+      for (const name of fetchedSkillNames) {
+        allFetchedSkillNames.add(name);
+      }
+    } catch (error) {
+      if (error instanceof GitHubClientError) {
+        logGitHubAuthHints(error);
+      } else {
+        logger.error(`Failed to fetch source "${sourceEntry.source}": ${formatError(error)}`);
+      }
+    }
+  }
+  const sourceKeys = new Set(sources.map((s) => normalizeSourceKey(s.source)));
+  const prunedSources = {};
+  for (const [key, value] of Object.entries(lock.sources)) {
+    if (sourceKeys.has(normalizeSourceKey(key))) {
+      prunedSources[key] = value;
+    } else {
+      logger.debug(`Pruned stale lockfile entry: ${key}`);
+    }
+  }
+  lock = { lockfileVersion: lock.lockfileVersion, sources: prunedSources };
+  if (!options.frozen && JSON.stringify(lock) !== originalLockJson) {
+    await writeLockFile({ baseDir, lock });
+  } else {
+    logger.debug("Lockfile unchanged, skipping write.");
+  }
+  return { fetchedSkillCount: totalSkillCount, sourcesProcessed: sources.length };
+}
+async function checkLockedSkillsExist(curatedDir, skillNames) {
+  if (skillNames.length === 0) return true;
+  for (const name of skillNames) {
+    if (!await directoryExists(join114(curatedDir, name))) {
+      return false;
+    }
+  }
+  return true;
+}
+async function fetchSource(params) {
+  const { sourceEntry, client, baseDir, localSkillNames, alreadyFetchedSkillNames, updateSources } = params;
+  let { lock } = params;
+  const parsed = parseSource(sourceEntry.source);
+  if (parsed.provider === "gitlab") {
+    throw new Error("GitLab sources are not yet supported.");
+  }
+  const sourceKey = sourceEntry.source;
+  const locked = getLockedSource(lock, sourceKey);
+  const lockedSkillNames = locked ? getLockedSkillNames(locked) : [];
+  let ref;
+  let resolvedSha;
+  let requestedRef;
+  if (locked && !updateSources) {
+    ref = locked.resolvedRef;
+    resolvedSha = locked.resolvedRef;
+    requestedRef = locked.requestedRef;
+    logger.debug(`Using locked ref for ${sourceKey}: ${resolvedSha}`);
+  } else {
+    requestedRef = parsed.ref ?? await client.getDefaultBranch(parsed.owner, parsed.repo);
+    resolvedSha = await client.resolveRefToSha(parsed.owner, parsed.repo, requestedRef);
+    ref = resolvedSha;
+    logger.debug(`Resolved ${sourceKey} ref "${requestedRef}" to SHA: ${resolvedSha}`);
+  }
+  const curatedDir = join114(baseDir, RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH);
+  if (locked && resolvedSha === locked.resolvedRef && !updateSources) {
+    const allExist = await checkLockedSkillsExist(curatedDir, lockedSkillNames);
+    if (allExist) {
+      logger.debug(`SHA unchanged for ${sourceKey}, skipping re-fetch.`);
+      return {
+        skillCount: 0,
+        fetchedSkillNames: lockedSkillNames,
+        updatedLock: lock
+      };
+    }
+  }
+  const skillFilter = sourceEntry.skills ?? ["*"];
+  const isWildcard = skillFilter.length === 1 && skillFilter[0] === "*";
+  const skillsBasePath = parsed.path ?? "skills";
+  let remoteSkillDirs;
+  try {
+    const entries = await client.listDirectory(parsed.owner, parsed.repo, skillsBasePath, ref);
+    remoteSkillDirs = entries.filter((e) => e.type === "dir").map((e) => ({ name: e.name, path: e.path }));
+  } catch (error) {
+    if (error instanceof GitHubClientError && error.statusCode === 404) {
+      logger.warn(`No skills/ directory found in ${sourceKey}. Skipping.`);
+      return { skillCount: 0, fetchedSkillNames: [], updatedLock: lock };
+    }
+    throw error;
+  }
+  const filteredDirs = isWildcard ? remoteSkillDirs : remoteSkillDirs.filter((d) => skillFilter.includes(d.name));
+  const semaphore = new Semaphore2(FETCH_CONCURRENCY_LIMIT);
+  const fetchedSkills = {};
+  if (locked) {
+    const resolvedCuratedDir = resolve5(curatedDir);
+    for (const prevSkill of lockedSkillNames) {
+      const prevDir = join114(curatedDir, prevSkill);
+      if (!resolve5(prevDir).startsWith(resolvedCuratedDir + sep)) {
+        logger.warn(
+          `Skipping removal of "${prevSkill}": resolved path is outside the curated directory.`
+        );
+        continue;
+      }
+      if (await directoryExists(prevDir)) {
+        await removeDirectory(prevDir);
+      }
+    }
+  }
+  for (const skillDir of filteredDirs) {
+    if (skillDir.name.includes("..") || skillDir.name.includes("/") || skillDir.name.includes("\\")) {
+      logger.warn(
+        `Skipping skill with invalid name "${skillDir.name}" from ${sourceKey}: contains path traversal characters.`
+      );
+      continue;
+    }
+    if (localSkillNames.has(skillDir.name)) {
+      logger.debug(
+        `Skipping remote skill "${skillDir.name}" from ${sourceKey}: local skill takes precedence.`
+      );
+      continue;
+    }
+    if (alreadyFetchedSkillNames.has(skillDir.name)) {
+      logger.warn(
+        `Skipping duplicate skill "${skillDir.name}" from ${sourceKey}: already fetched from another source.`
+      );
+      continue;
+    }
+    const allFiles = await listDirectoryRecursive({
+      client,
+      owner: parsed.owner,
+      repo: parsed.repo,
+      path: skillDir.path,
+      ref,
+      semaphore
+    });
+    const files = allFiles.filter((file) => {
+      if (file.size > MAX_FILE_SIZE) {
+        logger.warn(
+          `Skipping file "${file.path}" (${(file.size / 1024 / 1024).toFixed(2)}MB exceeds ${MAX_FILE_SIZE / 1024 / 1024}MB limit).`
+        );
+        return false;
+      }
+      return true;
+    });
+    const skillFiles = [];
+    for (const file of files) {
+      const relativeToSkill = file.path.substring(skillDir.path.length + 1);
+      const localFilePath = join114(curatedDir, skillDir.name, relativeToSkill);
+      checkPathTraversal({
+        relativePath: relativeToSkill,
+        intendedRootDir: join114(curatedDir, skillDir.name)
+      });
+      const content = await withSemaphore(
+        semaphore,
+        () => client.getFileContent(parsed.owner, parsed.repo, file.path, ref)
+      );
+      await writeFileContent(localFilePath, content);
+      skillFiles.push({ path: relativeToSkill, content });
+    }
+    const integrity = computeSkillIntegrity(skillFiles);
+    const lockedSkillEntry = locked?.skills[skillDir.name];
+    if (lockedSkillEntry && lockedSkillEntry.integrity && lockedSkillEntry.integrity !== integrity && resolvedSha === locked?.resolvedRef) {
+      logger.warn(
+        `Integrity mismatch for skill "${skillDir.name}" from ${sourceKey}: expected "${lockedSkillEntry.integrity}", got "${integrity}". Content may have been tampered with.`
+      );
+    }
+    fetchedSkills[skillDir.name] = { integrity };
+    logger.debug(`Fetched skill "${skillDir.name}" from ${sourceKey}`);
+  }
+  const fetchedNames = Object.keys(fetchedSkills);
+  const mergedSkills = { ...fetchedSkills };
+  if (locked) {
+    for (const [skillName, skillEntry] of Object.entries(locked.skills)) {
+      if (!(skillName in mergedSkills)) {
+        mergedSkills[skillName] = skillEntry;
+      }
+    }
+  }
+  lock = setLockedSource(lock, sourceKey, {
+    requestedRef,
+    resolvedRef: resolvedSha,
+    resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    skills: mergedSkills
+  });
+  logger.info(
+    `Fetched ${fetchedNames.length} skill(s) from ${sourceKey}: ${fetchedNames.join(", ") || "(none)"}`
+  );
+  return {
+    skillCount: fetchedNames.length,
+    fetchedSkillNames: fetchedNames,
+    updatedLock: lock
+  };
+}
+
+// src/cli/commands/install.ts
+async function installCommand(options) {
+  logger.configure({
+    verbose: options.verbose ?? false,
+    silent: options.silent ?? false
+  });
+  const config = await ConfigResolver.resolve({
+    configPath: options.configPath,
+    verbose: options.verbose,
+    silent: options.silent
+  });
+  const sources = config.getSources();
+  if (sources.length === 0) {
+    logger.warn("No sources defined in configuration. Nothing to install.");
+    return;
+  }
+  logger.debug(`Installing skills from ${sources.length} source(s)...`);
+  const result = await resolveAndFetchSources({
+    sources,
+    baseDir: process.cwd(),
+    options: {
+      updateSources: options.update,
+      frozen: options.frozen,
+      token: options.token
+    }
+  });
+  if (result.fetchedSkillCount > 0) {
+    logger.success(
+      `Installed ${result.fetchedSkillCount} skill(s) from ${result.sourcesProcessed} source(s).`
+    );
+  } else {
+    logger.success(`All skills up to date (${result.sourcesProcessed} source(s) checked).`);
+  }
+}
+
 // src/cli/commands/mcp.ts
 import { FastMCP } from "fastmcp";
 
 // src/mcp/tools.ts
-import { z as z61 } from "zod/mini";
+import { z as z62 } from "zod/mini";
 
 // src/mcp/commands.ts
-import { basename as basename24, join as join112 } from "path";
-import { z as z53 } from "zod/mini";
+import { basename as basename25, join as join115 } from "path";
+import { z as z54 } from "zod/mini";
 var maxCommandSizeBytes = 1024 * 1024;
 var maxCommandsCount = 1e3;
 async function listCommands() {
-  const commandsDir = join112(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
+  const commandsDir = join115(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
   try {
     const files = await listDirectoryFiles(commandsDir);
     const mdFiles = files.filter((file) => file.endsWith(".md"));
@@ -16237,7 +16797,7 @@ async function listCommands() {
           });
           const frontmatter = command.getFrontmatter();
           return {
-            relativePathFromCwd: join112(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, file),
+            relativePathFromCwd: join115(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, file),
             frontmatter
           };
         } catch (error) {
@@ -16248,7 +16808,9 @@ async function listCommands() {
     );
     return commands.filter((command) => command !== null);
   } catch (error) {
-    logger.error(`Failed to read commands directory: ${formatError(error)}`);
+    logger.error(
+      `Failed to read commands directory (${RULESYNC_COMMANDS_RELATIVE_DIR_PATH}): ${formatError(error)}`
+    );
     return [];
   }
 }
@@ -16257,13 +16819,13 @@ async function getCommand({ relativePathFromCwd }) {
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename24(relativePathFromCwd);
+  const filename = basename25(relativePathFromCwd);
   try {
     const command = await RulesyncCommand.fromFile({
       relativeFilePath: filename
     });
     return {
-      relativePathFromCwd: join112(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join115(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
       frontmatter: command.getFrontmatter(),
       body: command.getBody()
     };
@@ -16282,20 +16844,22 @@ async function putCommand({
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename24(relativePathFromCwd);
+  const filename = basename25(relativePathFromCwd);
   const estimatedSize = JSON.stringify(frontmatter).length + body.length;
   if (estimatedSize > maxCommandSizeBytes) {
     throw new Error(
-      `Command size ${estimatedSize} bytes exceeds maximum ${maxCommandSizeBytes} bytes (1MB)`
+      `Command size ${estimatedSize} bytes exceeds maximum ${maxCommandSizeBytes} bytes (1MB) for ${relativePathFromCwd}`
     );
   }
   try {
     const existingCommands = await listCommands();
     const isUpdate = existingCommands.some(
-      (command2) => command2.relativePathFromCwd === join112(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
+      (command2) => command2.relativePathFromCwd === join115(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
     );
     if (!isUpdate && existingCommands.length >= maxCommandsCount) {
-      throw new Error(`Maximum number of commands (${maxCommandsCount}) reached`);
+      throw new Error(
+        `Maximum number of commands (${maxCommandsCount}) reached in ${RULESYNC_COMMANDS_RELATIVE_DIR_PATH}`
+      );
     }
     const fileContent = stringifyFrontmatter(body, frontmatter);
     const command = new RulesyncCommand({
@@ -16307,11 +16871,11 @@ async function putCommand({
       fileContent,
       validate: true
     });
-    const commandsDir = join112(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
+    const commandsDir = join115(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
     await ensureDir(commandsDir);
     await writeFileContent(command.getFilePath(), command.getFileContent());
     return {
-      relativePathFromCwd: join112(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join115(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
       frontmatter: command.getFrontmatter(),
       body: command.getBody()
     };
@@ -16326,12 +16890,12 @@ async function deleteCommand({ relativePathFromCwd }) {
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename24(relativePathFromCwd);
-  const fullPath = join112(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename);
+  const filename = basename25(relativePathFromCwd);
+  const fullPath = join115(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename);
   try {
     await removeFile(fullPath);
     return {
-      relativePathFromCwd: join112(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
+      relativePathFromCwd: join115(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
     };
   } catch (error) {
     throw new Error(`Failed to delete command file ${relativePathFromCwd}: ${formatError(error)}`, {
@@ -16340,23 +16904,23 @@ async function deleteCommand({ relativePathFromCwd }) {
   }
 }
 var commandToolSchemas = {
-  listCommands: z53.object({}),
-  getCommand: z53.object({
-    relativePathFromCwd: z53.string()
+  listCommands: z54.object({}),
+  getCommand: z54.object({
+    relativePathFromCwd: z54.string()
   }),
-  putCommand: z53.object({
-    relativePathFromCwd: z53.string(),
+  putCommand: z54.object({
+    relativePathFromCwd: z54.string(),
     frontmatter: RulesyncCommandFrontmatterSchema,
-    body: z53.string()
+    body: z54.string()
   }),
-  deleteCommand: z53.object({
-    relativePathFromCwd: z53.string()
+  deleteCommand: z54.object({
+    relativePathFromCwd: z54.string()
   })
 };
 var commandTools = {
   listCommands: {
     name: "listCommands",
-    description: `List all commands from ${join112(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
+    description: `List all commands from ${join115(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
     parameters: commandToolSchemas.listCommands,
     execute: async () => {
       const commands = await listCommands();
@@ -16398,15 +16962,15 @@ var commandTools = {
 };
 
 // src/mcp/generate.ts
-import { z as z54 } from "zod/mini";
-var generateOptionsSchema = z54.object({
-  targets: z54.optional(z54.array(z54.string())),
-  features: z54.optional(z54.array(z54.string())),
-  delete: z54.optional(z54.boolean()),
-  global: z54.optional(z54.boolean()),
-  simulateCommands: z54.optional(z54.boolean()),
-  simulateSubagents: z54.optional(z54.boolean()),
-  simulateSkills: z54.optional(z54.boolean())
+import { z as z55 } from "zod/mini";
+var generateOptionsSchema = z55.object({
+  targets: z55.optional(z55.array(z55.string())),
+  features: z55.optional(z55.array(z55.string())),
+  delete: z55.optional(z55.boolean()),
+  global: z55.optional(z55.boolean()),
+  simulateCommands: z55.optional(z55.boolean()),
+  simulateSubagents: z55.optional(z55.boolean()),
+  simulateSkills: z55.optional(z55.boolean())
 });
 async function executeGenerate(options = {}) {
   try {
@@ -16483,11 +17047,11 @@ var generateTools = {
 };
 
 // src/mcp/ignore.ts
-import { join as join113 } from "path";
-import { z as z55 } from "zod/mini";
+import { join as join116 } from "path";
+import { z as z56 } from "zod/mini";
 var maxIgnoreFileSizeBytes = 100 * 1024;
 async function getIgnoreFile() {
-  const ignoreFilePath = join113(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
+  const ignoreFilePath = join116(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
   try {
     const content = await readFileContent(ignoreFilePath);
     return {
@@ -16495,17 +17059,20 @@ async function getIgnoreFile() {
       content
     };
   } catch (error) {
-    throw new Error(`Failed to read .rulesync/.aiignore file: ${formatError(error)}`, {
-      cause: error
-    });
+    throw new Error(
+      `Failed to read ignore file (${RULESYNC_AIIGNORE_RELATIVE_FILE_PATH}): ${formatError(error)}`,
+      {
+        cause: error
+      }
+    );
   }
 }
 async function putIgnoreFile({ content }) {
-  const ignoreFilePath = join113(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
+  const ignoreFilePath = join116(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
   const contentSizeBytes = Buffer.byteLength(content, "utf8");
   if (contentSizeBytes > maxIgnoreFileSizeBytes) {
     throw new Error(
-      `Ignore file size ${contentSizeBytes} bytes exceeds maximum ${maxIgnoreFileSizeBytes} bytes (100KB)`
+      `Ignore file size ${contentSizeBytes} bytes exceeds maximum ${maxIgnoreFileSizeBytes} bytes (100KB) for ${RULESYNC_AIIGNORE_RELATIVE_FILE_PATH}`
     );
   }
   try {
@@ -16516,14 +17083,17 @@ async function putIgnoreFile({ content }) {
       content
     };
   } catch (error) {
-    throw new Error(`Failed to write .rulesync/.aiignore file: ${formatError(error)}`, {
-      cause: error
-    });
+    throw new Error(
+      `Failed to write ignore file (${RULESYNC_AIIGNORE_RELATIVE_FILE_PATH}): ${formatError(error)}`,
+      {
+        cause: error
+      }
+    );
   }
 }
 async function deleteIgnoreFile() {
-  const aiignorePath = join113(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
-  const legacyIgnorePath = join113(process.cwd(), RULESYNC_IGNORE_RELATIVE_FILE_PATH);
+  const aiignorePath = join116(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
+  const legacyIgnorePath = join116(process.cwd(), RULESYNC_IGNORE_RELATIVE_FILE_PATH);
   try {
     await Promise.all([removeFile(aiignorePath), removeFile(legacyIgnorePath)]);
     return {
@@ -16533,7 +17103,7 @@ async function deleteIgnoreFile() {
     };
   } catch (error) {
     throw new Error(
-      `Failed to delete .rulesyncignore and .rulesync/.aiignore files: ${formatError(error)}`,
+      `Failed to delete ignore files (${RULESYNC_AIIGNORE_RELATIVE_FILE_PATH}, ${RULESYNC_IGNORE_RELATIVE_FILE_PATH}): ${formatError(error)}`,
       {
         cause: error
       }
@@ -16541,11 +17111,11 @@ async function deleteIgnoreFile() {
   }
 }
 var ignoreToolSchemas = {
-  getIgnoreFile: z55.object({}),
-  putIgnoreFile: z55.object({
-    content: z55.string()
+  getIgnoreFile: z56.object({}),
+  putIgnoreFile: z56.object({
+    content: z56.string()
   }),
-  deleteIgnoreFile: z55.object({})
+  deleteIgnoreFile: z56.object({})
 };
 var ignoreTools = {
   getIgnoreFile: {
@@ -16578,11 +17148,11 @@ var ignoreTools = {
 };
 
 // src/mcp/import.ts
-import { z as z56 } from "zod/mini";
-var importOptionsSchema = z56.object({
-  target: z56.string(),
-  features: z56.optional(z56.array(z56.string())),
-  global: z56.optional(z56.boolean())
+import { z as z57 } from "zod/mini";
+var importOptionsSchema = z57.object({
+  target: z57.string(),
+  features: z57.optional(z57.array(z57.string())),
+  global: z57.optional(z57.boolean())
 });
 async function executeImport(options) {
   try {
@@ -16651,15 +17221,15 @@ var importTools = {
 };
 
 // src/mcp/mcp.ts
-import { join as join114 } from "path";
-import { z as z57 } from "zod/mini";
+import { join as join117 } from "path";
+import { z as z58 } from "zod/mini";
 var maxMcpSizeBytes = 1024 * 1024;
 async function getMcpFile() {
   try {
     const rulesyncMcp = await RulesyncMcp.fromFile({
       validate: true
     });
-    const relativePathFromCwd = join114(
+    const relativePathFromCwd = join117(
       rulesyncMcp.getRelativeDirPath(),
       rulesyncMcp.getRelativeFilePath()
     );
@@ -16668,30 +17238,36 @@ async function getMcpFile() {
       content: rulesyncMcp.getFileContent()
     };
   } catch (error) {
-    throw new Error(`Failed to read MCP file: ${formatError(error)}`, {
-      cause: error
-    });
+    throw new Error(
+      `Failed to read MCP file (${RULESYNC_MCP_RELATIVE_FILE_PATH}): ${formatError(error)}`,
+      {
+        cause: error
+      }
+    );
   }
 }
 async function putMcpFile({ content }) {
   if (content.length > maxMcpSizeBytes) {
     throw new Error(
-      `MCP file size ${content.length} bytes exceeds maximum ${maxMcpSizeBytes} bytes (1MB)`
+      `MCP file size ${content.length} bytes exceeds maximum ${maxMcpSizeBytes} bytes (1MB) for ${RULESYNC_MCP_RELATIVE_FILE_PATH}`
     );
   }
   try {
     JSON.parse(content);
   } catch (error) {
-    throw new Error(`Invalid JSON format in MCP file: ${formatError(error)}`, {
-      cause: error
-    });
+    throw new Error(
+      `Invalid JSON format in MCP file (${RULESYNC_MCP_RELATIVE_FILE_PATH}): ${formatError(error)}`,
+      {
+        cause: error
+      }
+    );
   }
   try {
     const baseDir = process.cwd();
     const paths = RulesyncMcp.getSettablePaths();
     const relativeDirPath = paths.recommended.relativeDirPath;
     const relativeFilePath = paths.recommended.relativeFilePath;
-    const fullPath = join114(baseDir, relativeDirPath, relativeFilePath);
+    const fullPath = join117(baseDir, relativeDirPath, relativeFilePath);
     const rulesyncMcp = new RulesyncMcp({
       baseDir,
       relativeDirPath,
@@ -16699,32 +17275,35 @@ async function putMcpFile({ content }) {
       fileContent: content,
       validate: true
     });
-    await ensureDir(join114(baseDir, relativeDirPath));
+    await ensureDir(join117(baseDir, relativeDirPath));
     await writeFileContent(fullPath, content);
-    const relativePathFromCwd = join114(relativeDirPath, relativeFilePath);
+    const relativePathFromCwd = join117(relativeDirPath, relativeFilePath);
     return {
       relativePathFromCwd,
       content: rulesyncMcp.getFileContent()
     };
   } catch (error) {
-    throw new Error(`Failed to write MCP file: ${formatError(error)}`, {
-      cause: error
-    });
+    throw new Error(
+      `Failed to write MCP file (${RULESYNC_MCP_RELATIVE_FILE_PATH}): ${formatError(error)}`,
+      {
+        cause: error
+      }
+    );
   }
 }
 async function deleteMcpFile() {
   try {
     const baseDir = process.cwd();
     const paths = RulesyncMcp.getSettablePaths();
-    const recommendedPath = join114(
+    const recommendedPath = join117(
       baseDir,
       paths.recommended.relativeDirPath,
       paths.recommended.relativeFilePath
     );
-    const legacyPath = join114(baseDir, paths.legacy.relativeDirPath, paths.legacy.relativeFilePath);
+    const legacyPath = join117(baseDir, paths.legacy.relativeDirPath, paths.legacy.relativeFilePath);
     await removeFile(recommendedPath);
     await removeFile(legacyPath);
-    const relativePathFromCwd = join114(
+    const relativePathFromCwd = join117(
       paths.recommended.relativeDirPath,
       paths.recommended.relativeFilePath
     );
@@ -16732,17 +17311,20 @@ async function deleteMcpFile() {
       relativePathFromCwd
     };
   } catch (error) {
-    throw new Error(`Failed to delete MCP file: ${formatError(error)}`, {
-      cause: error
-    });
+    throw new Error(
+      `Failed to delete MCP file (${RULESYNC_MCP_RELATIVE_FILE_PATH}): ${formatError(error)}`,
+      {
+        cause: error
+      }
+    );
   }
 }
 var mcpToolSchemas = {
-  getMcpFile: z57.object({}),
-  putMcpFile: z57.object({
-    content: z57.string()
+  getMcpFile: z58.object({}),
+  putMcpFile: z58.object({
+    content: z58.string()
   }),
-  deleteMcpFile: z57.object({})
+  deleteMcpFile: z58.object({})
 };
 var mcpTools = {
   getMcpFile: {
@@ -16775,12 +17357,12 @@ var mcpTools = {
 };
 
 // src/mcp/rules.ts
-import { basename as basename25, join as join115 } from "path";
-import { z as z58 } from "zod/mini";
+import { basename as basename26, join as join118 } from "path";
+import { z as z59 } from "zod/mini";
 var maxRuleSizeBytes = 1024 * 1024;
 var maxRulesCount = 1e3;
 async function listRules() {
-  const rulesDir = join115(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
+  const rulesDir = join118(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
   try {
     const files = await listDirectoryFiles(rulesDir);
     const mdFiles = files.filter((file) => file.endsWith(".md"));
@@ -16793,7 +17375,7 @@ async function listRules() {
           });
           const frontmatter = rule.getFrontmatter();
           return {
-            relativePathFromCwd: join115(RULESYNC_RULES_RELATIVE_DIR_PATH, file),
+            relativePathFromCwd: join118(RULESYNC_RULES_RELATIVE_DIR_PATH, file),
             frontmatter
           };
         } catch (error) {
@@ -16804,7 +17386,9 @@ async function listRules() {
     );
     return rules.filter((rule) => rule !== null);
   } catch (error) {
-    logger.error(`Failed to read rules directory: ${formatError(error)}`);
+    logger.error(
+      `Failed to read rules directory (${RULESYNC_RULES_RELATIVE_DIR_PATH}): ${formatError(error)}`
+    );
     return [];
   }
 }
@@ -16813,14 +17397,14 @@ async function getRule({ relativePathFromCwd }) {
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename25(relativePathFromCwd);
+  const filename = basename26(relativePathFromCwd);
   try {
     const rule = await RulesyncRule.fromFile({
       relativeFilePath: filename,
       validate: true
     });
     return {
-      relativePathFromCwd: join115(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join118(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
       frontmatter: rule.getFrontmatter(),
       body: rule.getBody()
     };
@@ -16839,20 +17423,22 @@ async function putRule({
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename25(relativePathFromCwd);
+  const filename = basename26(relativePathFromCwd);
   const estimatedSize = JSON.stringify(frontmatter).length + body.length;
   if (estimatedSize > maxRuleSizeBytes) {
     throw new Error(
-      `Rule size ${estimatedSize} bytes exceeds maximum ${maxRuleSizeBytes} bytes (1MB)`
+      `Rule size ${estimatedSize} bytes exceeds maximum ${maxRuleSizeBytes} bytes (1MB) for ${relativePathFromCwd}`
     );
   }
   try {
     const existingRules = await listRules();
     const isUpdate = existingRules.some(
-      (rule2) => rule2.relativePathFromCwd === join115(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
+      (rule2) => rule2.relativePathFromCwd === join118(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
     );
     if (!isUpdate && existingRules.length >= maxRulesCount) {
-      throw new Error(`Maximum number of rules (${maxRulesCount}) reached`);
+      throw new Error(
+        `Maximum number of rules (${maxRulesCount}) reached in ${RULESYNC_RULES_RELATIVE_DIR_PATH}`
+      );
     }
     const rule = new RulesyncRule({
       baseDir: process.cwd(),
@@ -16862,11 +17448,11 @@ async function putRule({
       body,
       validate: true
     });
-    const rulesDir = join115(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
+    const rulesDir = join118(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
     await ensureDir(rulesDir);
     await writeFileContent(rule.getFilePath(), rule.getFileContent());
     return {
-      relativePathFromCwd: join115(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join118(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
       frontmatter: rule.getFrontmatter(),
       body: rule.getBody()
     };
@@ -16881,12 +17467,12 @@ async function deleteRule({ relativePathFromCwd }) {
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename25(relativePathFromCwd);
-  const fullPath = join115(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH, filename);
+  const filename = basename26(relativePathFromCwd);
+  const fullPath = join118(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH, filename);
   try {
     await removeFile(fullPath);
     return {
-      relativePathFromCwd: join115(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
+      relativePathFromCwd: join118(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
     };
   } catch (error) {
     throw new Error(`Failed to delete rule file ${relativePathFromCwd}: ${formatError(error)}`, {
@@ -16895,23 +17481,23 @@ async function deleteRule({ relativePathFromCwd }) {
   }
 }
 var ruleToolSchemas = {
-  listRules: z58.object({}),
-  getRule: z58.object({
-    relativePathFromCwd: z58.string()
+  listRules: z59.object({}),
+  getRule: z59.object({
+    relativePathFromCwd: z59.string()
   }),
-  putRule: z58.object({
-    relativePathFromCwd: z58.string(),
+  putRule: z59.object({
+    relativePathFromCwd: z59.string(),
     frontmatter: RulesyncRuleFrontmatterSchema,
-    body: z58.string()
+    body: z59.string()
   }),
-  deleteRule: z58.object({
-    relativePathFromCwd: z58.string()
+  deleteRule: z59.object({
+    relativePathFromCwd: z59.string()
   })
 };
 var ruleTools = {
   listRules: {
     name: "listRules",
-    description: `List all rules from ${join115(RULESYNC_RULES_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
+    description: `List all rules from ${join118(RULESYNC_RULES_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
     parameters: ruleToolSchemas.listRules,
     execute: async () => {
       const rules = await listRules();
@@ -16953,8 +17539,8 @@ var ruleTools = {
 };
 
 // src/mcp/skills.ts
-import { basename as basename26, dirname as dirname3, join as join116 } from "path";
-import { z as z59 } from "zod/mini";
+import { basename as basename27, dirname as dirname3, join as join119 } from "path";
+import { z as z60 } from "zod/mini";
 var maxSkillSizeBytes = 1024 * 1024;
 var maxSkillsCount = 1e3;
 function aiDirFileToMcpSkillFile(file) {
@@ -16970,19 +17556,19 @@ function mcpSkillFileToAiDirFile(file) {
   };
 }
 function extractDirName(relativeDirPathFromCwd) {
-  const dirName = basename26(relativeDirPathFromCwd);
+  const dirName = basename27(relativeDirPathFromCwd);
   if (!dirName) {
     throw new Error(`Invalid path: ${relativeDirPathFromCwd}`);
   }
   return dirName;
 }
 async function listSkills() {
-  const skillsDir = join116(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH);
+  const skillsDir = join119(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH);
   try {
-    const skillDirPaths = await findFilesByGlobs(join116(skillsDir, "*"), { type: "dir" });
+    const skillDirPaths = await findFilesByGlobs(join119(skillsDir, "*"), { type: "dir" });
     const skills = await Promise.all(
       skillDirPaths.map(async (dirPath) => {
-        const dirName = basename26(dirPath);
+        const dirName = basename27(dirPath);
         if (!dirName) return null;
         try {
           const skill = await RulesyncSkill.fromDir({
@@ -16990,7 +17576,7 @@ async function listSkills() {
           });
           const frontmatter = skill.getFrontmatter();
           return {
-            relativeDirPathFromCwd: join116(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
+            relativeDirPathFromCwd: join119(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
             frontmatter
           };
         } catch (error) {
@@ -17001,7 +17587,9 @@ async function listSkills() {
     );
     return skills.filter((skill) => skill !== null);
   } catch (error) {
-    logger.error(`Failed to read skills directory: ${formatError(error)}`);
+    logger.error(
+      `Failed to read skills directory (${RULESYNC_SKILLS_RELATIVE_DIR_PATH}): ${formatError(error)}`
+    );
     return [];
   }
 }
@@ -17016,7 +17604,7 @@ async function getSkill({ relativeDirPathFromCwd }) {
       dirName
     });
     return {
-      relativeDirPathFromCwd: join116(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
+      relativeDirPathFromCwd: join119(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
       frontmatter: skill.getFrontmatter(),
       body: skill.getBody(),
       otherFiles: skill.getOtherFiles().map(aiDirFileToMcpSkillFile)
@@ -17044,16 +17632,18 @@ async function putSkill({
   const estimatedSize = JSON.stringify(frontmatter).length + body.length + otherFiles.reduce((acc, file) => acc + file.name.length + file.body.length, 0);
   if (estimatedSize > maxSkillSizeBytes) {
     throw new Error(
-      `Skill size ${estimatedSize} bytes exceeds maximum ${maxSkillSizeBytes} bytes (1MB)`
+      `Skill size ${estimatedSize} bytes exceeds maximum ${maxSkillSizeBytes} bytes (1MB) for ${relativeDirPathFromCwd}`
     );
   }
   try {
     const existingSkills = await listSkills();
     const isUpdate = existingSkills.some(
-      (skill2) => skill2.relativeDirPathFromCwd === join116(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
+      (skill2) => skill2.relativeDirPathFromCwd === join119(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
     );
     if (!isUpdate && existingSkills.length >= maxSkillsCount) {
-      throw new Error(`Maximum number of skills (${maxSkillsCount}) reached`);
+      throw new Error(
+        `Maximum number of skills (${maxSkillsCount}) reached in ${RULESYNC_SKILLS_RELATIVE_DIR_PATH}`
+      );
     }
     const aiDirFiles = otherFiles.map(mcpSkillFileToAiDirFile);
     const skill = new RulesyncSkill({
@@ -17065,9 +17655,9 @@ async function putSkill({
       otherFiles: aiDirFiles,
       validate: true
     });
-    const skillDirPath = join116(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
+    const skillDirPath = join119(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
     await ensureDir(skillDirPath);
-    const skillFilePath = join116(skillDirPath, SKILL_FILE_NAME);
+    const skillFilePath = join119(skillDirPath, SKILL_FILE_NAME);
     const skillFileContent = stringifyFrontmatter(body, frontmatter);
     await writeFileContent(skillFilePath, skillFileContent);
     for (const file of otherFiles) {
@@ -17075,15 +17665,15 @@ async function putSkill({
         relativePath: file.name,
         intendedRootDir: skillDirPath
       });
-      const filePath = join116(skillDirPath, file.name);
-      const fileDir = join116(skillDirPath, dirname3(file.name));
+      const filePath = join119(skillDirPath, file.name);
+      const fileDir = join119(skillDirPath, dirname3(file.name));
       if (fileDir !== skillDirPath) {
         await ensureDir(fileDir);
       }
       await writeFileContent(filePath, file.body);
     }
     return {
-      relativeDirPathFromCwd: join116(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
+      relativeDirPathFromCwd: join119(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
       frontmatter: skill.getFrontmatter(),
       body: skill.getBody(),
       otherFiles: skill.getOtherFiles().map(aiDirFileToMcpSkillFile)
@@ -17105,13 +17695,13 @@ async function deleteSkill({
     intendedRootDir: process.cwd()
   });
   const dirName = extractDirName(relativeDirPathFromCwd);
-  const skillDirPath = join116(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
+  const skillDirPath = join119(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
   try {
     if (await directoryExists(skillDirPath)) {
       await removeDirectory(skillDirPath);
     }
     return {
-      relativeDirPathFromCwd: join116(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
+      relativeDirPathFromCwd: join119(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
     };
   } catch (error) {
     throw new Error(
@@ -17122,29 +17712,29 @@ async function deleteSkill({
     );
   }
 }
-var McpSkillFileSchema = z59.object({
-  name: z59.string(),
-  body: z59.string()
+var McpSkillFileSchema = z60.object({
+  name: z60.string(),
+  body: z60.string()
 });
 var skillToolSchemas = {
-  listSkills: z59.object({}),
-  getSkill: z59.object({
-    relativeDirPathFromCwd: z59.string()
+  listSkills: z60.object({}),
+  getSkill: z60.object({
+    relativeDirPathFromCwd: z60.string()
   }),
-  putSkill: z59.object({
-    relativeDirPathFromCwd: z59.string(),
+  putSkill: z60.object({
+    relativeDirPathFromCwd: z60.string(),
     frontmatter: RulesyncSkillFrontmatterSchema,
-    body: z59.string(),
-    otherFiles: z59.optional(z59.array(McpSkillFileSchema))
+    body: z60.string(),
+    otherFiles: z60.optional(z60.array(McpSkillFileSchema))
   }),
-  deleteSkill: z59.object({
-    relativeDirPathFromCwd: z59.string()
+  deleteSkill: z60.object({
+    relativeDirPathFromCwd: z60.string()
   })
 };
 var skillTools = {
   listSkills: {
     name: "listSkills",
-    description: `List all skills from ${join116(RULESYNC_SKILLS_RELATIVE_DIR_PATH, "*", SKILL_FILE_NAME)} with their frontmatter.`,
+    description: `List all skills from ${join119(RULESYNC_SKILLS_RELATIVE_DIR_PATH, "*", SKILL_FILE_NAME)} with their frontmatter.`,
     parameters: skillToolSchemas.listSkills,
     execute: async () => {
       const skills = await listSkills();
@@ -17187,12 +17777,12 @@ var skillTools = {
 };
 
 // src/mcp/subagents.ts
-import { basename as basename27, join as join117 } from "path";
-import { z as z60 } from "zod/mini";
+import { basename as basename28, join as join120 } from "path";
+import { z as z61 } from "zod/mini";
 var maxSubagentSizeBytes = 1024 * 1024;
 var maxSubagentsCount = 1e3;
 async function listSubagents() {
-  const subagentsDir = join117(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
+  const subagentsDir = join120(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
   try {
     const files = await listDirectoryFiles(subagentsDir);
     const mdFiles = files.filter((file) => file.endsWith(".md"));
@@ -17205,7 +17795,7 @@ async function listSubagents() {
           });
           const frontmatter = subagent.getFrontmatter();
           return {
-            relativePathFromCwd: join117(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, file),
+            relativePathFromCwd: join120(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, file),
             frontmatter
           };
         } catch (error) {
@@ -17218,7 +17808,9 @@ async function listSubagents() {
       (subagent) => subagent !== null
     );
   } catch (error) {
-    logger.error(`Failed to read subagents directory: ${formatError(error)}`);
+    logger.error(
+      `Failed to read subagents directory (${RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH}): ${formatError(error)}`
+    );
     return [];
   }
 }
@@ -17227,14 +17819,14 @@ async function getSubagent({ relativePathFromCwd }) {
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename27(relativePathFromCwd);
+  const filename = basename28(relativePathFromCwd);
   try {
     const subagent = await RulesyncSubagent.fromFile({
       relativeFilePath: filename,
       validate: true
     });
     return {
-      relativePathFromCwd: join117(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join120(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
       frontmatter: subagent.getFrontmatter(),
       body: subagent.getBody()
     };
@@ -17253,20 +17845,22 @@ async function putSubagent({
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename27(relativePathFromCwd);
+  const filename = basename28(relativePathFromCwd);
   const estimatedSize = JSON.stringify(frontmatter).length + body.length;
   if (estimatedSize > maxSubagentSizeBytes) {
     throw new Error(
-      `Subagent size ${estimatedSize} bytes exceeds maximum ${maxSubagentSizeBytes} bytes (1MB)`
+      `Subagent size ${estimatedSize} bytes exceeds maximum ${maxSubagentSizeBytes} bytes (1MB) for ${relativePathFromCwd}`
     );
   }
   try {
     const existingSubagents = await listSubagents();
     const isUpdate = existingSubagents.some(
-      (subagent2) => subagent2.relativePathFromCwd === join117(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
+      (subagent2) => subagent2.relativePathFromCwd === join120(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
     );
     if (!isUpdate && existingSubagents.length >= maxSubagentsCount) {
-      throw new Error(`Maximum number of subagents (${maxSubagentsCount}) reached`);
+      throw new Error(
+        `Maximum number of subagents (${maxSubagentsCount}) reached in ${RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH}`
+      );
     }
     const subagent = new RulesyncSubagent({
       baseDir: process.cwd(),
@@ -17276,11 +17870,11 @@ async function putSubagent({
       body,
       validate: true
     });
-    const subagentsDir = join117(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
+    const subagentsDir = join120(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
     await ensureDir(subagentsDir);
     await writeFileContent(subagent.getFilePath(), subagent.getFileContent());
     return {
-      relativePathFromCwd: join117(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join120(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
       frontmatter: subagent.getFrontmatter(),
       body: subagent.getBody()
     };
@@ -17295,12 +17889,12 @@ async function deleteSubagent({ relativePathFromCwd }) {
     relativePath: relativePathFromCwd,
     intendedRootDir: process.cwd()
   });
-  const filename = basename27(relativePathFromCwd);
-  const fullPath = join117(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename);
+  const filename = basename28(relativePathFromCwd);
+  const fullPath = join120(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename);
   try {
     await removeFile(fullPath);
     return {
-      relativePathFromCwd: join117(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
+      relativePathFromCwd: join120(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
     };
   } catch (error) {
     throw new Error(
@@ -17312,23 +17906,23 @@ async function deleteSubagent({ relativePathFromCwd }) {
   }
 }
 var subagentToolSchemas = {
-  listSubagents: z60.object({}),
-  getSubagent: z60.object({
-    relativePathFromCwd: z60.string()
+  listSubagents: z61.object({}),
+  getSubagent: z61.object({
+    relativePathFromCwd: z61.string()
   }),
-  putSubagent: z60.object({
-    relativePathFromCwd: z60.string(),
+  putSubagent: z61.object({
+    relativePathFromCwd: z61.string(),
     frontmatter: RulesyncSubagentFrontmatterSchema,
-    body: z60.string()
+    body: z61.string()
   }),
-  deleteSubagent: z60.object({
-    relativePathFromCwd: z60.string()
+  deleteSubagent: z61.object({
+    relativePathFromCwd: z61.string()
   })
 };
 var subagentTools = {
   listSubagents: {
     name: "listSubagents",
-    description: `List all subagents from ${join117(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
+    description: `List all subagents from ${join120(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
     parameters: subagentToolSchemas.listSubagents,
     execute: async () => {
       const subagents = await listSubagents();
@@ -17370,7 +17964,7 @@ var subagentTools = {
 };
 
 // src/mcp/tools.ts
-var rulesyncFeatureSchema = z61.enum([
+var rulesyncFeatureSchema = z62.enum([
   "rule",
   "command",
   "subagent",
@@ -17380,21 +17974,21 @@ var rulesyncFeatureSchema = z61.enum([
   "generate",
   "import"
 ]);
-var rulesyncOperationSchema = z61.enum(["list", "get", "put", "delete", "run"]);
-var skillFileSchema = z61.object({
-  name: z61.string(),
-  body: z61.string()
+var rulesyncOperationSchema = z62.enum(["list", "get", "put", "delete", "run"]);
+var skillFileSchema = z62.object({
+  name: z62.string(),
+  body: z62.string()
 });
-var rulesyncToolSchema = z61.object({
+var rulesyncToolSchema = z62.object({
   feature: rulesyncFeatureSchema,
   operation: rulesyncOperationSchema,
-  targetPathFromCwd: z61.optional(z61.string()),
-  frontmatter: z61.optional(z61.unknown()),
-  body: z61.optional(z61.string()),
-  otherFiles: z61.optional(z61.array(skillFileSchema)),
-  content: z61.optional(z61.string()),
-  generateOptions: z61.optional(generateOptionsSchema),
-  importOptions: z61.optional(importOptionsSchema)
+  targetPathFromCwd: z62.optional(z62.string()),
+  frontmatter: z62.optional(z62.unknown()),
+  body: z62.optional(z62.string()),
+  otherFiles: z62.optional(z62.array(skillFileSchema)),
+  content: z62.optional(z62.string()),
+  generateOptions: z62.optional(generateOptionsSchema),
+  importOptions: z62.optional(importOptionsSchema)
 });
 var supportedOperationsByFeature = {
   rule: ["list", "get", "put", "delete"],
@@ -17723,7 +18317,7 @@ async function downloadFile(url, destPath) {
     redirect: "follow"
   });
   if (!response.ok) {
-    throw new Error(`Failed to download: HTTP ${response.status}`);
+    throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
   }
   if (response.url) {
     validateDownloadUrl(response.url);
@@ -17953,7 +18547,7 @@ async function updateCommand(currentVersion, options) {
 }
 
 // src/cli/index.ts
-var getVersion = () => "7.0.0";
+var getVersion = () => "7.1.0";
 var main = async () => {
   const program = new Command();
   const version = getVersion();
@@ -18026,6 +18620,21 @@ var main = async () => {
       process.exit(1);
     }
   });
+  program.command("install").description("Install skills from declarative sources in rulesync.jsonc").option("--update", "Force re-resolve all source refs, ignoring lockfile").option("--frozen", "Fail if lockfile is missing or out of sync (for CI)").option("--token <token>", "GitHub token for private repos").option("-c, --config <path>", "Path to configuration file").option("-V, --verbose", "Verbose output").option("-s, --silent", "Suppress all output").action(async (options) => {
+    try {
+      await installCommand({
+        update: options.update,
+        frozen: options.frozen,
+        token: options.token,
+        configPath: options.config,
+        verbose: options.verbose,
+        silent: options.silent
+      });
+    } catch (error) {
+      logger.error(formatError(error));
+      process.exit(1);
+    }
+  });
   program.command("generate").description("Generate configuration files for AI tools").option(
     "-t, --targets <tools>",
     "Comma-separated list of tools to generate for (e.g., 'copilot,cursor,cline' or '*' for all)",