rulesync 3.31.0 → 3.33.0

package/dist/index.js

@@ -229,17 +229,18 @@ var ALL_TOOL_TARGETS = [
   "antigravity",
   "augmentcode",
   "augmentcode-legacy",
-  "copilot",
-  "cursor",
-  "cline",
   "claudecode",
+  "claudecode-legacy",
+  "cline",
   "codexcli",
+  "copilot",
+  "cursor",
+  "geminicli",
+  "junie",
+  "kiro",
   "opencode",
   "qwencode",
   "roo",
-  "geminicli",
-  "kiro",
-  "junie",
   "warp",
   "windsurf"
 ];
@@ -272,6 +273,11 @@ var ConfigFileSchema = z3.object({
   ...z3.partial(ConfigParamsSchema).shape
 });
 var RequiredConfigParamsSchema = z3.required(ConfigParamsSchema);
+var CONFLICTING_TARGET_PAIRS = [
+  ["augmentcode", "augmentcode-legacy"],
+  ["claudecode", "claudecode-legacy"]
+];
+var LEGACY_TARGETS = ["augmentcode-legacy", "claudecode-legacy"];
 var Config = class {
   baseDirs;
   targets;
@@ -298,6 +304,7 @@ var Config = class {
     experimentalSimulateCommands,
     experimentalSimulateSubagents
   }) {
+    this.validateConflictingTargets(targets);
     this.baseDirs = baseDirs;
     this.targets = targets;
     this.features = features;
@@ -309,12 +316,26 @@ var Config = class {
     this.simulateSkills = simulateSkills ?? false;
     this.modularMcp = modularMcp ?? false;
   }
+  validateConflictingTargets(targets) {
+    for (const [target1, target2] of CONFLICTING_TARGET_PAIRS) {
+      const hasTarget1 = targets.includes(target1);
+      const hasTarget2 = targets.includes(target2);
+      if (hasTarget1 && hasTarget2) {
+        throw new Error(
+          `Conflicting targets: '${target1}' and '${target2}' cannot be used together. Please choose one.`
+        );
+      }
+    }
+  }
   getBaseDirs() {
     return this.baseDirs;
   }
   getTargets() {
     if (this.targets.includes("*")) {
-      return [...ALL_TOOL_TARGETS];
+      return ALL_TOOL_TARGETS.filter(
+        // eslint-disable-next-line no-type-assertion/no-type-assertion
+        (target) => !LEGACY_TARGETS.includes(target)
+      );
     }
     return this.targets.filter((target) => target !== "*");
   }
@@ -3492,6 +3513,12 @@ var CodexcliMcp = class _CodexcliMcp extends ToolMcp {
 
 // src/features/mcp/copilot-mcp.ts
 import { join as join33 } from "path";
+function convertToCopilotFormat(mcpServers) {
+  return { servers: mcpServers };
+}
+function convertFromCopilotFormat(copilotConfig) {
+  return copilotConfig.servers ?? {};
+}
 var CopilotMcp = class _CopilotMcp extends ToolMcp {
   json;
   constructor(params) {
@@ -3531,16 +3558,20 @@ var CopilotMcp = class _CopilotMcp extends ToolMcp {
     rulesyncMcp,
     validate = true
   }) {
+    const copilotConfig = convertToCopilotFormat(rulesyncMcp.getMcpServers());
     return new _CopilotMcp({
       baseDir,
       relativeDirPath: this.getSettablePaths().relativeDirPath,
       relativeFilePath: this.getSettablePaths().relativeFilePath,
-      fileContent: rulesyncMcp.getFileContent(),
+      fileContent: JSON.stringify(copilotConfig, null, 2),
       validate
     });
   }
   toRulesyncMcp() {
-    return this.toRulesyncMcpDefault();
+    const mcpServers = convertFromCopilotFormat(this.json);
+    return this.toRulesyncMcpDefault({
+      fileContent: JSON.stringify({ mcpServers }, null, 2)
+    });
   }
   validate() {
     return { success: true, error: null };
@@ -3924,6 +3955,37 @@ var OpencodeMcp = class _OpencodeMcp extends ToolMcp {
 
 // src/features/mcp/roo-mcp.ts
 import { join as join38 } from "path";
+function isRooMcpServers(value) {
+  return value !== void 0 && value !== null && typeof value === "object";
+}
+function convertToRooFormat(mcpServers) {
+  return Object.fromEntries(
+    Object.entries(mcpServers).map(([serverName, serverConfig]) => {
+      const converted = { ...serverConfig };
+      if (serverConfig.type === "http") {
+        converted.type = "streamable-http";
+      }
+      if (serverConfig.transport === "http") {
+        converted.transport = "streamable-http";
+      }
+      return [serverName, converted];
+    })
+  );
+}
+function convertFromRooFormat(mcpServers) {
+  return Object.fromEntries(
+    Object.entries(mcpServers).map(([serverName, serverConfig]) => {
+      const converted = { ...serverConfig };
+      if (serverConfig.type === "streamable-http") {
+        converted.type = "http";
+      }
+      if (serverConfig.transport === "streamable-http") {
+        converted.transport = "http";
+      }
+      return [serverName, converted];
+    })
+  );
+}
 var RooMcp = class _RooMcp extends ToolMcp {
   json;
   constructor(params) {
@@ -3963,7 +4025,9 @@ var RooMcp = class _RooMcp extends ToolMcp {
     rulesyncMcp,
     validate = true
   }) {
-    const fileContent = rulesyncMcp.getFileContent();
+    const mcpServers = rulesyncMcp.getMcpServers();
+    const convertedMcpServers = convertToRooFormat(mcpServers);
+    const fileContent = JSON.stringify({ mcpServers: convertedMcpServers }, null, 2);
     return new _RooMcp({
       baseDir,
       relativeDirPath: this.getSettablePaths().relativeDirPath,
@@ -3973,7 +4037,11 @@ var RooMcp = class _RooMcp extends ToolMcp {
     });
   }
   toRulesyncMcp() {
-    return this.toRulesyncMcpDefault();
+    const rawMcpServers = isRooMcpServers(this.json.mcpServers) ? this.json.mcpServers : {};
+    const convertedMcpServers = convertFromRooFormat(rawMcpServers);
+    return this.toRulesyncMcpDefault({
+      fileContent: JSON.stringify({ mcpServers: convertedMcpServers }, null, 2)
+    });
   }
   validate() {
     return { success: true, error: null };
@@ -4214,21 +4282,23 @@ var McpProcessor = class extends FeatureProcessor {
 };
 
 // src/features/rules/rules-processor.ts
-import { basename as basename21, join as join81 } from "path";
+import { basename as basename21, join as join82 } from "path";
 import { encode } from "@toon-format/toon";
-import { z as z32 } from "zod/mini";
-
-// src/features/skills/codexcli-skill.ts
-import { join as join42 } from "path";
-import { z as z20 } from "zod/mini";
+import { z as z33 } from "zod/mini";
 
 // src/constants/general.ts
 var SKILL_FILE_NAME = "SKILL.md";
 
-// src/features/skills/rulesync-skill.ts
-import { join as join40 } from "path";
+// src/features/skills/agentsmd-skill.ts
+import { join as join42 } from "path";
+
+// src/features/skills/simulated-skill.ts
+import { join as join41 } from "path";
 import { z as z19 } from "zod/mini";
 
+// src/features/skills/tool-skill.ts
+import { join as join40 } from "path";
+
 // src/types/ai-dir.ts
 import path2, { basename as basename14, join as join39, relative as relative3, resolve as resolve4 } from "path";
 var AiDir = class {
@@ -4341,113 +4411,7 @@ var AiDir = class {
   }
 };
 
-// src/features/skills/rulesync-skill.ts
-var RulesyncSkillFrontmatterSchemaInternal = z19.object({
-  name: z19.string(),
-  description: z19.string(),
-  targets: z19._default(RulesyncTargetsSchema, ["*"]),
-  claudecode: z19.optional(
-    z19.object({
-      "allowed-tools": z19.optional(z19.array(z19.string()))
-    })
-  )
-});
-var RulesyncSkillFrontmatterSchema = RulesyncSkillFrontmatterSchemaInternal;
-var RulesyncSkill = class _RulesyncSkill extends AiDir {
-  constructor({
-    baseDir = process.cwd(),
-    relativeDirPath = RULESYNC_SKILLS_RELATIVE_DIR_PATH,
-    dirName,
-    frontmatter,
-    body,
-    otherFiles = [],
-    validate = true,
-    global = false
-  }) {
-    super({
-      baseDir,
-      relativeDirPath,
-      dirName,
-      mainFile: {
-        name: SKILL_FILE_NAME,
-        body,
-        frontmatter: { ...frontmatter }
-      },
-      otherFiles,
-      global
-    });
-    if (validate) {
-      const result = this.validate();
-      if (!result.success) {
-        throw result.error;
-      }
-    }
-  }
-  static getSettablePaths() {
-    return {
-      relativeDirPath: RULESYNC_SKILLS_RELATIVE_DIR_PATH
-    };
-  }
-  getFrontmatter() {
-    if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
-    }
-    const result = RulesyncSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
-    return result;
-  }
-  getBody() {
-    return this.mainFile?.body ?? "";
-  }
-  validate() {
-    const result = RulesyncSkillFrontmatterSchema.safeParse(this.mainFile?.frontmatter);
-    if (!result.success) {
-      return {
-        success: false,
-        error: new Error(
-          `Invalid frontmatter in ${this.getDirPath()}: ${formatError(result.error)}`
-        )
-      };
-    }
-    return { success: true, error: null };
-  }
-  static async fromDir({
-    baseDir = process.cwd(),
-    relativeDirPath = RULESYNC_SKILLS_RELATIVE_DIR_PATH,
-    dirName,
-    global = false
-  }) {
-    const skillDirPath = join40(baseDir, relativeDirPath, dirName);
-    const skillFilePath = join40(skillDirPath, SKILL_FILE_NAME);
-    if (!await fileExists(skillFilePath)) {
-      throw new Error(`${SKILL_FILE_NAME} not found in ${skillDirPath}`);
-    }
-    const fileContent = await readFileContent(skillFilePath);
-    const { frontmatter, body: content } = parseFrontmatter(fileContent);
-    const result = RulesyncSkillFrontmatterSchema.safeParse(frontmatter);
-    if (!result.success) {
-      throw new Error(`Invalid frontmatter in ${skillFilePath}: ${formatError(result.error)}`);
-    }
-    const otherFiles = await this.collectOtherFiles(
-      baseDir,
-      relativeDirPath,
-      dirName,
-      SKILL_FILE_NAME
-    );
-    return new _RulesyncSkill({
-      baseDir,
-      relativeDirPath,
-      dirName,
-      frontmatter: result.data,
-      body: content.trim(),
-      otherFiles,
-      validate: true,
-      global
-    });
-  }
-};
-
 // src/features/skills/tool-skill.ts
-import { join as join41 } from "path";
 var ToolSkill = class extends AiDir {
   /**
    * Get the settable paths for this tool's skill directories.
@@ -4521,8 +4485,8 @@ var ToolSkill = class extends AiDir {
   }) {
     const settablePaths = getSettablePaths({ global });
     const actualRelativeDirPath = relativeDirPath ?? settablePaths.relativeDirPath;
-    const skillDirPath = join41(baseDir, actualRelativeDirPath, dirName);
-    const skillFilePath = join41(skillDirPath, SKILL_FILE_NAME);
+    const skillDirPath = join40(baseDir, actualRelativeDirPath, dirName);
+    const skillFilePath = join40(skillDirPath, SKILL_FILE_NAME);
     if (!await fileExists(skillFilePath)) {
       throw new Error(`${SKILL_FILE_NAME} not found in ${skillDirPath}`);
     }
@@ -4546,21 +4510,22 @@ var ToolSkill = class extends AiDir {
   }
 };
 
-// src/features/skills/codexcli-skill.ts
-var CodexCliSkillFrontmatterSchema = z20.object({
-  name: z20.string(),
-  description: z20.string()
+// src/features/skills/simulated-skill.ts
+var SimulatedSkillFrontmatterSchema = z19.object({
+  name: z19.string(),
+  description: z19.string()
 });
-var CodexCliSkill = class _CodexCliSkill extends ToolSkill {
+var SimulatedSkill = class extends ToolSkill {
+  frontmatter;
+  body;
   constructor({
     baseDir = process.cwd(),
-    relativeDirPath = join42(".codex", "skills"),
+    relativeDirPath,
     dirName,
     frontmatter,
     body,
     otherFiles = [],
-    validate = true,
-    global = false
+    validate = true
   }) {
     super({
       baseDir,
@@ -4572,42 +4537,37 @@ var CodexCliSkill = class _CodexCliSkill extends ToolSkill {
         frontmatter: { ...frontmatter }
       },
       otherFiles,
-      global
+      global: false
+      // Simulated skills are project mode only
     });
     if (validate) {
-      const result = this.validate();
+      const result = SimulatedSkillFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
-        throw result.error;
+        throw new Error(
+          `Invalid frontmatter in ${join41(relativeDirPath, dirName)}: ${formatError(result.error)}`
+        );
       }
     }
+    this.frontmatter = frontmatter;
+    this.body = body;
   }
-  static getSettablePaths({ global = false } = {}) {
-    if (!global) {
-      throw new Error("CodexCliSkill only supports global mode. Please pass { global: true }.");
-    }
-    return {
-      relativeDirPath: join42(".codex", "skills")
-    };
+  getBody() {
+    return this.body;
   }
   getFrontmatter() {
-    if (!this.mainFile?.frontmatter) {
-      throw new Error("Frontmatter is not defined");
-    }
-    const result = CodexCliSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
-    return result;
+    return this.frontmatter;
   }
-  getBody() {
-    return this.mainFile?.body ?? "";
+  toRulesyncSkill() {
+    throw new Error("Not implemented because it is a SIMULATED skill.");
   }
   validate() {
-    if (!this.mainFile) {
-      return {
-        success: false,
-        error: new Error(`${this.getDirPath()}: ${SKILL_FILE_NAME} file does not exist`)
-      };
+    if (!this.frontmatter) {
+      return { success: true, error: null };
     }
-    const result = CodexCliSkillFrontmatterSchema.safeParse(this.mainFile.frontmatter);
-    if (!result.success) {
+    const result = SimulatedSkillFrontmatterSchema.safeParse(this.frontmatter);
+    if (result.success) {
+      return { success: true, error: null };
+    } else {
       return {
         success: false,
         error: new Error(
@@ -4615,98 +4575,141 @@ var CodexCliSkill = class _CodexCliSkill extends ToolSkill {
         )
       };
     }
-    return { success: true, error: null };
-  }
-  toRulesyncSkill() {
-    const frontmatter = this.getFrontmatter();
-    const rulesyncFrontmatter = {
-      name: frontmatter.name,
-      description: frontmatter.description,
-      targets: ["*"]
-    };
-    return new RulesyncSkill({
-      baseDir: this.baseDir,
-      relativeDirPath: this.relativeDirPath,
-      dirName: this.getDirName(),
-      frontmatter: rulesyncFrontmatter,
-      body: this.getBody(),
-      otherFiles: this.getOtherFiles(),
-      validate: true,
-      global: this.global
-    });
   }
-  static fromRulesyncSkill({
+  static fromRulesyncSkillDefault({
     rulesyncSkill,
-    validate = true,
-    global = false
+    validate = true
   }) {
-    const settablePaths = _CodexCliSkill.getSettablePaths({ global });
     const rulesyncFrontmatter = rulesyncSkill.getFrontmatter();
-    const codexFrontmatter = {
+    const simulatedFrontmatter = {
       name: rulesyncFrontmatter.name,
       description: rulesyncFrontmatter.description
     };
-    return new _CodexCliSkill({
+    return {
       baseDir: rulesyncSkill.getBaseDir(),
-      relativeDirPath: settablePaths.relativeDirPath,
+      relativeDirPath: this.getSettablePaths().relativeDirPath,
       dirName: rulesyncSkill.getDirName(),
-      frontmatter: codexFrontmatter,
+      frontmatter: simulatedFrontmatter,
       body: rulesyncSkill.getBody(),
       otherFiles: rulesyncSkill.getOtherFiles(),
-      validate,
-      global
-    });
+      validate
+    };
   }
-  static isTargetedByRulesyncSkill(rulesyncSkill) {
-    const targets = rulesyncSkill.getFrontmatter().targets;
-    return targets.includes("*") || targets.includes("codexcli");
-  }
-  static async fromDir(params) {
-    const loaded = await this.loadSkillDirContent({
-      ...params,
-      getSettablePaths: _CodexCliSkill.getSettablePaths
-    });
-    const result = CodexCliSkillFrontmatterSchema.safeParse(loaded.frontmatter);
+  static async fromDirDefault({
+    baseDir = process.cwd(),
+    relativeDirPath,
+    dirName
+  }) {
+    const settablePaths = this.getSettablePaths();
+    const actualRelativeDirPath = relativeDirPath ?? settablePaths.relativeDirPath;
+    const skillDirPath = join41(baseDir, actualRelativeDirPath, dirName);
+    const skillFilePath = join41(skillDirPath, SKILL_FILE_NAME);
+    if (!await fileExists(skillFilePath)) {
+      throw new Error(`${SKILL_FILE_NAME} not found in ${skillDirPath}`);
+    }
+    const fileContent = await readFileContent(skillFilePath);
+    const { frontmatter, body: content } = parseFrontmatter(fileContent);
+    const result = SimulatedSkillFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
-      const skillDirPath = join42(loaded.baseDir, loaded.relativeDirPath, loaded.dirName);
-      throw new Error(
-        `Invalid frontmatter in ${join42(skillDirPath, SKILL_FILE_NAME)}: ${formatError(result.error)}`
-      );
+      throw new Error(`Invalid frontmatter in ${skillFilePath}: ${formatError(result.error)}`);
     }
-    return new _CodexCliSkill({
-      baseDir: loaded.baseDir,
-      relativeDirPath: loaded.relativeDirPath,
-      dirName: loaded.dirName,
+    const otherFiles = await this.collectOtherFiles(
+      baseDir,
+      actualRelativeDirPath,
+      dirName,
+      SKILL_FILE_NAME
+    );
+    return {
+      baseDir,
+      relativeDirPath: actualRelativeDirPath,
+      dirName,
       frontmatter: result.data,
-      body: loaded.body,
-      otherFiles: loaded.otherFiles,
-      validate: true,
-      global: loaded.global
+      body: content.trim(),
+      otherFiles,
+      validate: true
+    };
+  }
+  /**
+   * Check if a RulesyncSkill should be converted to this simulated skill type.
+   * Uses the targets field in the RulesyncSkill frontmatter to determine targeting.
+   */
+  static isTargetedByRulesyncSkillDefault({
+    rulesyncSkill,
+    toolTarget
+  }) {
+    const frontmatter = rulesyncSkill.getFrontmatter();
+    const targets = frontmatter.targets;
+    if (targets.includes("*")) {
+      return true;
+    }
+    return targets.includes(toolTarget);
+  }
+  /**
+   * Get the settable paths for this tool's skill directories.
+   * Must be implemented by concrete subclasses.
+   */
+  static getSettablePaths(_options) {
+    throw new Error("Please implement this method in the subclass.");
+  }
+};
+
+// src/features/skills/agentsmd-skill.ts
+var AgentsmdSkill = class _AgentsmdSkill extends SimulatedSkill {
+  static getSettablePaths(options) {
+    if (options?.global) {
+      throw new Error("AgentsmdSkill does not support global mode.");
+    }
+    return {
+      relativeDirPath: join42(".agents", "skills")
+    };
+  }
+  static async fromDir(params) {
+    const baseParams = await this.fromDirDefault(params);
+    return new _AgentsmdSkill(baseParams);
+  }
+  static fromRulesyncSkill(params) {
+    const baseParams = {
+      ...this.fromRulesyncSkillDefault(params),
+      relativeDirPath: this.getSettablePaths().relativeDirPath
+    };
+    return new _AgentsmdSkill(baseParams);
+  }
+  static isTargetedByRulesyncSkill(rulesyncSkill) {
+    return this.isTargetedByRulesyncSkillDefault({
+      rulesyncSkill,
+      toolTarget: "agentsmd"
     });
   }
 };
 
-// src/features/skills/copilot-skill.ts
+// src/features/skills/codexcli-skill.ts
 import { join as join44 } from "path";
+import { z as z21 } from "zod/mini";
 
-// src/features/skills/simulated-skill.ts
+// src/features/skills/rulesync-skill.ts
 import { join as join43 } from "path";
-import { z as z21 } from "zod/mini";
-var SimulatedSkillFrontmatterSchema = z21.object({
-  name: z21.string(),
-  description: z21.string()
+import { z as z20 } from "zod/mini";
+var RulesyncSkillFrontmatterSchemaInternal = z20.object({
+  name: z20.string(),
+  description: z20.string(),
+  targets: z20._default(RulesyncTargetsSchema, ["*"]),
+  claudecode: z20.optional(
+    z20.object({
+      "allowed-tools": z20.optional(z20.array(z20.string()))
+    })
+  )
 });
-var SimulatedSkill = class extends ToolSkill {
-  frontmatter;
-  body;
+var RulesyncSkillFrontmatterSchema = RulesyncSkillFrontmatterSchemaInternal;
+var RulesyncSkill = class _RulesyncSkill extends AiDir {
   constructor({
     baseDir = process.cwd(),
-    relativeDirPath,
+    relativeDirPath = RULESYNC_SKILLS_RELATIVE_DIR_PATH,
     dirName,
     frontmatter,
     body,
     otherFiles = [],
-    validate = true
+    validate = true,
+    global = false
   }) {
     super({
       baseDir,
@@ -4718,37 +4721,33 @@ var SimulatedSkill = class extends ToolSkill {
         frontmatter: { ...frontmatter }
       },
       otherFiles,
-      global: false
-      // Simulated skills are project mode only
+      global
     });
     if (validate) {
-      const result = SimulatedSkillFrontmatterSchema.safeParse(frontmatter);
+      const result = this.validate();
       if (!result.success) {
-        throw new Error(
-          `Invalid frontmatter in ${join43(relativeDirPath, dirName)}: ${formatError(result.error)}`
-        );
+        throw result.error;
       }
     }
-    this.frontmatter = frontmatter;
-    this.body = body;
   }
-  getBody() {
-    return this.body;
+  static getSettablePaths() {
+    return {
+      relativeDirPath: RULESYNC_SKILLS_RELATIVE_DIR_PATH
+    };
   }
   getFrontmatter() {
-    return this.frontmatter;
+    if (!this.mainFile?.frontmatter) {
+      throw new Error("Frontmatter is not defined");
+    }
+    const result = RulesyncSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
+    return result;
   }
-  toRulesyncSkill() {
-    throw new Error("Not implemented because it is a SIMULATED skill.");
+  getBody() {
+    return this.mainFile?.body ?? "";
   }
   validate() {
-    if (!this.frontmatter) {
-      return { success: true, error: null };
-    }
-    const result = SimulatedSkillFrontmatterSchema.safeParse(this.frontmatter);
-    if (result.success) {
-      return { success: true, error: null };
-    } else {
+    const result = RulesyncSkillFrontmatterSchema.safeParse(this.mainFile?.frontmatter);
+    if (!result.success) {
       return {
         success: false,
         error: new Error(
@@ -4756,139 +4755,270 @@ var SimulatedSkill = class extends ToolSkill {
         )
       };
     }
+    return { success: true, error: null };
   }
-  static fromRulesyncSkillDefault({
-    rulesyncSkill,
-    validate = true
-  }) {
-    const rulesyncFrontmatter = rulesyncSkill.getFrontmatter();
-    const simulatedFrontmatter = {
-      name: rulesyncFrontmatter.name,
-      description: rulesyncFrontmatter.description
-    };
-    return {
-      baseDir: rulesyncSkill.getBaseDir(),
-      relativeDirPath: this.getSettablePaths().relativeDirPath,
-      dirName: rulesyncSkill.getDirName(),
-      frontmatter: simulatedFrontmatter,
-      body: rulesyncSkill.getBody(),
-      otherFiles: rulesyncSkill.getOtherFiles(),
-      validate
-    };
-  }
-  static async fromDirDefault({
+  static async fromDir({
     baseDir = process.cwd(),
-    relativeDirPath,
-    dirName
+    relativeDirPath = RULESYNC_SKILLS_RELATIVE_DIR_PATH,
+    dirName,
+    global = false
   }) {
-    const settablePaths = this.getSettablePaths();
-    const actualRelativeDirPath = relativeDirPath ?? settablePaths.relativeDirPath;
-    const skillDirPath = join43(baseDir, actualRelativeDirPath, dirName);
+    const skillDirPath = join43(baseDir, relativeDirPath, dirName);
     const skillFilePath = join43(skillDirPath, SKILL_FILE_NAME);
     if (!await fileExists(skillFilePath)) {
       throw new Error(`${SKILL_FILE_NAME} not found in ${skillDirPath}`);
     }
     const fileContent = await readFileContent(skillFilePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
-    const result = SimulatedSkillFrontmatterSchema.safeParse(frontmatter);
+    const result = RulesyncSkillFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(`Invalid frontmatter in ${skillFilePath}: ${formatError(result.error)}`);
     }
     const otherFiles = await this.collectOtherFiles(
       baseDir,
-      actualRelativeDirPath,
+      relativeDirPath,
       dirName,
       SKILL_FILE_NAME
     );
-    return {
+    return new _RulesyncSkill({
       baseDir,
-      relativeDirPath: actualRelativeDirPath,
+      relativeDirPath,
       dirName,
       frontmatter: result.data,
       body: content.trim(),
       otherFiles,
-      validate: true
+      validate: true,
+      global
+    });
+  }
+};
+
+// src/features/skills/codexcli-skill.ts
+var CodexCliSkillFrontmatterSchema = z21.object({
+  name: z21.string(),
+  description: z21.string()
+});
+var CodexCliSkill = class _CodexCliSkill extends ToolSkill {
+  constructor({
+    baseDir = process.cwd(),
+    relativeDirPath = join44(".codex", "skills"),
+    dirName,
+    frontmatter,
+    body,
+    otherFiles = [],
+    validate = true,
+    global = false
+  }) {
+    super({
+      baseDir,
+      relativeDirPath,
+      dirName,
+      mainFile: {
+        name: SKILL_FILE_NAME,
+        body,
+        frontmatter: { ...frontmatter }
+      },
+      otherFiles,
+      global
+    });
+    if (validate) {
+      const result = this.validate();
+      if (!result.success) {
+        throw result.error;
+      }
+    }
+  }
+  static getSettablePaths({ global = false } = {}) {
+    if (!global) {
+      throw new Error("CodexCliSkill only supports global mode. Please pass { global: true }.");
+    }
+    return {
+      relativeDirPath: join44(".codex", "skills")
     };
   }
-  /**
-   * Check if a RulesyncSkill should be converted to this simulated skill type.
-   * Uses the targets field in the RulesyncSkill frontmatter to determine targeting.
-   */
-  static isTargetedByRulesyncSkillDefault({
+  getFrontmatter() {
+    if (!this.mainFile?.frontmatter) {
+      throw new Error("Frontmatter is not defined");
+    }
+    const result = CodexCliSkillFrontmatterSchema.parse(this.mainFile.frontmatter);
+    return result;
+  }
+  getBody() {
+    return this.mainFile?.body ?? "";
+  }
+  validate() {
+    if (!this.mainFile) {
+      return {
+        success: false,
+        error: new Error(`${this.getDirPath()}: ${SKILL_FILE_NAME} file does not exist`)
+      };
+    }
+    const result = CodexCliSkillFrontmatterSchema.safeParse(this.mainFile.frontmatter);
+    if (!result.success) {
+      return {
+        success: false,
+        error: new Error(
+          `Invalid frontmatter in ${this.getDirPath()}: ${formatError(result.error)}`
+        )
+      };
+    }
+    return { success: true, error: null };
+  }
+  toRulesyncSkill() {
+    const frontmatter = this.getFrontmatter();
+    const rulesyncFrontmatter = {
+      name: frontmatter.name,
+      description: frontmatter.description,
+      targets: ["*"]
+    };
+    return new RulesyncSkill({
+      baseDir: this.baseDir,
+      relativeDirPath: this.relativeDirPath,
+      dirName: this.getDirName(),
+      frontmatter: rulesyncFrontmatter,
+      body: this.getBody(),
+      otherFiles: this.getOtherFiles(),
+      validate: true,
+      global: this.global
+    });
+  }
+  static fromRulesyncSkill({
     rulesyncSkill,
-    toolTarget
+    validate = true,
+    global = false
   }) {
-    const frontmatter = rulesyncSkill.getFrontmatter();
-    const targets = frontmatter.targets;
-    if (targets.includes("*")) {
-      return true;
-    }
-    return targets.includes(toolTarget);
+    const settablePaths = _CodexCliSkill.getSettablePaths({ global });
+    const rulesyncFrontmatter = rulesyncSkill.getFrontmatter();
+    const codexFrontmatter = {
+      name: rulesyncFrontmatter.name,
+      description: rulesyncFrontmatter.description
+    };
+    return new _CodexCliSkill({
+      baseDir: rulesyncSkill.getBaseDir(),
+      relativeDirPath: settablePaths.relativeDirPath,
+      dirName: rulesyncSkill.getDirName(),
+      frontmatter: codexFrontmatter,
+      body: rulesyncSkill.getBody(),
+      otherFiles: rulesyncSkill.getOtherFiles(),
+      validate,
+      global
+    });
   }
-  /**
-   * Get the settable paths for this tool's skill directories.
-   * Must be implemented by concrete subclasses.
-   */
-  static getSettablePaths(_options) {
-    throw new Error("Please implement this method in the subclass.");
+  static isTargetedByRulesyncSkill(rulesyncSkill) {
+    const targets = rulesyncSkill.getFrontmatter().targets;
+    return targets.includes("*") || targets.includes("codexcli");
+  }
+  static async fromDir(params) {
+    const loaded = await this.loadSkillDirContent({
+      ...params,
+      getSettablePaths: _CodexCliSkill.getSettablePaths
+    });
+    const result = CodexCliSkillFrontmatterSchema.safeParse(loaded.frontmatter);
+    if (!result.success) {
+      const skillDirPath = join44(loaded.baseDir, loaded.relativeDirPath, loaded.dirName);
+      throw new Error(
+        `Invalid frontmatter in ${join44(skillDirPath, SKILL_FILE_NAME)}: ${formatError(result.error)}`
+      );
+    }
+    return new _CodexCliSkill({
+      baseDir: loaded.baseDir,
+      relativeDirPath: loaded.relativeDirPath,
+      dirName: loaded.dirName,
+      frontmatter: result.data,
+      body: loaded.body,
+      otherFiles: loaded.otherFiles,
+      validate: true,
+      global: loaded.global
+    });
   }
 };
 
 // src/features/skills/copilot-skill.ts
+import { join as join45 } from "path";
 var CopilotSkill = class _CopilotSkill extends SimulatedSkill {
   static getSettablePaths(options) {
     if (options?.global) {
       throw new Error("CopilotSkill does not support global mode.");
     }
     return {
-      relativeDirPath: join44(".github", "skills")
+      relativeDirPath: join45(".github", "skills")
+    };
+  }
+  static async fromDir(params) {
+    const baseParams = await this.fromDirDefault(params);
+    return new _CopilotSkill(baseParams);
+  }
+  static fromRulesyncSkill(params) {
+    const baseParams = {
+      ...this.fromRulesyncSkillDefault(params),
+      relativeDirPath: this.getSettablePaths().relativeDirPath
+    };
+    return new _CopilotSkill(baseParams);
+  }
+  static isTargetedByRulesyncSkill(rulesyncSkill) {
+    return this.isTargetedByRulesyncSkillDefault({
+      rulesyncSkill,
+      toolTarget: "copilot"
+    });
+  }
+};
+
+// src/features/skills/cursor-skill.ts
+import { join as join46 } from "path";
+var CursorSkill = class _CursorSkill extends SimulatedSkill {
+  static getSettablePaths(options) {
+    if (options?.global) {
+      throw new Error("CursorSkill does not support global mode.");
+    }
+    return {
+      relativeDirPath: join46(".cursor", "skills")
     };
   }
   static async fromDir(params) {
     const baseParams = await this.fromDirDefault(params);
-    return new _CopilotSkill(baseParams);
+    return new _CursorSkill(baseParams);
   }
   static fromRulesyncSkill(params) {
     const baseParams = {
       ...this.fromRulesyncSkillDefault(params),
       relativeDirPath: this.getSettablePaths().relativeDirPath
     };
-    return new _CopilotSkill(baseParams);
+    return new _CursorSkill(baseParams);
   }
   static isTargetedByRulesyncSkill(rulesyncSkill) {
     return this.isTargetedByRulesyncSkillDefault({
       rulesyncSkill,
-      toolTarget: "copilot"
+      toolTarget: "cursor"
     });
   }
 };
 
-// src/features/skills/cursor-skill.ts
-import { join as join45 } from "path";
-var CursorSkill = class _CursorSkill extends SimulatedSkill {
+// src/features/skills/geminicli-skill.ts
+import { join as join47 } from "path";
+var GeminiCliSkill = class _GeminiCliSkill extends SimulatedSkill {
   static getSettablePaths(options) {
     if (options?.global) {
-      throw new Error("CursorSkill does not support global mode.");
+      throw new Error("GeminiCliSkill does not support global mode.");
     }
     return {
-      relativeDirPath: join45(".cursor", "skills")
+      relativeDirPath: join47(".gemini", "skills")
     };
   }
   static async fromDir(params) {
     const baseParams = await this.fromDirDefault(params);
-    return new _CursorSkill(baseParams);
+    return new _GeminiCliSkill(baseParams);
   }
   static fromRulesyncSkill(params) {
     const baseParams = {
       ...this.fromRulesyncSkillDefault(params),
       relativeDirPath: this.getSettablePaths().relativeDirPath
     };
-    return new _CursorSkill(baseParams);
+    return new _GeminiCliSkill(baseParams);
   }
   static isTargetedByRulesyncSkill(rulesyncSkill) {
     return this.isTargetedByRulesyncSkillDefault({
       rulesyncSkill,
-      toolTarget: "cursor"
+      toolTarget: "geminicli"
     });
   }
 };
@@ -4898,7 +5028,7 @@ import { basename as basename15, join as join50 } from "path";
 import { z as z23 } from "zod/mini";
 
 // src/types/dir-feature-processor.ts
-import { join as join46 } from "path";
+import { join as join48 } from "path";
 var DirFeatureProcessor = class {
   baseDir;
   constructor({ baseDir = process.cwd() }) {
@@ -4920,14 +5050,14 @@ var DirFeatureProcessor = class {
       await ensureDir(dirPath);
       const mainFile = aiDir.getMainFile();
       if (mainFile) {
-        const mainFilePath = join46(dirPath, mainFile.name);
+        const mainFilePath = join48(dirPath, mainFile.name);
         const content = stringifyFrontmatter(mainFile.body, mainFile.frontmatter);
         const contentWithNewline = addTrailingNewline(content);
         await writeFileContent(mainFilePath, contentWithNewline);
       }
       const otherFiles = aiDir.getOtherFiles();
       for (const file of otherFiles) {
-        const filePath = join46(dirPath, file.relativeFilePathToDirPath);
+        const filePath = join48(dirPath, file.relativeFilePathToDirPath);
         const contentWithNewline = addTrailingNewline(file.fileBuffer.toString("utf-8"));
         await writeFileContent(filePath, contentWithNewline);
       }
@@ -4941,38 +5071,8 @@ var DirFeatureProcessor = class {
   }
 };
 
-// src/features/skills/agentsmd-skill.ts
-import { join as join47 } from "path";
-var AgentsmdSkill = class _AgentsmdSkill extends SimulatedSkill {
-  static getSettablePaths(options) {
-    if (options?.global) {
-      throw new Error("AgentsmdSkill does not support global mode.");
-    }
-    return {
-      relativeDirPath: join47(".agents", "skills")
-    };
-  }
-  static async fromDir(params) {
-    const baseParams = await this.fromDirDefault(params);
-    return new _AgentsmdSkill(baseParams);
-  }
-  static fromRulesyncSkill(params) {
-    const baseParams = {
-      ...this.fromRulesyncSkillDefault(params),
-      relativeDirPath: this.getSettablePaths().relativeDirPath
-    };
-    return new _AgentsmdSkill(baseParams);
-  }
-  static isTargetedByRulesyncSkill(rulesyncSkill) {
-    return this.isTargetedByRulesyncSkillDefault({
-      rulesyncSkill,
-      toolTarget: "agentsmd"
-    });
-  }
-};
-
 // src/features/skills/claudecode-skill.ts
-import { join as join48 } from "path";
+import { join as join49 } from "path";
 import { z as z22 } from "zod/mini";
 var ClaudecodeSkillFrontmatterSchema = z22.object({
   name: z22.string(),
@@ -4982,7 +5082,7 @@ var ClaudecodeSkillFrontmatterSchema = z22.object({
 var ClaudecodeSkill = class _ClaudecodeSkill extends ToolSkill {
   constructor({
     baseDir = process.cwd(),
-    relativeDirPath = join48(".claude", "skills"),
+    relativeDirPath = join49(".claude", "skills"),
     dirName,
     frontmatter,
     body,
@@ -5013,7 +5113,7 @@ var ClaudecodeSkill = class _ClaudecodeSkill extends ToolSkill {
     global: _global = false
   } = {}) {
     return {
-      relativeDirPath: join48(".claude", "skills")
+      relativeDirPath: join49(".claude", "skills")
     };
   }
   getFrontmatter() {
@@ -5100,9 +5200,9 @@ var ClaudecodeSkill = class _ClaudecodeSkill extends ToolSkill {
     });
     const result = ClaudecodeSkillFrontmatterSchema.safeParse(loaded.frontmatter);
     if (!result.success) {
-      const skillDirPath = join48(loaded.baseDir, loaded.relativeDirPath, loaded.dirName);
+      const skillDirPath = join49(loaded.baseDir, loaded.relativeDirPath, loaded.dirName);
       throw new Error(
-        `Invalid frontmatter in ${join48(skillDirPath, SKILL_FILE_NAME)}: ${formatError(result.error)}`
+        `Invalid frontmatter in ${join49(skillDirPath, SKILL_FILE_NAME)}: ${formatError(result.error)}`
       );
     }
     return new _ClaudecodeSkill({
@@ -5118,36 +5218,6 @@ var ClaudecodeSkill = class _ClaudecodeSkill extends ToolSkill {
   }
 };
 
-// src/features/skills/geminicli-skill.ts
-import { join as join49 } from "path";
-var GeminiCliSkill = class _GeminiCliSkill extends SimulatedSkill {
-  static getSettablePaths(options) {
-    if (options?.global) {
-      throw new Error("GeminiCliSkill does not support global mode.");
-    }
-    return {
-      relativeDirPath: join49(".gemini", "skills")
-    };
-  }
-  static async fromDir(params) {
-    const baseParams = await this.fromDirDefault(params);
-    return new _GeminiCliSkill(baseParams);
-  }
-  static fromRulesyncSkill(params) {
-    const baseParams = {
-      ...this.fromRulesyncSkillDefault(params),
-      relativeDirPath: this.getSettablePaths().relativeDirPath
-    };
-    return new _GeminiCliSkill(baseParams);
-  }
-  static isTargetedByRulesyncSkill(rulesyncSkill) {
-    return this.isTargetedByRulesyncSkillDefault({
-      rulesyncSkill,
-      toolTarget: "geminicli"
-    });
-  }
-};
-
 // src/features/skills/skills-processor.ts
 var skillsProcessorToolTargetTuple = [
   "agentsmd",
@@ -6062,6 +6132,13 @@ var RulesyncRuleFrontmatterSchema = z28.object({
       subprojectPath: z28.optional(z28.string())
     })
   ),
+  claudecode: z28.optional(
+    z28.object({
+      // Glob patterns for conditional rules (takes precedence over globs)
+      // @example "src/**/*.ts, tests/**/*.test.ts"
+      paths: z28.optional(z28.string())
+    })
+  ),
   cursor: z28.optional(
     z28.object({
       alwaysApply: z28.optional(z28.boolean()),
@@ -6625,9 +6702,9 @@ var AugmentcodeRule = class _AugmentcodeRule extends ToolRule {
   }
 };
 
-// src/features/rules/claudecode-rule.ts
+// src/features/rules/claudecode-legacy-rule.ts
 import { join as join68 } from "path";
-var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
+var ClaudecodeLegacyRule = class _ClaudecodeLegacyRule extends ToolRule {
   static getSettablePaths({
     global
   } = {}) {
@@ -6662,7 +6739,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
       const fileContent2 = await readFileContent(
         join68(baseDir, paths.root.relativeDirPath, relativePath2)
       );
-      return new _ClaudecodeRule({
+      return new _ClaudecodeLegacyRule({
         baseDir,
         relativeDirPath: paths.root.relativeDirPath,
         relativeFilePath: paths.root.relativeFilePath,
@@ -6676,7 +6753,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
     }
     const relativePath = join68(paths.nonRoot.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(join68(baseDir, relativePath));
-    return new _ClaudecodeRule({
+    return new _ClaudecodeLegacyRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
       relativeFilePath,
@@ -6692,7 +6769,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
     global = false
   }) {
     const paths = this.getSettablePaths({ global });
-    return new _ClaudecodeRule(
+    return new _ClaudecodeLegacyRule(
       this.buildToolRuleParamsDefault({
         baseDir,
         rulesyncRule,
@@ -6711,16 +6788,208 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
   static isTargetedByRulesyncRule(rulesyncRule) {
     return this.isTargetedByRulesyncRuleDefault({
       rulesyncRule,
-      toolTarget: "claudecode"
+      toolTarget: "claudecode-legacy"
     });
   }
 };
 
-// src/features/rules/cline-rule.ts
+// src/features/rules/claudecode-rule.ts
 import { join as join69 } from "path";
 import { z as z29 } from "zod/mini";
-var ClineRuleFrontmatterSchema = z29.object({
-  description: z29.string()
+var ClaudecodeRuleFrontmatterSchema = z29.object({
+  paths: z29.optional(z29.string())
+});
+var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
+  frontmatter;
+  body;
+  static getSettablePaths({
+    global
+  } = {}) {
+    if (global) {
+      return {
+        root: {
+          relativeDirPath: ".claude",
+          relativeFilePath: "CLAUDE.md"
+        }
+      };
+    }
+    return {
+      root: {
+        relativeDirPath: ".claude",
+        relativeFilePath: "CLAUDE.md"
+      },
+      nonRoot: {
+        relativeDirPath: join69(".claude", "rules")
+      }
+    };
+  }
+  constructor({ frontmatter, body, ...rest }) {
+    if (rest.validate) {
+      const result = ClaudecodeRuleFrontmatterSchema.safeParse(frontmatter);
+      if (!result.success) {
+        throw new Error(
+          `Invalid frontmatter in ${join69(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+        );
+      }
+    }
+    super({
+      ...rest,
+      // Root file: no frontmatter; Non-root file: with optional paths frontmatter
+      fileContent: rest.root ? body : _ClaudecodeRule.generateFileContent(body, frontmatter)
+    });
+    this.frontmatter = frontmatter;
+    this.body = body;
+  }
+  static generateFileContent(body, frontmatter) {
+    if (frontmatter.paths) {
+      return stringifyFrontmatter(body, { paths: frontmatter.paths });
+    }
+    return body;
+  }
+  static async fromFile({
+    baseDir = process.cwd(),
+    relativeFilePath,
+    validate = true,
+    global = false
+  }) {
+    const paths = this.getSettablePaths({ global });
+    const isRoot = relativeFilePath === paths.root.relativeFilePath;
+    if (isRoot) {
+      const fileContent2 = await readFileContent(
+        join69(baseDir, paths.root.relativeDirPath, paths.root.relativeFilePath)
+      );
+      return new _ClaudecodeRule({
+        baseDir,
+        relativeDirPath: paths.root.relativeDirPath,
+        relativeFilePath: paths.root.relativeFilePath,
+        frontmatter: {},
+        body: fileContent2.trim(),
+        validate,
+        root: true
+      });
+    }
+    if (!paths.nonRoot) {
+      throw new Error("nonRoot path is not set");
+    }
+    const relativePath = join69(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join69(baseDir, relativePath));
+    const { frontmatter, body: content } = parseFrontmatter(fileContent);
+    const result = ClaudecodeRuleFrontmatterSchema.safeParse(frontmatter);
+    if (!result.success) {
+      throw new Error(
+        `Invalid frontmatter in ${join69(baseDir, relativePath)}: ${formatError(result.error)}`
+      );
+    }
+    return new _ClaudecodeRule({
+      baseDir,
+      relativeDirPath: paths.nonRoot.relativeDirPath,
+      relativeFilePath,
+      frontmatter: result.data,
+      body: content.trim(),
+      validate,
+      root: false
+    });
+  }
+  static fromRulesyncRule({
+    baseDir = process.cwd(),
+    rulesyncRule,
+    validate = true,
+    global = false
+  }) {
+    const rulesyncFrontmatter = rulesyncRule.getFrontmatter();
+    const root = rulesyncFrontmatter.root ?? false;
+    const paths = this.getSettablePaths({ global });
+    const claudecodePaths = rulesyncFrontmatter.claudecode?.paths;
+    const globs = rulesyncFrontmatter.globs;
+    const pathsValue = claudecodePaths ?? (globs?.length ? globs.join(", ") : void 0);
+    const claudecodeFrontmatter = {
+      paths: root ? void 0 : pathsValue
+    };
+    const body = rulesyncRule.getBody();
+    if (root) {
+      return new _ClaudecodeRule({
+        baseDir,
+        frontmatter: claudecodeFrontmatter,
+        body,
+        relativeDirPath: paths.root.relativeDirPath,
+        relativeFilePath: paths.root.relativeFilePath,
+        validate,
+        root
+      });
+    }
+    if (!paths.nonRoot) {
+      throw new Error("nonRoot path is not set");
+    }
+    return new _ClaudecodeRule({
+      baseDir,
+      frontmatter: claudecodeFrontmatter,
+      body,
+      relativeDirPath: paths.nonRoot.relativeDirPath,
+      relativeFilePath: rulesyncRule.getRelativeFilePath(),
+      validate,
+      root
+    });
+  }
+  toRulesyncRule() {
+    let globs;
+    if (this.isRoot()) {
+      globs = ["**/*"];
+    } else if (this.frontmatter.paths) {
+      globs = this.frontmatter.paths.split(",").map((g) => g.trim());
+    }
+    const rulesyncFrontmatter = {
+      targets: ["*"],
+      root: this.isRoot(),
+      description: this.description,
+      globs,
+      ...this.frontmatter.paths && {
+        claudecode: { paths: this.frontmatter.paths }
+      }
+    };
+    return new RulesyncRule({
+      baseDir: this.getBaseDir(),
+      frontmatter: rulesyncFrontmatter,
+      body: this.body,
+      relativeDirPath: RULESYNC_RULES_RELATIVE_DIR_PATH,
+      relativeFilePath: this.getRelativeFilePath(),
+      validate: true
+    });
+  }
+  validate() {
+    if (!this.frontmatter) {
+      return { success: true, error: null };
+    }
+    const result = ClaudecodeRuleFrontmatterSchema.safeParse(this.frontmatter);
+    if (result.success) {
+      return { success: true, error: null };
+    } else {
+      return {
+        success: false,
+        error: new Error(
+          `Invalid frontmatter in ${join69(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+        )
+      };
+    }
+  }
+  getFrontmatter() {
+    return this.frontmatter;
+  }
+  getBody() {
+    return this.body;
+  }
+  static isTargetedByRulesyncRule(rulesyncRule) {
+    return this.isTargetedByRulesyncRuleDefault({
+      rulesyncRule,
+      toolTarget: "claudecode"
+    });
+  }
+};
+
+// src/features/rules/cline-rule.ts
+import { join as join70 } from "path";
+import { z as z30 } from "zod/mini";
+var ClineRuleFrontmatterSchema = z30.object({
+  description: z30.string()
 });
 var ClineRule = class _ClineRule extends ToolRule {
   static getSettablePaths() {
@@ -6762,7 +7031,7 @@ var ClineRule = class _ClineRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join69(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join70(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _ClineRule({
       baseDir,
@@ -6775,7 +7044,7 @@ var ClineRule = class _ClineRule extends ToolRule {
 };
 
 // src/features/rules/codexcli-rule.ts
-import { join as join70 } from "path";
+import { join as join71 } from "path";
 var CodexcliRule = class _CodexcliRule extends ToolRule {
   static getSettablePaths({
     global
@@ -6794,7 +7063,7 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
         relativeFilePath: "AGENTS.md"
       },
       nonRoot: {
-        relativeDirPath: join70(".codex", "memories")
+        relativeDirPath: join71(".codex", "memories")
       }
     };
   }
@@ -6809,7 +7078,7 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join70(baseDir, paths.root.relativeDirPath, relativePath2)
+        join71(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _CodexcliRule({
         baseDir,
@@ -6823,8 +7092,8 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
     if (!paths.nonRoot) {
       throw new Error("nonRoot path is not set");
     }
-    const relativePath = join70(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join70(baseDir, relativePath));
+    const relativePath = join71(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join71(baseDir, relativePath));
     return new _CodexcliRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -6866,12 +7135,12 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
 };
 
 // src/features/rules/copilot-rule.ts
-import { join as join71 } from "path";
-import { z as z30 } from "zod/mini";
-var CopilotRuleFrontmatterSchema = z30.object({
-  description: z30.optional(z30.string()),
-  applyTo: z30.optional(z30.string()),
-  excludeAgent: z30.optional(z30.union([z30.literal("code-review"), z30.literal("coding-agent")]))
+import { join as join72 } from "path";
+import { z as z31 } from "zod/mini";
+var CopilotRuleFrontmatterSchema = z31.object({
+  description: z31.optional(z31.string()),
+  applyTo: z31.optional(z31.string()),
+  excludeAgent: z31.optional(z31.union([z31.literal("code-review"), z31.literal("coding-agent")]))
 });
 var CopilotRule = class _CopilotRule extends ToolRule {
   frontmatter;
@@ -6883,7 +7152,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
         relativeFilePath: "copilot-instructions.md"
       },
       nonRoot: {
-        relativeDirPath: join71(".github", "instructions")
+        relativeDirPath: join72(".github", "instructions")
       }
     };
   }
@@ -6892,7 +7161,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
       const result = CopilotRuleFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join71(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join72(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -6974,11 +7243,11 @@ var CopilotRule = class _CopilotRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "copilot-instructions.md";
-    const relativePath = isRoot ? join71(
+    const relativePath = isRoot ? join72(
       this.getSettablePaths().root.relativeDirPath,
       this.getSettablePaths().root.relativeFilePath
-    ) : join71(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join71(baseDir, relativePath));
+    ) : join72(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join72(baseDir, relativePath));
     if (isRoot) {
       return new _CopilotRule({
         baseDir,
@@ -6994,7 +7263,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
     const result = CopilotRuleFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(
-        `Invalid frontmatter in ${join71(baseDir, relativeFilePath)}: ${formatError(result.error)}`
+        `Invalid frontmatter in ${join72(baseDir, relativeFilePath)}: ${formatError(result.error)}`
       );
     }
     return new _CopilotRule({
@@ -7018,7 +7287,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join71(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join72(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -7038,12 +7307,12 @@ var CopilotRule = class _CopilotRule extends ToolRule {
 };
 
 // src/features/rules/cursor-rule.ts
-import { basename as basename20, join as join72 } from "path";
-import { z as z31 } from "zod/mini";
-var CursorRuleFrontmatterSchema = z31.object({
-  description: z31.optional(z31.string()),
-  globs: z31.optional(z31.string()),
-  alwaysApply: z31.optional(z31.boolean())
+import { basename as basename20, join as join73 } from "path";
+import { z as z32 } from "zod/mini";
+var CursorRuleFrontmatterSchema = z32.object({
+  description: z32.optional(z32.string()),
+  globs: z32.optional(z32.string()),
+  alwaysApply: z32.optional(z32.boolean())
 });
 var CursorRule = class _CursorRule extends ToolRule {
   frontmatter;
@@ -7051,7 +7320,7 @@ var CursorRule = class _CursorRule extends ToolRule {
   static getSettablePaths() {
     return {
       nonRoot: {
-        relativeDirPath: join72(".cursor", "rules")
+        relativeDirPath: join73(".cursor", "rules")
       }
     };
   }
@@ -7060,7 +7329,7 @@ var CursorRule = class _CursorRule extends ToolRule {
       const result = CursorRuleFrontmatterSchema.safeParse(frontmatter);
       if (!result.success) {
         throw new Error(
-          `Invalid frontmatter in ${join72(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join73(rest.relativeDirPath, rest.relativeFilePath)}: ${formatError(result.error)}`
         );
       }
     }
@@ -7177,13 +7446,13 @@ var CursorRule = class _CursorRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join72(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join73(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 ${join72(baseDir, relativeFilePath)}: ${formatError(result.error)}`
+        `Invalid frontmatter in ${join73(baseDir, relativeFilePath)}: ${formatError(result.error)}`
       );
     }
     return new _CursorRule({
@@ -7206,7 +7475,7 @@ var CursorRule = class _CursorRule extends ToolRule {
       return {
         success: false,
         error: new Error(
-          `Invalid frontmatter in ${join72(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
+          `Invalid frontmatter in ${join73(this.relativeDirPath, this.relativeFilePath)}: ${formatError(result.error)}`
         )
       };
     }
@@ -7226,7 +7495,7 @@ var CursorRule = class _CursorRule extends ToolRule {
 };
 
 // src/features/rules/geminicli-rule.ts
-import { join as join73 } from "path";
+import { join as join74 } from "path";
 var GeminiCliRule = class _GeminiCliRule extends ToolRule {
   static getSettablePaths({
     global
@@ -7245,7 +7514,7 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
         relativeFilePath: "GEMINI.md"
       },
       nonRoot: {
-        relativeDirPath: join73(".gemini", "memories")
+        relativeDirPath: join74(".gemini", "memories")
       }
     };
   }
@@ -7260,7 +7529,7 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join73(baseDir, paths.root.relativeDirPath, relativePath2)
+        join74(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _GeminiCliRule({
         baseDir,
@@ -7274,8 +7543,8 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
     if (!paths.nonRoot) {
       throw new Error("nonRoot path is not set");
     }
-    const relativePath = join73(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join73(baseDir, relativePath));
+    const relativePath = join74(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join74(baseDir, relativePath));
     return new _GeminiCliRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -7317,7 +7586,7 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
 };
 
 // src/features/rules/junie-rule.ts
-import { join as join74 } from "path";
+import { join as join75 } from "path";
 var JunieRule = class _JunieRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -7326,7 +7595,7 @@ var JunieRule = class _JunieRule extends ToolRule {
         relativeFilePath: "guidelines.md"
       },
       nonRoot: {
-        relativeDirPath: join74(".junie", "memories")
+        relativeDirPath: join75(".junie", "memories")
       }
     };
   }
@@ -7336,8 +7605,8 @@ var JunieRule = class _JunieRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "guidelines.md";
-    const relativePath = isRoot ? "guidelines.md" : join74(".junie", "memories", relativeFilePath);
-    const fileContent = await readFileContent(join74(baseDir, relativePath));
+    const relativePath = isRoot ? "guidelines.md" : join75(".junie", "memories", relativeFilePath);
+    const fileContent = await readFileContent(join75(baseDir, relativePath));
     return new _JunieRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -7377,12 +7646,12 @@ var JunieRule = class _JunieRule extends ToolRule {
 };
 
 // src/features/rules/kiro-rule.ts
-import { join as join75 } from "path";
+import { join as join76 } from "path";
 var KiroRule = class _KiroRule extends ToolRule {
   static getSettablePaths() {
     return {
       nonRoot: {
-        relativeDirPath: join75(".kiro", "steering")
+        relativeDirPath: join76(".kiro", "steering")
       }
     };
   }
@@ -7392,7 +7661,7 @@ var KiroRule = class _KiroRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join75(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join76(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _KiroRule({
       baseDir,
@@ -7432,7 +7701,7 @@ var KiroRule = class _KiroRule extends ToolRule {
 };
 
 // src/features/rules/opencode-rule.ts
-import { join as join76 } from "path";
+import { join as join77 } from "path";
 var OpenCodeRule = class _OpenCodeRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -7441,7 +7710,7 @@ var OpenCodeRule = class _OpenCodeRule extends ToolRule {
         relativeFilePath: "AGENTS.md"
       },
       nonRoot: {
-        relativeDirPath: join76(".opencode", "memories")
+        relativeDirPath: join77(".opencode", "memories")
       }
     };
   }
@@ -7451,8 +7720,8 @@ var OpenCodeRule = class _OpenCodeRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "AGENTS.md";
-    const relativePath = isRoot ? "AGENTS.md" : join76(".opencode", "memories", relativeFilePath);
-    const fileContent = await readFileContent(join76(baseDir, relativePath));
+    const relativePath = isRoot ? "AGENTS.md" : join77(".opencode", "memories", relativeFilePath);
+    const fileContent = await readFileContent(join77(baseDir, relativePath));
     return new _OpenCodeRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -7492,7 +7761,7 @@ var OpenCodeRule = class _OpenCodeRule extends ToolRule {
 };
 
 // src/features/rules/qwencode-rule.ts
-import { join as join77 } from "path";
+import { join as join78 } from "path";
 var QwencodeRule = class _QwencodeRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -7501,7 +7770,7 @@ var QwencodeRule = class _QwencodeRule extends ToolRule {
         relativeFilePath: "QWEN.md"
       },
       nonRoot: {
-        relativeDirPath: join77(".qwen", "memories")
+        relativeDirPath: join78(".qwen", "memories")
       }
     };
   }
@@ -7511,8 +7780,8 @@ var QwencodeRule = class _QwencodeRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "QWEN.md";
-    const relativePath = isRoot ? "QWEN.md" : join77(".qwen", "memories", relativeFilePath);
-    const fileContent = await readFileContent(join77(baseDir, relativePath));
+    const relativePath = isRoot ? "QWEN.md" : join78(".qwen", "memories", relativeFilePath);
+    const fileContent = await readFileContent(join78(baseDir, relativePath));
     return new _QwencodeRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -7549,12 +7818,12 @@ var QwencodeRule = class _QwencodeRule extends ToolRule {
 };
 
 // src/features/rules/roo-rule.ts
-import { join as join78 } from "path";
+import { join as join79 } from "path";
 var RooRule = class _RooRule extends ToolRule {
   static getSettablePaths() {
     return {
       nonRoot: {
-        relativeDirPath: join78(".roo", "rules")
+        relativeDirPath: join79(".roo", "rules")
       }
     };
   }
@@ -7564,7 +7833,7 @@ var RooRule = class _RooRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join78(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join79(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _RooRule({
       baseDir,
@@ -7619,7 +7888,7 @@ var RooRule = class _RooRule extends ToolRule {
 };
 
 // src/features/rules/warp-rule.ts
-import { join as join79 } from "path";
+import { join as join80 } from "path";
 var WarpRule = class _WarpRule extends ToolRule {
   constructor({ fileContent, root, ...rest }) {
     super({
@@ -7635,7 +7904,7 @@ var WarpRule = class _WarpRule extends ToolRule {
         relativeFilePath: "WARP.md"
       },
       nonRoot: {
-        relativeDirPath: join79(".warp", "memories")
+        relativeDirPath: join80(".warp", "memories")
       }
     };
   }
@@ -7645,8 +7914,8 @@ var WarpRule = class _WarpRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === this.getSettablePaths().root.relativeFilePath;
-    const relativePath = isRoot ? this.getSettablePaths().root.relativeFilePath : join79(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join79(baseDir, relativePath));
+    const relativePath = isRoot ? this.getSettablePaths().root.relativeFilePath : join80(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join80(baseDir, relativePath));
     return new _WarpRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : ".warp",
@@ -7686,12 +7955,12 @@ var WarpRule = class _WarpRule extends ToolRule {
 };
 
 // src/features/rules/windsurf-rule.ts
-import { join as join80 } from "path";
+import { join as join81 } from "path";
 var WindsurfRule = class _WindsurfRule extends ToolRule {
   static getSettablePaths() {
     return {
       nonRoot: {
-        relativeDirPath: join80(".windsurf", "rules")
+        relativeDirPath: join81(".windsurf", "rules")
       }
     };
   }
@@ -7701,7 +7970,7 @@ var WindsurfRule = class _WindsurfRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join80(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join81(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _WindsurfRule({
       baseDir,
@@ -7747,6 +8016,7 @@ var rulesProcessorToolTargets = [
   "augmentcode",
   "augmentcode-legacy",
   "claudecode",
+  "claudecode-legacy",
   "cline",
   "codexcli",
   "copilot",
@@ -7760,32 +8030,197 @@ var rulesProcessorToolTargets = [
   "warp",
   "windsurf"
 ];
-var RulesProcessorToolTargetSchema = z32.enum(rulesProcessorToolTargets);
-var rulesProcessorToolTargetsGlobal = [
-  "claudecode",
-  "codexcli",
-  "geminicli"
-];
+var RulesProcessorToolTargetSchema = z33.enum(rulesProcessorToolTargets);
 var toolRuleFactories = /* @__PURE__ */ new Map([
-  ["agentsmd", { class: AgentsMdRule, meta: { extension: "md" } }],
-  ["amazonqcli", { class: AmazonQCliRule, meta: { extension: "md" } }],
-  ["antigravity", { class: AntigravityRule, meta: { extension: "md" } }],
-  ["augmentcode", { class: AugmentcodeRule, meta: { extension: "md" } }],
-  ["augmentcode-legacy", { class: AugmentcodeLegacyRule, meta: { extension: "md" } }],
-  ["claudecode", { class: ClaudecodeRule, meta: { extension: "md" } }],
-  ["cline", { class: ClineRule, meta: { extension: "md" } }],
-  ["codexcli", { class: CodexcliRule, meta: { extension: "md" } }],
-  ["copilot", { class: CopilotRule, meta: { extension: "md" } }],
-  ["cursor", { class: CursorRule, meta: { extension: "mdc" } }],
-  ["geminicli", { class: GeminiCliRule, meta: { extension: "md" } }],
-  ["junie", { class: JunieRule, meta: { extension: "md" } }],
-  ["kiro", { class: KiroRule, meta: { extension: "md" } }],
-  ["opencode", { class: OpenCodeRule, meta: { extension: "md" } }],
-  ["qwencode", { class: QwencodeRule, meta: { extension: "md" } }],
-  ["roo", { class: RooRule, meta: { extension: "md" } }],
-  ["warp", { class: WarpRule, meta: { extension: "md" } }],
-  ["windsurf", { class: WindsurfRule, meta: { extension: "md" } }]
+  [
+    "agentsmd",
+    {
+      class: AgentsMdRule,
+      meta: {
+        extension: "md",
+        supportsGlobal: false,
+        ruleDiscoveryMode: "toon",
+        additionalConventions: {
+          commands: { commandClass: AgentsmdCommand },
+          subagents: { subagentClass: AgentsmdSubagent },
+          skills: { skillClass: AgentsmdSkill }
+        }
+      }
+    }
+  ],
+  [
+    "amazonqcli",
+    {
+      class: AmazonQCliRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "auto" }
+    }
+  ],
+  [
+    "antigravity",
+    {
+      class: AntigravityRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "auto" }
+    }
+  ],
+  [
+    "augmentcode",
+    {
+      class: AugmentcodeRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "auto" }
+    }
+  ],
+  [
+    "augmentcode-legacy",
+    {
+      class: AugmentcodeLegacyRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "toon" }
+    }
+  ],
+  [
+    "claudecode",
+    {
+      class: ClaudecodeRule,
+      meta: { extension: "md", supportsGlobal: true, ruleDiscoveryMode: "auto" }
+    }
+  ],
+  [
+    "claudecode-legacy",
+    {
+      class: ClaudecodeLegacyRule,
+      meta: { extension: "md", supportsGlobal: true, ruleDiscoveryMode: "claudecode-legacy" }
+    }
+  ],
+  [
+    "cline",
+    {
+      class: ClineRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "auto" }
+    }
+  ],
+  [
+    "codexcli",
+    {
+      class: CodexcliRule,
+      meta: {
+        extension: "md",
+        supportsGlobal: true,
+        ruleDiscoveryMode: "toon",
+        additionalConventions: {
+          subagents: { subagentClass: CodexCliSubagent },
+          skills: { skillClass: CodexCliSkill, globalOnly: true }
+        }
+      }
+    }
+  ],
+  [
+    "copilot",
+    {
+      class: CopilotRule,
+      meta: {
+        extension: "md",
+        supportsGlobal: false,
+        ruleDiscoveryMode: "auto",
+        additionalConventions: {
+          commands: { commandClass: CopilotCommand },
+          subagents: { subagentClass: CopilotSubagent },
+          skills: { skillClass: CopilotSkill }
+        }
+      }
+    }
+  ],
+  [
+    "cursor",
+    {
+      class: CursorRule,
+      meta: {
+        extension: "mdc",
+        supportsGlobal: false,
+        ruleDiscoveryMode: "auto",
+        additionalConventions: {
+          commands: { commandClass: CursorCommand },
+          subagents: { subagentClass: CursorSubagent },
+          skills: { skillClass: CursorSkill }
+        },
+        createsSeparateConventionsRule: true
+      }
+    }
+  ],
+  [
+    "geminicli",
+    {
+      class: GeminiCliRule,
+      meta: {
+        extension: "md",
+        supportsGlobal: true,
+        ruleDiscoveryMode: "toon",
+        additionalConventions: {
+          commands: { commandClass: GeminiCliCommand },
+          subagents: { subagentClass: GeminiCliSubagent },
+          skills: { skillClass: GeminiCliSkill }
+        }
+      }
+    }
+  ],
+  [
+    "junie",
+    {
+      class: JunieRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "toon" }
+    }
+  ],
+  [
+    "kiro",
+    {
+      class: KiroRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "toon" }
+    }
+  ],
+  [
+    "opencode",
+    {
+      class: OpenCodeRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "toon" }
+    }
+  ],
+  [
+    "qwencode",
+    {
+      class: QwencodeRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "toon" }
+    }
+  ],
+  [
+    "roo",
+    {
+      class: RooRule,
+      meta: {
+        extension: "md",
+        supportsGlobal: false,
+        ruleDiscoveryMode: "auto",
+        additionalConventions: {
+          commands: { commandClass: RooCommand },
+          subagents: { subagentClass: RooSubagent }
+        },
+        createsSeparateConventionsRule: true
+      }
+    }
+  ],
+  [
+    "warp",
+    {
+      class: WarpRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "toon" }
+    }
+  ],
+  [
+    "windsurf",
+    {
+      class: WindsurfRule,
+      meta: { extension: "md", supportsGlobal: false, ruleDiscoveryMode: "auto" }
+    }
+  ]
 ]);
+var rulesProcessorToolTargetsGlobal = Array.from(toolRuleFactories.entries()).filter(([_, factory]) => factory.meta.supportsGlobal).map(([target]) => target);
 var defaultGetFactory6 = (target) => {
   const factory = toolRuleFactories.get(target);
   if (!factory) {
@@ -7800,6 +8235,7 @@ var RulesProcessor = class extends FeatureProcessor {
   simulateSkills;
   global;
   getFactory;
+  skills;
   constructor({
     baseDir = process.cwd(),
     toolTarget,
@@ -7807,7 +8243,8 @@ var RulesProcessor = class extends FeatureProcessor {
     simulateSubagents = false,
     simulateSkills = false,
     global = false,
-    getFactory = defaultGetFactory6
+    getFactory = defaultGetFactory6,
+    skills
   }) {
     super({ baseDir });
     const result = RulesProcessorToolTargetSchema.safeParse(toolTarget);
@@ -7822,12 +8259,14 @@ var RulesProcessor = class extends FeatureProcessor {
     this.simulateSubagents = simulateSubagents;
     this.simulateSkills = simulateSkills;
     this.getFactory = getFactory;
+    this.skills = skills;
   }
   async convertRulesyncFilesToToolFiles(rulesyncFiles) {
     const rulesyncRules = rulesyncFiles.filter(
       (file) => file instanceof RulesyncRule
     );
     const factory = this.getFactory(this.toolTarget);
+    const { meta } = factory;
     const toolRules = rulesyncRules.map((rulesyncRule) => {
       if (!factory.class.isTargetedByRulesyncRule(rulesyncRule)) {
         return null;
@@ -7840,150 +8279,105 @@ var RulesProcessor = class extends FeatureProcessor {
       });
     }).filter((rule) => rule !== null);
     const isSimulated = this.simulateCommands || this.simulateSubagents || this.simulateSkills;
-    if (isSimulated && this.toolTarget === "cursor") {
-      toolRules.push(
-        new CursorRule({
-          baseDir: this.baseDir,
-          frontmatter: {
-            alwaysApply: true
-          },
-          body: this.generateAdditionalConventionsSection({
-            commands: { relativeDirPath: CursorCommand.getSettablePaths().relativeDirPath },
-            subagents: {
-              relativeDirPath: CursorSubagent.getSettablePaths().relativeDirPath
-            },
-            skills: {
-              relativeDirPath: CursorSkill.getSettablePaths().relativeDirPath
-            }
-          }),
-          relativeDirPath: CursorRule.getSettablePaths().nonRoot.relativeDirPath,
-          relativeFilePath: "additional-conventions.mdc",
-          validate: true
-        })
-      );
-    }
-    if (isSimulated && this.toolTarget === "roo") {
-      toolRules.push(
-        new RooRule({
-          baseDir: this.baseDir,
-          relativeDirPath: RooRule.getSettablePaths().nonRoot.relativeDirPath,
-          relativeFilePath: "additional-conventions.md",
-          fileContent: this.generateAdditionalConventionsSection({
-            commands: { relativeDirPath: RooCommand.getSettablePaths().relativeDirPath },
-            subagents: {
-              relativeDirPath: RooSubagent.getSettablePaths().relativeDirPath
-            }
-          }),
-          validate: true
-        })
-      );
+    if (isSimulated && meta.createsSeparateConventionsRule && meta.additionalConventions) {
+      const conventionsContent = this.generateAdditionalConventionsSectionFromMeta(meta);
+      const settablePaths = factory.class.getSettablePaths();
+      const nonRootPath = "nonRoot" in settablePaths ? settablePaths.nonRoot : null;
+      if (nonRootPath) {
+        toolRules.push(
+          factory.class.fromRulesyncRule({
+            baseDir: this.baseDir,
+            rulesyncRule: new RulesyncRule({
+              baseDir: this.baseDir,
+              relativeDirPath: nonRootPath.relativeDirPath,
+              relativeFilePath: "additional-conventions.md",
+              frontmatter: {
+                root: false,
+                targets: [this.toolTarget]
+              },
+              body: conventionsContent
+            }),
+            validate: true,
+            global: this.global
+          })
+        );
+      }
     }
     const rootRuleIndex = toolRules.findIndex((rule) => rule.isRoot());
     if (rootRuleIndex === -1) {
       return toolRules;
     }
-    switch (this.toolTarget) {
-      case "agentsmd": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + this.generateAdditionalConventionsSection({
-            commands: { relativeDirPath: AgentsmdCommand.getSettablePaths().relativeDirPath },
-            subagents: {
-              relativeDirPath: AgentsmdSubagent.getSettablePaths().relativeDirPath
-            }
-          }) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "augmentcode-legacy": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "claudecode": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateReferencesSection(toolRules) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "codexcli": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + this.generateAdditionalConventionsSection({
-            subagents: {
-              relativeDirPath: CodexCliSubagent.getSettablePaths().relativeDirPath
-            },
-            // Codex CLI skills are only supported in global mode
-            ...this.global && {
-              skills: {
-                relativeDirPath: CodexCliSkill.getSettablePaths({ global: this.global }).relativeDirPath
-              }
-            }
-          }) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "copilot": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateAdditionalConventionsSection({
-            commands: { relativeDirPath: CopilotCommand.getSettablePaths().relativeDirPath },
-            subagents: {
-              relativeDirPath: CopilotSubagent.getSettablePaths().relativeDirPath
-            },
-            skills: {
-              relativeDirPath: CopilotSkill.getSettablePaths().relativeDirPath
-            }
-          }) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "geminicli": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + this.generateAdditionalConventionsSection({
-            commands: { relativeDirPath: GeminiCliCommand.getSettablePaths().relativeDirPath },
-            subagents: {
-              relativeDirPath: GeminiCliSubagent.getSettablePaths().relativeDirPath
-            }
-          }) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "kiro": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "opencode": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "qwencode": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
-      case "warp": {
-        const rootRule = toolRules[rootRuleIndex];
-        rootRule?.setFileContent(
-          this.generateToonReferencesSection(toolRules) + rootRule.getFileContent()
-        );
-        return toolRules;
-      }
+    const rootRule = toolRules[rootRuleIndex];
+    if (!rootRule) {
+      return toolRules;
+    }
+    const referenceSection = this.generateReferenceSectionFromMeta(meta, toolRules);
+    const conventionsSection = !meta.createsSeparateConventionsRule && meta.additionalConventions ? this.generateAdditionalConventionsSectionFromMeta(meta) : "";
+    const newContent = referenceSection + conventionsSection + rootRule.getFileContent();
+    rootRule.setFileContent(newContent);
+    return toolRules;
+  }
+  buildSkillList(skillClass) {
+    if (!this.skills) return [];
+    const toolRelativeDirPath = skillClass.getSettablePaths({
+      global: this.global
+    }).relativeDirPath;
+    return this.skills.filter((skill) => skillClass.isTargetedByRulesyncSkill(skill)).map((skill) => {
+      const frontmatter = skill.getFrontmatter();
+      const relativePath = join82(toolRelativeDirPath, skill.getDirName(), SKILL_FILE_NAME);
+      return {
+        name: frontmatter.name,
+        description: frontmatter.description,
+        path: relativePath
+      };
+    });
+  }
+  /**
+   * Generate reference section based on meta configuration.
+   */
+  generateReferenceSectionFromMeta(meta, toolRules) {
+    switch (meta.ruleDiscoveryMode) {
+      case "toon":
+        return this.generateToonReferencesSection(toolRules);
+      case "claudecode-legacy":
+        return this.generateReferencesSection(toolRules);
+      case "auto":
       default:
-        return toolRules;
+        return "";
+    }
+  }
+  /**
+   * Generate additional conventions section based on meta configuration.
+   */
+  generateAdditionalConventionsSectionFromMeta(meta) {
+    const { additionalConventions } = meta;
+    if (!additionalConventions) {
+      return "";
+    }
+    const conventions = {};
+    if (additionalConventions.commands) {
+      const { commandClass } = additionalConventions.commands;
+      const relativeDirPath = commandClass.getSettablePaths({
+        global: this.global
+      }).relativeDirPath;
+      conventions.commands = { relativeDirPath };
+    }
+    if (additionalConventions.subagents) {
+      const { subagentClass } = additionalConventions.subagents;
+      const relativeDirPath = subagentClass.getSettablePaths({
+        global: this.global
+      }).relativeDirPath;
+      conventions.subagents = { relativeDirPath };
     }
+    if (additionalConventions.skills) {
+      const { skillClass, globalOnly } = additionalConventions.skills;
+      if (!globalOnly || this.global) {
+        conventions.skills = {
+          skillList: this.buildSkillList(skillClass)
+        };
+      }
+    }
+    return this.generateAdditionalConventionsSection(conventions);
   }
   async convertToolFilesToRulesyncFiles(toolFiles) {
     const toolRules = toolFiles.filter((file) => file instanceof ToolRule);
@@ -7997,7 +8391,7 @@ var RulesProcessor = class extends FeatureProcessor {
    * Load and parse rulesync rule files from .rulesync/rules/ directory
    */
   async loadRulesyncFiles() {
-    const files = await findFilesByGlobs(join81(RULESYNC_RULES_RELATIVE_DIR_PATH, "*.md"));
+    const files = await findFilesByGlobs(join82(RULESYNC_RULES_RELATIVE_DIR_PATH, "*.md"));
     logger.debug(`Found ${files.length} rulesync files`);
     const rulesyncRules = await Promise.all(
       files.map((file) => RulesyncRule.fromFile({ relativeFilePath: basename21(file) }))
@@ -8018,7 +8412,7 @@ var RulesProcessor = class extends FeatureProcessor {
     return rulesyncRules;
   }
   async loadRulesyncFilesLegacy() {
-    const legacyFiles = await findFilesByGlobs(join81(RULESYNC_RELATIVE_DIR_PATH, "*.md"));
+    const legacyFiles = await findFilesByGlobs(join82(RULESYNC_RELATIVE_DIR_PATH, "*.md"));
     logger.debug(`Found ${legacyFiles.length} legacy rulesync files`);
     return Promise.all(
       legacyFiles.map((file) => RulesyncRule.fromFileLegacy({ relativeFilePath: basename21(file) }))
@@ -8039,7 +8433,7 @@ var RulesProcessor = class extends FeatureProcessor {
           return [];
         }
         const rootFilePaths = await findFilesByGlobs(
-          join81(
+          join82(
             this.baseDir,
             settablePaths.root.relativeDirPath ?? ".",
             settablePaths.root.relativeFilePath
@@ -8061,7 +8455,7 @@ var RulesProcessor = class extends FeatureProcessor {
           return [];
         }
         const nonRootFilePaths = await findFilesByGlobs(
-          join81(this.baseDir, settablePaths.nonRoot.relativeDirPath, `*.${factory.meta.extension}`)
+          join82(this.baseDir, settablePaths.nonRoot.relativeDirPath, `*.${factory.meta.extension}`)
         );
         return await Promise.all(
           nonRootFilePaths.map(
@@ -8160,23 +8554,15 @@ 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, \`${join81(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, \`${join82(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, \`${join81(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, \`${join81(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "planner.md")}\`, and execute its contents as the block of operations.` : "";
-    const skillsSection = skills ? `## Simulated Skills
+When users call a simulated subagent, it will look for the corresponding markdown file, \`${join82(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "{subagent}.md")}\`, and execute its contents as the block of operations.
 
-Simulated skills are specialized capabilities that can be invoked to handle specific types of tasks.
-
-When users invoke a simulated skill, look for the corresponding SKILL.md file in \`${join81(RULESYNC_SKILLS_RELATIVE_DIR_PATH, "{skill}/SKILL.md")}\` and execute its contents as the block of operations.
-
-For example, if the user instructs \`Use the skill example-skill to achieve something\`, look for \`${join81(RULESYNC_SKILLS_RELATIVE_DIR_PATH, "example-skill/SKILL.md")}\` and execute its contents.
-
-Additionally, you should proactively consider using available skills when they would help accomplish a task more effectively, even if the user doesn't explicitly request them.` : "";
+For example, if the user instructs \`Call planner subagent to plan the refactoring\`, you have to look for the markdown file, \`${join82(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,
       ...this.simulateCommands && CommandsProcessor.getToolTargetsSimulated().includes(this.toolTarget) ? [commandsSection] : [],
@@ -8185,6 +8571,21 @@ Additionally, you should proactively consider using available skills when they w
     ].join("\n\n") + "\n\n";
     return result;
   }
+  generateSkillsSection(skills) {
+    if (!skills.skillList || skills.skillList.length === 0) {
+      return "";
+    }
+    const skillListWithAtPrefix = skills.skillList.map((skill) => ({
+      ...skill,
+      path: `@${skill.path}`
+    }));
+    const toonContent = encode({ skillList: skillListWithAtPrefix });
+    return `## Simulated Skills
+
+Simulated skills are specialized capabilities that can be invoked to handle specific types of tasks. When you determine that a skill would be helpful for the current task, read the corresponding SKILL.md file and execute its instructions.
+
+${toonContent}`;
+  }
 };
 
 // src/cli/commands/generate.ts
@@ -8197,13 +8598,15 @@ async function generateCommand(options) {
     process.exit(1);
   }
   logger.info(`Base directories: ${config.getBaseDirs().join(", ")}`);
-  const totalRulesOutputs = await generateRules(config);
   const totalIgnoreOutputs = await generateIgnore(config);
   const totalMcpOutputs = await generateMcp(config);
   const totalCommandOutputs = await generateCommands(config);
   const totalSubagentOutputs = await generateSubagents(config);
-  const totalSkillOutputs = await generateSkills(config);
-  const totalGenerated = totalRulesOutputs + totalMcpOutputs + totalCommandOutputs + totalIgnoreOutputs + totalSubagentOutputs + totalSkillOutputs;
+  const skillsResult = await generateSkills(config);
+  const totalRulesOutputs = await generateRules(config, {
+    skills: skillsResult.skills
+  });
+  const totalGenerated = totalRulesOutputs + totalMcpOutputs + totalCommandOutputs + totalIgnoreOutputs + totalSubagentOutputs + skillsResult.totalOutputs;
   if (totalGenerated === 0) {
     const enabledFeatures = config.getFeatures().join(", ");
     logger.warn(`\u26A0\uFE0F  No files generated for enabled features: ${enabledFeatures}`);
@@ -8216,11 +8619,11 @@ async function generateCommand(options) {
     if (totalMcpOutputs > 0) parts.push(`${totalMcpOutputs} MCP files`);
     if (totalCommandOutputs > 0) parts.push(`${totalCommandOutputs} commands`);
     if (totalSubagentOutputs > 0) parts.push(`${totalSubagentOutputs} subagents`);
-    if (totalSkillOutputs > 0) parts.push(`${totalSkillOutputs} skills`);
+    if (skillsResult.totalOutputs > 0) parts.push(`${skillsResult.totalOutputs} skills`);
     logger.success(`\u{1F389} All done! Generated ${totalGenerated} file(s) total (${parts.join(" + ")})`);
   }
 }
-async function generateRules(config) {
+async function generateRules(config, options) {
   if (!config.getFeatures().includes("rules")) {
     logger.debug("Skipping rule generation (not in --features)");
     return 0;
@@ -8239,7 +8642,8 @@ async function generateRules(config) {
         global: config.getGlobal(),
         simulateCommands: config.getSimulateCommands(),
         simulateSubagents: config.getSimulateSubagents(),
-        simulateSkills: config.getSimulateSkills()
+        simulateSkills: config.getSimulateSkills(),
+        skills: options?.skills
       });
       if (config.getDelete()) {
         const oldToolFiles = await processor.loadToolFiles({ forDeletion: true });
@@ -8403,9 +8807,10 @@ async function generateSubagents(config) {
 async function generateSkills(config) {
   if (!config.getFeatures().includes("skills")) {
     logger.debug("Skipping skill generation (not in --features)");
-    return 0;
+    return { totalOutputs: 0, skills: [] };
   }
   let totalSkillOutputs = 0;
+  const allSkills = [];
   logger.info("Generating skill files...");
   const toolTargets = intersection(
     config.getTargets(),
@@ -8426,112 +8831,164 @@ async function generateSkills(config) {
         await processor.removeAiDirs(oldToolDirs);
       }
       const rulesyncDirs = await processor.loadRulesyncDirs();
+      for (const rulesyncDir of rulesyncDirs) {
+        if (rulesyncDir instanceof RulesyncSkill) {
+          allSkills.push(rulesyncDir);
+        }
+      }
       const toolDirs = await processor.convertRulesyncDirsToToolDirs(rulesyncDirs);
       const writtenCount = await processor.writeAiDirs(toolDirs);
       totalSkillOutputs += writtenCount;
       logger.success(`Generated ${writtenCount} ${toolTarget} skill(s) in ${baseDir}`);
     }
   }
-  return totalSkillOutputs;
+  return { totalOutputs: totalSkillOutputs, skills: allSkills };
 }
 
 // src/cli/commands/gitignore.ts
-import { join as join82 } from "path";
+import { join as join83 } from "path";
+var RULESYNC_HEADER = "# Generated by Rulesync";
+var LEGACY_RULESYNC_HEADER = "# Generated by rulesync - AI tool configuration files";
+var RULESYNC_IGNORE_ENTRIES = [
+  // AGENTS.md
+  "**/AGENTS.md",
+  "**/.agents/",
+  // Amazon Q
+  "**/.amazonq/",
+  // Augment
+  "**/.augmentignore",
+  "**/.augment/rules/",
+  "**/.augment-guidelines",
+  // Claude Code
+  "**/CLAUDE.md",
+  "**/.claude/CLAUDE.md",
+  "**/.claude/memories/",
+  "**/.claude/rules/",
+  "**/.claude/commands/",
+  "**/.claude/agents/",
+  "**/.claude/skills/",
+  "**/.claude/settings.local.json",
+  "**/.mcp.json",
+  // Cline
+  "**/.clinerules/",
+  "**/.clineignore",
+  "**/.cline/mcp.json",
+  // Codex
+  "**/.codexignore",
+  "**/.codex/",
+  "**/.codex/skills/",
+  // Cursor
+  "**/.cursor/",
+  "**/.cursorignore",
+  // Gemini
+  "**/GEMINI.md",
+  "**/.gemini/memories/",
+  "**/.gemini/commands/",
+  "**/.gemini/subagents/",
+  "**/.gemini/skills/",
+  "**/.geminiignore",
+  // GitHub Copilot
+  "**/.github/copilot-instructions.md",
+  "**/.github/instructions/",
+  "**/.github/prompts/",
+  "**/.github/subagents/",
+  "**/.github/skills/",
+  "**/.vscode/mcp.json",
+  // Junie
+  "**/.junie/guidelines.md",
+  "**/.junie/mcp.json",
+  // Kiro
+  "**/.kiro/steering/",
+  "**/.aiignore",
+  // OpenCode
+  "**/.opencode/memories/",
+  "**/.opencode/command/",
+  "**/opencode.json",
+  // Qwen
+  "**/QWEN.md",
+  "**/.qwen/memories/",
+  // Roo
+  "**/.roo/rules/",
+  "**/.rooignore",
+  "**/.roo/mcp.json",
+  "**/.roo/subagents/",
+  // Warp
+  "**/.warp/",
+  "**/WARP.md",
+  // Others
+  "**/modular-mcp.json",
+  "!.rulesync/.aiignore"
+];
+var isRulesyncHeader = (line) => {
+  const trimmed = line.trim();
+  return trimmed === RULESYNC_HEADER || trimmed === LEGACY_RULESYNC_HEADER;
+};
+var isRulesyncEntry = (line) => {
+  const trimmed = line.trim();
+  if (trimmed === "" || isRulesyncHeader(line)) {
+    return false;
+  }
+  return RULESYNC_IGNORE_ENTRIES.includes(trimmed);
+};
+var removeExistingRulesyncEntries = (content) => {
+  const lines = content.split("\n");
+  const filteredLines = [];
+  let inRulesyncBlock = false;
+  let consecutiveEmptyLines = 0;
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (isRulesyncHeader(line)) {
+      inRulesyncBlock = true;
+      continue;
+    }
+    if (inRulesyncBlock) {
+      if (trimmed === "") {
+        consecutiveEmptyLines++;
+        if (consecutiveEmptyLines >= 2) {
+          inRulesyncBlock = false;
+          consecutiveEmptyLines = 0;
+        }
+        continue;
+      }
+      if (isRulesyncEntry(line)) {
+        consecutiveEmptyLines = 0;
+        continue;
+      }
+      inRulesyncBlock = false;
+      consecutiveEmptyLines = 0;
+    }
+    if (isRulesyncEntry(line)) {
+      continue;
+    }
+    filteredLines.push(line);
+  }
+  let result = filteredLines.join("\n");
+  while (result.endsWith("\n\n")) {
+    result = result.slice(0, -1);
+  }
+  return result;
+};
 var gitignoreCommand = async () => {
-  const gitignorePath = join82(process.cwd(), ".gitignore");
-  const rulesFilesToIgnore = [
-    "# Generated by rulesync - AI tool configuration files",
-    // AGENTS.md
-    "**/AGENTS.md",
-    "**/.agents/",
-    // Amazon Q
-    "**/.amazonq/",
-    // Augment
-    "**/.augmentignore",
-    "**/.augment/rules/",
-    "**/.augment-guidelines",
-    // Claude Code
-    "**/CLAUDE.md",
-    "**/.claude/memories/",
-    "**/.claude/commands/",
-    "**/.claude/agents/",
-    "**/.claude/skills/",
-    "**/.claude/settings.local.json",
-    "**/.mcp.json",
-    // Cline
-    "**/.clinerules/",
-    "**/.clineignore",
-    "**/.cline/mcp.json",
-    // Codex
-    "**/.codexignore",
-    "**/.codex/",
-    "**/.codex/skills/",
-    // Cursor
-    "**/.cursor/",
-    "**/.cursorignore",
-    // Gemini
-    "**/GEMINI.md",
-    "**/.gemini/memories/",
-    "**/.gemini/commands/",
-    "**/.gemini/subagents/",
-    "**/.gemini/skills/",
-    // GitHub Copilot
-    "**/.github/copilot-instructions.md",
-    "**/.github/instructions/",
-    "**/.github/prompts/",
-    "**/.github/subagents/",
-    "**/.github/skills/",
-    "**/.vscode/mcp.json",
-    // Junie
-    "**/.junie/guidelines.md",
-    "**/.junie/mcp.json",
-    // Kiro
-    "**/.kiro/steering/",
-    "**/.aiignore",
-    // OpenCode
-    "**/.opencode/memories/",
-    "**/.opencode/command/",
-    "**/opencode.json",
-    // Qwen
-    "**/QWEN.md",
-    "**/.qwen/memories/",
-    // Roo
-    "**/.roo/rules/",
-    "**/.rooignore",
-    "**/.roo/mcp.json",
-    "**/.roo/subagents/",
-    // Warp
-    "**/.warp/",
-    "**/WARP.md",
-    // Others
-    "**/modular-mcp.json",
-    "!.rulesync/.aiignore"
-  ];
+  const gitignorePath = join83(process.cwd(), ".gitignore");
   let gitignoreContent = "";
   if (await fileExists(gitignorePath)) {
     gitignoreContent = await readFileContent(gitignorePath);
   }
-  const linesToAdd = [];
-  for (const rule of rulesFilesToIgnore) {
-    if (!gitignoreContent.includes(rule)) {
-      linesToAdd.push(rule);
-    }
-  }
-  if (linesToAdd.length === 0) {
+  const cleanedContent = removeExistingRulesyncEntries(gitignoreContent);
+  const rulesyncBlock = [RULESYNC_HEADER, ...RULESYNC_IGNORE_ENTRIES].join("\n");
+  const newContent = cleanedContent.trim() ? `${cleanedContent.trimEnd()}
+
+${rulesyncBlock}
+` : `${rulesyncBlock}
+`;
+  if (gitignoreContent === newContent) {
     logger.success(".gitignore is already up to date");
     return;
   }
-  const newContent = gitignoreContent ? `${gitignoreContent.trimEnd()}
-
-${linesToAdd.join("\n")}
-` : `${linesToAdd.join("\n")}
-`;
   await writeFileContent(gitignorePath, newContent);
-  logger.success(`Added ${linesToAdd.length} rules to .gitignore:`);
-  for (const line of linesToAdd) {
-    if (!line.startsWith("#")) {
-      logger.info(`  ${line}`);
-    }
+  logger.success("Updated .gitignore with rulesync entries:");
+  for (const entry of RULESYNC_IGNORE_ENTRIES) {
+    logger.info(`  ${entry}`);
   }
 };
 
@@ -8711,7 +9168,7 @@ async function importSkills(config, tool) {
 }
 
 // src/cli/commands/init.ts
-import { join as join83 } from "path";
+import { join as join84 } from "path";
 async function initCommand() {
   logger.info("Initializing rulesync...");
   await ensureDir(RULESYNC_RELATIVE_DIR_PATH);
@@ -8874,14 +9331,14 @@ Attention, again, you are just the planner, so though you can read any files and
   await ensureDir(commandPaths.relativeDirPath);
   await ensureDir(subagentPaths.relativeDirPath);
   await ensureDir(ignorePaths.recommended.relativeDirPath);
-  const ruleFilepath = join83(rulePaths.recommended.relativeDirPath, sampleRuleFile.filename);
+  const ruleFilepath = join84(rulePaths.recommended.relativeDirPath, sampleRuleFile.filename);
   if (!await fileExists(ruleFilepath)) {
     await writeFileContent(ruleFilepath, sampleRuleFile.content);
     logger.success(`Created ${ruleFilepath}`);
   } else {
     logger.info(`Skipped ${ruleFilepath} (already exists)`);
   }
-  const mcpFilepath = join83(
+  const mcpFilepath = join84(
     mcpPaths.recommended.relativeDirPath,
     mcpPaths.recommended.relativeFilePath
   );
@@ -8891,21 +9348,21 @@ Attention, again, you are just the planner, so though you can read any files and
   } else {
     logger.info(`Skipped ${mcpFilepath} (already exists)`);
   }
-  const commandFilepath = join83(commandPaths.relativeDirPath, sampleCommandFile.filename);
+  const commandFilepath = join84(commandPaths.relativeDirPath, sampleCommandFile.filename);
   if (!await fileExists(commandFilepath)) {
     await writeFileContent(commandFilepath, sampleCommandFile.content);
     logger.success(`Created ${commandFilepath}`);
   } else {
     logger.info(`Skipped ${commandFilepath} (already exists)`);
   }
-  const subagentFilepath = join83(subagentPaths.relativeDirPath, sampleSubagentFile.filename);
+  const subagentFilepath = join84(subagentPaths.relativeDirPath, sampleSubagentFile.filename);
   if (!await fileExists(subagentFilepath)) {
     await writeFileContent(subagentFilepath, sampleSubagentFile.content);
     logger.success(`Created ${subagentFilepath}`);
   } else {
     logger.info(`Skipped ${subagentFilepath} (already exists)`);
   }
-  const ignoreFilepath = join83(
+  const ignoreFilepath = join84(
     ignorePaths.recommended.relativeDirPath,
     ignorePaths.recommended.relativeFilePath
   );
@@ -8921,12 +9378,12 @@ Attention, again, you are just the planner, so though you can read any files and
 import { FastMCP } from "fastmcp";
 
 // src/mcp/commands.ts
-import { basename as basename22, join as join84 } from "path";
-import { z as z33 } from "zod/mini";
+import { basename as basename22, join as join85 } from "path";
+import { z as z34 } from "zod/mini";
 var maxCommandSizeBytes = 1024 * 1024;
 var maxCommandsCount = 1e3;
 async function listCommands() {
-  const commandsDir = join84(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
+  const commandsDir = join85(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
   try {
     const files = await listDirectoryFiles(commandsDir);
     const mdFiles = files.filter((file) => file.endsWith(".md"));
@@ -8938,7 +9395,7 @@ async function listCommands() {
           });
           const frontmatter = command.getFrontmatter();
           return {
-            relativePathFromCwd: join84(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, file),
+            relativePathFromCwd: join85(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, file),
             frontmatter
           };
         } catch (error) {
@@ -8964,7 +9421,7 @@ async function getCommand({ relativePathFromCwd }) {
       relativeFilePath: filename
     });
     return {
-      relativePathFromCwd: join84(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join85(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
       frontmatter: command.getFrontmatter(),
       body: command.getBody()
     };
@@ -8993,7 +9450,7 @@ async function putCommand({
   try {
     const existingCommands = await listCommands();
     const isUpdate = existingCommands.some(
-      (command2) => command2.relativePathFromCwd === join84(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
+      (command2) => command2.relativePathFromCwd === join85(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
     );
     if (!isUpdate && existingCommands.length >= maxCommandsCount) {
       throw new Error(`Maximum number of commands (${maxCommandsCount}) reached`);
@@ -9008,11 +9465,11 @@ async function putCommand({
       fileContent,
       validate: true
     });
-    const commandsDir = join84(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
+    const commandsDir = join85(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH);
     await ensureDir(commandsDir);
     await writeFileContent(command.getFilePath(), command.getFileContent());
     return {
-      relativePathFromCwd: join84(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join85(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename),
       frontmatter: command.getFrontmatter(),
       body: command.getBody()
     };
@@ -9028,11 +9485,11 @@ async function deleteCommand({ relativePathFromCwd }) {
     intendedRootDir: process.cwd()
   });
   const filename = basename22(relativePathFromCwd);
-  const fullPath = join84(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename);
+  const fullPath = join85(process.cwd(), RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename);
   try {
     await removeFile(fullPath);
     return {
-      relativePathFromCwd: join84(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
+      relativePathFromCwd: join85(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, filename)
     };
   } catch (error) {
     throw new Error(`Failed to delete command file ${relativePathFromCwd}: ${formatError(error)}`, {
@@ -9041,23 +9498,23 @@ async function deleteCommand({ relativePathFromCwd }) {
   }
 }
 var commandToolSchemas = {
-  listCommands: z33.object({}),
-  getCommand: z33.object({
-    relativePathFromCwd: z33.string()
+  listCommands: z34.object({}),
+  getCommand: z34.object({
+    relativePathFromCwd: z34.string()
   }),
-  putCommand: z33.object({
-    relativePathFromCwd: z33.string(),
+  putCommand: z34.object({
+    relativePathFromCwd: z34.string(),
     frontmatter: RulesyncCommandFrontmatterSchema,
-    body: z33.string()
+    body: z34.string()
   }),
-  deleteCommand: z33.object({
-    relativePathFromCwd: z33.string()
+  deleteCommand: z34.object({
+    relativePathFromCwd: z34.string()
   })
 };
 var commandTools = {
   listCommands: {
     name: "listCommands",
-    description: `List all commands from ${join84(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
+    description: `List all commands from ${join85(RULESYNC_COMMANDS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
     parameters: commandToolSchemas.listCommands,
     execute: async () => {
       const commands = await listCommands();
@@ -9099,11 +9556,11 @@ var commandTools = {
 };
 
 // src/mcp/ignore.ts
-import { join as join85 } from "path";
-import { z as z34 } from "zod/mini";
+import { join as join86 } from "path";
+import { z as z35 } from "zod/mini";
 var maxIgnoreFileSizeBytes = 100 * 1024;
 async function getIgnoreFile() {
-  const ignoreFilePath = join85(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
+  const ignoreFilePath = join86(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
   try {
     const content = await readFileContent(ignoreFilePath);
     return {
@@ -9117,7 +9574,7 @@ async function getIgnoreFile() {
   }
 }
 async function putIgnoreFile({ content }) {
-  const ignoreFilePath = join85(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
+  const ignoreFilePath = join86(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
   const contentSizeBytes = Buffer.byteLength(content, "utf8");
   if (contentSizeBytes > maxIgnoreFileSizeBytes) {
     throw new Error(
@@ -9138,8 +9595,8 @@ async function putIgnoreFile({ content }) {
   }
 }
 async function deleteIgnoreFile() {
-  const aiignorePath = join85(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
-  const legacyIgnorePath = join85(process.cwd(), RULESYNC_IGNORE_RELATIVE_FILE_PATH);
+  const aiignorePath = join86(process.cwd(), RULESYNC_AIIGNORE_RELATIVE_FILE_PATH);
+  const legacyIgnorePath = join86(process.cwd(), RULESYNC_IGNORE_RELATIVE_FILE_PATH);
   try {
     await Promise.all([removeFile(aiignorePath), removeFile(legacyIgnorePath)]);
     return {
@@ -9157,11 +9614,11 @@ async function deleteIgnoreFile() {
   }
 }
 var ignoreToolSchemas = {
-  getIgnoreFile: z34.object({}),
-  putIgnoreFile: z34.object({
-    content: z34.string()
+  getIgnoreFile: z35.object({}),
+  putIgnoreFile: z35.object({
+    content: z35.string()
   }),
-  deleteIgnoreFile: z34.object({})
+  deleteIgnoreFile: z35.object({})
 };
 var ignoreTools = {
   getIgnoreFile: {
@@ -9194,8 +9651,8 @@ var ignoreTools = {
 };
 
 // src/mcp/mcp.ts
-import { join as join86 } from "path";
-import { z as z35 } from "zod/mini";
+import { join as join87 } from "path";
+import { z as z36 } from "zod/mini";
 var maxMcpSizeBytes = 1024 * 1024;
 async function getMcpFile() {
   const config = await ConfigResolver.resolve({});
@@ -9204,7 +9661,7 @@ async function getMcpFile() {
       validate: true,
       modularMcp: config.getModularMcp()
     });
-    const relativePathFromCwd = join86(
+    const relativePathFromCwd = join87(
       rulesyncMcp.getRelativeDirPath(),
       rulesyncMcp.getRelativeFilePath()
     );
@@ -9237,7 +9694,7 @@ async function putMcpFile({ content }) {
     const paths = RulesyncMcp.getSettablePaths();
     const relativeDirPath = paths.recommended.relativeDirPath;
     const relativeFilePath = paths.recommended.relativeFilePath;
-    const fullPath = join86(baseDir, relativeDirPath, relativeFilePath);
+    const fullPath = join87(baseDir, relativeDirPath, relativeFilePath);
     const rulesyncMcp = new RulesyncMcp({
       baseDir,
       relativeDirPath,
@@ -9246,9 +9703,9 @@ async function putMcpFile({ content }) {
       validate: true,
       modularMcp: config.getModularMcp()
     });
-    await ensureDir(join86(baseDir, relativeDirPath));
+    await ensureDir(join87(baseDir, relativeDirPath));
     await writeFileContent(fullPath, content);
-    const relativePathFromCwd = join86(relativeDirPath, relativeFilePath);
+    const relativePathFromCwd = join87(relativeDirPath, relativeFilePath);
     return {
       relativePathFromCwd,
       content: rulesyncMcp.getFileContent()
@@ -9263,15 +9720,15 @@ async function deleteMcpFile() {
   try {
     const baseDir = process.cwd();
     const paths = RulesyncMcp.getSettablePaths();
-    const recommendedPath = join86(
+    const recommendedPath = join87(
       baseDir,
       paths.recommended.relativeDirPath,
       paths.recommended.relativeFilePath
     );
-    const legacyPath = join86(baseDir, paths.legacy.relativeDirPath, paths.legacy.relativeFilePath);
+    const legacyPath = join87(baseDir, paths.legacy.relativeDirPath, paths.legacy.relativeFilePath);
     await removeFile(recommendedPath);
     await removeFile(legacyPath);
-    const relativePathFromCwd = join86(
+    const relativePathFromCwd = join87(
       paths.recommended.relativeDirPath,
       paths.recommended.relativeFilePath
     );
@@ -9285,11 +9742,11 @@ async function deleteMcpFile() {
   }
 }
 var mcpToolSchemas = {
-  getMcpFile: z35.object({}),
-  putMcpFile: z35.object({
-    content: z35.string()
+  getMcpFile: z36.object({}),
+  putMcpFile: z36.object({
+    content: z36.string()
   }),
-  deleteMcpFile: z35.object({})
+  deleteMcpFile: z36.object({})
 };
 var mcpTools = {
   getMcpFile: {
@@ -9322,12 +9779,12 @@ var mcpTools = {
 };
 
 // src/mcp/rules.ts
-import { basename as basename23, join as join87 } from "path";
-import { z as z36 } from "zod/mini";
+import { basename as basename23, join as join88 } from "path";
+import { z as z37 } from "zod/mini";
 var maxRuleSizeBytes = 1024 * 1024;
 var maxRulesCount = 1e3;
 async function listRules() {
-  const rulesDir = join87(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
+  const rulesDir = join88(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
   try {
     const files = await listDirectoryFiles(rulesDir);
     const mdFiles = files.filter((file) => file.endsWith(".md"));
@@ -9340,7 +9797,7 @@ async function listRules() {
           });
           const frontmatter = rule.getFrontmatter();
           return {
-            relativePathFromCwd: join87(RULESYNC_RULES_RELATIVE_DIR_PATH, file),
+            relativePathFromCwd: join88(RULESYNC_RULES_RELATIVE_DIR_PATH, file),
             frontmatter
           };
         } catch (error) {
@@ -9367,7 +9824,7 @@ async function getRule({ relativePathFromCwd }) {
       validate: true
     });
     return {
-      relativePathFromCwd: join87(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join88(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
       frontmatter: rule.getFrontmatter(),
       body: rule.getBody()
     };
@@ -9396,7 +9853,7 @@ async function putRule({
   try {
     const existingRules = await listRules();
     const isUpdate = existingRules.some(
-      (rule2) => rule2.relativePathFromCwd === join87(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
+      (rule2) => rule2.relativePathFromCwd === join88(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
     );
     if (!isUpdate && existingRules.length >= maxRulesCount) {
       throw new Error(`Maximum number of rules (${maxRulesCount}) reached`);
@@ -9409,11 +9866,11 @@ async function putRule({
       body,
       validate: true
     });
-    const rulesDir = join87(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
+    const rulesDir = join88(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH);
     await ensureDir(rulesDir);
     await writeFileContent(rule.getFilePath(), rule.getFileContent());
     return {
-      relativePathFromCwd: join87(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join88(RULESYNC_RULES_RELATIVE_DIR_PATH, filename),
       frontmatter: rule.getFrontmatter(),
       body: rule.getBody()
     };
@@ -9429,11 +9886,11 @@ async function deleteRule({ relativePathFromCwd }) {
     intendedRootDir: process.cwd()
   });
   const filename = basename23(relativePathFromCwd);
-  const fullPath = join87(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH, filename);
+  const fullPath = join88(process.cwd(), RULESYNC_RULES_RELATIVE_DIR_PATH, filename);
   try {
     await removeFile(fullPath);
     return {
-      relativePathFromCwd: join87(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
+      relativePathFromCwd: join88(RULESYNC_RULES_RELATIVE_DIR_PATH, filename)
     };
   } catch (error) {
     throw new Error(`Failed to delete rule file ${relativePathFromCwd}: ${formatError(error)}`, {
@@ -9442,23 +9899,23 @@ async function deleteRule({ relativePathFromCwd }) {
   }
 }
 var ruleToolSchemas = {
-  listRules: z36.object({}),
-  getRule: z36.object({
-    relativePathFromCwd: z36.string()
+  listRules: z37.object({}),
+  getRule: z37.object({
+    relativePathFromCwd: z37.string()
   }),
-  putRule: z36.object({
-    relativePathFromCwd: z36.string(),
+  putRule: z37.object({
+    relativePathFromCwd: z37.string(),
     frontmatter: RulesyncRuleFrontmatterSchema,
-    body: z36.string()
+    body: z37.string()
   }),
-  deleteRule: z36.object({
-    relativePathFromCwd: z36.string()
+  deleteRule: z37.object({
+    relativePathFromCwd: z37.string()
   })
 };
 var ruleTools = {
   listRules: {
     name: "listRules",
-    description: `List all rules from ${join87(RULESYNC_RULES_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
+    description: `List all rules from ${join88(RULESYNC_RULES_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
     parameters: ruleToolSchemas.listRules,
     execute: async () => {
       const rules = await listRules();
@@ -9500,8 +9957,8 @@ var ruleTools = {
 };
 
 // src/mcp/skills.ts
-import { basename as basename24, dirname as dirname2, join as join88 } from "path";
-import { z as z37 } from "zod/mini";
+import { basename as basename24, dirname as dirname2, join as join89 } from "path";
+import { z as z38 } from "zod/mini";
 var maxSkillSizeBytes = 1024 * 1024;
 var maxSkillsCount = 1e3;
 function aiDirFileToMcpSkillFile(file) {
@@ -9524,9 +9981,9 @@ function extractDirName(relativeDirPathFromCwd) {
   return dirName;
 }
 async function listSkills() {
-  const skillsDir = join88(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH);
+  const skillsDir = join89(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH);
   try {
-    const skillDirPaths = await findFilesByGlobs(join88(skillsDir, "*"), { type: "dir" });
+    const skillDirPaths = await findFilesByGlobs(join89(skillsDir, "*"), { type: "dir" });
     const skills = await Promise.all(
       skillDirPaths.map(async (dirPath) => {
         const dirName = basename24(dirPath);
@@ -9537,7 +9994,7 @@ async function listSkills() {
           });
           const frontmatter = skill.getFrontmatter();
           return {
-            relativeDirPathFromCwd: join88(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
+            relativeDirPathFromCwd: join89(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
             frontmatter
           };
         } catch (error) {
@@ -9563,7 +10020,7 @@ async function getSkill({ relativeDirPathFromCwd }) {
       dirName
     });
     return {
-      relativeDirPathFromCwd: join88(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
+      relativeDirPathFromCwd: join89(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
       frontmatter: skill.getFrontmatter(),
       body: skill.getBody(),
       otherFiles: skill.getOtherFiles().map(aiDirFileToMcpSkillFile)
@@ -9597,7 +10054,7 @@ async function putSkill({
   try {
     const existingSkills = await listSkills();
     const isUpdate = existingSkills.some(
-      (skill2) => skill2.relativeDirPathFromCwd === join88(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
+      (skill2) => skill2.relativeDirPathFromCwd === join89(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
     );
     if (!isUpdate && existingSkills.length >= maxSkillsCount) {
       throw new Error(`Maximum number of skills (${maxSkillsCount}) reached`);
@@ -9612,9 +10069,9 @@ async function putSkill({
       otherFiles: aiDirFiles,
       validate: true
     });
-    const skillDirPath = join88(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
+    const skillDirPath = join89(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
     await ensureDir(skillDirPath);
-    const skillFilePath = join88(skillDirPath, SKILL_FILE_NAME);
+    const skillFilePath = join89(skillDirPath, SKILL_FILE_NAME);
     const skillFileContent = stringifyFrontmatter(body, frontmatter);
     await writeFileContent(skillFilePath, skillFileContent);
     for (const file of otherFiles) {
@@ -9622,15 +10079,15 @@ async function putSkill({
         relativePath: file.name,
         intendedRootDir: skillDirPath
       });
-      const filePath = join88(skillDirPath, file.name);
-      const fileDir = join88(skillDirPath, dirname2(file.name));
+      const filePath = join89(skillDirPath, file.name);
+      const fileDir = join89(skillDirPath, dirname2(file.name));
       if (fileDir !== skillDirPath) {
         await ensureDir(fileDir);
       }
       await writeFileContent(filePath, file.body);
     }
     return {
-      relativeDirPathFromCwd: join88(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
+      relativeDirPathFromCwd: join89(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName),
       frontmatter: skill.getFrontmatter(),
       body: skill.getBody(),
       otherFiles: skill.getOtherFiles().map(aiDirFileToMcpSkillFile)
@@ -9652,13 +10109,13 @@ async function deleteSkill({
     intendedRootDir: process.cwd()
   });
   const dirName = extractDirName(relativeDirPathFromCwd);
-  const skillDirPath = join88(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
+  const skillDirPath = join89(process.cwd(), RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName);
   try {
     if (await directoryExists(skillDirPath)) {
       await removeDirectory(skillDirPath);
     }
     return {
-      relativeDirPathFromCwd: join88(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
+      relativeDirPathFromCwd: join89(RULESYNC_SKILLS_RELATIVE_DIR_PATH, dirName)
     };
   } catch (error) {
     throw new Error(
@@ -9669,29 +10126,29 @@ async function deleteSkill({
     );
   }
 }
-var McpSkillFileSchema = z37.object({
-  name: z37.string(),
-  body: z37.string()
+var McpSkillFileSchema = z38.object({
+  name: z38.string(),
+  body: z38.string()
 });
 var skillToolSchemas = {
-  listSkills: z37.object({}),
-  getSkill: z37.object({
-    relativeDirPathFromCwd: z37.string()
+  listSkills: z38.object({}),
+  getSkill: z38.object({
+    relativeDirPathFromCwd: z38.string()
   }),
-  putSkill: z37.object({
-    relativeDirPathFromCwd: z37.string(),
+  putSkill: z38.object({
+    relativeDirPathFromCwd: z38.string(),
     frontmatter: RulesyncSkillFrontmatterSchema,
-    body: z37.string(),
-    otherFiles: z37.optional(z37.array(McpSkillFileSchema))
+    body: z38.string(),
+    otherFiles: z38.optional(z38.array(McpSkillFileSchema))
   }),
-  deleteSkill: z37.object({
-    relativeDirPathFromCwd: z37.string()
+  deleteSkill: z38.object({
+    relativeDirPathFromCwd: z38.string()
   })
 };
 var skillTools = {
   listSkills: {
     name: "listSkills",
-    description: `List all skills from ${join88(RULESYNC_SKILLS_RELATIVE_DIR_PATH, "*", SKILL_FILE_NAME)} with their frontmatter.`,
+    description: `List all skills from ${join89(RULESYNC_SKILLS_RELATIVE_DIR_PATH, "*", SKILL_FILE_NAME)} with their frontmatter.`,
     parameters: skillToolSchemas.listSkills,
     execute: async () => {
       const skills = await listSkills();
@@ -9734,12 +10191,12 @@ var skillTools = {
 };
 
 // src/mcp/subagents.ts
-import { basename as basename25, join as join89 } from "path";
-import { z as z38 } from "zod/mini";
+import { basename as basename25, join as join90 } from "path";
+import { z as z39 } from "zod/mini";
 var maxSubagentSizeBytes = 1024 * 1024;
 var maxSubagentsCount = 1e3;
 async function listSubagents() {
-  const subagentsDir = join89(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
+  const subagentsDir = join90(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
   try {
     const files = await listDirectoryFiles(subagentsDir);
     const mdFiles = files.filter((file) => file.endsWith(".md"));
@@ -9752,7 +10209,7 @@ async function listSubagents() {
           });
           const frontmatter = subagent.getFrontmatter();
           return {
-            relativePathFromCwd: join89(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, file),
+            relativePathFromCwd: join90(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, file),
             frontmatter
           };
         } catch (error) {
@@ -9781,7 +10238,7 @@ async function getSubagent({ relativePathFromCwd }) {
       validate: true
     });
     return {
-      relativePathFromCwd: join89(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join90(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
       frontmatter: subagent.getFrontmatter(),
       body: subagent.getBody()
     };
@@ -9810,7 +10267,7 @@ async function putSubagent({
   try {
     const existingSubagents = await listSubagents();
     const isUpdate = existingSubagents.some(
-      (subagent2) => subagent2.relativePathFromCwd === join89(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
+      (subagent2) => subagent2.relativePathFromCwd === join90(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
     );
     if (!isUpdate && existingSubagents.length >= maxSubagentsCount) {
       throw new Error(`Maximum number of subagents (${maxSubagentsCount}) reached`);
@@ -9823,11 +10280,11 @@ async function putSubagent({
       body,
       validate: true
     });
-    const subagentsDir = join89(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
+    const subagentsDir = join90(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH);
     await ensureDir(subagentsDir);
     await writeFileContent(subagent.getFilePath(), subagent.getFileContent());
     return {
-      relativePathFromCwd: join89(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
+      relativePathFromCwd: join90(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename),
       frontmatter: subagent.getFrontmatter(),
       body: subagent.getBody()
     };
@@ -9843,11 +10300,11 @@ async function deleteSubagent({ relativePathFromCwd }) {
     intendedRootDir: process.cwd()
   });
   const filename = basename25(relativePathFromCwd);
-  const fullPath = join89(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename);
+  const fullPath = join90(process.cwd(), RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename);
   try {
     await removeFile(fullPath);
     return {
-      relativePathFromCwd: join89(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
+      relativePathFromCwd: join90(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, filename)
     };
   } catch (error) {
     throw new Error(
@@ -9859,23 +10316,23 @@ async function deleteSubagent({ relativePathFromCwd }) {
   }
 }
 var subagentToolSchemas = {
-  listSubagents: z38.object({}),
-  getSubagent: z38.object({
-    relativePathFromCwd: z38.string()
+  listSubagents: z39.object({}),
+  getSubagent: z39.object({
+    relativePathFromCwd: z39.string()
   }),
-  putSubagent: z38.object({
-    relativePathFromCwd: z38.string(),
+  putSubagent: z39.object({
+    relativePathFromCwd: z39.string(),
     frontmatter: RulesyncSubagentFrontmatterSchema,
-    body: z38.string()
+    body: z39.string()
   }),
-  deleteSubagent: z38.object({
-    relativePathFromCwd: z38.string()
+  deleteSubagent: z39.object({
+    relativePathFromCwd: z39.string()
   })
 };
 var subagentTools = {
   listSubagents: {
     name: "listSubagents",
-    description: `List all subagents from ${join89(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
+    description: `List all subagents from ${join90(RULESYNC_SUBAGENTS_RELATIVE_DIR_PATH, "*.md")} with their frontmatter.`,
     parameters: subagentToolSchemas.listSubagents,
     execute: async () => {
       const subagents = await listSubagents();
@@ -9953,7 +10410,7 @@ async function mcpCommand({ version }) {
 }
 
 // src/cli/index.ts
-var getVersion = () => "3.31.0";
+var getVersion = () => "3.33.0";
 var main = async () => {
   const program = new Command();
   const version = getVersion();