rulesync 3.28.0 → 3.28.2

package/README.md

@@ -203,7 +203,7 @@ npx rulesync generate --targets claudecode --features rules,subagents
 npx rulesync generate --targets "*" --features rules
 
 # Generate simulated commands and subagents
-npx rulesync generate --targets copilot,cursor,codexcli --features commands,subagents --simulated-commands --simulated-subagents
+npx rulesync generate --targets copilot,cursor,codexcli --features commands,subagents --simulate-commands --simulate-subagents
 
 # Add generated files to .gitignore
 npx rulesync gitignore
@@ -213,11 +213,28 @@ npx rulesync gitignore
 
 You can configure Rulesync by creating a `rulesync.jsonc` file in the root of your project.
 
+### JSON Schema Support
+
+Rulesync provides a JSON Schema for editor validation and autocompletion. Add the `$schema` property to your `rulesync.jsonc`:
+
+```jsonc
+// rulesync.jsonc
+{
+  "$schema": "https://raw.githubusercontent.com/dyoshikawa/rulesync/refs/heads/main/config-schema.json",
+  "targets": ["claudecode"],
+  "features": ["rules"]
+}
+```
+
+### Configuration Options
+
 Example:
 
 ```jsonc
 // rulesync.jsonc
 {
+  "$schema": "https://raw.githubusercontent.com/dyoshikawa/rulesync/refs/heads/main/config-schema.json",
+
   // List of tools to generate configurations for. You can specify "*" to generate all tools.
   "targets": ["cursor", "claudecode", "geminicli", "opencode", "codexcli"],
 
@@ -466,9 +483,9 @@ Simulated commands, subagents and skills allow you to generate simulated feature
     npx rulesync generate \
       --targets copilot,cursor,codexcli \
       --features commands,subagents,skills \
-      --simulated-commands \
-      --simulated-subagents \
-      --simulated-skills
+      --simulate-commands \
+      --simulate-subagents \
+      --simulate-skills
     ```
 3. Use simulated commands, subagents and skills in your prompts.
     - Prompt examples:

package/dist/index.cjs

@@ -290,6 +290,10 @@ var ConfigParamsSchema = import_mini3.z.object({
   experimentalSimulateSubagents: (0, import_mini3.optional)(import_mini3.z.boolean())
 });
 var PartialConfigParamsSchema = import_mini3.z.partial(ConfigParamsSchema);
+var ConfigFileSchema = import_mini3.z.object({
+  $schema: (0, import_mini3.optional)(import_mini3.z.string()),
+  ...import_mini3.z.partial(ConfigParamsSchema).shape
+});
 var RequiredConfigParamsSchema = import_mini3.z.required(ConfigParamsSchema);
 var Config = class {
   baseDirs;
@@ -419,7 +423,9 @@ var ConfigResolver = class {
       try {
         const fileContent = await readFileContent(validatedConfigPath);
         const jsonData = (0, import_jsonc_parser.parse)(fileContent);
-        configByFile = PartialConfigParamsSchema.parse(jsonData);
+        const parsed = ConfigFileSchema.parse(jsonData);
+        const { $schema: _schema, ...configParams2 } = parsed;
+        configByFile = configParams2;
       } catch (error) {
         logger.error(`Failed to load config file: ${formatError(error)}`);
         throw error;
@@ -665,6 +671,13 @@ var AiFile = class {
   setFileContent(newFileContent) {
     this.fileContent = newFileContent;
   }
+  /**
+   * Returns whether this file can be deleted by rulesync.
+   * Override in subclasses that should not be deleted (e.g., user-managed config files).
+   */
+  isDeletable() {
+    return true;
+  }
 };
 
 // src/features/commands/tool-command.ts
@@ -899,7 +912,7 @@ var RulesyncFile = class extends AiFile {
 };
 
 // src/features/commands/rulesync-command.ts
-var RulesyncCommandFrontmatterSchema = import_mini5.z.object({
+var RulesyncCommandFrontmatterSchema = import_mini5.z.looseObject({
   targets: RulesyncTargetsSchema,
   description: import_mini5.z.string()
 });
@@ -1100,7 +1113,7 @@ var AntigravityCommand = class _AntigravityCommand extends ToolCommand {
 // src/features/commands/claudecode-command.ts
 var import_node_path9 = require("path");
 var import_mini7 = require("zod/mini");
-var ClaudecodeCommandFrontmatterSchema = import_mini7.z.object({
+var ClaudecodeCommandFrontmatterSchema = import_mini7.z.looseObject({
   description: import_mini7.z.string()
 });
 var ClaudecodeCommand = class _ClaudecodeCommand extends ToolCommand {
@@ -1134,9 +1147,12 @@ var ClaudecodeCommand = class _ClaudecodeCommand extends ToolCommand {
     return this.frontmatter;
   }
   toRulesyncCommand() {
+    const { description, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["*"],
-      description: this.frontmatter.description
+      description,
+      // Preserve extra fields in claudecode section
+      ...Object.keys(restFields).length > 0 && { claudecode: restFields }
     };
     const fileContent = stringifyFrontmatter(this.body, rulesyncFrontmatter);
     return new RulesyncCommand({
@@ -1157,8 +1173,10 @@ var ClaudecodeCommand = class _ClaudecodeCommand extends ToolCommand {
     global = false
   }) {
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const claudecodeFields = rulesyncFrontmatter.claudecode ?? {};
     const claudecodeFrontmatter = {
-      description: rulesyncFrontmatter.description
+      description: rulesyncFrontmatter.description,
+      ...claudecodeFields
     };
     const body = rulesyncCommand.getBody();
     const paths = this.getSettablePaths({ global });
@@ -1295,7 +1313,7 @@ var CodexcliCommand = class _CodexcliCommand extends ToolCommand {
 // src/features/commands/copilot-command.ts
 var import_node_path11 = require("path");
 var import_mini8 = require("zod/mini");
-var CopilotCommandFrontmatterSchema = import_mini8.z.object({
+var CopilotCommandFrontmatterSchema = import_mini8.z.looseObject({
   mode: import_mini8.z.literal("agent"),
   description: import_mini8.z.string()
 });
@@ -1330,9 +1348,12 @@ var CopilotCommand = class _CopilotCommand extends ToolCommand {
     return this.frontmatter;
   }
   toRulesyncCommand() {
+    const { mode: _mode, description, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["*"],
-      description: this.frontmatter.description
+      description,
+      // Preserve extra fields in copilot section (excluding mode which is fixed)
+      ...Object.keys(restFields).length > 0 && { copilot: restFields }
     };
     const originalFilePath = this.relativeFilePath;
     const relativeFilePath = originalFilePath.replace(/\.prompt\.md$/, ".md");
@@ -1369,9 +1390,11 @@ var CopilotCommand = class _CopilotCommand extends ToolCommand {
   }) {
     const paths = this.getSettablePaths();
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const copilotFields = rulesyncFrontmatter.copilot ?? {};
     const copilotFrontmatter = {
       mode: "agent",
-      description: rulesyncFrontmatter.description
+      description: rulesyncFrontmatter.description,
+      ...copilotFields
     };
     const body = rulesyncCommand.getBody();
     const originalFilePath = rulesyncCommand.getRelativeFilePath();
@@ -1490,7 +1513,7 @@ var CursorCommand = class _CursorCommand extends ToolCommand {
 var import_node_path13 = require("path");
 var import_smol_toml = require("smol-toml");
 var import_mini9 = require("zod/mini");
-var GeminiCliCommandFrontmatterSchema = import_mini9.z.object({
+var GeminiCliCommandFrontmatterSchema = import_mini9.z.looseObject({
   description: import_mini9.z.optional(import_mini9.z.string()),
   prompt: import_mini9.z.string()
 });
@@ -1518,8 +1541,8 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
         );
       }
       return {
-        description: result.data.description || "",
-        prompt: result.data.prompt
+        ...result.data,
+        description: result.data.description || ""
       };
     } catch (error) {
       throw new Error(`Failed to parse TOML command file: ${error}`, { cause: error });
@@ -1535,9 +1558,12 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
     };
   }
   toRulesyncCommand() {
+    const { description, prompt: _prompt, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["geminicli"],
-      description: this.frontmatter.description
+      description: description ?? "",
+      // Preserve extra fields in geminicli section (excluding prompt which is the body)
+      ...Object.keys(restFields).length > 0 && { geminicli: restFields }
     };
     const fileContent = stringifyFrontmatter(this.body, rulesyncFrontmatter);
     return new RulesyncCommand({
@@ -1558,9 +1584,11 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
     global = false
   }) {
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const geminicliFields = rulesyncFrontmatter.geminicli ?? {};
     const geminiFrontmatter = {
       description: rulesyncFrontmatter.description,
-      prompt: rulesyncCommand.getBody()
+      prompt: rulesyncCommand.getBody(),
+      ...geminicliFields
     };
     const tomlContent = `description = "${geminiFrontmatter.description}"
 prompt = """
@@ -1611,7 +1639,7 @@ ${geminiFrontmatter.prompt}
 // src/features/commands/roo-command.ts
 var import_node_path14 = require("path");
 var import_mini10 = require("zod/mini");
-var RooCommandFrontmatterSchema = import_mini10.z.object({
+var RooCommandFrontmatterSchema = import_mini10.z.looseObject({
   description: import_mini10.z.string(),
   "argument-hint": (0, import_mini10.optional)(import_mini10.z.string())
 });
@@ -1646,9 +1674,12 @@ var RooCommand = class _RooCommand extends ToolCommand {
     return this.frontmatter;
   }
   toRulesyncCommand() {
+    const { description, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["roo"],
-      description: this.frontmatter.description
+      description,
+      // Preserve extra fields in roo section
+      ...Object.keys(restFields).length > 0 && { roo: restFields }
     };
     const fileContent = stringifyFrontmatter(this.body, rulesyncFrontmatter);
     return new RulesyncCommand({
@@ -1668,8 +1699,10 @@ var RooCommand = class _RooCommand extends ToolCommand {
     validate = true
   }) {
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const rooFields = rulesyncFrontmatter.roo ?? {};
     const rooFrontmatter = {
-      description: rulesyncFrontmatter.description
+      description: rulesyncFrontmatter.description,
+      ...rooFields
     };
     const body = rulesyncCommand.getBody();
     const fileContent = stringifyFrontmatter(body, rooFrontmatter);
@@ -2304,6 +2337,13 @@ var ClaudecodeIgnore = class _ClaudecodeIgnore extends ToolIgnore {
       relativeFilePath: "settings.local.json"
     };
   }
+  /**
+   * ClaudecodeIgnore uses settings.local.json which is a user-managed config file.
+   * It should not be deleted by rulesync.
+   */
+  isDeletable() {
+    return false;
+  }
   toRulesyncIgnore() {
     const rulesyncPatterns = this.patterns.map((pattern) => {
       if (pattern.startsWith("Read(") && pattern.endsWith(")")) {
@@ -2794,7 +2834,7 @@ var IgnoreProcessor = class extends FeatureProcessor {
     try {
       const toolIgnores = await this.loadToolIgnores();
       if (forDeletion) {
-        return toolIgnores.filter((toolFile) => !(toolFile instanceof ClaudecodeIgnore));
+        return toolIgnores.filter((toolFile) => toolFile.isDeletable());
       }
       return toolIgnores;
     } catch (error) {
@@ -3296,6 +3336,14 @@ var ClaudecodeMcp = class _ClaudecodeMcp extends ToolMcp {
   getJson() {
     return this.json;
   }
+  /**
+   * In global mode, ~/.claude/.claude.json should not be deleted
+   * as it may contain other user settings.
+   * In local mode, .mcp.json can be safely deleted.
+   */
+  isDeletable() {
+    return !this.global;
+  }
   static getSettablePaths({ global } = {}) {
     if (global) {
       return {
@@ -3878,6 +3926,12 @@ var OpencodeMcp = class _OpencodeMcp extends ToolMcp {
   getJson() {
     return this.json;
   }
+  /**
+   * opencode.json may contain other settings, so it should not be deleted.
+   */
+  isDeletable() {
+    return false;
+  }
   static getSettablePaths({ global } = {}) {
     if (global) {
       return {
@@ -4162,11 +4216,7 @@ var McpProcessor = class extends FeatureProcessor {
       })();
       logger.info(`Successfully loaded ${toolMcps.length} ${this.toolTarget} MCP files`);
       if (forDeletion) {
-        let filteredMcps = toolMcps.filter((toolFile) => !(toolFile instanceof OpencodeMcp));
-        if (this.global) {
-          filteredMcps = filteredMcps.filter((toolFile) => !(toolFile instanceof ClaudecodeMcp));
-        }
-        return filteredMcps;
+        return toolMcps.filter((toolFile) => toolFile.isDeletable());
       }
       return toolMcps;
     } catch (error) {
@@ -4547,20 +4597,13 @@ var SimulatedSkill = class extends ToolSkill {
       name: rulesyncFrontmatter.name,
       description: rulesyncFrontmatter.description
     };
-    const otherFiles = rulesyncSkill.getOtherFiles();
-    if (otherFiles.length > 0) {
-      logger.warn(
-        `Skill "${rulesyncFrontmatter.name}" has ${otherFiles.length} additional file(s) that will be ignored for simulated skill generation.`
-      );
-    }
     return {
       baseDir: rulesyncSkill.getBaseDir(),
       relativeDirPath: this.getSettablePaths().relativeDirPath,
       dirName: rulesyncSkill.getDirName(),
       frontmatter: simulatedFrontmatter,
       body: rulesyncSkill.getBody(),
-      otherFiles: [],
-      // Simulated skills ignore otherFiles
+      otherFiles: rulesyncSkill.getOtherFiles(),
       validate
     };
   }
@@ -4582,14 +4625,19 @@ var SimulatedSkill = class extends ToolSkill {
     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: content.trim(),
-      otherFiles: [],
-      // Simulated skills ignore otherFiles
+      otherFiles,
       validate: true
     };
   }
@@ -5603,16 +5651,10 @@ var import_mini24 = require("zod/mini");
 // src/features/subagents/rulesync-subagent.ts
 var import_node_path58 = require("path");
 var import_mini23 = require("zod/mini");
-var RulesyncSubagentModelSchema = import_mini23.z.enum(["opus", "sonnet", "haiku", "inherit"]);
-var RulesyncSubagentFrontmatterSchema = import_mini23.z.object({
+var RulesyncSubagentFrontmatterSchema = import_mini23.z.looseObject({
   targets: RulesyncTargetsSchema,
   name: import_mini23.z.string(),
-  description: import_mini23.z.string(),
-  claudecode: import_mini23.z.optional(
-    import_mini23.z.object({
-      model: RulesyncSubagentModelSchema
-    })
-  )
+  description: import_mini23.z.string()
 });
 var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
   frontmatter;
@@ -5683,7 +5725,7 @@ var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
 };
 
 // src/features/subagents/claudecode-subagent.ts
-var ClaudecodeSubagentFrontmatterSchema = import_mini24.z.object({
+var ClaudecodeSubagentFrontmatterSchema = import_mini24.z.looseObject({
   name: import_mini24.z.string(),
   description: import_mini24.z.string(),
   model: import_mini24.z.optional(import_mini24.z.enum(["opus", "sonnet", "haiku", "inherit"]))
@@ -5718,15 +5760,17 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
     return this.body;
   }
   toRulesyncSubagent() {
+    const { name, description, model, ...restFields } = this.frontmatter;
+    const claudecodeSection = {
+      ...model && { model },
+      ...restFields
+    };
     const rulesyncFrontmatter = {
       targets: ["claudecode"],
-      name: this.frontmatter.name,
-      description: this.frontmatter.description,
-      ...this.frontmatter.model && {
-        claudecode: {
-          model: this.frontmatter.model
-        }
-      }
+      name,
+      description,
+      // Only include claudecode section if there are fields
+      ...Object.keys(claudecodeSection).length > 0 && { claudecode: claudecodeSection }
     };
     return new RulesyncSubagent({
       baseDir: ".",
@@ -5745,11 +5789,17 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
     global = false
   }) {
     const rulesyncFrontmatter = rulesyncSubagent.getFrontmatter();
-    const claudecodeFrontmatter = {
+    const claudecodeSection = rulesyncFrontmatter.claudecode ?? {};
+    const rawClaudecodeFrontmatter = {
       name: rulesyncFrontmatter.name,
       description: rulesyncFrontmatter.description,
-      model: rulesyncFrontmatter.claudecode?.model
+      ...claudecodeSection
     };
+    const result = ClaudecodeSubagentFrontmatterSchema.safeParse(rawClaudecodeFrontmatter);
+    if (!result.success) {
+      throw new Error(`Invalid claudecode subagent frontmatter: ${formatError(result.error)}`);
+    }
+    const claudecodeFrontmatter = result.data;
     const body = rulesyncSubagent.getBody();
     const fileContent = stringifyFrontmatter(body, claudecodeFrontmatter);
     const paths = this.getSettablePaths({ global });
@@ -8638,7 +8688,7 @@ var RulesProcessor = class extends FeatureProcessor {
         `@${rule.getRelativePathFromCwd()} description: "${escapedDescription}" globs: "${globsText}"`
       );
     }
-    return lines.join("\n") + "\n";
+    return lines.join("\n") + "\n\n";
   }
   generateAdditionalConventionsSection({
     commands,
@@ -10218,7 +10268,7 @@ async function mcpCommand({ version }) {
 }
 
 // src/cli/index.ts
-var getVersion = () => "3.28.0";
+var getVersion = () => "3.28.2";
 var main = async () => {
   const program = new import_commander.Command();
   const version = getVersion();

package/dist/index.js

@@ -267,6 +267,10 @@ var ConfigParamsSchema = z3.object({
   experimentalSimulateSubagents: optional(z3.boolean())
 });
 var PartialConfigParamsSchema = z3.partial(ConfigParamsSchema);
+var ConfigFileSchema = z3.object({
+  $schema: optional(z3.string()),
+  ...z3.partial(ConfigParamsSchema).shape
+});
 var RequiredConfigParamsSchema = z3.required(ConfigParamsSchema);
 var Config = class {
   baseDirs;
@@ -396,7 +400,9 @@ var ConfigResolver = class {
       try {
         const fileContent = await readFileContent(validatedConfigPath);
         const jsonData = parseJsonc(fileContent);
-        configByFile = PartialConfigParamsSchema.parse(jsonData);
+        const parsed = ConfigFileSchema.parse(jsonData);
+        const { $schema: _schema, ...configParams2 } = parsed;
+        configByFile = configParams2;
       } catch (error) {
         logger.error(`Failed to load config file: ${formatError(error)}`);
         throw error;
@@ -642,6 +648,13 @@ var AiFile = class {
   setFileContent(newFileContent) {
     this.fileContent = newFileContent;
   }
+  /**
+   * Returns whether this file can be deleted by rulesync.
+   * Override in subclasses that should not be deleted (e.g., user-managed config files).
+   */
+  isDeletable() {
+    return true;
+  }
 };
 
 // src/features/commands/tool-command.ts
@@ -876,7 +889,7 @@ var RulesyncFile = class extends AiFile {
 };
 
 // src/features/commands/rulesync-command.ts
-var RulesyncCommandFrontmatterSchema = z5.object({
+var RulesyncCommandFrontmatterSchema = z5.looseObject({
   targets: RulesyncTargetsSchema,
   description: z5.string()
 });
@@ -1077,7 +1090,7 @@ var AntigravityCommand = class _AntigravityCommand extends ToolCommand {
 // src/features/commands/claudecode-command.ts
 import { basename as basename6, join as join7 } from "path";
 import { z as z7 } from "zod/mini";
-var ClaudecodeCommandFrontmatterSchema = z7.object({
+var ClaudecodeCommandFrontmatterSchema = z7.looseObject({
   description: z7.string()
 });
 var ClaudecodeCommand = class _ClaudecodeCommand extends ToolCommand {
@@ -1111,9 +1124,12 @@ var ClaudecodeCommand = class _ClaudecodeCommand extends ToolCommand {
     return this.frontmatter;
   }
   toRulesyncCommand() {
+    const { description, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["*"],
-      description: this.frontmatter.description
+      description,
+      // Preserve extra fields in claudecode section
+      ...Object.keys(restFields).length > 0 && { claudecode: restFields }
     };
     const fileContent = stringifyFrontmatter(this.body, rulesyncFrontmatter);
     return new RulesyncCommand({
@@ -1134,8 +1150,10 @@ var ClaudecodeCommand = class _ClaudecodeCommand extends ToolCommand {
     global = false
   }) {
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const claudecodeFields = rulesyncFrontmatter.claudecode ?? {};
     const claudecodeFrontmatter = {
-      description: rulesyncFrontmatter.description
+      description: rulesyncFrontmatter.description,
+      ...claudecodeFields
     };
     const body = rulesyncCommand.getBody();
     const paths = this.getSettablePaths({ global });
@@ -1272,7 +1290,7 @@ var CodexcliCommand = class _CodexcliCommand extends ToolCommand {
 // src/features/commands/copilot-command.ts
 import { basename as basename8, join as join9 } from "path";
 import { z as z8 } from "zod/mini";
-var CopilotCommandFrontmatterSchema = z8.object({
+var CopilotCommandFrontmatterSchema = z8.looseObject({
   mode: z8.literal("agent"),
   description: z8.string()
 });
@@ -1307,9 +1325,12 @@ var CopilotCommand = class _CopilotCommand extends ToolCommand {
     return this.frontmatter;
   }
   toRulesyncCommand() {
+    const { mode: _mode, description, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["*"],
-      description: this.frontmatter.description
+      description,
+      // Preserve extra fields in copilot section (excluding mode which is fixed)
+      ...Object.keys(restFields).length > 0 && { copilot: restFields }
     };
     const originalFilePath = this.relativeFilePath;
     const relativeFilePath = originalFilePath.replace(/\.prompt\.md$/, ".md");
@@ -1346,9 +1367,11 @@ var CopilotCommand = class _CopilotCommand extends ToolCommand {
   }) {
     const paths = this.getSettablePaths();
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const copilotFields = rulesyncFrontmatter.copilot ?? {};
     const copilotFrontmatter = {
       mode: "agent",
-      description: rulesyncFrontmatter.description
+      description: rulesyncFrontmatter.description,
+      ...copilotFields
     };
     const body = rulesyncCommand.getBody();
     const originalFilePath = rulesyncCommand.getRelativeFilePath();
@@ -1467,7 +1490,7 @@ var CursorCommand = class _CursorCommand extends ToolCommand {
 import { basename as basename10, join as join11 } from "path";
 import { parse as parseToml } from "smol-toml";
 import { z as z9 } from "zod/mini";
-var GeminiCliCommandFrontmatterSchema = z9.object({
+var GeminiCliCommandFrontmatterSchema = z9.looseObject({
   description: z9.optional(z9.string()),
   prompt: z9.string()
 });
@@ -1495,8 +1518,8 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
         );
       }
       return {
-        description: result.data.description || "",
-        prompt: result.data.prompt
+        ...result.data,
+        description: result.data.description || ""
       };
     } catch (error) {
       throw new Error(`Failed to parse TOML command file: ${error}`, { cause: error });
@@ -1512,9 +1535,12 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
     };
   }
   toRulesyncCommand() {
+    const { description, prompt: _prompt, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["geminicli"],
-      description: this.frontmatter.description
+      description: description ?? "",
+      // Preserve extra fields in geminicli section (excluding prompt which is the body)
+      ...Object.keys(restFields).length > 0 && { geminicli: restFields }
     };
     const fileContent = stringifyFrontmatter(this.body, rulesyncFrontmatter);
     return new RulesyncCommand({
@@ -1535,9 +1561,11 @@ var GeminiCliCommand = class _GeminiCliCommand extends ToolCommand {
     global = false
   }) {
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const geminicliFields = rulesyncFrontmatter.geminicli ?? {};
     const geminiFrontmatter = {
       description: rulesyncFrontmatter.description,
-      prompt: rulesyncCommand.getBody()
+      prompt: rulesyncCommand.getBody(),
+      ...geminicliFields
     };
     const tomlContent = `description = "${geminiFrontmatter.description}"
 prompt = """
@@ -1588,7 +1616,7 @@ ${geminiFrontmatter.prompt}
 // src/features/commands/roo-command.ts
 import { basename as basename11, join as join12 } from "path";
 import { optional as optional2, z as z10 } from "zod/mini";
-var RooCommandFrontmatterSchema = z10.object({
+var RooCommandFrontmatterSchema = z10.looseObject({
   description: z10.string(),
   "argument-hint": optional2(z10.string())
 });
@@ -1623,9 +1651,12 @@ var RooCommand = class _RooCommand extends ToolCommand {
     return this.frontmatter;
   }
   toRulesyncCommand() {
+    const { description, ...restFields } = this.frontmatter;
     const rulesyncFrontmatter = {
       targets: ["roo"],
-      description: this.frontmatter.description
+      description,
+      // Preserve extra fields in roo section
+      ...Object.keys(restFields).length > 0 && { roo: restFields }
     };
     const fileContent = stringifyFrontmatter(this.body, rulesyncFrontmatter);
     return new RulesyncCommand({
@@ -1645,8 +1676,10 @@ var RooCommand = class _RooCommand extends ToolCommand {
     validate = true
   }) {
     const rulesyncFrontmatter = rulesyncCommand.getFrontmatter();
+    const rooFields = rulesyncFrontmatter.roo ?? {};
     const rooFrontmatter = {
-      description: rulesyncFrontmatter.description
+      description: rulesyncFrontmatter.description,
+      ...rooFields
     };
     const body = rulesyncCommand.getBody();
     const fileContent = stringifyFrontmatter(body, rooFrontmatter);
@@ -2281,6 +2314,13 @@ var ClaudecodeIgnore = class _ClaudecodeIgnore extends ToolIgnore {
       relativeFilePath: "settings.local.json"
     };
   }
+  /**
+   * ClaudecodeIgnore uses settings.local.json which is a user-managed config file.
+   * It should not be deleted by rulesync.
+   */
+  isDeletable() {
+    return false;
+  }
   toRulesyncIgnore() {
     const rulesyncPatterns = this.patterns.map((pattern) => {
       if (pattern.startsWith("Read(") && pattern.endsWith(")")) {
@@ -2771,7 +2811,7 @@ var IgnoreProcessor = class extends FeatureProcessor {
     try {
       const toolIgnores = await this.loadToolIgnores();
       if (forDeletion) {
-        return toolIgnores.filter((toolFile) => !(toolFile instanceof ClaudecodeIgnore));
+        return toolIgnores.filter((toolFile) => toolFile.isDeletable());
       }
       return toolIgnores;
     } catch (error) {
@@ -3273,6 +3313,14 @@ var ClaudecodeMcp = class _ClaudecodeMcp extends ToolMcp {
   getJson() {
     return this.json;
   }
+  /**
+   * In global mode, ~/.claude/.claude.json should not be deleted
+   * as it may contain other user settings.
+   * In local mode, .mcp.json can be safely deleted.
+   */
+  isDeletable() {
+    return !this.global;
+  }
   static getSettablePaths({ global } = {}) {
     if (global) {
       return {
@@ -3855,6 +3903,12 @@ var OpencodeMcp = class _OpencodeMcp extends ToolMcp {
   getJson() {
     return this.json;
   }
+  /**
+   * opencode.json may contain other settings, so it should not be deleted.
+   */
+  isDeletable() {
+    return false;
+  }
   static getSettablePaths({ global } = {}) {
     if (global) {
       return {
@@ -4139,11 +4193,7 @@ var McpProcessor = class extends FeatureProcessor {
       })();
       logger.info(`Successfully loaded ${toolMcps.length} ${this.toolTarget} MCP files`);
       if (forDeletion) {
-        let filteredMcps = toolMcps.filter((toolFile) => !(toolFile instanceof OpencodeMcp));
-        if (this.global) {
-          filteredMcps = filteredMcps.filter((toolFile) => !(toolFile instanceof ClaudecodeMcp));
-        }
-        return filteredMcps;
+        return toolMcps.filter((toolFile) => toolFile.isDeletable());
       }
       return toolMcps;
     } catch (error) {
@@ -4524,20 +4574,13 @@ var SimulatedSkill = class extends ToolSkill {
       name: rulesyncFrontmatter.name,
       description: rulesyncFrontmatter.description
     };
-    const otherFiles = rulesyncSkill.getOtherFiles();
-    if (otherFiles.length > 0) {
-      logger.warn(
-        `Skill "${rulesyncFrontmatter.name}" has ${otherFiles.length} additional file(s) that will be ignored for simulated skill generation.`
-      );
-    }
     return {
       baseDir: rulesyncSkill.getBaseDir(),
       relativeDirPath: this.getSettablePaths().relativeDirPath,
       dirName: rulesyncSkill.getDirName(),
       frontmatter: simulatedFrontmatter,
       body: rulesyncSkill.getBody(),
-      otherFiles: [],
-      // Simulated skills ignore otherFiles
+      otherFiles: rulesyncSkill.getOtherFiles(),
       validate
     };
   }
@@ -4559,14 +4602,19 @@ var SimulatedSkill = class extends ToolSkill {
     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: content.trim(),
-      otherFiles: [],
-      // Simulated skills ignore otherFiles
+      otherFiles,
       validate: true
     };
   }
@@ -5580,16 +5628,10 @@ import { z as z24 } from "zod/mini";
 // src/features/subagents/rulesync-subagent.ts
 import { basename as basename16, join as join56 } from "path";
 import { z as z23 } from "zod/mini";
-var RulesyncSubagentModelSchema = z23.enum(["opus", "sonnet", "haiku", "inherit"]);
-var RulesyncSubagentFrontmatterSchema = z23.object({
+var RulesyncSubagentFrontmatterSchema = z23.looseObject({
   targets: RulesyncTargetsSchema,
   name: z23.string(),
-  description: z23.string(),
-  claudecode: z23.optional(
-    z23.object({
-      model: RulesyncSubagentModelSchema
-    })
-  )
+  description: z23.string()
 });
 var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
   frontmatter;
@@ -5660,7 +5702,7 @@ var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
 };
 
 // src/features/subagents/claudecode-subagent.ts
-var ClaudecodeSubagentFrontmatterSchema = z24.object({
+var ClaudecodeSubagentFrontmatterSchema = z24.looseObject({
   name: z24.string(),
   description: z24.string(),
   model: z24.optional(z24.enum(["opus", "sonnet", "haiku", "inherit"]))
@@ -5695,15 +5737,17 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
     return this.body;
   }
   toRulesyncSubagent() {
+    const { name, description, model, ...restFields } = this.frontmatter;
+    const claudecodeSection = {
+      ...model && { model },
+      ...restFields
+    };
     const rulesyncFrontmatter = {
       targets: ["claudecode"],
-      name: this.frontmatter.name,
-      description: this.frontmatter.description,
-      ...this.frontmatter.model && {
-        claudecode: {
-          model: this.frontmatter.model
-        }
-      }
+      name,
+      description,
+      // Only include claudecode section if there are fields
+      ...Object.keys(claudecodeSection).length > 0 && { claudecode: claudecodeSection }
     };
     return new RulesyncSubagent({
       baseDir: ".",
@@ -5722,11 +5766,17 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
     global = false
   }) {
     const rulesyncFrontmatter = rulesyncSubagent.getFrontmatter();
-    const claudecodeFrontmatter = {
+    const claudecodeSection = rulesyncFrontmatter.claudecode ?? {};
+    const rawClaudecodeFrontmatter = {
       name: rulesyncFrontmatter.name,
       description: rulesyncFrontmatter.description,
-      model: rulesyncFrontmatter.claudecode?.model
+      ...claudecodeSection
     };
+    const result = ClaudecodeSubagentFrontmatterSchema.safeParse(rawClaudecodeFrontmatter);
+    if (!result.success) {
+      throw new Error(`Invalid claudecode subagent frontmatter: ${formatError(result.error)}`);
+    }
+    const claudecodeFrontmatter = result.data;
     const body = rulesyncSubagent.getBody();
     const fileContent = stringifyFrontmatter(body, claudecodeFrontmatter);
     const paths = this.getSettablePaths({ global });
@@ -8615,7 +8665,7 @@ var RulesProcessor = class extends FeatureProcessor {
         `@${rule.getRelativePathFromCwd()} description: "${escapedDescription}" globs: "${globsText}"`
       );
     }
-    return lines.join("\n") + "\n";
+    return lines.join("\n") + "\n\n";
   }
   generateAdditionalConventionsSection({
     commands,
@@ -10195,7 +10245,7 @@ async function mcpCommand({ version }) {
 }
 
 // src/cli/index.ts
-var getVersion = () => "3.28.0";
+var getVersion = () => "3.28.2";
 var main = async () => {
   const program = new Command();
   const version = getVersion();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rulesync",
-  "version": "3.28.0",
+  "version": "3.28.2",
   "description": "Unified AI rules management CLI tool that generates configuration files for various AI development tools",
   "keywords": [
     "ai",
@@ -49,15 +49,15 @@
     "zod": "4.1.13"
   },
   "devDependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.1.53",
-    "@biomejs/biome": "2.3.7",
+    "@anthropic-ai/claude-agent-sdk": "0.1.55",
+    "@biomejs/biome": "2.3.8",
     "@eslint/js": "9.39.1",
     "@secretlint/secretlint-rule-preset-recommend": "11.2.5",
     "@tsconfig/node24": "24.0.3",
     "@types/js-yaml": "4.0.9",
     "@types/node": "24.10.1",
-    "@typescript/native-preview": "7.0.0-dev.20251125.1",
-    "@vitest/coverage-v8": "4.0.13",
+    "@typescript/native-preview": "7.0.0-dev.20251130.1",
+    "@vitest/coverage-v8": "4.0.14",
     "cspell": "9.3.2",
     "eslint": "9.39.1",
     "eslint-plugin-import": "2.32.0",
@@ -70,12 +70,12 @@
     "oxlint": "1.30.0",
     "secretlint": "11.2.5",
     "simple-git-hooks": "2.13.1",
-    "sort-package-json": "3.4.0",
+    "sort-package-json": "3.5.0",
     "tsup": "8.5.1",
-    "tsx": "4.20.6",
+    "tsx": "4.21.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.48.0",
-    "vitest": "4.0.13"
+    "vitest": "4.0.14"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -98,6 +98,7 @@
     "eslint:fix": "eslint . --fix --max-warnings 0 --cache",
     "fix": "pnpm run bcheck:fix && pnpm run oxlint:fix && pnpm run eslint:fix",
     "generate": "pnpm run dev generate",
+    "generate:schema": "tsx scripts/generate-json-schema.ts",
     "knip": "knip",
     "oxlint": "oxlint . --max-warnings 0",
     "oxlint:fix": "oxlint . --fix --max-warnings 0",