rulesync 7.15.2 → 7.17.0

package/dist/index.cjs

@@ -60,6 +60,8 @@ var RULESYNC_CURATED_SKILLS_RELATIVE_DIR_PATH = (0, import_node_path.join)(
   RULESYNC_SKILLS_RELATIVE_DIR_PATH,
   ".curated"
 );
+var RULESYNC_MCP_FILE_NAME = "mcp.json";
+var RULESYNC_MCP_SCHEMA_URL = "https://github.com/dyoshikawa/rulesync/releases/latest/download/mcp-schema.json";
 var MAX_FILE_SIZE = 10 * 1024 * 1024;
 
 // src/utils/error.ts
@@ -351,14 +353,21 @@ var ToolTargetSchema = import_mini2.z.enum(ALL_TOOL_TARGETS);
 var ToolTargetsSchema = import_mini2.z.array(ToolTargetSchema);
 var RulesyncTargetsSchema = import_mini2.z.array(import_mini2.z.enum(ALL_TOOL_TARGETS_WITH_WILDCARD));
 
-// src/config/config.ts
-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 = import_mini3.z.object({
   source: import_mini3.z.string().check((0, import_mini3.minLength)(1, "source must be a non-empty string")),
   skills: (0, import_mini3.optional)(import_mini3.z.array(import_mini3.z.string())),
@@ -738,6 +747,7 @@ var import_node_path7 = require("path");
 
 // src/utils/frontmatter.ts
 var import_gray_matter = __toESM(require("gray-matter"), 1);
+var import_js_yaml = require("js-yaml");
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") return false;
   const prototype = Object.getPrototypeOf(value);
@@ -776,8 +786,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 import_gray_matter.default.stringify(body, cleanFrontmatter, {
+      engines: {
+        yaml: {
+          parse: (input) => (0, import_js_yaml.load)(input) ?? {},
+          stringify: (data) => (0, import_js_yaml.dump)(data, { lineWidth: -1 })
+        }
+      }
+    });
+  }
   return import_gray_matter.default.stringify(body, cleanFrontmatter);
 }
 function parseFrontmatter(content, filePath) {
@@ -1896,7 +1953,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;
@@ -5694,7 +5751,7 @@ var import_mini20 = require("zod/mini");
 
 // src/types/mcp.ts
 var import_mini19 = require("zod/mini");
-var McpServerSchema = import_mini19.z.object({
+var McpServerSchema = import_mini19.z.looseObject({
   type: import_mini19.z.optional(import_mini19.z.enum(["stdio", "sse", "http"])),
   command: import_mini19.z.optional(import_mini19.z.union([import_mini19.z.string(), import_mini19.z.array(import_mini19.z.string())])),
   args: import_mini19.z.optional(import_mini19.z.array(import_mini19.z.string())),
@@ -5726,6 +5783,10 @@ var RulesyncMcpServerSchema = import_mini20.z.extend(McpServerSchema, {
 var RulesyncMcpConfigSchema = import_mini20.z.object({
   mcpServers: import_mini20.z.record(import_mini20.z.string(), RulesyncMcpServerSchema)
 });
+var RulesyncMcpFileSchema = import_mini20.z.looseObject({
+  $schema: import_mini20.z.optional(import_mini20.z.string()),
+  ...RulesyncMcpConfigSchema.shape
+});
 var RulesyncMcp = class _RulesyncMcp extends RulesyncFile {
   json;
   constructor(params) {
@@ -5751,7 +5812,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 };
     }
@@ -5854,11 +5915,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) {
@@ -6161,10 +6228,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)
     });
   }
@@ -6322,12 +6386,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 ${(0, import_node_path48.join)(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"
@@ -6335,41 +6413,62 @@ var CursorMcp = class _CursorMcp extends ToolMcp {
   }
   static async fromFile({
     baseDir = process.cwd(),
-    validate = true
+    validate = true,
+    global = false
   }) {
-    const fileContent = await readFileContent(
-      (0, import_node_path48.join)(
-        baseDir,
-        this.getSettablePaths().relativeDirPath,
-        this.getSettablePaths().relativeFilePath
-      )
-    );
+    const paths = this.getSettablePaths({ global });
+    const filePath = (0, import_node_path48.join)(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 ${(0, import_node_path48.join)(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(
+      (0, import_node_path48.join)(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 ${(0, import_node_path48.join)(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() {
@@ -6379,12 +6478,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() {
@@ -6393,14 +6488,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
     });
   }
 };
@@ -6460,13 +6557,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 };
@@ -7229,7 +7320,7 @@ var toolMcpFactories = /* @__PURE__ */ new Map([
       class: CursorMcp,
       meta: {
         supportsProject: true,
-        supportsGlobal: false,
+        supportsGlobal: true,
         supportsEnabledTools: false,
         supportsDisabledTools: false
       }
@@ -7942,9 +8033,15 @@ var import_node_path61 = require("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.
@@ -7970,7 +8067,9 @@ var DirFeatureProcessor = class {
       let mainFileContent;
       if (mainFile) {
         const mainFilePath = (0, import_node_path61.join)(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) {
@@ -10709,7 +10808,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(
@@ -11790,7 +11889,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,

package/dist/index.js

@@ -6,7 +6,7 @@ import {
   generate,
   importFromTool,
   logger
-} from "./chunk-WY325EI7.js";
+} from "./chunk-ZQUEAGJI.js";
 
 // src/index.ts
 async function generate2(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rulesync",
-  "version": "7.15.2",
+  "version": "7.17.0",
   "description": "Unified AI rules management CLI tool that generates configuration files for various AI development tools",
   "keywords": [
     "ai",