rulesync 3.32.0 → 3.33.0

package/dist/index.js

@@ -3513,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) {
@@ -3552,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 };
@@ -3945,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) {
@@ -3984,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,
@@ -3994,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 };
@@ -4239,17 +4286,19 @@ import { basename as basename21, join as join82 } from "path";
 import { encode } from "@toon-format/toon";
 import { z as z33 } from "zod/mini";
 
-// src/features/skills/codexcli-skill.ts
-import { join as join42 } from "path";
-import { z as z20 } 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 {
@@ -4362,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.
@@ -4542,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}`);
     }
@@ -4567,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,
@@ -4593,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(
@@ -4636,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
-    });
-  }
-  static isTargetedByRulesyncSkill(rulesyncSkill) {
-    const targets = rulesyncSkill.getFrontmatter().targets;
-    return targets.includes("*") || targets.includes("codexcli");
+      validate
+    };
   }
-  static async fromDir(params) {
-    const loaded = await this.loadSkillDirContent({
-      ...params,
-      getSettablePaths: _CodexCliSkill.getSettablePaths
-    });
-    const result = CodexCliSkillFrontmatterSchema.safeParse(loaded.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)}`
-      );
+  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}`);
     }
-    return new _CodexCliSkill({
-      baseDir: loaded.baseDir,
-      relativeDirPath: loaded.relativeDirPath,
-      dirName: loaded.dirName,
+    const fileContent = await readFileContent(skillFilePath);
+    const { frontmatter, body: content } = parseFrontmatter(fileContent);
+    const result = SimulatedSkillFrontmatterSchema.safeParse(frontmatter);
+    if (!result.success) {
+      throw new Error(`Invalid frontmatter in ${skillFilePath}: ${formatError(result.error)}`);
+    }
+    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,
@@ -4739,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(
@@ -4777,92 +4755,193 @@ 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) {
@@ -4885,31 +4964,61 @@ var CopilotSkill = class _CopilotSkill extends SimulatedSkill {
 };
 
 // src/features/skills/cursor-skill.ts
-import { join as join45 } from "path";
+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.");
+      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 _CursorSkill(baseParams);
+  }
+  static fromRulesyncSkill(params) {
+    const baseParams = {
+      ...this.fromRulesyncSkillDefault(params),
+      relativeDirPath: this.getSettablePaths().relativeDirPath
+    };
+    return new _CursorSkill(baseParams);
+  }
+  static isTargetedByRulesyncSkill(rulesyncSkill) {
+    return this.isTargetedByRulesyncSkillDefault({
+      rulesyncSkill,
+      toolTarget: "cursor"
+    });
+  }
+};
+
+// 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("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"
     });
   }
 };
@@ -4919,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() }) {
@@ -4941,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);
       }
@@ -4962,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(),
@@ -5003,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,
@@ -5034,7 +5113,7 @@ var ClaudecodeSkill = class _ClaudecodeSkill extends ToolSkill {
     global: _global = false
   } = {}) {
     return {
-      relativeDirPath: join48(".claude", "skills")
+      relativeDirPath: join49(".claude", "skills")
     };
   }
   getFrontmatter() {
@@ -5121,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({
@@ -5139,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",
@@ -7982,33 +8031,196 @@ var rulesProcessorToolTargets = [
   "windsurf"
 ];
 var RulesProcessorToolTargetSchema = z33.enum(rulesProcessorToolTargets);
-var rulesProcessorToolTargetsGlobal = [
-  "claudecode",
-  "claudecode-legacy",
-  "codexcli",
-  "geminicli"
-];
 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" } }],
-  ["claudecode-legacy", { class: ClaudecodeLegacyRule, 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) {
@@ -8023,6 +8235,7 @@ var RulesProcessor = class extends FeatureProcessor {
   simulateSkills;
   global;
   getFactory;
+  skills;
   constructor({
     baseDir = process.cwd(),
     toolTarget,
@@ -8030,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);
@@ -8045,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;
@@ -8063,153 +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": {
-        return toolRules;
-      }
-      case "claudecode-legacy": {
-        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);
@@ -8394,15 +8562,7 @@ Simulated subagents are specialized AI assistants that can be invoked to handle
 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.
 
 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 ? `## Simulated Skills
-
-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 \`${join82(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 \`${join82(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.` : "";
+    const skillsSection = skills ? this.generateSkillsSection(skills) : "";
     const result = [
       overview,
       ...this.simulateCommands && CommandsProcessor.getToolTargetsSimulated().includes(this.toolTarget) ? [commandsSection] : [],
@@ -8411,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
@@ -8423,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}`);
@@ -8442,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;
@@ -8465,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 });
@@ -8629,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(),
@@ -8652,13 +8831,18 @@ 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
@@ -10226,7 +10410,7 @@ async function mcpCommand({ version }) {
 }
 
 // src/cli/index.ts
-var getVersion = () => "3.32.0";
+var getVersion = () => "3.33.0";
 var main = async () => {
   const program = new Command();
   const version = getVersion();