rulesync 7.15.2 → 7.17.0

package/README.md

@@ -71,7 +71,7 @@ See [Quick Start guide](https://dyoshikawa.github.io/rulesync/getting-started/qu
 | Gemini CLI         | geminicli    | ✅ 🌏 |   ✅   |  ✅ 🌏   |  ✅ 🌏   |    🎮     | ✅ 🌏  | ✅ 🌏 |
 | Goose              | goose        | ✅ 🌏 |   ✅   |          |          |           |        |       |
 | GitHub Copilot     | copilot      | ✅ 🌏 |        |    ✅    |    ✅    |    ✅     |   ✅   |  ✅   |
-| Cursor             | cursor       |  ✅   |   ✅   |    ✅    |  ✅ 🌏   |   ✅ 🌏   | ✅ 🌏  |  ✅   |
+| Cursor             | cursor       |  ✅   |   ✅   |  ✅ 🌏   |  ✅ 🌏   |   ✅ 🌏   | ✅ 🌏  |  ✅   |
 | Factory Droid      | factorydroid | ✅ 🌏 |        |  ✅ 🌏   |  ✅ 🌏   |   ✅ 🌏   | ✅ 🌏  | ✅ 🌏 |
 | OpenCode           | opencode     | ✅ 🌏 |        | ✅ 🌏 🔧 |  ✅ 🌏   |   ✅ 🌏   | ✅ 🌏  | ✅ 🌏 |
 | Cline              | cline        |  ✅   |   ✅   |    ✅    |  ✅ 🌏   |           | ✅ 🌏  |       |

package/dist/{chunk-WY325EI7.js → chunk-ZQUEAGJI.js}

@@ -157,6 +157,8 @@ var RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH = join(
 var RULESYNC_SOURCES_LOCK_RELATIVE_FILE_PATH = "rulesync.lock";
 var RULESYNC_MCP_FILE_NAME = "mcp.json";
 var RULESYNC_HOOKS_FILE_NAME = "hooks.json";
+var RULESYNC_CONFIG_SCHEMA_URL = "https://github.com/dyoshikawa/rulesync/releases/latest/download/config-schema.json";
+var RULESYNC_MCP_SCHEMA_URL = "https://github.com/dyoshikawa/rulesync/releases/latest/download/mcp-schema.json";
 var MAX_FILE_SIZE = 10 * 1024 * 1024;
 var FETCH_CONCURRENCY_LIMIT = 10;
 
@@ -342,13 +344,22 @@ async function removeTempDirectory(tempDir) {
 // src/config/config.ts
 import { isAbsolute } from "path";
 import { minLength, optional, refine, z as z3 } from "zod/mini";
-function hasControlCharacters(value) {
+
+// src/utils/validation.ts
+function findControlCharacter(value) {
   for (let i = 0; i < value.length; i++) {
     const code = value.charCodeAt(i);
-    if (code >= 0 && code <= 31 || code === 127) return true;
+    if (code >= 0 && code <= 31 || code === 127) {
+      return { position: i, hex: `0x${code.toString(16).padStart(2, "0")}` };
+    }
   }
-  return false;
+  return null;
 }
+function hasControlCharacters(value) {
+  return findControlCharacter(value) !== null;
+}
+
+// src/config/config.ts
 var SourceEntrySchema = z3.object({
   source: z3.string().check(minLength(1, "source must be a non-empty string")),
   skills: optional(z3.array(z3.string())),
@@ -728,6 +739,7 @@ import { join as join5 } from "path";
 
 // src/utils/frontmatter.ts
 import matter from "gray-matter";
+import { dump, load } from "js-yaml";
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") return false;
   const prototype = Object.getPrototypeOf(value);
@@ -766,8 +778,55 @@ function deepRemoveNullishObject(obj) {
   }
   return result;
 }
-function stringifyFrontmatter(body, frontmatter) {
-  const cleanFrontmatter = deepRemoveNullishObject(frontmatter);
+function deepFlattenStringsValue(value) {
+  if (value === null || value === void 0) {
+    return void 0;
+  }
+  if (typeof value === "string") {
+    return value.replace(/\n+/g, " ").trim();
+  }
+  if (Array.isArray(value)) {
+    const cleanedArray = value.map((item) => deepFlattenStringsValue(item)).filter((item) => item !== void 0);
+    return cleanedArray;
+  }
+  if (isPlainObject(value)) {
+    const result = {};
+    for (const [key, val] of Object.entries(value)) {
+      const cleaned = deepFlattenStringsValue(val);
+      if (cleaned !== void 0) {
+        result[key] = cleaned;
+      }
+    }
+    return result;
+  }
+  return value;
+}
+function deepFlattenStringsObject(obj) {
+  if (!obj || typeof obj !== "object") {
+    return {};
+  }
+  const result = {};
+  for (const [key, val] of Object.entries(obj)) {
+    const cleaned = deepFlattenStringsValue(val);
+    if (cleaned !== void 0) {
+      result[key] = cleaned;
+    }
+  }
+  return result;
+}
+function stringifyFrontmatter(body, frontmatter, options) {
+  const { avoidBlockScalars = false } = options ?? {};
+  const cleanFrontmatter = avoidBlockScalars ? deepFlattenStringsObject(frontmatter) : deepRemoveNullishObject(frontmatter);
+  if (avoidBlockScalars) {
+    return matter.stringify(body, cleanFrontmatter, {
+      engines: {
+        yaml: {
+          parse: (input) => load(input) ?? {},
+          stringify: (data) => dump(data, { lineWidth: -1 })
+        }
+      }
+    });
+  }
   return matter.stringify(body, cleanFrontmatter);
 }
 function parseFrontmatter(content, filePath) {
@@ -1886,7 +1945,7 @@ var CursorCommand = class _CursorCommand extends ToolCommand {
     }
     super({
       ...rest,
-      fileContent: stringifyFrontmatter(body, frontmatter)
+      fileContent: stringifyFrontmatter(body, frontmatter, { avoidBlockScalars: true })
     });
     this.frontmatter = frontmatter;
     this.body = body;
@@ -5684,7 +5743,7 @@ import { z as z20 } from "zod/mini";
 
 // src/types/mcp.ts
 import { z as z19 } from "zod/mini";
-var McpServerSchema = z19.object({
+var McpServerSchema = z19.looseObject({
   type: z19.optional(z19.enum(["stdio", "sse", "http"])),
   command: z19.optional(z19.union([z19.string(), z19.array(z19.string())])),
   args: z19.optional(z19.array(z19.string())),
@@ -5716,6 +5775,10 @@ var RulesyncMcpServerSchema = z20.extend(McpServerSchema, {
 var RulesyncMcpConfigSchema = z20.object({
   mcpServers: z20.record(z20.string(), RulesyncMcpServerSchema)
 });
+var RulesyncMcpFileSchema = z20.looseObject({
+  $schema: z20.optional(z20.string()),
+  ...RulesyncMcpConfigSchema.shape
+});
 var RulesyncMcp = class _RulesyncMcp extends RulesyncFile {
   json;
   constructor(params) {
@@ -5741,7 +5804,7 @@ var RulesyncMcp = class _RulesyncMcp extends RulesyncFile {
     };
   }
   validate() {
-    const result = RulesyncMcpConfigSchema.safeParse(this.json);
+    const result = RulesyncMcpFileSchema.safeParse(this.json);
     if (!result.success) {
       return { success: false, error: result.error };
     }
@@ -5844,11 +5907,17 @@ var ToolMcp = class extends ToolFile {
   toRulesyncMcpDefault({
     fileContent = void 0
   } = {}) {
+    const content = fileContent ?? this.fileContent;
+    const { $schema: _, ...json } = JSON.parse(content);
+    const withSchema = {
+      $schema: RULESYNC_MCP_SCHEMA_URL,
+      ...json
+    };
     return new RulesyncMcp({
       baseDir: this.baseDir,
       relativeDirPath: RULESYNC_RELATIVE_DIR_PATH,
-      relativeFilePath: ".mcp.json",
-      fileContent: fileContent ?? this.fileContent
+      relativeFilePath: RULESYNC_MCP_FILE_NAME,
+      fileContent: JSON.stringify(withSchema, null, 2)
     });
   }
   static async fromFile(_params) {
@@ -6151,10 +6220,7 @@ var CodexcliMcp = class _CodexcliMcp extends ToolMcp {
   toRulesyncMcp() {
     const mcpServers = this.toml.mcp_servers ?? {};
     const converted = convertFromCodexFormat(mcpServers);
-    return new RulesyncMcp({
-      baseDir: this.baseDir,
-      relativeDirPath: RULESYNC_RELATIVE_DIR_PATH,
-      relativeFilePath: ".mcp.json",
+    return this.toRulesyncMcpDefault({
       fileContent: JSON.stringify({ mcpServers: converted }, null, 2)
     });
   }
@@ -6312,12 +6378,26 @@ var CursorMcp = class _CursorMcp extends ToolMcp {
   json;
   constructor(params) {
     super(params);
-    this.json = this.fileContent !== void 0 ? JSON.parse(this.fileContent) : {};
+    if (this.fileContent !== void 0) {
+      try {
+        this.json = JSON.parse(this.fileContent);
+      } catch (error) {
+        throw new Error(
+          `Failed to parse Cursor MCP config at ${join46(this.relativeDirPath, this.relativeFilePath)}: ${formatError(error)}`,
+          { cause: error }
+        );
+      }
+    } else {
+      this.json = {};
+    }
   }
   getJson() {
     return this.json;
   }
-  static getSettablePaths() {
+  isDeletable() {
+    return !this.global;
+  }
+  static getSettablePaths(_options) {
     return {
       relativeDirPath: ".cursor",
       relativeFilePath: "mcp.json"
@@ -6325,41 +6405,62 @@ var CursorMcp = class _CursorMcp extends ToolMcp {
   }
   static async fromFile({
     baseDir = process.cwd(),
-    validate = true
+    validate = true,
+    global = false
   }) {
-    const fileContent = await readFileContent(
-      join46(
-        baseDir,
-        this.getSettablePaths().relativeDirPath,
-        this.getSettablePaths().relativeFilePath
-      )
-    );
+    const paths = this.getSettablePaths({ global });
+    const filePath = join46(baseDir, paths.relativeDirPath, paths.relativeFilePath);
+    const fileContent = await readFileContentOrNull(filePath) ?? '{"mcpServers":{}}';
+    let json;
+    try {
+      json = JSON.parse(fileContent);
+    } catch (error) {
+      throw new Error(
+        `Failed to parse Cursor MCP config at ${join46(paths.relativeDirPath, paths.relativeFilePath)}: ${formatError(error)}`,
+        { cause: error }
+      );
+    }
+    const newJson = { ...json, mcpServers: json.mcpServers ?? {} };
     return new _CursorMcp({
       baseDir,
-      relativeDirPath: this.getSettablePaths().relativeDirPath,
-      relativeFilePath: this.getSettablePaths().relativeFilePath,
-      fileContent,
-      validate
+      relativeDirPath: paths.relativeDirPath,
+      relativeFilePath: paths.relativeFilePath,
+      fileContent: JSON.stringify(newJson, null, 2),
+      validate,
+      global
     });
   }
-  static fromRulesyncMcp({
+  static async fromRulesyncMcp({
     baseDir = process.cwd(),
     rulesyncMcp,
-    validate = true
+    validate = true,
+    global = false
   }) {
-    const json = rulesyncMcp.getJson();
-    const mcpServers = isMcpServers(json.mcpServers) ? json.mcpServers : {};
+    const paths = this.getSettablePaths({ global });
+    const fileContent = await readOrInitializeFileContent(
+      join46(baseDir, paths.relativeDirPath, paths.relativeFilePath),
+      JSON.stringify({ mcpServers: {} }, null, 2)
+    );
+    let json;
+    try {
+      json = JSON.parse(fileContent);
+    } catch (error) {
+      throw new Error(
+        `Failed to parse Cursor MCP config at ${join46(paths.relativeDirPath, paths.relativeFilePath)}: ${formatError(error)}`,
+        { cause: error }
+      );
+    }
+    const rulesyncJson = rulesyncMcp.getJson();
+    const mcpServers = isMcpServers(rulesyncJson.mcpServers) ? rulesyncJson.mcpServers : {};
     const transformedServers = convertEnvToCursorFormat(mcpServers);
-    const cursorConfig = {
-      mcpServers: transformedServers
-    };
-    const fileContent = JSON.stringify(cursorConfig, null, 2);
+    const cursorConfig = { ...json, mcpServers: transformedServers };
     return new _CursorMcp({
       baseDir,
-      relativeDirPath: this.getSettablePaths().relativeDirPath,
-      relativeFilePath: this.getSettablePaths().relativeFilePath,
-      fileContent,
-      validate
+      relativeDirPath: paths.relativeDirPath,
+      relativeFilePath: paths.relativeFilePath,
+      fileContent: JSON.stringify(cursorConfig, null, 2),
+      validate,
+      global
     });
   }
   toRulesyncMcp() {
@@ -6369,12 +6470,8 @@ var CursorMcp = class _CursorMcp extends ToolMcp {
       ...this.json,
       mcpServers: transformedServers
     };
-    return new RulesyncMcp({
-      baseDir: this.baseDir,
-      relativeDirPath: this.relativeDirPath,
-      relativeFilePath: "rulesync.mcp.json",
-      fileContent: JSON.stringify(transformedJson),
-      validate: true
+    return this.toRulesyncMcpDefault({
+      fileContent: JSON.stringify(transformedJson, null, 2)
     });
   }
   validate() {
@@ -6383,14 +6480,16 @@ var CursorMcp = class _CursorMcp extends ToolMcp {
   static forDeletion({
     baseDir = process.cwd(),
     relativeDirPath,
-    relativeFilePath
+    relativeFilePath,
+    global = false
   }) {
     return new _CursorMcp({
       baseDir,
       relativeDirPath,
       relativeFilePath,
       fileContent: "{}",
-      validate: false
+      validate: false,
+      global
     });
   }
 };
@@ -6450,13 +6549,7 @@ var FactorydroidMcp = class _FactorydroidMcp extends ToolMcp {
     });
   }
   toRulesyncMcp() {
-    return new RulesyncMcp({
-      baseDir: this.baseDir,
-      relativeDirPath: this.relativeDirPath,
-      relativeFilePath: "rulesync.mcp.json",
-      fileContent: JSON.stringify(this.json),
-      validate: true
-    });
+    return this.toRulesyncMcpDefault();
   }
   validate() {
     return { success: true, error: null };
@@ -7219,7 +7312,7 @@ var toolMcpFactories = /* @__PURE__ */ new Map([
       class: CursorMcp,
       meta: {
         supportsProject: true,
-        supportsGlobal: false,
+        supportsGlobal: true,
         supportsEnabledTools: false,
         supportsDisabledTools: false
       }
@@ -7932,9 +8025,15 @@ import { join as join59 } from "path";
 var DirFeatureProcessor = class {
   baseDir;
   dryRun;
-  constructor({ baseDir = process.cwd(), dryRun = false }) {
+  avoidBlockScalars;
+  constructor({
+    baseDir = process.cwd(),
+    dryRun = false,
+    avoidBlockScalars = false
+  }) {
     this.baseDir = baseDir;
     this.dryRun = dryRun;
+    this.avoidBlockScalars = avoidBlockScalars;
   }
   /**
    * Return tool targets that this feature supports.
@@ -7960,7 +8059,9 @@ var DirFeatureProcessor = class {
       let mainFileContent;
       if (mainFile) {
         const mainFilePath = join59(dirPath, mainFile.name);
-        const content = stringifyFrontmatter(mainFile.body, mainFile.frontmatter);
+        const content = stringifyFrontmatter(mainFile.body, mainFile.frontmatter, {
+          avoidBlockScalars: this.avoidBlockScalars
+        });
         mainFileContent = addTrailingNewline(content);
         const existingContent = await readFileContentOrNull(mainFilePath);
         if (existingContent !== mainFileContent) {
@@ -10699,7 +10800,7 @@ var SkillsProcessor = class extends DirFeatureProcessor {
     getFactory = defaultGetFactory4,
     dryRun = false
   }) {
-    super({ baseDir, dryRun });
+    super({ baseDir, dryRun, avoidBlockScalars: toolTarget === "cursor" });
     const result = SkillsProcessorToolTargetSchema.safeParse(toolTarget);
     if (!result.success) {
       throw new Error(
@@ -11780,7 +11881,7 @@ var CursorSubagent = class _CursorSubagent extends ToolSubagent {
       ...cursorSection
     };
     const body = rulesyncSubagent.getBody();
-    const fileContent = stringifyFrontmatter(body, cursorFrontmatter);
+    const fileContent = stringifyFrontmatter(body, cursorFrontmatter, { avoidBlockScalars: true });
     const paths = this.getSettablePaths({ global });
     return new _CursorSubagent({
       baseDir,
@@ -16894,6 +16995,8 @@ export {
   RULESYNC_SOURCES_LOCK_RELATIVE_FILE_PATH,
   RULESYNC_MCP_FILE_NAME,
   RULESYNC_HOOKS_FILE_NAME,
+  RULESYNC_CONFIG_SCHEMA_URL,
+  RULESYNC_MCP_SCHEMA_URL,
   MAX_FILE_SIZE,
   FETCH_CONCURRENCY_LIMIT,
   formatError,
@@ -16915,6 +17018,7 @@ export {
   ALL_FEATURES,
   ALL_FEATURES_WITH_WILDCARD,
   ALL_TOOL_TARGETS,
+  findControlCharacter,
   ConfigResolver,
   stringifyFrontmatter,
   RulesyncCommandFrontmatterSchema,