rulesync 0.61.0 → 0.62.0

package/dist/index.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-import "./chunk-U63N3YDS.js";
+import "./chunk-M7NL7G7A.js";
 import "./chunk-LXTA7DBA.js";
 import "./chunk-PCATT4UZ.js";
-import "./chunk-ICMPPX55.js";
+import "./chunk-NETSYSMD.js";
 import "./chunk-YTU3SCQO.js";
-import "./chunk-3ZLMXJTX.js";
-import "./chunk-74TYZWHJ.js";
-import "./chunk-C5LFJFPS.js";
+import "./chunk-U4PLVMCG.js";
+import "./chunk-UEAYL4NT.js";
+import "./chunk-2CW2KFB3.js";
 import "./chunk-KUGTKMNW.js";
-import "./chunk-DA3XULAD.js";
-import "./chunk-LRYVNLH5.js";
-import "./chunk-2KYIOT5S.js";
+import "./chunk-4PSTOKKD.js";
+import "./chunk-MDYDKNXQ.js";
+import "./chunk-GQTMTBX4.js";
 import {
   ALL_TOOL_TARGETS,
   RulesyncTargetsSchema,
@@ -26,75 +26,9 @@ import { Command } from "commander";
 import { mkdir, writeFile } from "fs/promises";
 import * as path from "path";
 
-// src/utils/config.ts
-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 mkdir(rulesDir, { recursive: true });
-    const template = generateRuleTemplate(sanitizedFilename);
-    await 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
-import { writeFileSync } from "fs";
-import path2 from "path";
+// src/utils/config-loader.ts
+import { loadConfig as loadC12Config } from "c12";
+import { $ZodError } from "zod/v4/core";
 
 // src/types/claudecode.ts
 import { z } from "zod/mini";
@@ -121,7 +55,8 @@ var ConfigSchema = z3.object({
   watchEnabled: z3.boolean(),
   defaultTargets: ToolTargetsSchema,
   claudecodeCommands: z3.optional(z3.string()),
-  geminicliCommands: z3.optional(z3.string())
+  geminicliCommands: z3.optional(z3.string()),
+  legacy: z3.optional(z3.boolean())
 });
 
 // src/types/config-options.ts
@@ -150,6 +85,7 @@ var ConfigOptionsSchema = z4.object({
   verbose: z4.optional(z4.boolean()),
   delete: z4.optional(z4.boolean()),
   baseDir: z4.optional(z4.union([z4.string(), z4.array(z4.string())])),
+  legacy: z4.optional(z4.boolean()),
   watch: z4.optional(
     z4.object({
       enabled: z4.optional(z4.boolean()),
@@ -169,6 +105,7 @@ var MergedConfigSchema = z4.object({
   delete: z4.optional(z4.boolean()),
   baseDir: z4.optional(z4.union([z4.string(), z4.array(z4.string())])),
   configPath: z4.optional(z4.string()),
+  legacy: z4.optional(z4.boolean()),
   watch: z4.optional(
     z4.object({
       enabled: z4.optional(z4.boolean()),
@@ -233,9 +170,38 @@ var GenerateOptionsSchema = z6.object({
   watch: z6.optional(z6.boolean())
 });
 
+// src/utils/config.ts
+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
-import { loadConfig as loadC12Config } from "c12";
-import { $ZodError } from "zod/v4/core";
 var MODULE_NAME = "rulesync";
 async function loadConfig(options = {}) {
   const defaultConfig = getDefaultConfig();
@@ -422,6 +388,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 mkdir(rulesDir, { recursive: true });
+    const template = generateRuleTemplate(sanitizedFilename);
+    await 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
+import { writeFileSync } from "fs";
+import path2 from "path";
+
 // src/utils/error.ts
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
@@ -488,6 +497,19 @@ async function findFiles(dir, extension = ".md") {
     return [];
   }
 }
+async function findRuleFiles(aiRulesDir) {
+  const rulesDir = join2(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 === "") {
@@ -522,6 +544,50 @@ async function removeClaudeGeneratedFiles() {
   }
 }
 
+// src/utils/logger.ts
+import { consola } from "consola";
+var Logger = class {
+  _verbose = false;
+  console = 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) {
@@ -531,50 +597,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)
     );
@@ -595,7 +661,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);
@@ -611,7 +677,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);
       }
     }
@@ -625,7 +691,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);
       }
     }
@@ -648,18 +714,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 {
     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);
@@ -792,12 +858,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) {
@@ -2392,7 +2452,7 @@ import { basename as basename2 } from "path";
 import matter2 from "gray-matter";
 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 = [];
@@ -2548,22 +2608,22 @@ async function generateMcpConfigurations(mcpConfig, baseDir, targetTools) {
       servers,
       dir
     ),
-    claudecode: async (servers, dir) => (await import("./claudecode-XKHMZT7R.js")).generateClaudeMcpConfiguration(
+    claudecode: async (servers, dir) => (await import("./claudecode-YTEFACCT.js")).generateClaudeMcpConfiguration(
       servers,
       dir
     ),
     copilot: async (servers, dir) => (await import("./copilot-MOR3HHJX.js")).generateCopilotMcpConfiguration(servers, dir),
-    cursor: async (servers, dir) => (await import("./cursor-WWHUW5AD.js")).generateCursorMcpConfiguration(servers, dir),
-    cline: async (servers, dir) => (await import("./cline-FNWPJ7K4.js")).generateClineMcpConfiguration(servers, dir),
-    codexcli: async (servers, dir) => (await import("./codexcli-FDFHY66P.js")).generateCodexMcpConfiguration(servers, dir),
+    cursor: async (servers, dir) => (await import("./cursor-YJGH7W24.js")).generateCursorMcpConfiguration(servers, dir),
+    cline: async (servers, dir) => (await import("./cline-CKNUDEA3.js")).generateClineMcpConfiguration(servers, dir),
+    codexcli: async (servers, dir) => (await import("./codexcli-7SDGYI7D.js")).generateCodexMcpConfiguration(servers, dir),
     roo: async (servers, dir) => (await import("./roo-L3QTTIPO.js")).generateRooMcpConfiguration(servers, dir),
-    geminicli: async (servers, dir) => (await import("./geminicli-7TIDQ62D.js")).generateGeminiCliMcpConfiguration(
+    geminicli: async (servers, dir) => (await import("./geminicli-E7KZTZ2G.js")).generateGeminiCliMcpConfiguration(
       servers,
       dir
     ),
     kiro: async (servers, dir) => (await import("./kiro-YDHXY2MA.js")).generateKiroMcpConfiguration(servers, dir),
-    junie: async (servers, dir) => (await import("./junie-VMNDWBNB.js")).generateJunieMcpConfiguration(servers, dir),
-    windsurf: async (servers, dir) => (await import("./windsurf-KOSK4MZJ.js")).generateWindsurfMcpConfiguration(
+    junie: async (servers, dir) => (await import("./junie-5LEQU4BO.js")).generateJunieMcpConfiguration(servers, dir),
+    windsurf: async (servers, dir) => (await import("./windsurf-4P6HEUBV.js")).generateWindsurfMcpConfiguration(
       servers,
       dir
     )
@@ -2598,6 +2658,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;
@@ -2606,18 +2667,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;
@@ -2628,33 +2689,37 @@ 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 = join15(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":
@@ -2676,15 +2741,21 @@ async function generateCommand(options = {}) {
             break;
           case "claudecode":
             deleteTasks.push(removeClaudeGeneratedFiles());
-            deleteTasks.push(removeDirectory(join15(".claude", "commands")));
+            if (hasCommandFiles) {
+              deleteTasks.push(removeDirectory(join15(".claude", "commands")));
+            }
             break;
           case "roo":
             deleteTasks.push(removeDirectory(config.outputPaths.roo));
-            deleteTasks.push(removeDirectory(join15(".roo", "commands")));
+            if (hasCommandFiles) {
+              deleteTasks.push(removeDirectory(join15(".roo", "commands")));
+            }
             break;
           case "geminicli":
             deleteTasks.push(removeDirectory(config.outputPaths.geminicli));
-            deleteTasks.push(removeDirectory(join15(".gemini", "commands")));
+            if (hasCommandFiles) {
+              deleteTasks.push(removeDirectory(join15(".gemini", "commands")));
+            }
             break;
           case "kiro":
             deleteTasks.push(removeDirectory(config.outputPaths.kiro));
@@ -2695,44 +2766,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(
@@ -2741,27 +2802,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(
@@ -2770,14 +2825,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++;
       }
     }
@@ -2787,13 +2840,13 @@ 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);
   }
 }
@@ -3700,7 +3753,13 @@ import matter6 from "gray-matter";
 
 // 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;
@@ -3800,6 +3859,12 @@ async function importConfiguration(options) {
         targetDir = join23(rulesDirPath, "commands");
         const { mkdir: mkdir3 } = await import("fs/promises");
         await mkdir3(targetDir, { recursive: true });
+      } else {
+        if (!useLegacyLocation) {
+          targetDir = join23(rulesDirPath, "rules");
+          const { mkdir: mkdir3 } = await import("fs/promises");
+          await mkdir3(targetDir, { recursive: true });
+        }
       }
       const filePath = join23(targetDir, `${baseFilename}.md`);
       const content = generateRuleFileContent(rule);
@@ -3868,6 +3933,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");
@@ -3878,66 +3944,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
 import { join as join24 } from "path";
-async function initCommand() {
-  const aiRulesDir = ".rulesync";
+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 : join24(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: `---
@@ -3973,7 +4047,7 @@ globs: ["**/*"]
 - Follow single responsibility principle
 `
   };
-  const filepath = join24(aiRulesDir, sampleFile.filename);
+  const filepath = join24(rulesDir, sampleFile.filename);
   if (!await fileExists(filepath)) {
     await writeFileContent(filepath, sampleFile.content);
     console.log(`Created ${filepath}`);
@@ -4117,11 +4191,11 @@ async function watchCommand() {
 
 // src/cli/index.ts
 var program = new Command();
-program.name("rulesync").description("Unified AI rules management CLI tool").version("0.61.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("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)"