rulesync 0.60.0 → 0.62.0

package/dist/index.cjs

@@ -35,11 +35,11 @@ function isToolTarget(target) {
   if (!target) return false;
   return ALL_TOOL_TARGETS.some((validTarget) => validTarget === target);
 }
-var import_mini, ALL_TOOL_TARGETS, ToolTargetSchema, ToolTargetsSchema, WildcardTargetSchema, RulesyncTargetsSchema;
+var import_mini3, ALL_TOOL_TARGETS, ToolTargetSchema, ToolTargetsSchema, WildcardTargetSchema, RulesyncTargetsSchema;
 var init_tool_targets = __esm({
   "src/types/tool-targets.ts"() {
     "use strict";
-    import_mini = require("zod/mini");
+    import_mini3 = require("zod/mini");
     ALL_TOOL_TARGETS = [
       "augmentcode",
       "augmentcode-legacy",
@@ -54,10 +54,10 @@ var init_tool_targets = __esm({
       "junie",
       "windsurf"
     ];
-    ToolTargetSchema = import_mini.z.enum(ALL_TOOL_TARGETS);
-    ToolTargetsSchema = import_mini.z.array(ToolTargetSchema);
-    WildcardTargetSchema = import_mini.z.tuple([import_mini.z.literal("*")]);
-    RulesyncTargetsSchema = import_mini.z.union([ToolTargetsSchema, WildcardTargetSchema]);
+    ToolTargetSchema = import_mini3.z.enum(ALL_TOOL_TARGETS);
+    ToolTargetsSchema = import_mini3.z.array(ToolTargetSchema);
+    WildcardTargetSchema = import_mini3.z.tuple([import_mini3.z.literal("*")]);
+    RulesyncTargetsSchema = import_mini3.z.union([ToolTargetsSchema, WildcardTargetSchema]);
   }
 });
 
@@ -230,6 +230,16 @@ function generateMcpFromRegistry(tool, config) {
   }
   return generateMcpConfig(config, generatorConfig);
 }
+function createMcpGenerator(toolName) {
+  return {
+    generateMcp: (config) => {
+      return generateMcpFromRegistry(toolName, config);
+    },
+    generateMcpConfiguration: (mcpServers, baseDir = "") => {
+      return generateMcpConfigurationFilesFromRegistry(toolName, mcpServers, baseDir);
+    }
+  };
+}
 function generateMcpConfigurationFilesFromRegistry(tool, mcpServers, baseDir = "") {
   const generatorConfig = MCP_GENERATOR_REGISTRY[tool];
   if (!generatorConfig) {
@@ -247,7 +257,8 @@ function generateMcpConfigurationFilesFromRegistry(tool, mcpServers, baseDir = "
   return generateMcpConfigurationFiles(mcpServers, generatorConfig, baseDir);
 }
 function generateJunieMcpConfigurationFiles(mcpServers, baseDir = "") {
-  const filepath = baseDir ? `${baseDir}/.junie/mcp-config.json` : ".junie/mcp-config.json";
+  const junieMcpPath = ".junie/mcp/mcp.json";
+  const filepath = baseDir ? `${baseDir}/${junieMcpPath}` : junieMcpPath;
   const config = {
     mcpServers: {}
   };
@@ -282,7 +293,7 @@ function generateJunieMcpConfigurationFiles(mcpServers, baseDir = "") {
     }
   ];
 }
-var serverTransforms, configWrappers, MCP_GENERATOR_REGISTRY;
+var serverTransforms, configWrappers, MCP_GENERATOR_REGISTRY, cursorMcpGenerator, clineMcpGenerator;
 var init_shared_factory = __esm({
   "src/generators/mcp/shared-factory.ts"() {
     "use strict";
@@ -484,6 +495,8 @@ var init_shared_factory = __esm({
         configWrapper: configWrappers.mcpServers
       }
     };
+    cursorMcpGenerator = createMcpGenerator("cursor");
+    clineMcpGenerator = createMcpGenerator("cline");
   }
 });
 
@@ -512,16 +525,13 @@ __export(cline_exports, {
   generateClineMcp: () => generateClineMcp,
   generateClineMcpConfiguration: () => generateClineMcpConfiguration
 });
-function generateClineMcp(config) {
-  return generateMcpFromRegistry("cline", config);
-}
-function generateClineMcpConfiguration(mcpServers, baseDir = "") {
-  return generateMcpConfigurationFilesFromRegistry("cline", mcpServers, baseDir);
-}
+var generateClineMcp, generateClineMcpConfiguration;
 var init_cline = __esm({
   "src/generators/mcp/cline.ts"() {
     "use strict";
     init_shared_factory();
+    generateClineMcp = clineMcpGenerator.generateMcp;
+    generateClineMcpConfiguration = clineMcpGenerator.generateMcpConfiguration;
   }
 });
 
@@ -759,16 +769,13 @@ __export(cursor_exports, {
   generateCursorMcp: () => generateCursorMcp,
   generateCursorMcpConfiguration: () => generateCursorMcpConfiguration
 });
-function generateCursorMcp(config) {
-  return generateMcpFromRegistry("cursor", config);
-}
-function generateCursorMcpConfiguration(mcpServers, baseDir = "") {
-  return generateMcpConfigurationFilesFromRegistry("cursor", mcpServers, baseDir);
-}
+var generateCursorMcp, generateCursorMcpConfiguration;
 var init_cursor = __esm({
   "src/generators/mcp/cursor.ts"() {
     "use strict";
     init_shared_factory();
+    generateCursorMcp = cursorMcpGenerator.generateMcp;
+    generateCursorMcpConfiguration = cursorMcpGenerator.generateMcpConfiguration;
   }
 });
 
@@ -1049,92 +1056,25 @@ var import_commander = require("commander");
 var import_promises = require("fs/promises");
 var path = __toESM(require("path"), 1);
 
-// src/utils/config.ts
-init_tool_targets();
-function getDefaultConfig() {
-  return {
-    aiRulesDir: ".rulesync",
-    outputPaths: {
-      augmentcode: ".",
-      "augmentcode-legacy": ".",
-      copilot: ".github/instructions",
-      cursor: ".cursor/rules",
-      cline: ".clinerules",
-      claudecode: ".",
-      codexcli: ".",
-      roo: ".roo/rules",
-      geminicli: ".gemini/memories",
-      kiro: ".kiro/steering",
-      junie: ".",
-      windsurf: "."
-    },
-    watchEnabled: false,
-    defaultTargets: ALL_TOOL_TARGETS.filter((tool) => tool !== "augmentcode-legacy")
-  };
-}
-function resolveTargets(targets, config) {
-  if (targets.length === 1 && targets[0] === "*") {
-    return config.defaultTargets;
-  }
-  const validatedTargets = ToolTargetsSchema.parse(targets);
-  return validatedTargets;
-}
-
-// src/cli/commands/add.ts
-function sanitizeFilename(filename) {
-  return filename.endsWith(".md") ? filename.slice(0, -3) : filename;
-}
-function generateRuleTemplate(filename) {
-  return `---
-root: false
-targets: ["*"]
-description: "Rules for ${filename}"
-globs: []
----
-
-# ${filename.charAt(0).toUpperCase() + filename.slice(1)} Rules
-
-Add your rules here.
-`;
-}
-async function addCommand(filename) {
-  try {
-    const config = getDefaultConfig();
-    const sanitizedFilename = sanitizeFilename(filename);
-    const rulesDir = config.aiRulesDir;
-    const filePath = path.join(rulesDir, `${sanitizedFilename}.md`);
-    await (0, import_promises.mkdir)(rulesDir, { recursive: true });
-    const template = generateRuleTemplate(sanitizedFilename);
-    await (0, import_promises.writeFile)(filePath, template, "utf8");
-    console.log(`\u2705 Created rule file: ${filePath}`);
-    console.log(`\u{1F4DD} Edit the file to customize your rules.`);
-  } catch (error) {
-    console.error(
-      `\u274C Failed to create rule file: ${error instanceof Error ? error.message : String(error)}`
-    );
-    process.exit(3);
-  }
-}
-
-// src/cli/commands/config.ts
-var import_node_fs = require("fs");
-var import_node_path2 = __toESM(require("path"), 1);
+// src/utils/config-loader.ts
+var import_c12 = require("c12");
+var import_core = require("zod/v4/core");
 
 // src/types/claudecode.ts
-var import_mini2 = require("zod/mini");
-var ClaudeSettingsSchema = import_mini2.z.looseObject({
-  permissions: import_mini2.z._default(
-    import_mini2.z.looseObject({
-      deny: import_mini2.z._default(import_mini2.z.array(import_mini2.z.string()), [])
+var import_mini = require("zod/mini");
+var ClaudeSettingsSchema = import_mini.z.looseObject({
+  permissions: import_mini.z._default(
+    import_mini.z.looseObject({
+      deny: import_mini.z._default(import_mini.z.array(import_mini.z.string()), [])
     }),
     { deny: [] }
   )
 });
 
 // src/types/commands.ts
-var import_mini3 = require("zod/mini");
-var CommandFrontmatterSchema = import_mini3.z.object({
-  description: import_mini3.z.optional(import_mini3.z.string())
+var import_mini2 = require("zod/mini");
+var CommandFrontmatterSchema = import_mini2.z.object({
+  description: import_mini2.z.optional(import_mini2.z.string())
 });
 
 // src/types/config.ts
@@ -1146,7 +1086,8 @@ var ConfigSchema = import_mini4.z.object({
   watchEnabled: import_mini4.z.boolean(),
   defaultTargets: ToolTargetsSchema,
   claudecodeCommands: import_mini4.z.optional(import_mini4.z.string()),
-  geminicliCommands: import_mini4.z.optional(import_mini4.z.string())
+  geminicliCommands: import_mini4.z.optional(import_mini4.z.string()),
+  legacy: import_mini4.z.optional(import_mini4.z.boolean())
 });
 
 // src/types/config-options.ts
@@ -1176,6 +1117,7 @@ var ConfigOptionsSchema = import_mini5.z.object({
   verbose: import_mini5.z.optional(import_mini5.z.boolean()),
   delete: import_mini5.z.optional(import_mini5.z.boolean()),
   baseDir: import_mini5.z.optional(import_mini5.z.union([import_mini5.z.string(), import_mini5.z.array(import_mini5.z.string())])),
+  legacy: import_mini5.z.optional(import_mini5.z.boolean()),
   watch: import_mini5.z.optional(
     import_mini5.z.object({
       enabled: import_mini5.z.optional(import_mini5.z.boolean()),
@@ -1195,6 +1137,7 @@ var MergedConfigSchema = import_mini5.z.object({
   delete: import_mini5.z.optional(import_mini5.z.boolean()),
   baseDir: import_mini5.z.optional(import_mini5.z.union([import_mini5.z.string(), import_mini5.z.array(import_mini5.z.string())])),
   configPath: import_mini5.z.optional(import_mini5.z.string()),
+  legacy: import_mini5.z.optional(import_mini5.z.boolean()),
   watch: import_mini5.z.optional(
     import_mini5.z.object({
       enabled: import_mini5.z.optional(import_mini5.z.boolean()),
@@ -1250,13 +1193,6 @@ var RuleFrontmatterSchema = import_mini7.z.object({
   windsurfOutputFormat: import_mini7.z.optional(import_mini7.z.enum(["single-file", "directory"])),
   tags: import_mini7.z.optional(import_mini7.z.array(import_mini7.z.string()))
 });
-var ParsedRuleSchema = import_mini7.z.object({
-  frontmatter: RuleFrontmatterSchema,
-  content: import_mini7.z.string(),
-  filename: import_mini7.z.string(),
-  filepath: import_mini7.z.string(),
-  type: import_mini7.z.optional(import_mini7.z.enum(["rule", "command"]))
-});
 var GeneratedOutputSchema = import_mini7.z.object({
   tool: ToolTargetSchema,
   filepath: import_mini7.z.string(),
@@ -1271,9 +1207,39 @@ var GenerateOptionsSchema = import_mini7.z.object({
 // src/types/index.ts
 init_tool_targets();
 
+// src/utils/config.ts
+init_tool_targets();
+function getDefaultConfig() {
+  return {
+    aiRulesDir: ".rulesync",
+    outputPaths: {
+      augmentcode: ".",
+      "augmentcode-legacy": ".",
+      copilot: ".github/instructions",
+      cursor: ".cursor/rules",
+      cline: ".clinerules",
+      claudecode: ".",
+      codexcli: ".",
+      roo: ".roo/rules",
+      geminicli: ".gemini/memories",
+      kiro: ".kiro/steering",
+      junie: ".",
+      windsurf: "."
+    },
+    watchEnabled: false,
+    defaultTargets: ALL_TOOL_TARGETS.filter((tool) => tool !== "augmentcode-legacy"),
+    legacy: false
+  };
+}
+function resolveTargets(targets, config) {
+  if (targets.length === 1 && targets[0] === "*") {
+    return config.defaultTargets;
+  }
+  const validatedTargets = ToolTargetsSchema.parse(targets);
+  return validatedTargets;
+}
+
 // src/utils/config-loader.ts
-var import_c12 = require("c12");
-var import_core = require("zod/v4/core");
 var MODULE_NAME = "rulesync";
 async function loadConfig(options = {}) {
   const defaultConfig = getDefaultConfig();
@@ -1460,6 +1426,49 @@ function mergeWithCliOptions(config, cliOptions) {
   return merged;
 }
 
+// src/cli/commands/add.ts
+function sanitizeFilename(filename) {
+  return filename.endsWith(".md") ? filename.slice(0, -3) : filename;
+}
+function generateRuleTemplate(filename) {
+  return `---
+root: false
+targets: ["*"]
+description: "Rules for ${filename}"
+globs: []
+---
+
+# ${filename.charAt(0).toUpperCase() + filename.slice(1)} Rules
+
+Add your rules here.
+`;
+}
+async function addCommand(filename, options = {}) {
+  try {
+    const configResult = await loadConfig();
+    const config = configResult.config;
+    const sanitizedFilename = sanitizeFilename(filename);
+    const aiRulesDir = config.aiRulesDir;
+    const useLegacy = options.legacy ?? config.legacy ?? false;
+    const rulesDir = useLegacy ? aiRulesDir : path.join(aiRulesDir, "rules");
+    const filePath = path.join(rulesDir, `${sanitizedFilename}.md`);
+    await (0, import_promises.mkdir)(rulesDir, { recursive: true });
+    const template = generateRuleTemplate(sanitizedFilename);
+    await (0, import_promises.writeFile)(filePath, template, "utf8");
+    console.log(`\u2705 Created rule file: ${filePath}`);
+    console.log(`\u{1F4DD} Edit the file to customize your rules.`);
+  } catch (error) {
+    console.error(
+      `\u274C Failed to create rule file: ${error instanceof Error ? error.message : String(error)}`
+    );
+    process.exit(3);
+  }
+}
+
+// src/cli/commands/config.ts
+var import_node_fs = require("fs");
+var import_node_path2 = __toESM(require("path"), 1);
+
 // src/utils/error.ts
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
@@ -1526,6 +1535,19 @@ async function findFiles(dir, extension = ".md") {
     return [];
   }
 }
+async function findRuleFiles(aiRulesDir) {
+  const rulesDir = (0, import_node_path.join)(aiRulesDir, "rules");
+  const newLocationFiles = await findFiles(rulesDir, ".md");
+  const legacyLocationFiles = await findFiles(aiRulesDir, ".md");
+  const newLocationBasenames = new Set(
+    newLocationFiles.map((file) => file.split("/").pop()?.replace(/\.md$/, ""))
+  );
+  const filteredLegacyFiles = legacyLocationFiles.filter((file) => {
+    const basename6 = file.split("/").pop()?.replace(/\.md$/, "");
+    return !newLocationBasenames.has(basename6);
+  });
+  return [...newLocationFiles, ...filteredLegacyFiles];
+}
 async function removeDirectory(dirPath) {
   const dangerousPaths = [".", "/", "~", "src", "node_modules"];
   if (dangerousPaths.includes(dirPath) || dirPath === "") {
@@ -1560,6 +1582,50 @@ async function removeClaudeGeneratedFiles() {
   }
 }
 
+// src/utils/logger.ts
+var import_consola = require("consola");
+var Logger = class {
+  _verbose = false;
+  console = import_consola.consola.withDefaults({
+    tag: "rulesync"
+  });
+  setVerbose(verbose) {
+    this._verbose = verbose;
+  }
+  get verbose() {
+    return this._verbose;
+  }
+  // Regular log (always shown, regardless of verbose)
+  log(message, ...args) {
+    this.console.log(message, ...args);
+  }
+  // Info level (shown only in verbose mode)
+  info(message, ...args) {
+    if (this._verbose) {
+      this.console.info(message, ...args);
+    }
+  }
+  // Success (always shown)
+  success(message, ...args) {
+    this.console.success(message, ...args);
+  }
+  // Warning (always shown)
+  warn(message, ...args) {
+    this.console.warn(message, ...args);
+  }
+  // Error (always shown)
+  error(message, ...args) {
+    this.console.error(message, ...args);
+  }
+  // Debug level (shown only in verbose mode)
+  debug(message, ...args) {
+    if (this._verbose) {
+      this.console.debug(message, ...args);
+    }
+  }
+};
+var logger = new Logger();
+
 // src/cli/commands/config.ts
 async function configCommand(options = {}) {
   if (options.init) {
@@ -1569,50 +1635,50 @@ async function configCommand(options = {}) {
   await showConfig();
 }
 async function showConfig() {
-  console.log("Loading configuration...\n");
+  logger.log("Loading configuration...\n");
   try {
     const result = await loadConfig();
     if (result.isEmpty) {
-      console.log("No configuration file found. Using default configuration.\n");
+      logger.log("No configuration file found. Using default configuration.\n");
     } else {
-      console.log(`Configuration loaded from: ${result.filepath}
+      logger.log(`Configuration loaded from: ${result.filepath}
 `);
     }
-    console.log("Current configuration:");
-    console.log("=====================");
+    logger.log("Current configuration:");
+    logger.log("=====================");
     const config = result.config;
-    console.log(`
+    logger.log(`
 AI Rules Directory: ${config.aiRulesDir}`);
-    console.log(`
+    logger.log(`
 Default Targets: ${config.defaultTargets.join(", ")}`);
     if (config.exclude && config.exclude.length > 0) {
-      console.log(`Excluded Targets: ${config.exclude.join(", ")}`);
+      logger.log(`Excluded Targets: ${config.exclude.join(", ")}`);
     }
-    console.log("\nOutput Paths:");
+    logger.log("\nOutput Paths:");
     for (const [tool, outputPath] of Object.entries(config.outputPaths)) {
-      console.log(`  ${tool}: ${outputPath}`);
+      logger.log(`  ${tool}: ${outputPath}`);
     }
     if (config.baseDir) {
       const dirs = Array.isArray(config.baseDir) ? config.baseDir : [config.baseDir];
-      console.log(`
+      logger.log(`
 Base Directories: ${dirs.join(", ")}`);
     }
-    console.log(`
+    logger.log(`
 Verbose: ${config.verbose || false}`);
-    console.log(`Delete before generate: ${config.delete || false}`);
+    logger.log(`Delete before generate: ${config.delete || false}`);
     if (config.watch) {
-      console.log("\nWatch Configuration:");
-      console.log(`  Enabled: ${config.watch.enabled || false}`);
+      logger.log("\nWatch Configuration:");
+      logger.log(`  Enabled: ${config.watch.enabled || false}`);
       if (config.watch.interval) {
-        console.log(`  Interval: ${config.watch.interval}ms`);
+        logger.log(`  Interval: ${config.watch.interval}ms`);
       }
       if (config.watch.ignore && config.watch.ignore.length > 0) {
-        console.log(`  Ignore patterns: ${config.watch.ignore.join(", ")}`);
+        logger.log(`  Ignore patterns: ${config.watch.ignore.join(", ")}`);
       }
     }
-    console.log("\nTip: Use 'rulesync config init' to create a configuration file.");
+    logger.log("\nTip: Use 'rulesync config init' to create a configuration file.");
   } catch (error) {
-    console.error(
+    logger.error(
       "\u274C Failed to load configuration:",
       error instanceof Error ? error.message : String(error)
     );
@@ -1633,7 +1699,7 @@ async function initConfig(options) {
   const validFormats = Object.keys(FORMAT_CONFIG);
   const selectedFormat = options.format || "jsonc";
   if (!validFormats.includes(selectedFormat)) {
-    console.error(
+    logger.error(
       `\u274C Invalid format: ${selectedFormat}. Valid formats are: ${validFormats.join(", ")}`
     );
     process.exit(1);
@@ -1649,7 +1715,7 @@ async function initConfig(options) {
       if (result.success) {
         validTargets.push(result.data);
       } else {
-        console.error(`\u274C Invalid target: ${target}`);
+        logger.error(`\u274C Invalid target: ${target}`);
         process.exit(1);
       }
     }
@@ -1663,7 +1729,7 @@ async function initConfig(options) {
       if (result.success) {
         validExcludes.push(result.data);
       } else {
-        console.error(`\u274C Invalid exclude target: ${exclude}`);
+        logger.error(`\u274C Invalid exclude target: ${exclude}`);
         process.exit(1);
       }
     }
@@ -1686,18 +1752,18 @@ async function initConfig(options) {
   try {
     const fs2 = await import("fs/promises");
     await fs2.access(filepath);
-    console.error(`\u274C Configuration file already exists: ${filepath}`);
-    console.log("Remove the existing file or choose a different format.");
+    logger.error(`\u274C Configuration file already exists: ${filepath}`);
+    logger.log("Remove the existing file or choose a different format.");
     process.exit(1);
   } catch {
   }
   try {
     (0, import_node_fs.writeFileSync)(filepath, content, "utf-8");
-    console.log(`\u2705 Created configuration file: ${filepath}`);
-    console.log("\nYou can now customize the configuration to fit your needs.");
-    console.log("Run 'rulesync generate' to use the new configuration.");
+    logger.success(`Created configuration file: ${filepath}`);
+    logger.log("\nYou can now customize the configuration to fit your needs.");
+    logger.log("Run 'rulesync generate' to use the new configuration.");
   } catch (error) {
-    console.error(
+    logger.error(
       `\u274C Failed to create configuration file: ${error instanceof Error ? error.message : String(error)}`
     );
     process.exit(1);
@@ -1771,10 +1837,10 @@ export default config;
 }
 
 // src/cli/commands/generate.ts
-var import_node_path14 = require("path");
+var import_node_path15 = require("path");
 
 // src/core/command-generator.ts
-var import_node_path6 = require("path");
+var import_node_path7 = require("path");
 
 // src/generators/commands/claudecode.ts
 var import_node_path3 = require("path");
@@ -1830,12 +1896,6 @@ var GeminiCliCommandGenerator = class {
     let converted = content;
     converted = converted.replace(/\$ARGUMENTS/g, "{{args}}");
     converted = converted.replace(/!`([^`]+)`/g, "!{$1}");
-    const atSyntaxMatches = converted.match(/@[^\s]+/g);
-    if (atSyntaxMatches) {
-      console.warn(
-        `\u26A0\uFE0F  Warning: @ syntax found (${atSyntaxMatches.join(", ")}). Gemini CLI does not support file content injection. Consider using shell commands or remove these references.`
-      );
-    }
     return converted.trim();
   }
   escapeTomlString(str) {
@@ -1843,17 +1903,44 @@ var GeminiCliCommandGenerator = class {
   }
 };
 
+// src/generators/commands/roo.ts
+var import_node_path5 = require("path");
+var RooCommandGenerator = class {
+  generate(command, outputDir) {
+    const filepath = this.getOutputPath(command.filename, outputDir);
+    const frontmatter = ["---"];
+    if (command.frontmatter.description) {
+      frontmatter.push(`description: ${command.frontmatter.description}`);
+    }
+    frontmatter.push("---");
+    const content = `${frontmatter.join("\n")}
+
+${command.content.trim()}
+`;
+    return {
+      tool: "roo",
+      filepath,
+      content
+    };
+  }
+  getOutputPath(filename, baseDir) {
+    const flattenedName = filename.replace(/\//g, "-");
+    return (0, import_node_path5.join)(baseDir, ".roo", "commands", `${flattenedName}.md`);
+  }
+};
+
 // src/generators/commands/index.ts
 var commandGenerators = {
   claudecode: new ClaudeCodeCommandGenerator(),
-  geminicli: new GeminiCliCommandGenerator()
+  geminicli: new GeminiCliCommandGenerator(),
+  roo: new RooCommandGenerator()
 };
 function getCommandGenerator(tool) {
   return commandGenerators[tool];
 }
 
 // src/core/command-parser.ts
-var import_node_path5 = require("path");
+var import_node_path6 = require("path");
 var import_gray_matter = __toESM(require("gray-matter"), 1);
 async function parseCommandsFromDirectory(commandsDir) {
   const commandFiles = await findFiles(commandsDir, ".md");
@@ -1879,7 +1966,7 @@ async function parseCommandFile(filepath) {
   const parsed = (0, import_gray_matter.default)(content);
   try {
     const validatedData = CommandFrontmatterSchema.parse(parsed.data);
-    const filename = (0, import_node_path5.basename)(filepath, ".md");
+    const filename = (0, import_node_path6.basename)(filepath, ".md");
     return {
       frontmatter: {
         description: validatedData.description
@@ -1897,7 +1984,7 @@ async function parseCommandFile(filepath) {
 
 // src/core/command-generator.ts
 async function generateCommands(projectRoot, baseDir, targets) {
-  const commandsDir = (0, import_node_path6.join)(projectRoot, ".rulesync", "commands");
+  const commandsDir = (0, import_node_path7.join)(projectRoot, ".rulesync", "commands");
   if (!await fileExists(commandsDir)) {
     return [];
   }
@@ -1907,7 +1994,9 @@ async function generateCommands(projectRoot, baseDir, targets) {
   }
   const outputs = [];
   const outputDir = baseDir || projectRoot;
-  const supportedTargets = targets.filter((target) => ["claudecode", "geminicli"].includes(target));
+  const supportedTargets = targets.filter(
+    (target) => ["claudecode", "geminicli", "roo"].includes(target)
+  );
   for (const target of supportedTargets) {
     const generator = getCommandGenerator(target);
     if (!generator) {
@@ -1929,58 +2018,81 @@ async function generateCommands(projectRoot, baseDir, targets) {
 }
 
 // src/generators/ignore/shared-factory.ts
-var import_node_path7 = require("path");
+var import_node_path8 = require("path");
 
 // src/generators/ignore/shared-helpers.ts
 function extractIgnorePatternsFromRules(rules) {
   const patterns = [];
   for (const rule of rules) {
     if (rule.frontmatter.globs && rule.frontmatter.globs.length > 0) {
-      for (const glob of rule.frontmatter.globs) {
-        if (shouldExcludeFromAI(glob)) {
-          patterns.push(`# Exclude: ${rule.frontmatter.description}`);
-          patterns.push(glob);
-        }
+      const sensitiveGlobs = rule.frontmatter.globs.filter(shouldExcludeFromAI);
+      if (sensitiveGlobs.length > 0) {
+        patterns.push(`# Exclude: ${rule.frontmatter.description}`);
+        patterns.push(...sensitiveGlobs);
       }
     }
-    const contentPatterns = extractIgnorePatternsFromContent(rule.content);
+    const contentPatterns = extractBasicIgnorePatternsFromContent(rule.content);
     patterns.push(...contentPatterns);
   }
   return patterns;
 }
 function shouldExcludeFromAI(glob) {
-  const excludePatterns = [
-    // Large generated files that slow indexing
-    "**/assets/generated/**",
-    "**/public/build/**",
-    // Test fixtures with potentially sensitive data
-    "**/tests/fixtures/**",
-    "**/test/fixtures/**",
-    "**/*.fixture.*",
-    // Build outputs that provide little value for AI context
+  const sensitivePatterns = [
+    // Security-related patterns
+    "**/secret**",
+    "**/credential**",
+    "**/token**",
+    "**/key**",
+    "**/password**",
+    "**/auth**",
+    "**/private**",
+    "**/confidential**",
+    "**/internal**",
+    "**/internal-docs/**",
+    "**/admin**",
+    // Configuration patterns that might contain secrets
+    "**/config/prod**",
+    "**/config/production**",
+    "**/config/secret**",
+    "**/config/secrets/**",
+    "**/env/**",
+    "**/.env**",
+    // Build and deployment patterns
     "**/dist/**",
     "**/build/**",
-    "**/coverage/**",
-    // Configuration that might contain sensitive data
-    "**/config/production/**",
-    "**/config/secrets/**",
-    "**/config/prod/**",
-    "**/deploy/prod/**",
-    "**/*.prod.*",
-    // Internal documentation that might be sensitive
-    "**/internal/**",
-    "**/internal-docs/**",
-    "**/proprietary/**",
-    "**/personal-notes/**",
-    "**/private/**",
-    "**/confidential/**"
+    "**/target/**",
+    "**/out/**",
+    "**/node_modules/**",
+    // Data and media patterns
+    "**/data/**",
+    "**/dataset**",
+    "**/backup**",
+    "**/logs/**",
+    "**/log/**",
+    "**/temp/**",
+    "**/tmp/**",
+    "**/cache/**",
+    // Test fixtures that might contain sensitive data
+    "**/test/fixtures/**",
+    "**/test**/fixture**",
+    "**/test**/mock**",
+    "**/test**/data/**",
+    // Database and infrastructure
+    "**/*.sqlite",
+    "**/*.db",
+    "**/*.dump",
+    // Production files
+    "**/*.prod.json",
+    "**/*.production.*"
   ];
-  return excludePatterns.some((pattern) => {
-    const regex = new RegExp(pattern.replace(/\*\*/g, ".*").replace(/\*/g, "[^/]*"));
-    return regex.test(glob);
+  const lowerGlob = glob.toLowerCase();
+  return sensitivePatterns.some((pattern) => {
+    const regexPattern = pattern.replace(/\*\*/g, ".*").replace(/\*/g, "[^/]*").replace(/\?/g, ".");
+    const regex = new RegExp(`^${regexPattern}$`, "i");
+    return regex.test(lowerGlob);
   });
 }
-function extractIgnorePatternsFromContent(content) {
+function extractBasicIgnorePatternsFromContent(content) {
   const patterns = [];
   const lines = content.split("\n");
   for (const line of lines) {
@@ -1991,24 +2103,6 @@ function extractIgnorePatternsFromContent(content) {
         patterns.push(pattern);
       }
     }
-    if (trimmed.startsWith("# AUGMENT_IGNORE:") || trimmed.startsWith("# augmentignore:")) {
-      const pattern = trimmed.replace(/^# (AUGMENT_IGNORE|augmentignore):\s*/, "").trim();
-      if (pattern) {
-        patterns.push(pattern);
-      }
-    }
-    if (trimmed.startsWith("# AUGMENT_INCLUDE:") || trimmed.startsWith("# augmentinclude:")) {
-      const pattern = trimmed.replace(/^# (AUGMENT_INCLUDE|augmentinclude):\s*/, "").trim();
-      if (pattern) {
-        patterns.push(`!${pattern}`);
-      }
-    }
-    if (trimmed.includes("exclude") || trimmed.includes("ignore")) {
-      const matches = trimmed.match(/['"`]([^'"`]+\.(log|tmp|cache|temp))['"`]/g);
-      if (matches) {
-        patterns.push(...matches.map((m) => m.replace(/['"`]/g, "")));
-      }
-    }
   }
   return patterns;
 }
@@ -2047,7 +2141,7 @@ function generateIgnoreFile(rules, config, ignoreConfig, baseDir) {
   const outputs = [];
   const content = generateIgnoreContent(rules, ignoreConfig);
   const outputPath = baseDir || process.cwd();
-  const filepath = (0, import_node_path7.join)(outputPath, ignoreConfig.filename);
+  const filepath = (0, import_node_path8.join)(outputPath, ignoreConfig.filename);
   outputs.push({
     tool: ignoreConfig.tool,
     filepath,
@@ -2635,20 +2729,20 @@ function generateWindsurfIgnore(rules, config, baseDir) {
 }
 
 // src/generators/rules/augmentcode.ts
-var import_node_path10 = require("path");
+var import_node_path11 = require("path");
 
 // src/generators/rules/shared-helpers.ts
-var import_node_path9 = require("path");
+var import_node_path10 = require("path");
 
 // src/utils/ignore.ts
-var import_node_path8 = require("path");
+var import_node_path9 = require("path");
 var import_micromatch = __toESM(require("micromatch"), 1);
 var cachedIgnorePatterns = null;
 async function loadIgnorePatterns(baseDir = process.cwd()) {
   if (cachedIgnorePatterns) {
     return cachedIgnorePatterns;
   }
-  const ignorePath = (0, import_node_path8.join)(baseDir, ".rulesyncignore");
+  const ignorePath = (0, import_node_path9.join)(baseDir, ".rulesyncignore");
   if (!await fileExists(ignorePath)) {
     cachedIgnorePatterns = { patterns: [] };
     return cachedIgnorePatterns;
@@ -2702,7 +2796,7 @@ function addOutput(outputs, tool, config, baseDir, relativePath, content) {
   const outputDir = resolveOutputDir(config, tool, baseDir);
   outputs.push({
     tool,
-    filepath: (0, import_node_path9.join)(outputDir, relativePath),
+    filepath: (0, import_node_path10.join)(outputDir, relativePath),
     content
   });
 }
@@ -2711,7 +2805,7 @@ async function generateRulesConfig(rules, config, generatorConfig, baseDir) {
   for (const rule of rules) {
     const content = generatorConfig.generateContent(rule);
     const outputDir = resolveOutputDir(config, generatorConfig.tool, baseDir);
-    const filepath = generatorConfig.pathResolver ? generatorConfig.pathResolver(rule, outputDir) : (0, import_node_path9.join)(outputDir, `${rule.filename}${generatorConfig.fileExtension}`);
+    const filepath = generatorConfig.pathResolver ? generatorConfig.pathResolver(rule, outputDir) : (0, import_node_path10.join)(outputDir, `${rule.filename}${generatorConfig.fileExtension}`);
     outputs.push({
       tool: generatorConfig.tool,
       filepath,
@@ -2739,7 +2833,7 @@ async function generateComplexRules(rules, config, generatorConfig, baseDir) {
     for (const rule of detailRules) {
       const content = generatorConfig.generateDetailContent(rule);
       const filepath = resolvePath(
-        (0, import_node_path9.join)(generatorConfig.detailSubDir, `${rule.filename}.md`),
+        (0, import_node_path10.join)(generatorConfig.detailSubDir, `${rule.filename}.md`),
         baseDir
       );
       outputs.push({
@@ -2802,7 +2896,7 @@ async function generateAugmentcodeConfig(rules, config, baseDir) {
       "augmentcode",
       config,
       baseDir,
-      (0, import_node_path10.join)(".augment", "rules", `${rule.filename}.md`),
+      (0, import_node_path11.join)(".augment", "rules", `${rule.filename}.md`),
       generateRuleFile(rule)
     );
   });
@@ -2855,7 +2949,7 @@ function generateLegacyGuidelinesFile(allRules) {
 }
 
 // src/generators/rules/claudecode.ts
-var import_node_path11 = require("path");
+var import_node_path12 = require("path");
 async function generateClaudecodeConfig(rules, config, baseDir) {
   const generatorConfig = {
     tool: "claudecode",
@@ -2867,7 +2961,7 @@ async function generateClaudecodeConfig(rules, config, baseDir) {
     generateDetailContent: generateMemoryFile,
     detailSubDir: ".claude/memories",
     updateAdditionalConfig: async (ignorePatterns, baseDir2) => {
-      const settingsPath = resolvePath((0, import_node_path11.join)(".claude", "settings.json"), baseDir2);
+      const settingsPath = resolvePath((0, import_node_path12.join)(".claude", "settings.json"), baseDir2);
       await updateClaudeSettings(settingsPath, ignorePatterns);
       return [];
     }
@@ -2931,7 +3025,7 @@ async function updateClaudeSettings(settingsPath, ignorePatterns) {
 }
 
 // src/generators/rules/generator-registry.ts
-var import_node_path12 = require("path");
+var import_node_path13 = require("path");
 function determineCursorRuleType(frontmatter) {
   if (frontmatter.cursorRuleType) {
     return frontmatter.cursorRuleType;
@@ -3011,7 +3105,7 @@ var GENERATOR_REGISTRY = {
     },
     pathResolver: (rule, outputDir) => {
       const baseFilename = rule.filename.replace(/\.md$/, "");
-      return (0, import_node_path12.join)(outputDir, `${baseFilename}.instructions.md`);
+      return (0, import_node_path13.join)(outputDir, `${baseFilename}.instructions.md`);
     }
   },
   cursor: {
@@ -3051,7 +3145,7 @@ var GENERATOR_REGISTRY = {
       return lines.join("\n");
     },
     pathResolver: (rule, outputDir) => {
-      return (0, import_node_path12.join)(outputDir, `${rule.filename}.mdc`);
+      return (0, import_node_path13.join)(outputDir, `${rule.filename}.mdc`);
     }
   },
   codexcli: {
@@ -3087,10 +3181,10 @@ var GENERATOR_REGISTRY = {
     pathResolver: (rule, outputDir) => {
       const outputFormat = rule.frontmatter.windsurfOutputFormat || "directory";
       if (outputFormat === "single-file") {
-        return (0, import_node_path12.join)(outputDir, ".windsurf-rules");
+        return (0, import_node_path13.join)(outputDir, ".windsurf-rules");
       } else {
-        const rulesDir = (0, import_node_path12.join)(outputDir, ".windsurf", "rules");
-        return (0, import_node_path12.join)(rulesDir, `${rule.filename}.md`);
+        const rulesDir = (0, import_node_path13.join)(outputDir, ".windsurf", "rules");
+        return (0, import_node_path13.join)(rulesDir, `${rule.filename}.md`);
       }
     }
   },
@@ -3181,10 +3275,18 @@ async function generateFromRegistry(tool, rules, config, baseDir) {
   }
 }
 
-// src/generators/rules/cline.ts
-async function generateClineConfig(rules, config, baseDir) {
-  return generateFromRegistry("cline", rules, config, baseDir);
+// src/generators/rules/generator-factory.ts
+function createSimpleGenerator(toolName) {
+  return async function(rules, config, baseDir) {
+    return generateFromRegistry(toolName, rules, config, baseDir);
+  };
 }
+var generateCursorConfig = createSimpleGenerator("cursor");
+var generateClineConfig = createSimpleGenerator("cline");
+var generateCopilotConfig = createSimpleGenerator("copilot");
+var generateWindsurfConfig = createSimpleGenerator("windsurf");
+var generateKiroConfig = createSimpleGenerator("kiro");
+var generateRooConfig = createSimpleGenerator("roo");
 
 // src/generators/rules/codexcli.ts
 async function generateCodexConfig(rules, config, baseDir) {
@@ -3231,16 +3333,6 @@ function generateConcatenatedCodexContent(rules) {
   return sections.join("\n\n---\n\n");
 }
 
-// src/generators/rules/copilot.ts
-async function generateCopilotConfig(rules, config, baseDir) {
-  return generateFromRegistry("copilot", rules, config, baseDir);
-}
-
-// src/generators/rules/cursor.ts
-async function generateCursorConfig(rules, config, baseDir) {
-  return generateFromRegistry("cursor", rules, config, baseDir);
-}
-
 // src/generators/rules/geminicli.ts
 async function generateGeminiConfig(rules, config, baseDir) {
   const generatorConfig = {
@@ -3310,21 +3402,6 @@ function generateGuidelinesMarkdown(rootRule, detailRules) {
   return lines.join("\n").trim();
 }
 
-// src/generators/rules/kiro.ts
-async function generateKiroConfig(rules, config, baseDir) {
-  return generateFromRegistry("kiro", rules, config, baseDir);
-}
-
-// src/generators/rules/roo.ts
-async function generateRooConfig(rules, config, baseDir) {
-  return generateFromRegistry("roo", rules, config, baseDir);
-}
-
-// src/generators/rules/windsurf.ts
-async function generateWindsurfConfig(rules, config, baseDir) {
-  return generateFromRegistry("windsurf", rules, config, baseDir);
-}
-
 // src/core/generator.ts
 async function generateConfigurations(rules, config, targetTools, baseDir) {
   const outputs = createOutputsArray();
@@ -3409,11 +3486,11 @@ async function generateForTool(tool, rules, config, baseDir) {
 }
 
 // src/core/parser.ts
-var import_node_path13 = require("path");
+var import_node_path14 = require("path");
 var import_gray_matter2 = __toESM(require("gray-matter"), 1);
 async function parseRulesFromDirectory(aiRulesDir) {
   const ignorePatterns = await loadIgnorePatterns();
-  const allRuleFiles = await findFiles(aiRulesDir, ".md");
+  const allRuleFiles = await findRuleFiles(aiRulesDir);
   const ruleFiles = filterIgnoredFiles(allRuleFiles, ignorePatterns.patterns);
   const rules = [];
   const errors = [];
@@ -3463,7 +3540,7 @@ async function parseRuleFile(filepath) {
       },
       ...validatedData.tags !== void 0 && { tags: validatedData.tags }
     };
-    const filename = (0, import_node_path13.basename)(filepath, ".md");
+    const filename = (0, import_node_path14.basename)(filepath, ".md");
     return {
       frontmatter,
       content: parsed.content,
@@ -3632,6 +3709,7 @@ async function generateCommand(options = {}) {
     ...options.baseDirs !== void 0 && { baseDirs: options.baseDirs }
   };
   const config = mergeWithCliOptions(configResult.config, cliOptions);
+  logger.setVerbose(config.verbose || false);
   if (options.tools && options.tools.length > 0) {
     const configTargets = config.defaultTargets;
     const cliTools = options.tools;
@@ -3640,18 +3718,18 @@ async function generateCommand(options = {}) {
     const notInConfig = cliTools.filter((tool) => !configTargetsSet.has(tool));
     const notInCli = configTargets.filter((tool) => !cliToolsSet.has(tool));
     if (notInConfig.length > 0 || notInCli.length > 0) {
-      console.warn("\u26A0\uFE0F  Warning: CLI tool selection differs from configuration!");
-      console.warn(`   Config targets: ${configTargets.join(", ")}`);
-      console.warn(`   CLI specified: ${cliTools.join(", ")}`);
+      logger.warn("\u26A0\uFE0F  Warning: CLI tool selection differs from configuration!");
+      logger.warn(`   Config targets: ${configTargets.join(", ")}`);
+      logger.warn(`   CLI specified: ${cliTools.join(", ")}`);
       if (notInConfig.length > 0) {
-        console.warn(`   Tools specified but not in config: ${notInConfig.join(", ")}`);
+        logger.warn(`   Tools specified but not in config: ${notInConfig.join(", ")}`);
       }
       if (notInCli.length > 0) {
-        console.warn(`   Tools in config but not specified: ${notInCli.join(", ")}`);
+        logger.warn(`   Tools in config but not specified: ${notInCli.join(", ")}`);
       }
-      console.warn("\n   The configuration file targets will be used.");
-      console.warn("   To change targets, update your rulesync config file.");
-      console.warn("");
+      logger.warn("\n   The configuration file targets will be used.");
+      logger.warn("   To change targets, update your rulesync config file.");
+      logger.warn("");
     }
   }
   let baseDirs;
@@ -3662,42 +3740,46 @@ async function generateCommand(options = {}) {
   } else {
     baseDirs = [process.cwd()];
   }
-  if (config.verbose && configResult.filepath) {
-    console.log(`Loaded configuration from: ${configResult.filepath}`);
-  }
-  console.log("Generating configuration files...");
+  logger.info(`Loaded configuration from: ${configResult.filepath}`);
+  logger.log("Generating configuration files...");
   if (!await fileExists(config.aiRulesDir)) {
-    console.error("\u274C .rulesync directory not found. Run 'rulesync init' first.");
+    logger.error("\u274C .rulesync directory not found. Run 'rulesync init' first.");
     process.exit(1);
   }
   try {
-    if (config.verbose) {
-      console.log(`Parsing rules from ${config.aiRulesDir}...`);
-    }
+    logger.info(`Parsing rules from ${config.aiRulesDir}...`);
     const rules = await parseRulesFromDirectory(config.aiRulesDir);
     if (rules.length === 0) {
-      console.warn("\u26A0\uFE0F  No rules found in .rulesync directory");
+      logger.warn("\u26A0\uFE0F  No rules found in .rulesync directory");
       return;
     }
-    if (config.verbose) {
-      console.log(`Found ${rules.length} rule(s)`);
-      console.log(`Base directories: ${baseDirs.join(", ")}`);
-    }
+    logger.info(`Found ${rules.length} rule(s)`);
+    logger.info(`Base directories: ${baseDirs.join(", ")}`);
     if (config.delete) {
-      if (config.verbose) {
-        console.log("Deleting existing output directories...");
-      }
+      logger.info("Deleting existing output directories...");
       const targetTools = config.defaultTargets;
       const deleteTasks = [];
+      const commandsDir = (0, import_node_path15.join)(config.aiRulesDir, "commands");
+      const hasCommands = await fileExists(commandsDir);
+      let hasCommandFiles = false;
+      if (hasCommands) {
+        const { readdir: readdir2 } = await import("fs/promises");
+        try {
+          const files = await readdir2(commandsDir);
+          hasCommandFiles = files.some((file) => file.endsWith(".md"));
+        } catch {
+          hasCommandFiles = false;
+        }
+      }
       for (const tool of targetTools) {
         switch (tool) {
           case "augmentcode":
-            deleteTasks.push(removeDirectory((0, import_node_path14.join)(".augment", "rules")));
-            deleteTasks.push(removeDirectory((0, import_node_path14.join)(".augment", "ignore")));
+            deleteTasks.push(removeDirectory((0, import_node_path15.join)(".augment", "rules")));
+            deleteTasks.push(removeDirectory((0, import_node_path15.join)(".augment", "ignore")));
             break;
           case "augmentcode-legacy":
             deleteTasks.push(removeClaudeGeneratedFiles());
-            deleteTasks.push(removeDirectory((0, import_node_path14.join)(".augment", "ignore")));
+            deleteTasks.push(removeDirectory((0, import_node_path15.join)(".augment", "ignore")));
             break;
           case "copilot":
             deleteTasks.push(removeDirectory(config.outputPaths.copilot));
@@ -3710,14 +3792,21 @@ async function generateCommand(options = {}) {
             break;
           case "claudecode":
             deleteTasks.push(removeClaudeGeneratedFiles());
-            deleteTasks.push(removeDirectory((0, import_node_path14.join)(".claude", "commands")));
+            if (hasCommandFiles) {
+              deleteTasks.push(removeDirectory((0, import_node_path15.join)(".claude", "commands")));
+            }
             break;
           case "roo":
             deleteTasks.push(removeDirectory(config.outputPaths.roo));
+            if (hasCommandFiles) {
+              deleteTasks.push(removeDirectory((0, import_node_path15.join)(".roo", "commands")));
+            }
             break;
           case "geminicli":
             deleteTasks.push(removeDirectory(config.outputPaths.geminicli));
-            deleteTasks.push(removeDirectory((0, import_node_path14.join)(".gemini", "commands")));
+            if (hasCommandFiles) {
+              deleteTasks.push(removeDirectory((0, import_node_path15.join)(".gemini", "commands")));
+            }
             break;
           case "kiro":
             deleteTasks.push(removeDirectory(config.outputPaths.kiro));
@@ -3728,44 +3817,34 @@ async function generateCommand(options = {}) {
         }
       }
       await Promise.all(deleteTasks);
-      if (config.verbose) {
-        console.log("Deleted existing output directories");
-      }
+      logger.info("Deleted existing output directories");
     }
     let totalOutputs = 0;
     for (const baseDir of baseDirs) {
-      if (config.verbose) {
-        console.log(`
+      logger.info(`
 Generating configurations for base directory: ${baseDir}`);
-      }
       const outputs = await generateConfigurations(rules, config, config.defaultTargets, baseDir);
       if (outputs.length === 0) {
-        if (config.verbose) {
-          console.warn(`\u26A0\uFE0F  No configurations generated for ${baseDir}`);
-        }
+        logger.warn(`\u26A0\uFE0F  No configurations generated for ${baseDir}`);
         continue;
       }
       for (const output of outputs) {
         await writeFileContent(output.filepath, output.content);
-        console.log(`\u2705 Generated ${output.tool} configuration: ${output.filepath}`);
+        logger.success(`Generated ${output.tool} configuration: ${output.filepath}`);
       }
       totalOutputs += outputs.length;
     }
     if (totalOutputs === 0) {
-      console.warn("\u26A0\uFE0F  No configurations generated");
+      logger.warn("\u26A0\uFE0F  No configurations generated");
       return;
     }
-    if (config.verbose) {
-      console.log("\nGenerating MCP configurations...");
-    }
+    logger.info("\nGenerating MCP configurations...");
     let totalMcpOutputs = 0;
     for (const baseDir of baseDirs) {
       try {
         const mcpConfig = parseMcpConfig(process.cwd());
         if (!mcpConfig || !mcpConfig.mcpServers || Object.keys(mcpConfig.mcpServers).length === 0) {
-          if (config.verbose) {
-            console.log(`No MCP configuration found for ${baseDir}`);
-          }
+          logger.info(`No MCP configuration found for ${baseDir}`);
           continue;
         }
         const mcpResults = await generateMcpConfigurations(
@@ -3774,27 +3853,21 @@ Generating configurations for base directory: ${baseDir}`);
           config.defaultTargets
         );
         if (mcpResults.length === 0) {
-          if (config.verbose) {
-            console.log(`No MCP configurations generated for ${baseDir}`);
-          }
+          logger.info(`No MCP configurations generated for ${baseDir}`);
           continue;
         }
         for (const result of mcpResults) {
           await writeFileContent(result.filepath, result.content);
-          console.log(`\u2705 Generated ${result.tool} MCP configuration: ${result.filepath}`);
+          logger.success(`Generated ${result.tool} MCP configuration: ${result.filepath}`);
           totalMcpOutputs++;
         }
       } catch (error) {
-        if (config.verbose) {
-          console.error(
-            `\u274C Failed to generate MCP configurations: ${error instanceof Error ? error.message : String(error)}`
-          );
-        }
+        logger.error(
+          `\u274C Failed to generate MCP configurations: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
     }
-    if (config.verbose) {
-      console.log("\nGenerating command files...");
-    }
+    logger.info("\nGenerating command files...");
     let totalCommandOutputs = 0;
     for (const baseDir of baseDirs) {
       const commandResults = await generateCommands(
@@ -3803,14 +3876,12 @@ Generating configurations for base directory: ${baseDir}`);
         config.defaultTargets
       );
       if (commandResults.length === 0) {
-        if (config.verbose) {
-          console.log(`No commands found for ${baseDir}`);
-        }
+        logger.info(`No commands found for ${baseDir}`);
         continue;
       }
       for (const result of commandResults) {
         await writeFileContent(result.filepath, result.content);
-        console.log(`\u2705 Generated ${result.tool} command: ${result.filepath}`);
+        logger.success(`Generated ${result.tool} command: ${result.filepath}`);
         totalCommandOutputs++;
       }
     }
@@ -3820,22 +3891,22 @@ Generating configurations for base directory: ${baseDir}`);
       if (totalOutputs > 0) parts.push(`${totalOutputs} configurations`);
       if (totalMcpOutputs > 0) parts.push(`${totalMcpOutputs} MCP configurations`);
       if (totalCommandOutputs > 0) parts.push(`${totalCommandOutputs} commands`);
-      console.log(
+      logger.success(
         `
 \u{1F389} All done! Generated ${totalGenerated} file(s) total (${parts.join(" + ")})`
       );
     }
   } catch (error) {
-    console.error("\u274C Failed to generate configurations:", error);
+    logger.error("\u274C Failed to generate configurations:", error);
     process.exit(1);
   }
 }
 
 // src/cli/commands/gitignore.ts
 var import_node_fs2 = require("fs");
-var import_node_path15 = require("path");
+var import_node_path16 = require("path");
 var gitignoreCommand = async () => {
-  const gitignorePath = (0, import_node_path15.join)(process.cwd(), ".gitignore");
+  const gitignorePath = (0, import_node_path16.join)(process.cwd(), ".gitignore");
   const rulesFilesToIgnore = [
     "# Generated by rulesync - AI tool configuration files",
     "**/.github/copilot-instructions.md",
@@ -3901,11 +3972,11 @@ ${linesToAdd.join("\n")}
 };
 
 // src/core/importer.ts
-var import_node_path22 = require("path");
+var import_node_path23 = require("path");
 var import_gray_matter7 = __toESM(require("gray-matter"), 1);
 
 // src/parsers/augmentcode.ts
-var import_node_path16 = require("path");
+var import_node_path17 = require("path");
 var import_gray_matter3 = __toESM(require("gray-matter"), 1);
 
 // src/utils/parser-helpers.ts
@@ -3954,7 +4025,7 @@ async function parseAugmentcodeLegacyConfiguration(baseDir = process.cwd()) {
 async function parseUnifiedAugmentcode(baseDir, config) {
   const result = createParseResult();
   if (config.rulesDir) {
-    const rulesDir = (0, import_node_path16.join)(baseDir, config.rulesDir);
+    const rulesDir = (0, import_node_path17.join)(baseDir, config.rulesDir);
     if (await fileExists(rulesDir)) {
       const rulesResult = await parseAugmentRules(rulesDir, config);
       addRules(result, rulesResult.rules);
@@ -3967,7 +4038,7 @@ async function parseUnifiedAugmentcode(baseDir, config) {
     }
   }
   if (config.legacyFilePath) {
-    const legacyPath = (0, import_node_path16.join)(baseDir, config.legacyFilePath);
+    const legacyPath = (0, import_node_path17.join)(baseDir, config.legacyFilePath);
     if (await fileExists(legacyPath)) {
       const legacyResult = await parseAugmentGuidelines(legacyPath, config);
       if (legacyResult.rule) {
@@ -3991,7 +4062,7 @@ async function parseAugmentRules(rulesDir, config) {
     const files = await readdir2(rulesDir);
     for (const file of files) {
       if (file.endsWith(".md") || file.endsWith(".mdc")) {
-        const filePath = (0, import_node_path16.join)(rulesDir, file);
+        const filePath = (0, import_node_path17.join)(rulesDir, file);
         try {
           const rawContent = await readFileContent(filePath);
           const parsed = (0, import_gray_matter3.default)(rawContent);
@@ -4000,7 +4071,7 @@ async function parseAugmentRules(rulesDir, config) {
           const description = frontmatterData.description || "";
           const tags = Array.isArray(frontmatterData.tags) ? frontmatterData.tags : void 0;
           const isRoot = ruleType === "always";
-          const filename = (0, import_node_path16.basename)(file, file.endsWith(".mdc") ? ".mdc" : ".md");
+          const filename = (0, import_node_path17.basename)(file, file.endsWith(".mdc") ? ".mdc" : ".md");
           const frontmatter = {
             root: isRoot,
             targets: [config.targetName],
@@ -4058,7 +4129,7 @@ async function parseAugmentGuidelines(guidelinesPath, config) {
 }
 
 // src/parsers/shared-helpers.ts
-var import_node_path17 = require("path");
+var import_node_path18 = require("path");
 var import_gray_matter4 = __toESM(require("gray-matter"), 1);
 async function parseConfigurationFiles(baseDir = process.cwd(), config) {
   const errors = [];
@@ -4114,7 +4185,7 @@ async function parseConfigurationFiles(baseDir = process.cwd(), config) {
           const files = await readdir2(dirPath);
           for (const file of files) {
             if (file.endsWith(dirConfig.filePattern)) {
-              const filePath = (0, import_node_path17.join)(dirPath, file);
+              const filePath = (0, import_node_path18.join)(dirPath, file);
               const fileResult = await safeAsyncOperation(async () => {
                 const rawContent = await readFileContent(filePath);
                 let content;
@@ -4259,10 +4330,10 @@ async function parseMemoryFiles(memoryDir, config) {
     const files = await readdir2(memoryDir);
     for (const file of files) {
       if (file.endsWith(".md")) {
-        const filePath = (0, import_node_path17.join)(memoryDir, file);
+        const filePath = (0, import_node_path18.join)(memoryDir, file);
         const content = await readFileContent(filePath);
         if (content.trim()) {
-          const filename = (0, import_node_path17.basename)(file, ".md");
+          const filename = (0, import_node_path18.basename)(file, ".md");
           const frontmatter = {
             root: false,
             targets: [config.tool],
@@ -4289,10 +4360,10 @@ async function parseCommandsFiles(commandsDir, config) {
     const files = await readdir2(commandsDir);
     for (const file of files) {
       if (file.endsWith(".md")) {
-        const filePath = (0, import_node_path17.join)(commandsDir, file);
+        const filePath = (0, import_node_path18.join)(commandsDir, file);
         const content = await readFileContent(filePath);
         if (content.trim()) {
-          const filename = (0, import_node_path17.basename)(file, ".md");
+          const filename = (0, import_node_path18.basename)(file, ".md");
           let frontmatter;
           let ruleContent;
           try {
@@ -4403,7 +4474,7 @@ async function parseClineConfiguration(baseDir = process.cwd()) {
 }
 
 // src/parsers/codexcli.ts
-var import_node_path18 = require("path");
+var import_node_path19 = require("path");
 
 // src/parsers/copilot.ts
 async function parseCopilotConfiguration(baseDir = process.cwd()) {
@@ -4426,7 +4497,7 @@ async function parseCopilotConfiguration(baseDir = process.cwd()) {
 }
 
 // src/parsers/cursor.ts
-var import_node_path19 = require("path");
+var import_node_path20 = require("path");
 var import_gray_matter5 = __toESM(require("gray-matter"), 1);
 var import_js_yaml = require("js-yaml");
 var import_mini8 = require("zod/mini");
@@ -4551,7 +4622,7 @@ async function parseCursorConfiguration(baseDir = process.cwd()) {
   const rules = [];
   let ignorePatterns;
   let mcpServers;
-  const cursorFilePath = (0, import_node_path19.join)(baseDir, ".cursorrules");
+  const cursorFilePath = (0, import_node_path20.join)(baseDir, ".cursorrules");
   if (await fileExists(cursorFilePath)) {
     try {
       const rawContent = await readFileContent(cursorFilePath);
@@ -4572,20 +4643,20 @@ async function parseCursorConfiguration(baseDir = process.cwd()) {
       errors.push(`Failed to parse .cursorrules file: ${errorMessage}`);
     }
   }
-  const cursorRulesDir = (0, import_node_path19.join)(baseDir, ".cursor", "rules");
+  const cursorRulesDir = (0, import_node_path20.join)(baseDir, ".cursor", "rules");
   if (await fileExists(cursorRulesDir)) {
     try {
       const { readdir: readdir2 } = await import("fs/promises");
       const files = await readdir2(cursorRulesDir);
       for (const file of files) {
         if (file.endsWith(".mdc")) {
-          const filePath = (0, import_node_path19.join)(cursorRulesDir, file);
+          const filePath = (0, import_node_path20.join)(cursorRulesDir, file);
           try {
             const rawContent = await readFileContent(filePath);
             const parsed = (0, import_gray_matter5.default)(rawContent, customMatterOptions);
             const content = parsed.content.trim();
             if (content) {
-              const filename = (0, import_node_path19.basename)(file, ".mdc");
+              const filename = (0, import_node_path20.basename)(file, ".mdc");
               const frontmatter = convertCursorMdcFrontmatter(parsed.data, filename);
               rules.push({
                 frontmatter,
@@ -4608,7 +4679,7 @@ async function parseCursorConfiguration(baseDir = process.cwd()) {
   if (rules.length === 0) {
     errors.push("No Cursor configuration files found (.cursorrules or .cursor/rules/*.mdc)");
   }
-  const cursorIgnorePath = (0, import_node_path19.join)(baseDir, ".cursorignore");
+  const cursorIgnorePath = (0, import_node_path20.join)(baseDir, ".cursorignore");
   if (await fileExists(cursorIgnorePath)) {
     try {
       const content = await readFileContent(cursorIgnorePath);
@@ -4621,7 +4692,7 @@ async function parseCursorConfiguration(baseDir = process.cwd()) {
       errors.push(`Failed to parse .cursorignore: ${errorMessage}`);
     }
   }
-  const cursorMcpPath = (0, import_node_path19.join)(baseDir, ".cursor", "mcp.json");
+  const cursorMcpPath = (0, import_node_path20.join)(baseDir, ".cursor", "mcp.json");
   if (await fileExists(cursorMcpPath)) {
     try {
       const content = await readFileContent(cursorMcpPath);
@@ -4671,11 +4742,11 @@ async function parseGeminiConfiguration(baseDir = process.cwd()) {
 }
 
 // src/parsers/junie.ts
-var import_node_path20 = require("path");
+var import_node_path21 = require("path");
 async function parseJunieConfiguration(baseDir = process.cwd()) {
   const errors = [];
   const rules = [];
-  const guidelinesPath = (0, import_node_path20.join)(baseDir, ".junie", "guidelines.md");
+  const guidelinesPath = (0, import_node_path21.join)(baseDir, ".junie", "guidelines.md");
   if (!await fileExists(guidelinesPath)) {
     errors.push(".junie/guidelines.md file not found");
     return { rules, errors };
@@ -4728,12 +4799,18 @@ async function parseRooConfiguration(baseDir = process.cwd()) {
 
 // src/parsers/windsurf.ts
 var import_promises3 = require("fs/promises");
-var import_node_path21 = require("path");
+var import_node_path22 = require("path");
 var import_gray_matter6 = __toESM(require("gray-matter"), 1);
 
 // src/core/importer.ts
 async function importConfiguration(options) {
-  const { tool, baseDir = process.cwd(), rulesDir = ".rulesync", verbose = false } = options;
+  const {
+    tool,
+    baseDir = process.cwd(),
+    rulesDir = ".rulesync",
+    verbose = false,
+    useLegacyLocation = false
+  } = options;
   const errors = [];
   let rules = [];
   let ignorePatterns;
@@ -4815,7 +4892,7 @@ async function importConfiguration(options) {
   if (rules.length === 0 && !ignorePatterns && !mcpServers) {
     return { success: false, rulesCreated: 0, errors };
   }
-  const rulesDirPath = (0, import_node_path22.join)(baseDir, rulesDir);
+  const rulesDirPath = (0, import_node_path23.join)(baseDir, rulesDir);
   try {
     const { mkdir: mkdir3 } = await import("fs/promises");
     await mkdir3(rulesDirPath, { recursive: true });
@@ -4830,11 +4907,17 @@ async function importConfiguration(options) {
       const baseFilename = rule.filename;
       let targetDir = rulesDirPath;
       if (rule.type === "command") {
-        targetDir = (0, import_node_path22.join)(rulesDirPath, "commands");
+        targetDir = (0, import_node_path23.join)(rulesDirPath, "commands");
         const { mkdir: mkdir3 } = await import("fs/promises");
         await mkdir3(targetDir, { recursive: true });
+      } else {
+        if (!useLegacyLocation) {
+          targetDir = (0, import_node_path23.join)(rulesDirPath, "rules");
+          const { mkdir: mkdir3 } = await import("fs/promises");
+          await mkdir3(targetDir, { recursive: true });
+        }
       }
-      const filePath = (0, import_node_path22.join)(targetDir, `${baseFilename}.md`);
+      const filePath = (0, import_node_path23.join)(targetDir, `${baseFilename}.md`);
       const content = generateRuleFileContent(rule);
       await writeFileContent(filePath, content);
       rulesCreated++;
@@ -4849,7 +4932,7 @@ async function importConfiguration(options) {
   let ignoreFileCreated = false;
   if (ignorePatterns && ignorePatterns.length > 0) {
     try {
-      const rulesyncignorePath = (0, import_node_path22.join)(baseDir, ".rulesyncignore");
+      const rulesyncignorePath = (0, import_node_path23.join)(baseDir, ".rulesyncignore");
       const ignoreContent = `${ignorePatterns.join("\n")}
 `;
       await writeFileContent(rulesyncignorePath, ignoreContent);
@@ -4865,7 +4948,7 @@ async function importConfiguration(options) {
   let mcpFileCreated = false;
   if (mcpServers && Object.keys(mcpServers).length > 0) {
     try {
-      const mcpPath = (0, import_node_path22.join)(baseDir, rulesDir, ".mcp.json");
+      const mcpPath = (0, import_node_path23.join)(baseDir, rulesDir, ".mcp.json");
       const mcpContent = `${JSON.stringify({ mcpServers }, null, 2)}
 `;
       await writeFileContent(mcpPath, mcpContent);
@@ -4901,6 +4984,7 @@ function generateRuleFileContent(rule) {
 
 // src/cli/commands/import.ts
 async function importCommand(options = {}) {
+  logger.setVerbose(options.verbose || false);
   const tools = [];
   if (options.augmentcode) tools.push("augmentcode");
   if (options["augmentcode-legacy"]) tools.push("augmentcode-legacy");
@@ -4911,66 +4995,74 @@ async function importCommand(options = {}) {
   if (options.roo) tools.push("roo");
   if (options.geminicli) tools.push("geminicli");
   if (tools.length === 0) {
-    console.error(
+    logger.error(
       "\u274C Please specify one tool to import from (--augmentcode, --augmentcode-legacy, --claudecode, --cursor, --copilot, --cline, --roo, --geminicli)"
     );
     process.exit(1);
   }
   if (tools.length > 1) {
-    console.error(
+    logger.error(
       "\u274C Only one tool can be specified at a time. Please run the import command separately for each tool."
     );
     process.exit(1);
   }
   const tool = tools[0];
   if (!tool) {
-    console.error("Error: No tool specified");
+    logger.error("Error: No tool specified");
     process.exit(1);
   }
-  console.log(`Importing configuration files from ${tool}...`);
+  logger.log(`Importing configuration files from ${tool}...`);
   try {
     const result = await importConfiguration({
       tool,
-      verbose: options.verbose ?? false
+      verbose: options.verbose ?? false,
+      useLegacyLocation: options.legacy ?? false
     });
     if (result.success) {
-      console.log(`\u2705 Imported ${result.rulesCreated} rule(s) from ${tool}`);
+      logger.success(`Imported ${result.rulesCreated} rule(s) from ${tool}`);
       if (result.ignoreFileCreated) {
-        console.log("\u2705 Created .rulesyncignore file from ignore patterns");
+        logger.success("Created .rulesyncignore file from ignore patterns");
       }
       if (result.mcpFileCreated) {
-        console.log("\u2705 Created .rulesync/.mcp.json file from MCP configuration");
+        logger.success("Created .rulesync/.mcp.json file from MCP configuration");
       }
-      console.log("You can now run 'rulesync generate' to create tool-specific configurations.");
+      logger.log("You can now run 'rulesync generate' to create tool-specific configurations.");
     } else if (result.errors.length > 0) {
-      console.warn(`\u26A0\uFE0F  Failed to import from ${tool}: ${result.errors[0]}`);
-      if (options.verbose && result.errors.length > 1) {
-        console.log("\nDetailed errors:");
+      logger.warn(`\u26A0\uFE0F  Failed to import from ${tool}: ${result.errors[0]}`);
+      if (result.errors.length > 1) {
+        logger.info("\nDetailed errors:");
         for (const error of result.errors) {
-          console.log(`  - ${error}`);
+          logger.info(`  - ${error}`);
         }
       }
     }
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    console.error(`\u274C Error importing from ${tool}: ${errorMessage}`);
+    logger.error(`\u274C Error importing from ${tool}: ${errorMessage}`);
     process.exit(1);
   }
 }
 
 // src/cli/commands/init.ts
-var import_node_path23 = require("path");
-async function initCommand() {
-  const aiRulesDir = ".rulesync";
+var import_node_path24 = require("path");
+async function initCommand(options = {}) {
+  const configResult = await loadConfig();
+  const config = configResult.config;
+  const aiRulesDir = config.aiRulesDir;
   console.log("Initializing rulesync...");
   await ensureDir(aiRulesDir);
-  await createSampleFiles(aiRulesDir);
+  const useLegacy = options.legacy ?? config.legacy ?? false;
+  const rulesDir = useLegacy ? aiRulesDir : (0, import_node_path24.join)(aiRulesDir, "rules");
+  if (!useLegacy) {
+    await ensureDir(rulesDir);
+  }
+  await createSampleFiles(rulesDir);
   console.log("\u2705 rulesync initialized successfully!");
   console.log("\nNext steps:");
-  console.log("1. Edit rule files in .rulesync/");
+  console.log(`1. Edit rule files in ${rulesDir}/`);
   console.log("2. Run 'rulesync generate' to create configuration files");
 }
-async function createSampleFiles(aiRulesDir) {
+async function createSampleFiles(rulesDir) {
   const sampleFile = {
     filename: "overview.md",
     content: `---
@@ -5006,7 +5098,7 @@ globs: ["**/*"]
 - Follow single responsibility principle
 `
   };
-  const filepath = (0, import_node_path23.join)(aiRulesDir, sampleFile.filename);
+  const filepath = (0, import_node_path24.join)(rulesDir, sampleFile.filename);
   if (!await fileExists(filepath)) {
     await writeFileContent(filepath, sampleFile.content);
     console.log(`Created ${filepath}`);
@@ -5150,12 +5242,12 @@ async function watchCommand() {
 
 // src/cli/index.ts
 var program = new import_commander.Command();
-program.name("rulesync").description("Unified AI rules management CLI tool").version("0.60.0");
-program.command("init").description("Initialize rulesync in current directory").action(initCommand);
-program.command("add <filename>").description("Add a new rule file").action(addCommand);
+program.name("rulesync").description("Unified AI rules management CLI tool").version("0.62.0");
+program.command("init").description("Initialize rulesync in current directory").option("--legacy", "Use legacy file location (.rulesync/*.md instead of .rulesync/rules/*.md)").action(initCommand);
+program.command("add <filename>").description("Add a new rule file").option("--legacy", "Use legacy file location (.rulesync/*.md instead of .rulesync/rules/*.md)").action(addCommand);
 program.command("gitignore").description("Add generated files to .gitignore").action(gitignoreCommand);
-program.command("import").description("Import configurations from AI tools to rulesync format").option("--augmentcode", "Import from AugmentCode (.augment/rules/)").option("--augmentcode-legacy", "Import from AugmentCode legacy format (.augment-guidelines)").option("--claudecode", "Import from Claude Code (CLAUDE.md)").option("--cursor", "Import from Cursor (.cursorrules)").option("--copilot", "Import from GitHub Copilot (.github/copilot-instructions.md)").option("--cline", "Import from Cline (.cline/instructions.md)").option("--roo", "Import from Roo Code (.roo/instructions.md)").option("--geminicli", "Import from Gemini CLI (GEMINI.md)").option("--junie", "Import from JetBrains Junie (.junie/guidelines.md)").option("-v, --verbose", "Verbose output").action(importCommand);
-program.command("generate").description("Generate configuration files for AI tools").option("--augmentcode", "Generate only for AugmentCode").option("--augmentcode-legacy", "Generate only for AugmentCode legacy format").option("--copilot", "Generate only for GitHub Copilot").option("--cursor", "Generate only for Cursor").option("--cline", "Generate only for Cline").option("--codexcli", "Generate only for OpenAI Codex CLI").option("--claudecode", "Generate only for Claude Code").option("--roo", "Generate only for Roo Code").option("--geminicli", "Generate only for Gemini CLI").option("--junie", "Generate only for JetBrains Junie").option("--kiro", "Generate only for Kiro IDE").option("--delete", "Delete all existing files in output directories before generating").option(
+program.command("import").description("Import configurations from AI tools to rulesync format").option("--augmentcode", "Import from AugmentCode (.augment/rules/)").option("--augmentcode-legacy", "Import from AugmentCode legacy format (.augment-guidelines)").option("--claudecode", "Import from Claude Code (CLAUDE.md)").option("--cursor", "Import from Cursor (.cursorrules)").option("--copilot", "Import from GitHub Copilot (.github/copilot-instructions.md)").option("--cline", "Import from Cline (.cline/instructions.md)").option("--roo", "Import from Roo Code (.roo/instructions.md)").option("--geminicli", "Import from Gemini CLI (GEMINI.md)").option("--junie", "Import from JetBrains Junie (.junie/guidelines.md)").option("-v, --verbose", "Verbose output").option("--legacy", "Use legacy file location (.rulesync/*.md instead of .rulesync/rules/*.md)").action(importCommand);
+program.command("generate").description("Generate configuration files for AI tools").option("--augmentcode", "Generate only for AugmentCode").option("--augmentcode-legacy", "Generate only for AugmentCode legacy format").option("--copilot", "Generate only for GitHub Copilot").option("--cursor", "Generate only for Cursor").option("--cline", "Generate only for Cline").option("--codexcli", "Generate only for OpenAI Codex CLI").option("--claudecode", "Generate only for Claude Code").option("--roo", "Generate only for Roo Code").option("--geminicli", "Generate only for Gemini CLI").option("--junie", "Generate only for JetBrains Junie").option("--kiro", "Generate only for Kiro IDE").option("--windsurf", "Generate only for Windsurf").option("--delete", "Delete all existing files in output directories before generating").option(
   "-b, --base-dir <paths>",
   "Base directories to generate files (comma-separated for multiple paths)"
 ).option("-v, --verbose", "Verbose output").option("-c, --config <path>", "Path to configuration file").option("--no-config", "Disable configuration file loading").action(async (options) => {
@@ -5171,6 +5263,7 @@ program.command("generate").description("Generate configuration files for AI too
   if (options.geminicli) tools.push("geminicli");
   if (options.junie) tools.push("junie");
   if (options.kiro) tools.push("kiro");
+  if (options.windsurf) tools.push("windsurf");
   const generateOptions = {
     verbose: options.verbose,
     delete: options.delete,