rulesync 0.62.0 → 0.64.0

package/dist/index.cjs

@@ -35,12 +35,13 @@ function isToolTarget(target) {
   if (!target) return false;
   return ALL_TOOL_TARGETS.some((validTarget) => validTarget === target);
 }
-var import_mini3, ALL_TOOL_TARGETS, ToolTargetSchema, ToolTargetsSchema, WildcardTargetSchema, RulesyncTargetsSchema;
+var import_mini2, ALL_TOOL_TARGETS, ToolTargetSchema, ToolTargetsSchema, WildcardTargetSchema, RulesyncTargetsSchema;
 var init_tool_targets = __esm({
   "src/types/tool-targets.ts"() {
     "use strict";
-    import_mini3 = require("zod/mini");
+    import_mini2 = require("zod/mini");
     ALL_TOOL_TARGETS = [
+      "amazonqcli",
       "augmentcode",
       "augmentcode-legacy",
       "copilot",
@@ -48,16 +49,163 @@ var init_tool_targets = __esm({
       "cline",
       "claudecode",
       "codexcli",
+      "opencode",
       "roo",
       "geminicli",
       "kiro",
       "junie",
       "windsurf"
     ];
-    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]);
+    ToolTargetSchema = import_mini2.z.enum(ALL_TOOL_TARGETS);
+    ToolTargetsSchema = import_mini2.z.array(ToolTargetSchema);
+    WildcardTargetSchema = import_mini2.z.tuple([import_mini2.z.literal("*")]);
+    RulesyncTargetsSchema = import_mini2.z.union([ToolTargetsSchema, WildcardTargetSchema]);
+  }
+});
+
+// src/utils/logger.ts
+var import_consola, Logger, logger;
+var init_logger = __esm({
+  "src/utils/logger.ts"() {
+    "use strict";
+    import_consola = require("consola");
+    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);
+        }
+      }
+    };
+    logger = new Logger();
+  }
+});
+
+// src/utils/file.ts
+async function ensureDir(dirPath) {
+  try {
+    await (0, import_promises2.stat)(dirPath);
+  } catch {
+    await (0, import_promises2.mkdir)(dirPath, { recursive: true });
+  }
+}
+function resolvePath(relativePath, baseDir) {
+  if (!baseDir) return relativePath;
+  const resolved = (0, import_node_path.resolve)(baseDir, relativePath);
+  const rel = (0, import_node_path.relative)(baseDir, resolved);
+  if (rel.startsWith("..") || (0, import_node_path.resolve)(resolved) !== resolved) {
+    throw new Error(`Path traversal detected: ${relativePath}`);
+  }
+  return resolved;
+}
+async function readFileContent(filepath) {
+  return (0, import_promises2.readFile)(filepath, "utf-8");
+}
+async function writeFileContent(filepath, content) {
+  await ensureDir((0, import_node_path.dirname)(filepath));
+  await (0, import_promises2.writeFile)(filepath, content, "utf-8");
+}
+async function fileExists(filepath) {
+  try {
+    await (0, import_promises2.stat)(filepath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function findFiles(dir, extension = ".md") {
+  try {
+    const files = await (0, import_promises2.readdir)(dir);
+    return files.filter((file) => file.endsWith(extension)).map((file) => (0, import_node_path.join)(dir, file));
+  } catch {
+    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 === "") {
+    logger.warn(`Skipping deletion of dangerous path: ${dirPath}`);
+    return;
+  }
+  try {
+    if (await fileExists(dirPath)) {
+      await (0, import_promises2.rm)(dirPath, { recursive: true, force: true });
+    }
+  } catch (error) {
+    logger.warn(`Failed to remove directory ${dirPath}:`, error);
+  }
+}
+async function removeFile(filepath) {
+  try {
+    if (await fileExists(filepath)) {
+      await (0, import_promises2.rm)(filepath);
+    }
+  } catch (error) {
+    logger.warn(`Failed to remove file ${filepath}:`, error);
+  }
+}
+async function removeClaudeGeneratedFiles() {
+  const filesToRemove = ["CLAUDE.md", ".claude/memories"];
+  for (const fileOrDir of filesToRemove) {
+    if (fileOrDir.endsWith("/memories")) {
+      await removeDirectory(fileOrDir);
+    } else {
+      await removeFile(fileOrDir);
+    }
+  }
+}
+var import_promises2, import_node_path;
+var init_file = __esm({
+  "src/utils/file.ts"() {
+    "use strict";
+    import_promises2 = require("fs/promises");
+    import_node_path = require("path");
+    init_logger();
   }
 });
 
@@ -85,6 +233,75 @@ var init_mcp_helpers = __esm({
   }
 });
 
+// src/generators/mcp/amazonqcli.ts
+var amazonqcli_exports = {};
+__export(amazonqcli_exports, {
+  generateAmazonqcliMcp: () => generateAmazonqcliMcp,
+  generateAmazonqcliMcpString: () => generateAmazonqcliMcpString
+});
+async function generateAmazonqcliMcp(mcpServers, config, baseDir) {
+  const outputs = [];
+  const configPaths = [
+    ".amazonq/mcp.json"
+    // Workspace configuration
+    // Note: Global configuration is ~/.aws/amazonq/mcp.json but is user-specific
+    // According to precautions.md, we should not create user-level files
+  ];
+  for (const configPath of configPaths) {
+    const filepath = resolvePath(configPath, baseDir);
+    const content = generateAmazonqcliMcpConfig({ mcpServers });
+    outputs.push({
+      tool: "amazonqcli",
+      filepath,
+      content
+    });
+  }
+  return outputs;
+}
+function generateAmazonqcliMcpString(config) {
+  return generateAmazonqcliMcpConfig(config);
+}
+function generateAmazonqcliMcpConfig(config) {
+  const servers = {};
+  for (const [serverName, server] of Object.entries(config.mcpServers)) {
+    if (!shouldIncludeServer(server, "amazonqcli")) {
+      continue;
+    }
+    const amazonqServer = {};
+    if (server.command) {
+      amazonqServer.command = server.command;
+      if (server.args) {
+        amazonqServer.args = server.args;
+      }
+    }
+    if (server.env) {
+      amazonqServer.env = server.env;
+    }
+    if (server.timeout !== void 0) {
+      amazonqServer.timeout = server.timeout;
+    }
+    if (server.disabled !== void 0) {
+      amazonqServer.disabled = server.disabled;
+    }
+    if (server.alwaysAllow) {
+      amazonqServer.autoApprove = server.alwaysAllow;
+    }
+    servers[serverName] = amazonqServer;
+  }
+  const finalConfig = {
+    mcpServers: servers
+  };
+  return `${JSON.stringify(finalConfig, null, 2)}
+`;
+}
+var init_amazonqcli = __esm({
+  "src/generators/mcp/amazonqcli.ts"() {
+    "use strict";
+    init_file();
+    init_mcp_helpers();
+  }
+});
+
 // src/generators/mcp/augmentcode.ts
 var augmentcode_exports = {};
 __export(augmentcode_exports, {
@@ -104,7 +321,10 @@ function generateAugmentcodeMcp(config) {
       name: serverName
     };
     if (server.command) {
-      augmentServer.command = server.command;
+      const command = Array.isArray(server.command) ? server.command[0] : server.command;
+      if (command) {
+        augmentServer.command = command;
+      }
       if (server.args) {
         augmentServer.args = server.args;
       }
@@ -152,7 +372,10 @@ function generateAugmentcodeMcpConfiguration(mcpServers, baseDir = "") {
     const { targets: _, ...serverConfig } = server;
     const augmentServer = {};
     if (serverConfig.command) {
-      augmentServer.command = serverConfig.command;
+      const command = Array.isArray(serverConfig.command) ? serverConfig.command[0] : serverConfig.command;
+      if (command) {
+        augmentServer.command = command;
+      }
       if (serverConfig.args) {
         augmentServer.args = serverConfig.args;
       }
@@ -199,6 +422,17 @@ var init_augmentcode = __esm({
   }
 });
 
+// src/constants/schemas.ts
+var SCHEMA_URLS;
+var init_schemas = __esm({
+  "src/constants/schemas.ts"() {
+    "use strict";
+    SCHEMA_URLS = {
+      OPENCODE: "https://opencode.ai/config.json"
+    };
+  }
+});
+
 // src/generators/mcp/shared-factory.ts
 function generateMcpConfig(config, toolConfig) {
   const servers = {};
@@ -248,7 +482,7 @@ function generateMcpConfigurationFilesFromRegistry(tool, mcpServers, baseDir = "
   if (tool === "junie") {
     return generateJunieMcpConfigurationFiles(mcpServers, baseDir);
   }
-  const customTools = ["copilot", "augmentcode", "roo", "codexcli", "kiro", "geminicli"];
+  const customTools = ["copilot", "augmentcode", "codexcli", "kiro"];
   if (customTools.includes(tool)) {
     throw new Error(
       `Tool ${tool} uses custom configuration logic - use its specific generator function instead`
@@ -297,6 +531,7 @@ var serverTransforms, configWrappers, MCP_GENERATOR_REGISTRY, cursorMcpGenerator
 var init_shared_factory = __esm({
   "src/generators/mcp/shared-factory.ts"() {
     "use strict";
+    init_schemas();
     init_mcp_helpers();
     serverTransforms = {
       /**
@@ -307,7 +542,8 @@ var init_shared_factory = __esm({
         if (server.command) {
           result.command = server.command;
           if (server.args) result.args = server.args;
-        } else if (server.url || server.httpUrl) {
+        }
+        if (server.url || server.httpUrl) {
           const url = server.httpUrl || server.url;
           if (url) result.url = url;
         }
@@ -316,6 +552,25 @@ var init_shared_factory = __esm({
         }
         return result;
       },
+      /**
+       * Roo-specific server transformation (preserves httpUrl, transport, type, etc.)
+       */
+      roo: (server) => {
+        const result = serverTransforms.extended(server);
+        if (server.httpUrl) {
+          if (!server.url) {
+            result.httpUrl = server.httpUrl;
+            delete result.url;
+          }
+        }
+        if (server.transport) {
+          result.transport = server.transport;
+        }
+        if (server.type) {
+          result.type = server.type;
+        }
+        return result;
+      },
       /**
        * Extended server transformation (includes disabled, alwaysAllow, etc.)
        */
@@ -367,6 +622,12 @@ var init_shared_factory = __esm({
       })
     };
     MCP_GENERATOR_REGISTRY = {
+      roo: {
+        target: "roo",
+        configPaths: [".roo/mcp.json"],
+        serverTransform: serverTransforms.roo,
+        configWrapper: configWrappers.mcpServers
+      },
       claudecode: {
         target: "claudecode",
         configPaths: [".mcp.json"],
@@ -493,6 +754,48 @@ var init_shared_factory = __esm({
         configPaths: [".cline/mcp.json"],
         serverTransform: serverTransforms.extended,
         configWrapper: configWrappers.mcpServers
+      },
+      geminicli: {
+        target: "geminicli",
+        configPaths: [".gemini/settings.json"],
+        serverTransform: (server) => {
+          const { targets: _, ...serverConfig } = server;
+          const geminiServer = { ...serverConfig };
+          if (server.env) {
+            geminiServer.env = server.env;
+          }
+          return geminiServer;
+        },
+        configWrapper: configWrappers.mcpServers
+      },
+      opencode: {
+        target: "opencode",
+        configPaths: ["opencode.json"],
+        serverTransform: (server) => {
+          const opencodeServer = {};
+          if (server.command) {
+            opencodeServer.type = "local";
+            opencodeServer.command = Array.isArray(server.command) ? server.command : [server.command];
+            if (server.args) opencodeServer.args = server.args;
+            if (server.env) opencodeServer.environment = server.env;
+            if (server.cwd) opencodeServer.cwd = server.cwd;
+          } else if (server.url || server.httpUrl) {
+            opencodeServer.type = "remote";
+            const url = server.httpUrl || server.url;
+            if (url) opencodeServer.url = url;
+            if (server.headers) opencodeServer.headers = server.headers;
+          }
+          if (server.disabled !== void 0) {
+            opencodeServer.enabled = !server.disabled;
+          } else {
+            opencodeServer.enabled = true;
+          }
+          return opencodeServer;
+        },
+        configWrapper: (servers) => ({
+          $schema: SCHEMA_URLS.OPENCODE,
+          mcp: servers
+        })
       }
     };
     cursorMcpGenerator = createMcpGenerator("cursor");
@@ -696,7 +999,10 @@ function generateCopilotMcp(config, target) {
     if (!shouldIncludeServer(server, "copilot")) continue;
     const copilotServer = {};
     if (server.command) {
-      copilotServer.command = server.command;
+      const command = Array.isArray(server.command) ? server.command[0] : server.command;
+      if (command) {
+        copilotServer.command = command;
+      }
       if (server.args) copilotServer.args = server.args;
     } else if (server.url || server.httpUrl) {
       const url = server.httpUrl || server.url;
@@ -786,53 +1092,10 @@ __export(geminicli_exports, {
   generateGeminiCliMcpConfiguration: () => generateGeminiCliMcpConfiguration
 });
 function generateGeminiCliMcp(config) {
-  return generateMcpConfig(config, {
-    target: "geminicli",
-    configPaths: [".gemini/settings.json"],
-    serverTransform: (server) => {
-      const geminiServer = {};
-      if (server.command) {
-        geminiServer.command = server.command;
-        if (server.args) geminiServer.args = server.args;
-      } else if (server.url || server.httpUrl) {
-        if (server.httpUrl) {
-          geminiServer.httpUrl = server.httpUrl;
-        } else if (server.url) {
-          geminiServer.url = server.url;
-        }
-      }
-      if (server.env) {
-        geminiServer.env = server.env;
-      }
-      if (server.timeout !== void 0) {
-        geminiServer.timeout = server.timeout;
-      }
-      if (server.trust !== void 0) {
-        geminiServer.trust = server.trust;
-      }
-      return geminiServer;
-    },
-    configWrapper: configWrappers.mcpServers
-  });
+  return generateMcpFromRegistry("geminicli", config);
 }
 function generateGeminiCliMcpConfiguration(mcpServers, baseDir = "") {
-  return generateMcpConfigurationFiles(
-    mcpServers,
-    {
-      target: "geminicli",
-      configPaths: [".gemini/settings.json"],
-      serverTransform: (server) => {
-        const { targets: _, ...serverConfig } = server;
-        const geminiServer = { ...serverConfig };
-        if (server.env) {
-          geminiServer.env = server.env;
-        }
-        return geminiServer;
-      },
-      configWrapper: configWrappers.mcpServers
-    },
-    baseDir
-  );
+  return generateMcpConfigurationFilesFromRegistry("geminicli", mcpServers, baseDir);
 }
 var init_geminicli = __esm({
   "src/generators/mcp/geminicli.ts"() {
@@ -956,77 +1219,15 @@ __export(roo_exports, {
   generateRooMcpConfiguration: () => generateRooMcpConfiguration
 });
 function generateRooMcp(config) {
-  const rooConfig = {
-    mcpServers: {}
-  };
-  for (const [serverName, server] of Object.entries(config.mcpServers)) {
-    if (!shouldIncludeServer(server, "roo")) continue;
-    const rooServer = {};
-    if (server.command) {
-      rooServer.command = server.command;
-      if (server.args) rooServer.args = server.args;
-    } else if (server.url || server.httpUrl) {
-      const url = server.httpUrl || server.url;
-      if (url) {
-        rooServer.url = url;
-      }
-      if (server.httpUrl || server.transport === "http") {
-        rooServer.type = "streamable-http";
-      } else if (server.transport === "sse" || server.type === "sse") {
-        rooServer.type = "sse";
-      }
-    }
-    if (server.env) {
-      rooServer.env = {};
-      for (const [key, value] of Object.entries(server.env)) {
-        if (value.startsWith("${env:") && value.endsWith("}")) {
-          rooServer.env[key] = value;
-        } else {
-          rooServer.env[key] = `\${env:${value}}`;
-        }
-      }
-    }
-    if (server.disabled !== void 0) {
-      rooServer.disabled = server.disabled;
-    }
-    if (server.alwaysAllow) {
-      rooServer.alwaysAllow = server.alwaysAllow;
-    }
-    if (server.networkTimeout !== void 0) {
-      rooServer.networkTimeout = Math.max(3e4, Math.min(3e5, server.networkTimeout));
-    }
-    rooConfig.mcpServers[serverName] = rooServer;
-  }
-  return JSON.stringify(rooConfig, null, 2);
+  return generateMcpFromRegistry("roo", config);
 }
 function generateRooMcpConfiguration(mcpServers, baseDir = "") {
-  const filepath = baseDir ? `${baseDir}/.roo/mcp.json` : ".roo/mcp.json";
-  const config = {
-    mcpServers: {}
-  };
-  for (const [serverName, server] of Object.entries(mcpServers)) {
-    if (!shouldIncludeServer(server, "roo")) {
-      continue;
-    }
-    const { targets: _targets, ...serverConfig } = server;
-    const rooServer = { ...serverConfig };
-    if (serverConfig.httpUrl !== void 0 && serverConfig.url !== void 0) {
-      rooServer.url = serverConfig.httpUrl;
-    }
-    config.mcpServers[serverName] = rooServer;
-  }
-  return [
-    {
-      filepath,
-      content: `${JSON.stringify(config, null, 2)}
-`
-    }
-  ];
+  return generateMcpConfigurationFilesFromRegistry("roo", mcpServers, baseDir);
 }
 var init_roo = __esm({
   "src/generators/mcp/roo.ts"() {
     "use strict";
-    init_mcp_helpers();
+    init_shared_factory();
   }
 });
 
@@ -1049,6 +1250,25 @@ var init_windsurf = __esm({
   }
 });
 
+// src/generators/mcp/opencode.ts
+var opencode_exports = {};
+__export(opencode_exports, {
+  generateOpenCodeMcp: () => generateOpenCodeMcp,
+  generateOpenCodeMcpConfiguration: () => generateOpenCodeMcpConfiguration
+});
+function generateOpenCodeMcp(config) {
+  return generateMcpFromRegistry("opencode", config);
+}
+function generateOpenCodeMcpConfiguration(mcpServers, baseDir = "") {
+  return generateMcpConfigurationFilesFromRegistry("opencode", mcpServers, baseDir);
+}
+var init_opencode = __esm({
+  "src/generators/mcp/opencode.ts"() {
+    "use strict";
+    init_shared_factory();
+  }
+});
+
 // src/cli/index.ts
 var import_commander = require("commander");
 
@@ -1071,12 +1291,21 @@ var ClaudeSettingsSchema = import_mini.z.looseObject({
   )
 });
 
-// src/types/commands.ts
-var import_mini2 = require("zod/mini");
-var CommandFrontmatterSchema = import_mini2.z.object({
-  description: import_mini2.z.optional(import_mini2.z.string())
+// src/types/shared.ts
+var import_mini3 = require("zod/mini");
+init_tool_targets();
+var OutputSchema = import_mini3.z.object({
+  tool: ToolTargetSchema,
+  filepath: import_mini3.z.string(),
+  content: import_mini3.z.string()
+});
+var BaseFrontmatterSchema = import_mini3.z.object({
+  description: import_mini3.z.optional(import_mini3.z.string())
 });
 
+// src/types/commands.ts
+var CommandFrontmatterSchema = BaseFrontmatterSchema;
+
 // src/types/config.ts
 var import_mini4 = require("zod/mini");
 init_tool_targets();
@@ -1094,6 +1323,7 @@ var ConfigSchema = import_mini4.z.object({
 var import_mini5 = require("zod/mini");
 init_tool_targets();
 var OutputPathsSchema = import_mini5.z.object({
+  amazonqcli: import_mini5.z.optional(import_mini5.z.string()),
   augmentcode: import_mini5.z.optional(import_mini5.z.string()),
   "augmentcode-legacy": import_mini5.z.optional(import_mini5.z.string()),
   copilot: import_mini5.z.optional(import_mini5.z.string()),
@@ -1101,6 +1331,7 @@ var OutputPathsSchema = import_mini5.z.object({
   cline: import_mini5.z.optional(import_mini5.z.string()),
   claudecode: import_mini5.z.optional(import_mini5.z.string()),
   codexcli: import_mini5.z.optional(import_mini5.z.string()),
+  opencode: import_mini5.z.optional(import_mini5.z.string()),
   roo: import_mini5.z.optional(import_mini5.z.string()),
   geminicli: import_mini5.z.optional(import_mini5.z.string()),
   kiro: import_mini5.z.optional(import_mini5.z.string()),
@@ -1152,7 +1383,7 @@ var import_mini6 = require("zod/mini");
 init_tool_targets();
 var McpTransportTypeSchema = import_mini6.z.enum(["stdio", "sse", "http"]);
 var McpServerBaseSchema = import_mini6.z.object({
-  command: import_mini6.z.optional(import_mini6.z.string()),
+  command: import_mini6.z.optional(import_mini6.z.union([import_mini6.z.string(), import_mini6.z.array(import_mini6.z.string())])),
   args: import_mini6.z.optional(import_mini6.z.array(import_mini6.z.string())),
   url: import_mini6.z.optional(import_mini6.z.string()),
   httpUrl: import_mini6.z.optional(import_mini6.z.string()),
@@ -1193,11 +1424,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 GeneratedOutputSchema = import_mini7.z.object({
-  tool: ToolTargetSchema,
-  filepath: import_mini7.z.string(),
-  content: import_mini7.z.string()
-});
 var GenerateOptionsSchema = import_mini7.z.object({
   targetTools: import_mini7.z.optional(ToolTargetsSchema),
   outputDir: import_mini7.z.optional(import_mini7.z.string()),
@@ -1213,6 +1439,7 @@ function getDefaultConfig() {
   return {
     aiRulesDir: ".rulesync",
     outputPaths: {
+      amazonqcli: ".amazonq/rules",
       augmentcode: ".",
       "augmentcode-legacy": ".",
       copilot: ".github/instructions",
@@ -1220,6 +1447,7 @@ function getDefaultConfig() {
       cline: ".clinerules",
       claudecode: ".",
       codexcli: ".",
+      opencode: ".",
       roo: ".roo/rules",
       geminicli: ".gemini/memories",
       kiro: ".kiro/steering",
@@ -1427,6 +1655,7 @@ function mergeWithCliOptions(config, cliOptions) {
 }
 
 // src/cli/commands/add.ts
+init_logger();
 function sanitizeFilename(filename) {
   return filename.endsWith(".md") ? filename.slice(0, -3) : filename;
 }
@@ -1455,11 +1684,11 @@ async function addCommand(filename, options = {}) {
     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.`);
+    logger.success(`Created rule file: ${filePath}`);
+    logger.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)}`
+    logger.error(
+      `Failed to create rule file: ${error instanceof Error ? error.message : String(error)}`
     );
     process.exit(3);
   }
@@ -1470,6 +1699,7 @@ var import_node_fs = require("fs");
 var import_node_path2 = __toESM(require("path"), 1);
 
 // src/utils/error.ts
+init_logger();
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -1499,134 +1729,11 @@ async function safeAsyncOperation(operation, errorContext) {
   }
 }
 
-// src/utils/file.ts
-var import_promises2 = require("fs/promises");
-var import_node_path = require("path");
-async function ensureDir(dirPath) {
-  try {
-    await (0, import_promises2.stat)(dirPath);
-  } catch {
-    await (0, import_promises2.mkdir)(dirPath, { recursive: true });
-  }
-}
-function resolvePath(relativePath, baseDir) {
-  return baseDir ? (0, import_node_path.join)(baseDir, relativePath) : relativePath;
-}
-async function readFileContent(filepath) {
-  return (0, import_promises2.readFile)(filepath, "utf-8");
-}
-async function writeFileContent(filepath, content) {
-  await ensureDir((0, import_node_path.dirname)(filepath));
-  await (0, import_promises2.writeFile)(filepath, content, "utf-8");
-}
-async function fileExists(filepath) {
-  try {
-    await (0, import_promises2.stat)(filepath);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function findFiles(dir, extension = ".md") {
-  try {
-    const files = await (0, import_promises2.readdir)(dir);
-    return files.filter((file) => file.endsWith(extension)).map((file) => (0, import_node_path.join)(dir, file));
-  } catch {
-    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 === "") {
-    console.warn(`Skipping deletion of dangerous path: ${dirPath}`);
-    return;
-  }
-  try {
-    if (await fileExists(dirPath)) {
-      await (0, import_promises2.rm)(dirPath, { recursive: true, force: true });
-    }
-  } catch (error) {
-    console.warn(`Failed to remove directory ${dirPath}:`, error);
-  }
-}
-async function removeFile(filepath) {
-  try {
-    if (await fileExists(filepath)) {
-      await (0, import_promises2.rm)(filepath);
-    }
-  } catch (error) {
-    console.warn(`Failed to remove file ${filepath}:`, error);
-  }
-}
-async function removeClaudeGeneratedFiles() {
-  const filesToRemove = ["CLAUDE.md", ".claude/memories"];
-  for (const fileOrDir of filesToRemove) {
-    if (fileOrDir.endsWith("/memories")) {
-      await removeDirectory(fileOrDir);
-    } else {
-      await removeFile(fileOrDir);
-    }
-  }
-}
-
-// 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/utils/index.ts
+init_file();
 
 // src/cli/commands/config.ts
+init_logger();
 async function configCommand(options = {}) {
   if (options.init) {
     await initConfig(options);
@@ -1837,96 +1944,161 @@ export default config;
 }
 
 // src/cli/commands/generate.ts
-var import_node_path15 = require("path");
+var import_node_path13 = require("path");
 
 // src/core/command-generator.ts
-var import_node_path7 = require("path");
+var import_node_path5 = require("path");
 
-// src/generators/commands/claudecode.ts
+// src/utils/command-generators.ts
 var import_node_path3 = require("path");
-var ClaudeCodeCommandGenerator = class {
-  generate(command, outputDir) {
-    const filepath = this.getOutputPath(command.filename, outputDir);
-    const frontmatter = ["---"];
-    if (command.frontmatter.description) {
-      frontmatter.push(`description: ${command.frontmatter.description}`);
+function generateYamlFrontmatter(command, options) {
+  const frontmatterLines = ["---"];
+  if (options?.includeDescription && command.frontmatter.description) {
+    frontmatterLines.push(`description: ${command.frontmatter.description}`);
+  }
+  if (options?.additionalFields) {
+    for (const field of options.additionalFields) {
+      frontmatterLines.push(`${field.key}: ${field.value}`);
     }
-    frontmatter.push("---");
-    const content = `${frontmatter.join("\n")}
+  }
+  frontmatterLines.push("---");
+  return frontmatterLines;
+}
+function buildCommandContent(command, frontmatterOptions) {
+  const frontmatter = generateYamlFrontmatter(command, frontmatterOptions);
+  return `${frontmatter.join("\n")}
 
 ${command.content.trim()}
 `;
+}
+function getFlattenedCommandPath(filename, baseDir, subdir) {
+  const flattenedName = filename.replace(/\//g, "-");
+  return (0, import_node_path3.join)(baseDir, subdir, `${flattenedName}.md`);
+}
+function getHierarchicalCommandPath(filename, baseDir, subdir, extension = "md") {
+  const nameWithoutExt = filename.replace(/\.[^/.]+$/, "");
+  const fileWithExt = `${nameWithoutExt}.${extension}`;
+  return (0, import_node_path3.join)(baseDir, subdir, fileWithExt);
+}
+function escapeTomlString(str) {
+  return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
+}
+var syntaxConverters = {
+  /**
+   * Convert Claude Code syntax to Gemini CLI syntax
+   */
+  toGeminiCli(content) {
+    let converted = content;
+    converted = converted.replace(/\$ARGUMENTS/g, "{{args}}");
+    converted = converted.replace(/!`([^`]+)`/g, "!{$1}");
+    return converted.trim();
+  },
+  /**
+   * Convert to Roo Code syntax (currently identical to Claude Code)
+   */
+  toRooCode(content) {
+    return content.trim();
+  }
+};
+
+// src/generators/commands/base.ts
+var BaseCommandGenerator = class {
+  /**
+   * Generate command output for the specified tool
+   */
+  generate(command, outputDir) {
+    const filepath = this.getOutputPath(command.filename, outputDir);
+    const content = this.processContent(command);
     return {
-      tool: "claudecode",
+      tool: this.getToolName(),
       filepath,
       content
     };
   }
+  /**
+   * Get the output path for the command file
+   * Override this method if custom path logic is needed
+   */
   getOutputPath(filename, baseDir) {
-    const flattenedName = filename.replace(/\//g, "-");
-    return (0, import_node_path3.join)(baseDir, ".claude", "commands", `${flattenedName}.md`);
+    if (this.supportsHierarchy()) {
+      return getHierarchicalCommandPath(
+        filename,
+        baseDir,
+        this.getCommandsDirectory(),
+        this.getFileExtension()
+      );
+    } else {
+      return getFlattenedCommandPath(filename, baseDir, this.getCommandsDirectory());
+    }
+  }
+  /**
+   * Whether this tool supports hierarchical directory structure
+   * Override to return true for tools that support nested commands
+   */
+  supportsHierarchy() {
+    return false;
+  }
+  /**
+   * Get file extension for the target tool
+   * Override if tool uses different extension than .md
+   */
+  getFileExtension() {
+    return "md";
+  }
+};
+
+// src/generators/commands/claudecode.ts
+var ClaudeCodeCommandGenerator = class extends BaseCommandGenerator {
+  getToolName() {
+    return "claudecode";
+  }
+  getCommandsDirectory() {
+    return ".claude/commands";
+  }
+  processContent(command) {
+    return buildCommandContent(command, { includeDescription: true });
   }
+  // Uses flattened structure by default (supportsHierarchy returns false)
 };
 
 // src/generators/commands/geminicli.ts
-var import_node_path4 = require("path");
-var GeminiCliCommandGenerator = class {
-  generate(command, outputDir) {
-    const filepath = this.getOutputPath(command.filename, outputDir);
-    const convertedContent = this.convertSyntax(command.content);
+var GeminiCliCommandGenerator = class extends BaseCommandGenerator {
+  getToolName() {
+    return "geminicli";
+  }
+  getCommandsDirectory() {
+    return ".gemini/commands";
+  }
+  processContent(command) {
+    const convertedContent = syntaxConverters.toGeminiCli(command.content);
     const tomlLines = [];
     if (command.frontmatter.description) {
-      tomlLines.push(`description = "${this.escapeTomlString(command.frontmatter.description)}"`);
+      tomlLines.push(`description = "${escapeTomlString(command.frontmatter.description)}"`);
       tomlLines.push("");
     }
     tomlLines.push(`prompt = """${convertedContent}"""`);
-    const content = tomlLines.join("\n") + "\n";
-    return {
-      tool: "geminicli",
-      filepath,
-      content
-    };
-  }
-  getOutputPath(filename, baseDir) {
-    const tomlFilename = filename.replace(/\.md$/, ".toml");
-    const filenameWithExt = tomlFilename.endsWith(".toml") ? tomlFilename : `${tomlFilename}.toml`;
-    return (0, import_node_path4.join)(baseDir, ".gemini", "commands", filenameWithExt);
+    return tomlLines.join("\n") + "\n";
   }
-  convertSyntax(content) {
-    let converted = content;
-    converted = converted.replace(/\$ARGUMENTS/g, "{{args}}");
-    converted = converted.replace(/!`([^`]+)`/g, "!{$1}");
-    return converted.trim();
+  supportsHierarchy() {
+    return true;
   }
-  escapeTomlString(str) {
-    return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
+  getFileExtension() {
+    return "toml";
   }
 };
 
 // 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
-    };
+var RooCommandGenerator = class extends BaseCommandGenerator {
+  getToolName() {
+    return "roo";
   }
-  getOutputPath(filename, baseDir) {
-    const flattenedName = filename.replace(/\//g, "-");
-    return (0, import_node_path5.join)(baseDir, ".roo", "commands", `${flattenedName}.md`);
+  getCommandsDirectory() {
+    return ".roo/commands";
+  }
+  processContent(command) {
+    return buildCommandContent(command, { includeDescription: true });
   }
+  // Uses flattened structure by default (supportsHierarchy returns false)
 };
 
 // src/generators/commands/index.ts
@@ -1939,9 +2111,33 @@ function getCommandGenerator(tool) {
   return commandGenerators[tool];
 }
 
+// src/core/command-generator.ts
+init_file();
+init_logger();
+
 // src/core/command-parser.ts
-var import_node_path6 = require("path");
+var import_node_path4 = require("path");
+
+// src/utils/frontmatter.ts
 var import_gray_matter = __toESM(require("gray-matter"), 1);
+function parseFrontmatter(content, options) {
+  const parsed = (0, import_gray_matter.default)(content, options?.matterOptions);
+  return {
+    content: parsed.content.trim(),
+    data: parsed.data || {}
+  };
+}
+function extractArrayField(data, key, defaultValue = []) {
+  const value = data[key];
+  return Array.isArray(value) ? value : defaultValue;
+}
+function extractStringField(data, key, defaultValue) {
+  const value = data[key];
+  return typeof value === "string" ? value : defaultValue;
+}
+
+// src/core/command-parser.ts
+init_logger();
 async function parseCommandsFromDirectory(commandsDir) {
   const commandFiles = await findFiles(commandsDir, ".md");
   const commands = [];
@@ -1956,17 +2152,17 @@ async function parseCommandsFromDirectory(commandsDir) {
     }
   }
   if (errors.length > 0) {
-    console.warn(`\u26A0\uFE0F  Command parsing errors:
+    logger.warn(`Command parsing errors:
 ${errors.join("\n")}`);
   }
   return commands;
 }
 async function parseCommandFile(filepath) {
   const content = await readFileContent(filepath);
-  const parsed = (0, import_gray_matter.default)(content);
+  const parsed = parseFrontmatter(content);
   try {
     const validatedData = CommandFrontmatterSchema.parse(parsed.data);
-    const filename = (0, import_node_path6.basename)(filepath, ".md");
+    const filename = (0, import_node_path4.basename)(filepath, ".md");
     return {
       frontmatter: {
         description: validatedData.description
@@ -1984,7 +2180,7 @@ async function parseCommandFile(filepath) {
 
 // src/core/command-generator.ts
 async function generateCommands(projectRoot, baseDir, targets) {
-  const commandsDir = (0, import_node_path7.join)(projectRoot, ".rulesync", "commands");
+  const commandsDir = (0, import_node_path5.join)(projectRoot, ".rulesync", "commands");
   if (!await fileExists(commandsDir)) {
     return [];
   }
@@ -2008,8 +2204,8 @@ async function generateCommands(projectRoot, baseDir, targets) {
         outputs.push(output);
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error(
-          `\u274C Failed to generate ${target} command for ${command.filename}: ${errorMessage}`
+        logger.error(
+          `Failed to generate ${target} command for ${command.filename}: ${errorMessage}`
         );
       }
     }
@@ -2018,7 +2214,7 @@ async function generateCommands(projectRoot, baseDir, targets) {
 }
 
 // src/generators/ignore/shared-factory.ts
-var import_node_path8 = require("path");
+var import_node_path6 = require("path");
 
 // src/generators/ignore/shared-helpers.ts
 function extractIgnorePatternsFromRules(rules) {
@@ -2141,7 +2337,7 @@ function generateIgnoreFile(rules, config, ignoreConfig, baseDir) {
   const outputs = [];
   const content = generateIgnoreContent(rules, ignoreConfig);
   const outputPath = baseDir || process.cwd();
-  const filepath = (0, import_node_path8.join)(outputPath, ignoreConfig.filename);
+  const filepath = (0, import_node_path6.join)(outputPath, ignoreConfig.filename);
   outputs.push({
     tool: ignoreConfig.tool,
     filepath,
@@ -2728,21 +2924,21 @@ function generateWindsurfIgnore(rules, config, baseDir) {
   return generateIgnoreFile(rules, config, ignoreConfigs.windsurf, baseDir);
 }
 
-// src/generators/rules/augmentcode.ts
-var import_node_path11 = require("path");
-
 // src/generators/rules/shared-helpers.ts
-var import_node_path10 = require("path");
+var import_node_path8 = require("path");
+init_file();
 
 // src/utils/ignore.ts
-var import_node_path9 = require("path");
+var import_node_path7 = require("path");
 var import_micromatch = __toESM(require("micromatch"), 1);
+init_file();
+init_logger();
 var cachedIgnorePatterns = null;
 async function loadIgnorePatterns(baseDir = process.cwd()) {
   if (cachedIgnorePatterns) {
     return cachedIgnorePatterns;
   }
-  const ignorePath = (0, import_node_path9.join)(baseDir, ".rulesyncignore");
+  const ignorePath = (0, import_node_path7.join)(baseDir, ".rulesyncignore");
   if (!await fileExists(ignorePath)) {
     cachedIgnorePatterns = { patterns: [] };
     return cachedIgnorePatterns;
@@ -2753,7 +2949,7 @@ async function loadIgnorePatterns(baseDir = process.cwd()) {
     cachedIgnorePatterns = { patterns };
     return cachedIgnorePatterns;
   } catch (error) {
-    console.warn(`Failed to read .rulesyncignore: ${error}`);
+    logger.warn(`Failed to read .rulesyncignore: ${error}`);
     cachedIgnorePatterns = { patterns: [] };
     return cachedIgnorePatterns;
   }
@@ -2796,7 +2992,7 @@ function addOutput(outputs, tool, config, baseDir, relativePath, content) {
   const outputDir = resolveOutputDir(config, tool, baseDir);
   outputs.push({
     tool,
-    filepath: (0, import_node_path10.join)(outputDir, relativePath),
+    filepath: (0, import_node_path8.join)(outputDir, relativePath),
     content
   });
 }
@@ -2805,7 +3001,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_path10.join)(outputDir, `${rule.filename}${generatorConfig.fileExtension}`);
+    const filepath = generatorConfig.pathResolver ? generatorConfig.pathResolver(rule, outputDir) : (0, import_node_path8.join)(outputDir, `${rule.filename}${generatorConfig.fileExtension}`);
     outputs.push({
       tool: generatorConfig.tool,
       filepath,
@@ -2833,7 +3029,7 @@ async function generateComplexRules(rules, config, generatorConfig, baseDir) {
     for (const rule of detailRules) {
       const content = generatorConfig.generateDetailContent(rule);
       const filepath = resolvePath(
-        (0, import_node_path10.join)(generatorConfig.detailSubDir, `${rule.filename}.md`),
+        (0, import_node_path8.join)(generatorConfig.detailSubDir, `${rule.filename}.md`),
         baseDir
       );
       outputs.push({
@@ -2887,7 +3083,61 @@ function generateIgnoreFile2(patterns, tool) {
   return lines.join("\n");
 }
 
+// src/generators/rules/amazonqcli.ts
+async function generateAmazonqcliConfig(rules, config, baseDir) {
+  const generatorConfig = {
+    tool: "amazonqcli",
+    fileExtension: ".md",
+    generateContent: generateRuleFile,
+    generateRootContent: generateMainRulesFile,
+    rootFilePath: ".amazonq/rules/main.md",
+    generateDetailContent: generateRuleFile,
+    detailSubDir: ".amazonq/rules"
+  };
+  return generateComplexRules(rules, config, generatorConfig, baseDir);
+}
+function generateMainRulesFile(rootRule, detailRules) {
+  const lines = [];
+  if (detailRules.length > 0) {
+    lines.push("# Amazon Q Developer CLI Project Rules");
+    lines.push("");
+    lines.push("This file contains the main project rules. See also:");
+    lines.push("");
+    for (const rule of detailRules) {
+      lines.push(`- ${rule.filename}.md: ${rule.frontmatter.description}`);
+    }
+    lines.push("");
+  }
+  if (rootRule) {
+    if (detailRules.length > 0) {
+      lines.push("## Overview");
+      lines.push("");
+    }
+    lines.push(rootRule.content);
+    lines.push("");
+  } else if (detailRules.length === 0) {
+    lines.push("# Amazon Q Developer CLI Project Rules");
+    lines.push("");
+    lines.push("This file contains project-specific rules and context for Amazon Q Developer CLI.");
+    lines.push("");
+    lines.push("## Development Standards");
+    lines.push("");
+    lines.push("Add your project-specific development standards here.");
+    lines.push("");
+  }
+  return lines.join("\n").trim() + "\n";
+}
+function generateRuleFile(rule) {
+  const lines = [];
+  lines.push(`# ${rule.frontmatter.description || rule.filename}`);
+  lines.push("");
+  lines.push(rule.content.trim());
+  lines.push("");
+  return lines.join("\n");
+}
+
 // src/generators/rules/augmentcode.ts
+var import_node_path9 = require("path");
 async function generateAugmentcodeConfig(rules, config, baseDir) {
   const outputs = createOutputsArray();
   rules.forEach((rule) => {
@@ -2896,13 +3146,13 @@ async function generateAugmentcodeConfig(rules, config, baseDir) {
       "augmentcode",
       config,
       baseDir,
-      (0, import_node_path11.join)(".augment", "rules", `${rule.filename}.md`),
-      generateRuleFile(rule)
+      (0, import_node_path9.join)(".augment", "rules", `${rule.filename}.md`),
+      generateRuleFile2(rule)
     );
   });
   return outputs;
 }
-function generateRuleFile(rule) {
+function generateRuleFile2(rule) {
   const lines = [];
   lines.push("---");
   let ruleType = "manual";
@@ -2949,7 +3199,9 @@ function generateLegacyGuidelinesFile(allRules) {
 }
 
 // src/generators/rules/claudecode.ts
-var import_node_path12 = require("path");
+var import_node_path10 = require("path");
+init_file();
+init_logger();
 async function generateClaudecodeConfig(rules, config, baseDir) {
   const generatorConfig = {
     tool: "claudecode",
@@ -2961,7 +3213,7 @@ async function generateClaudecodeConfig(rules, config, baseDir) {
     generateDetailContent: generateMemoryFile,
     detailSubDir: ".claude/memories",
     updateAdditionalConfig: async (ignorePatterns, baseDir2) => {
-      const settingsPath = resolvePath((0, import_node_path12.join)(".claude", "settings.json"), baseDir2);
+      const settingsPath = resolvePath((0, import_node_path10.join)(".claude", "settings.json"), baseDir2);
       await updateClaudeSettings(settingsPath, ignorePatterns);
       return [];
     }
@@ -2998,7 +3250,7 @@ async function updateClaudeSettings(settingsPath, ignorePatterns) {
       const content = await readFileContent(settingsPath);
       rawSettings = JSON.parse(content);
     } catch {
-      console.warn(`Failed to parse existing ${settingsPath}, creating new settings`);
+      logger.warn(`Failed to parse existing ${settingsPath}, creating new settings`);
       rawSettings = {};
     }
   }
@@ -3021,11 +3273,11 @@ async function updateClaudeSettings(settingsPath, ignorePatterns) {
   settings.permissions.deny = Array.from(new Set(filteredDeny));
   const jsonContent = JSON.stringify(settings, null, 2);
   await writeFileContent(settingsPath, jsonContent);
-  console.log(`\u2705 Updated Claude Code settings: ${settingsPath}`);
+  logger.success(`Updated Claude Code settings: ${settingsPath}`);
 }
 
 // src/generators/rules/generator-registry.ts
-var import_node_path13 = require("path");
+var import_node_path11 = require("path");
 function determineCursorRuleType(frontmatter) {
   if (frontmatter.cursorRuleType) {
     return frontmatter.cursorRuleType;
@@ -3049,6 +3301,22 @@ function determineCursorRuleType(frontmatter) {
 }
 var GENERATOR_REGISTRY = {
   // Simple generators - generate one file per rule
+  amazonqcli: {
+    type: "complex",
+    tool: "amazonqcli",
+    fileExtension: ".md",
+    // ignoreFileName omitted - Amazon Q CLI doesn't have native ignore file support yet
+    generateContent: (rule) => {
+      const lines = [];
+      if (rule.frontmatter.description) {
+        lines.push(`# ${rule.frontmatter.description}
+`);
+      }
+      lines.push(rule.content.trim());
+      return lines.join("\n");
+    }
+    // Complex generation handled by existing generator
+  },
   cline: {
     type: "simple",
     tool: "cline",
@@ -3105,7 +3373,7 @@ var GENERATOR_REGISTRY = {
     },
     pathResolver: (rule, outputDir) => {
       const baseFilename = rule.filename.replace(/\.md$/, "");
-      return (0, import_node_path13.join)(outputDir, `${baseFilename}.instructions.md`);
+      return (0, import_node_path11.join)(outputDir, `${baseFilename}.instructions.md`);
     }
   },
   cursor: {
@@ -3145,7 +3413,7 @@ var GENERATOR_REGISTRY = {
       return lines.join("\n");
     },
     pathResolver: (rule, outputDir) => {
-      return (0, import_node_path13.join)(outputDir, `${rule.filename}.mdc`);
+      return (0, import_node_path11.join)(outputDir, `${rule.filename}.mdc`);
     }
   },
   codexcli: {
@@ -3181,10 +3449,10 @@ var GENERATOR_REGISTRY = {
     pathResolver: (rule, outputDir) => {
       const outputFormat = rule.frontmatter.windsurfOutputFormat || "directory";
       if (outputFormat === "single-file") {
-        return (0, import_node_path13.join)(outputDir, ".windsurf-rules");
+        return (0, import_node_path11.join)(outputDir, ".windsurf-rules");
       } else {
-        const rulesDir = (0, import_node_path13.join)(outputDir, ".windsurf", "rules");
-        return (0, import_node_path13.join)(rulesDir, `${rule.filename}.md`);
+        const rulesDir = (0, import_node_path11.join)(outputDir, ".windsurf", "rules");
+        return (0, import_node_path11.join)(rulesDir, `${rule.filename}.md`);
       }
     }
   },
@@ -3215,6 +3483,22 @@ var GENERATOR_REGISTRY = {
       const lines = [];
       if (rule.frontmatter.description) {
         lines.push(`# ${rule.frontmatter.description}
+`);
+      }
+      lines.push(rule.content.trim());
+      return lines.join("\n");
+    }
+    // Complex generation handled by existing generator
+  },
+  opencode: {
+    type: "complex",
+    tool: "opencode",
+    fileExtension: ".md",
+    // ignoreFileName omitted - OpenCode doesn't use dedicated ignore files
+    generateContent: (rule) => {
+      const lines = [];
+      if (rule.frontmatter.description) {
+        lines.push(`# ${rule.frontmatter.description}
 `);
       }
       lines.push(rule.content.trim());
@@ -3257,8 +3541,8 @@ async function generateFromRegistry(tool, rules, config, baseDir) {
     const enhancedConfig = {
       tool: generatorConfig.tool,
       fileExtension: generatorConfig.fileExtension,
-      ignoreFileName: generatorConfig.ignoreFileName,
       generateContent: generatorConfig.generateContent,
+      ...generatorConfig.ignoreFileName && { ignoreFileName: generatorConfig.ignoreFileName },
       ...generatorConfig.generateRootContent && {
         generateRootContent: generatorConfig.generateRootContent
       },
@@ -3289,48 +3573,91 @@ var generateKiroConfig = createSimpleGenerator("kiro");
 var generateRooConfig = createSimpleGenerator("roo");
 
 // src/generators/rules/codexcli.ts
-async function generateCodexConfig(rules, config, baseDir) {
-  const outputs = [];
-  if (rules.length === 0) {
-    return outputs;
-  }
-  const sortedRules = [...rules].sort((a, b) => {
-    if (a.frontmatter.root === true && b.frontmatter.root !== true) return -1;
-    if (a.frontmatter.root !== true && b.frontmatter.root === true) return 1;
-    return 0;
-  });
-  const concatenatedContent = generateConcatenatedCodexContent(sortedRules);
-  if (concatenatedContent.trim()) {
-    const outputDir = resolveOutputDir(config, "codexcli", baseDir);
-    const filepath = `${outputDir}/codex.md`;
-    outputs.push({
-      tool: "codexcli",
-      filepath,
-      content: concatenatedContent
-    });
-  }
-  const ignorePatterns = await loadIgnorePatterns(baseDir);
-  if (ignorePatterns.patterns.length > 0) {
-    const ignorePath = resolvePath(".codexignore", baseDir);
-    const ignoreContent = generateIgnoreFile2(ignorePatterns.patterns, "codexcli");
-    outputs.push({
-      tool: "codexcli",
-      filepath: ignorePath,
-      content: ignoreContent
+init_file();
+
+// src/utils/xml-document-generator.ts
+var import_fast_xml_parser = require("fast-xml-parser");
+function generateRootMarkdownWithXmlDocs(rootRule, memoryRules, config) {
+  const lines = [];
+  if (memoryRules.length > 0) {
+    lines.push(
+      "Please also reference the following documents as needed. In this case, `@` stands for the project root directory."
+    );
+    lines.push("");
+    const documentsData = {
+      Documents: {
+        Document: memoryRules.map((rule) => {
+          const relativePath = `@${config.memorySubDir}/${rule.filename}.md`;
+          const document = {
+            Path: relativePath,
+            Description: rule.frontmatter.description
+          };
+          if (rule.frontmatter.globs.length > 0) {
+            document.FilePatterns = rule.frontmatter.globs.join(", ");
+          }
+          return document;
+        })
+      }
+    };
+    const builder = new import_fast_xml_parser.XMLBuilder({
+      format: true,
+      ignoreAttributes: false,
+      suppressEmptyNode: false
     });
+    const xmlContent = builder.build(documentsData);
+    lines.push(xmlContent);
+    lines.push("");
+    lines.push("");
   }
-  return outputs;
+  if (rootRule) {
+    lines.push(rootRule.content.trim());
+  } else if (memoryRules.length === 0) {
+    lines.push(`# ${config.fallbackTitle}`);
+    lines.push("");
+    lines.push("No configuration rules have been defined yet.");
+  }
+  return lines.join("\n");
 }
-function generateConcatenatedCodexContent(rules) {
-  const sections = [];
-  for (const rule of rules) {
-    const content = rule.content.trim();
-    if (!content) {
-      continue;
+
+// src/generators/rules/codexcli.ts
+async function generateCodexConfig(rules, config, baseDir) {
+  const outputs = [];
+  const nonEmptyRules = rules.filter((rule) => rule.content.trim().length > 0);
+  if (nonEmptyRules.length > 0) {
+    const generatorConfig = {
+      tool: "codexcli",
+      fileExtension: ".md",
+      ignoreFileName: ".codexignore",
+      generateContent: generateCodexMemoryMarkdown,
+      generateDetailContent: generateCodexMemoryMarkdown,
+      generateRootContent: generateCodexRootMarkdown,
+      rootFilePath: "AGENTS.md",
+      detailSubDir: ".codex/memories"
+    };
+    const ruleOutputs = await generateComplexRules(nonEmptyRules, config, generatorConfig, baseDir);
+    outputs.push(...ruleOutputs);
+  } else {
+    const ignorePatterns = await loadIgnorePatterns(baseDir);
+    if (ignorePatterns.patterns.length > 0) {
+      const ignorePath = resolvePath(".codexignore", baseDir);
+      const ignoreContent = generateIgnoreFile2(ignorePatterns.patterns, "codexcli");
+      outputs.push({
+        tool: "codexcli",
+        filepath: ignorePath,
+        content: ignoreContent
+      });
     }
-    sections.push(content);
   }
-  return sections.join("\n\n---\n\n");
+  return outputs;
+}
+function generateCodexMemoryMarkdown(rule) {
+  return rule.content.trim();
+}
+function generateCodexRootMarkdown(rootRule, memoryRules, _baseDir) {
+  return generateRootMarkdownWithXmlDocs(rootRule, memoryRules, {
+    memorySubDir: ".codex/memories",
+    fallbackTitle: "OpenAI Codex CLI Configuration"
+  });
 }
 
 // src/generators/rules/geminicli.ts
@@ -3351,28 +3678,10 @@ function generateGeminiMemoryMarkdown(rule) {
   return rule.content.trim();
 }
 function generateGeminiRootMarkdown(rootRule, memoryRules, _baseDir) {
-  const lines = [];
-  if (memoryRules.length > 0) {
-    lines.push("Please also reference the following documents as needed:");
-    lines.push("");
-    lines.push("| Document | Description | File Patterns |");
-    lines.push("|----------|-------------|---------------|");
-    for (const rule of memoryRules) {
-      const relativePath = `@.gemini/memories/${rule.filename}.md`;
-      const filePatterns = rule.frontmatter.globs.length > 0 ? rule.frontmatter.globs.join(", ") : "-";
-      lines.push(`| ${relativePath} | ${rule.frontmatter.description} | ${filePatterns} |`);
-    }
-    lines.push("");
-    lines.push("");
-  }
-  if (rootRule) {
-    lines.push(rootRule.content.trim());
-  } else if (memoryRules.length === 0) {
-    lines.push("# Gemini CLI Configuration");
-    lines.push("");
-    lines.push("No configuration rules have been defined yet.");
-  }
-  return lines.join("\n");
+  return generateRootMarkdownWithXmlDocs(rootRule, memoryRules, {
+    memorySubDir: ".gemini/memories",
+    fallbackTitle: "Gemini CLI Configuration"
+  });
 }
 
 // src/generators/rules/junie.ts
@@ -3402,20 +3711,43 @@ function generateGuidelinesMarkdown(rootRule, detailRules) {
   return lines.join("\n").trim();
 }
 
+// src/generators/rules/opencode.ts
+async function generateOpenCodeConfig(rules, config, baseDir) {
+  const generatorConfig = {
+    tool: "opencode",
+    fileExtension: ".md",
+    // ignoreFileName omitted - OpenCode doesn't use dedicated ignore files
+    generateContent: generateOpenCodeMarkdown,
+    generateDetailContent: generateOpenCodeMarkdown,
+    generateRootContent: generateOpenCodeRootMarkdown,
+    rootFilePath: "AGENTS.md",
+    detailSubDir: ".opencode/memories"
+  };
+  return generateComplexRules(rules, config, generatorConfig, baseDir);
+}
+function generateOpenCodeMarkdown(rule) {
+  return rule.content.trim();
+}
+function generateOpenCodeRootMarkdown(rootRule, memoryRules, _baseDir) {
+  return generateRootMarkdownWithXmlDocs(rootRule, memoryRules, {
+    memorySubDir: ".opencode/memories",
+    fallbackTitle: "OpenCode Configuration"
+  });
+}
+
 // src/core/generator.ts
+init_logger();
 async function generateConfigurations(rules, config, targetTools, baseDir) {
   const outputs = createOutputsArray();
   const toolsToGenerate = targetTools || config.defaultTargets;
   const rootFiles = rules.filter((rule) => rule.frontmatter.root === true);
   if (rootFiles.length === 0) {
-    console.warn(
-      "\u26A0\uFE0F  Warning: No files with 'root: true' found. This may result in incomplete configurations."
-    );
+    logger.warn("No files with 'root: true' found. This may result in incomplete configurations.");
   }
   for (const tool of toolsToGenerate) {
     const relevantRules = filterRulesForTool(rules, tool, config);
     if (relevantRules.length === 0) {
-      console.warn(`No rules found for tool: ${tool}`);
+      logger.warn(`No rules found for tool: ${tool}`);
       continue;
     }
     const toolOutputs = await generateForTool(tool, relevantRules, config, baseDir);
@@ -3436,6 +3768,8 @@ function filterRulesForTool(rules, tool, config) {
 }
 async function generateForTool(tool, rules, config, baseDir) {
   switch (tool) {
+    case "amazonqcli":
+      return await generateAmazonqcliConfig(rules, config, baseDir);
     case "augmentcode": {
       const augmentRulesOutputs = await generateAugmentcodeConfig(rules, config, baseDir);
       const augmentIgnoreOutputs = await generateAugmentCodeIgnoreFiles(rules, config, baseDir);
@@ -3474,20 +3808,22 @@ async function generateForTool(tool, rules, config, baseDir) {
       const kiroIgnoreOutputs = await generateKiroIgnoreFiles(rules, config, baseDir);
       return [...kiroRulesOutputs, ...kiroIgnoreOutputs];
     }
+    case "opencode":
+      return generateOpenCodeConfig(rules, config, baseDir);
     case "windsurf": {
       const windsurfRulesOutputs = await generateWindsurfConfig(rules, config, baseDir);
       const windsurfIgnoreOutputs = await generateWindsurfIgnore(rules, config, baseDir);
       return [...windsurfRulesOutputs, ...windsurfIgnoreOutputs];
     }
     default:
-      console.warn(`Unknown tool: ${tool}`);
+      logger.warn(`Unknown tool: ${tool}`);
       return null;
   }
 }
 
 // src/core/parser.ts
-var import_node_path14 = require("path");
-var import_gray_matter2 = __toESM(require("gray-matter"), 1);
+var import_node_path12 = require("path");
+init_logger();
 async function parseRulesFromDirectory(aiRulesDir) {
   const ignorePatterns = await loadIgnorePatterns();
   const allRuleFiles = await findRuleFiles(aiRulesDir);
@@ -3495,7 +3831,7 @@ async function parseRulesFromDirectory(aiRulesDir) {
   const rules = [];
   const errors = [];
   if (ignorePatterns.patterns.length > 0) {
-    console.log(`Loaded ${ignorePatterns.patterns.length} ignore patterns from .rulesyncignore`);
+    logger.info(`Loaded ${ignorePatterns.patterns.length} ignore patterns from .rulesyncignore`);
   }
   for (const filepath of ruleFiles) {
     try {
@@ -3521,7 +3857,7 @@ ${errors.join("\n")}`);
 }
 async function parseRuleFile(filepath) {
   const content = await readFileContent(filepath);
-  const parsed = (0, import_gray_matter2.default)(content);
+  const parsed = parseFrontmatter(content);
   try {
     const validatedData = RuleFrontmatterSchema.parse(parsed.data);
     const frontmatter = {
@@ -3540,7 +3876,7 @@ async function parseRuleFile(filepath) {
       },
       ...validatedData.tags !== void 0 && { tags: validatedData.tags }
     };
-    const filename = (0, import_node_path14.basename)(filepath, ".md");
+    const filename = (0, import_node_path12.basename)(filepath, ".md");
     return {
       frontmatter,
       content: parsed.content,
@@ -3608,6 +3944,7 @@ async function validateRule(rule) {
 var path4 = __toESM(require("path"), 1);
 
 // src/generators/mcp/index.ts
+init_amazonqcli();
 init_augmentcode();
 init_claudecode();
 init_cline();
@@ -3620,6 +3957,9 @@ init_kiro();
 init_roo();
 init_windsurf();
 
+// src/core/mcp-generator.ts
+init_file();
+
 // src/core/mcp-parser.ts
 var fs = __toESM(require("fs"), 1);
 var path3 = __toESM(require("path"), 1);
@@ -3651,6 +3991,35 @@ function parseMcpConfig(projectRoot) {
 async function generateMcpConfigurations(mcpConfig, baseDir, targetTools) {
   const outputs = [];
   const toolMap = {
+    amazonqcli: async (servers, dir) => {
+      const config = {
+        aiRulesDir: ".rulesync",
+        outputPaths: {
+          amazonqcli: ".amazonq/rules",
+          augmentcode: ".",
+          "augmentcode-legacy": ".",
+          copilot: ".github/instructions",
+          cursor: ".cursor/rules",
+          cline: ".clinerules",
+          claudecode: ".",
+          codexcli: ".",
+          opencode: ".",
+          roo: ".roo/rules",
+          geminicli: ".gemini/memories",
+          kiro: ".kiro/steering",
+          junie: ".",
+          windsurf: "."
+        },
+        watchEnabled: false,
+        defaultTargets: []
+      };
+      const results = await (await Promise.resolve().then(() => (init_amazonqcli(), amazonqcli_exports))).generateAmazonqcliMcp(
+        servers,
+        config,
+        dir
+      );
+      return results.map((result) => ({ filepath: result.filepath, content: result.content }));
+    },
     augmentcode: async (servers, dir) => (await Promise.resolve().then(() => (init_augmentcode(), augmentcode_exports))).generateAugmentcodeMcpConfiguration(
       servers,
       dir
@@ -3667,6 +4036,10 @@ async function generateMcpConfigurations(mcpConfig, baseDir, targetTools) {
     cursor: async (servers, dir) => (await Promise.resolve().then(() => (init_cursor(), cursor_exports))).generateCursorMcpConfiguration(servers, dir),
     cline: async (servers, dir) => (await Promise.resolve().then(() => (init_cline(), cline_exports))).generateClineMcpConfiguration(servers, dir),
     codexcli: async (servers, dir) => (await Promise.resolve().then(() => (init_codexcli(), codexcli_exports))).generateCodexMcpConfiguration(servers, dir),
+    opencode: async (servers, dir) => (await Promise.resolve().then(() => (init_opencode(), opencode_exports))).generateOpenCodeMcpConfiguration(
+      servers,
+      dir
+    ),
     roo: async (servers, dir) => (await Promise.resolve().then(() => (init_roo(), roo_exports))).generateRooMcpConfiguration(servers, dir),
     geminicli: async (servers, dir) => (await Promise.resolve().then(() => (init_geminicli(), geminicli_exports))).generateGeminiCliMcpConfiguration(
       servers,
@@ -3696,6 +4069,7 @@ async function generateMcpConfigurations(mcpConfig, baseDir, targetTools) {
 }
 
 // src/cli/commands/generate.ts
+init_logger();
 async function generateCommand(options = {}) {
   const configLoaderOptions = {
     ...options.config !== void 0 && { configPath: options.config },
@@ -3759,7 +4133,7 @@ async function generateCommand(options = {}) {
       logger.info("Deleting existing output directories...");
       const targetTools = config.defaultTargets;
       const deleteTasks = [];
-      const commandsDir = (0, import_node_path15.join)(config.aiRulesDir, "commands");
+      const commandsDir = (0, import_node_path13.join)(config.aiRulesDir, "commands");
       const hasCommands = await fileExists(commandsDir);
       let hasCommandFiles = false;
       if (hasCommands) {
@@ -3774,12 +4148,12 @@ async function generateCommand(options = {}) {
       for (const tool of targetTools) {
         switch (tool) {
           case "augmentcode":
-            deleteTasks.push(removeDirectory((0, import_node_path15.join)(".augment", "rules")));
-            deleteTasks.push(removeDirectory((0, import_node_path15.join)(".augment", "ignore")));
+            deleteTasks.push(removeDirectory((0, import_node_path13.join)(".augment", "rules")));
+            deleteTasks.push(removeDirectory((0, import_node_path13.join)(".augment", "ignore")));
             break;
           case "augmentcode-legacy":
             deleteTasks.push(removeClaudeGeneratedFiles());
-            deleteTasks.push(removeDirectory((0, import_node_path15.join)(".augment", "ignore")));
+            deleteTasks.push(removeDirectory((0, import_node_path13.join)(".augment", "ignore")));
             break;
           case "copilot":
             deleteTasks.push(removeDirectory(config.outputPaths.copilot));
@@ -3793,24 +4167,27 @@ async function generateCommand(options = {}) {
           case "claudecode":
             deleteTasks.push(removeClaudeGeneratedFiles());
             if (hasCommandFiles) {
-              deleteTasks.push(removeDirectory((0, import_node_path15.join)(".claude", "commands")));
+              deleteTasks.push(removeDirectory((0, import_node_path13.join)(".claude", "commands")));
             }
             break;
           case "roo":
             deleteTasks.push(removeDirectory(config.outputPaths.roo));
             if (hasCommandFiles) {
-              deleteTasks.push(removeDirectory((0, import_node_path15.join)(".roo", "commands")));
+              deleteTasks.push(removeDirectory((0, import_node_path13.join)(".roo", "commands")));
             }
             break;
           case "geminicli":
             deleteTasks.push(removeDirectory(config.outputPaths.geminicli));
             if (hasCommandFiles) {
-              deleteTasks.push(removeDirectory((0, import_node_path15.join)(".gemini", "commands")));
+              deleteTasks.push(removeDirectory((0, import_node_path13.join)(".gemini", "commands")));
             }
             break;
           case "kiro":
             deleteTasks.push(removeDirectory(config.outputPaths.kiro));
             break;
+          case "opencode":
+            deleteTasks.push(removeDirectory(config.outputPaths.opencode));
+            break;
           case "windsurf":
             deleteTasks.push(removeDirectory(config.outputPaths.windsurf));
             break;
@@ -3904,11 +4281,14 @@ Generating configurations for base directory: ${baseDir}`);
 
 // src/cli/commands/gitignore.ts
 var import_node_fs2 = require("fs");
-var import_node_path16 = require("path");
+var import_node_path14 = require("path");
+init_logger();
 var gitignoreCommand = async () => {
-  const gitignorePath = (0, import_node_path16.join)(process.cwd(), ".gitignore");
+  const gitignorePath = (0, import_node_path14.join)(process.cwd(), ".gitignore");
   const rulesFilesToIgnore = [
     "# Generated by rulesync - AI tool configuration files",
+    "**/.amazonq/rules/",
+    "**/.amazonq/mcp.json",
     "**/.github/copilot-instructions.md",
     "**/.github/instructions/",
     "**/.cursor/rules/",
@@ -3918,7 +4298,7 @@ var gitignoreCommand = async () => {
     "**/CLAUDE.md",
     "**/.claude/memories/",
     "**/.claude/commands/",
-    "**/codex.md",
+    "**/AGENTS.md",
     "**/.codexignore",
     "**/.roo/rules/",
     "**/.rooignore",
@@ -3934,6 +4314,9 @@ var gitignoreCommand = async () => {
     "**/.augment-guidelines",
     "**/.junie/guidelines.md",
     "**/.noai",
+    "**/.opencode/memories/",
+    "**/.opencode/commands/",
+    "**/opencode.json",
     "**/.mcp.json",
     "!.rulesync/.mcp.json",
     "**/.cursor/mcp.json",
@@ -3954,7 +4337,7 @@ var gitignoreCommand = async () => {
     }
   }
   if (linesToAdd.length === 0) {
-    console.log("\u2705 .gitignore is already up to date");
+    logger.success(".gitignore is already up to date");
     return;
   }
   const newContent = gitignoreContent ? `${gitignoreContent.trimEnd()}
@@ -3963,174 +4346,21 @@ ${linesToAdd.join("\n")}
 ` : `${linesToAdd.join("\n")}
 `;
   (0, import_node_fs2.writeFileSync)(gitignorePath, newContent);
-  console.log(`\u2705 Added ${linesToAdd.length} rules to .gitignore:`);
+  logger.success(`Added ${linesToAdd.length} rules to .gitignore:`);
   for (const line of linesToAdd) {
     if (!line.startsWith("#")) {
-      console.log(`  ${line}`);
+      logger.log(`  ${line}`);
     }
   }
 };
 
 // src/core/importer.ts
-var import_node_path23 = require("path");
-var import_gray_matter7 = __toESM(require("gray-matter"), 1);
-
-// src/parsers/augmentcode.ts
-var import_node_path17 = require("path");
-var import_gray_matter3 = __toESM(require("gray-matter"), 1);
-
-// src/utils/parser-helpers.ts
-function createParseResult() {
-  return { rules: [], errors: [] };
-}
-function addError(result, error) {
-  result.errors.push(error);
-}
-function addRule(result, rule) {
-  if (!result.rules) {
-    result.rules = [];
-  }
-  result.rules.push(rule);
-}
-function addRules(result, rules) {
-  if (!result.rules) {
-    result.rules = [];
-  }
-  result.rules.push(...rules);
-}
-async function safeReadFile(operation, errorContext) {
-  try {
-    const result = await operation();
-    return createSuccessResult(result);
-  } catch (error) {
-    return createErrorResult(error, errorContext);
-  }
-}
-
-// src/parsers/augmentcode.ts
-async function parseAugmentcodeConfiguration(baseDir = process.cwd()) {
-  return parseUnifiedAugmentcode(baseDir, {
-    rulesDir: ".augment/rules",
-    targetName: "augmentcode",
-    filenamePrefix: "augmentcode"
-  });
-}
-async function parseAugmentcodeLegacyConfiguration(baseDir = process.cwd()) {
-  return parseUnifiedAugmentcode(baseDir, {
-    legacyFilePath: ".augment-guidelines",
-    targetName: "augmentcode-legacy",
-    filenamePrefix: "augmentcode-legacy"
-  });
-}
-async function parseUnifiedAugmentcode(baseDir, config) {
-  const result = createParseResult();
-  if (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);
-      result.errors.push(...rulesResult.errors);
-    } else {
-      addError(
-        result,
-        `No AugmentCode configuration found. Expected ${config.rulesDir} directory.`
-      );
-    }
-  }
-  if (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) {
-        addRule(result, legacyResult.rule);
-      }
-      result.errors.push(...legacyResult.errors);
-    } else {
-      addError(
-        result,
-        `No AugmentCode legacy configuration found. Expected ${config.legacyFilePath} file.`
-      );
-    }
-  }
-  return { rules: result.rules || [], errors: result.errors };
-}
-async function parseAugmentRules(rulesDir, config) {
-  const rules = [];
-  const errors = [];
-  try {
-    const { readdir: readdir2 } = await import("fs/promises");
-    const files = await readdir2(rulesDir);
-    for (const file of files) {
-      if (file.endsWith(".md") || file.endsWith(".mdc")) {
-        const filePath = (0, import_node_path17.join)(rulesDir, file);
-        try {
-          const rawContent = await readFileContent(filePath);
-          const parsed = (0, import_gray_matter3.default)(rawContent);
-          const frontmatterData = parsed.data;
-          const ruleType = frontmatterData.type || "manual";
-          const description = frontmatterData.description || "";
-          const tags = Array.isArray(frontmatterData.tags) ? frontmatterData.tags : void 0;
-          const isRoot = ruleType === "always";
-          const filename = (0, import_node_path17.basename)(file, file.endsWith(".mdc") ? ".mdc" : ".md");
-          const frontmatter = {
-            root: isRoot,
-            targets: [config.targetName],
-            description,
-            globs: ["**/*"],
-            // AugmentCode doesn't use specific globs in the same way
-            ...tags && { tags }
-          };
-          rules.push({
-            frontmatter,
-            content: parsed.content.trim(),
-            filename: `${config.filenamePrefix}-${ruleType}-${filename}`,
-            filepath: filePath
-          });
-        } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : String(error);
-          errors.push(`Failed to parse ${filePath}: ${errorMessage}`);
-        }
-      }
-    }
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    errors.push(`Failed to read ${config.rulesDir || rulesDir} directory: ${errorMessage}`);
-  }
-  return { rules, errors };
-}
-async function parseAugmentGuidelines(guidelinesPath, config) {
-  const parseResult = await safeReadFile(
-    async () => {
-      const content = await readFileContent(guidelinesPath);
-      if (content.trim()) {
-        const frontmatter = {
-          root: true,
-          // Legacy guidelines become root rules
-          targets: [config.targetName],
-          description: "Legacy AugmentCode guidelines",
-          globs: ["**/*"]
-        };
-        return {
-          frontmatter,
-          content: content.trim(),
-          filename: `${config.filenamePrefix}-guidelines`,
-          filepath: guidelinesPath
-        };
-      }
-      return null;
-    },
-    `Failed to parse ${config.legacyFilePath || guidelinesPath}`
-  );
-  if (parseResult.success) {
-    return { rule: parseResult.result || null, errors: [] };
-  } else {
-    return { rule: null, errors: [parseResult.error || "Unknown error"] };
-  }
-}
+var import_node_path21 = require("path");
+var import_gray_matter2 = __toESM(require("gray-matter"), 1);
 
 // src/parsers/shared-helpers.ts
-var import_node_path18 = require("path");
-var import_gray_matter4 = __toESM(require("gray-matter"), 1);
+var import_node_path15 = require("path");
+init_file();
 async function parseConfigurationFiles(baseDir = process.cwd(), config) {
   const errors = [];
   const rules = [];
@@ -4143,16 +4373,18 @@ async function parseConfigurationFiles(baseDir = process.cwd(), config) {
         let content;
         let frontmatter;
         if (mainFile.useFrontmatter) {
-          const parsed = (0, import_gray_matter4.default)(rawContent);
-          content = parsed.content.trim();
-          const parsedFrontmatter = parsed.data;
+          const parsed = parseFrontmatter(rawContent);
+          content = parsed.content;
           frontmatter = {
             root: mainFile.isRoot ?? false,
             targets: [config.tool],
-            description: parsedFrontmatter.description || mainFile.description,
-            globs: Array.isArray(parsedFrontmatter.globs) ? parsedFrontmatter.globs : ["**/*"],
-            ...parsedFrontmatter.tags && { tags: parsedFrontmatter.tags }
+            description: extractStringField(parsed.data, "description", mainFile.description),
+            globs: extractArrayField(parsed.data, "globs", ["**/*"])
           };
+          const tags = extractArrayField(parsed.data, "tags");
+          if (tags.length > 0) {
+            frontmatter.tags = tags;
+          }
         } else {
           content = rawContent.trim();
           frontmatter = {
@@ -4185,23 +4417,29 @@ 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_path18.join)(dirPath, file);
+              const filePath = (0, import_node_path15.join)(dirPath, file);
               const fileResult = await safeAsyncOperation(async () => {
                 const rawContent = await readFileContent(filePath);
                 let content;
                 let frontmatter;
                 const filename = file.replace(new RegExp(`\\${dirConfig.filePattern}$`), "");
                 if (dirConfig.filePattern === ".instructions.md") {
-                  const parsed = (0, import_gray_matter4.default)(rawContent);
-                  content = parsed.content.trim();
-                  const parsedFrontmatter = parsed.data;
+                  const parsed = parseFrontmatter(rawContent);
+                  content = parsed.content;
                   frontmatter = {
                     root: false,
                     targets: [config.tool],
-                    description: parsedFrontmatter.description || `${dirConfig.description}: ${filename}`,
-                    globs: Array.isArray(parsedFrontmatter.globs) ? parsedFrontmatter.globs : ["**/*"],
-                    ...parsedFrontmatter.tags && { tags: parsedFrontmatter.tags }
+                    description: extractStringField(
+                      parsed.data,
+                      "description",
+                      `${dirConfig.description}: ${filename}`
+                    ),
+                    globs: extractArrayField(parsed.data, "globs", ["**/*"])
                   };
+                  const tags = extractArrayField(parsed.data, "tags");
+                  if (tags.length > 0) {
+                    frontmatter.tags = tags;
+                  }
                 } else {
                   content = rawContent.trim();
                   frontmatter = {
@@ -4330,10 +4568,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_path18.join)(memoryDir, file);
+        const filePath = (0, import_node_path15.join)(memoryDir, file);
         const content = await readFileContent(filePath);
         if (content.trim()) {
-          const filename = (0, import_node_path18.basename)(file, ".md");
+          const filename = (0, import_node_path15.basename)(file, ".md");
           const frontmatter = {
             root: false,
             targets: [config.tool],
@@ -4360,20 +4598,19 @@ async function parseCommandsFiles(commandsDir, config) {
     const files = await readdir2(commandsDir);
     for (const file of files) {
       if (file.endsWith(".md")) {
-        const filePath = (0, import_node_path18.join)(commandsDir, file);
+        const filePath = (0, import_node_path15.join)(commandsDir, file);
         const content = await readFileContent(filePath);
         if (content.trim()) {
-          const filename = (0, import_node_path18.basename)(file, ".md");
+          const filename = (0, import_node_path15.basename)(file, ".md");
           let frontmatter;
           let ruleContent;
           try {
-            const parsed = (0, import_gray_matter4.default)(content);
-            ruleContent = parsed.content.trim();
-            const parsedFrontmatter = parsed.data;
+            const parsed = parseFrontmatter(content);
+            ruleContent = parsed.content;
             frontmatter = {
               root: false,
               targets: [config.tool],
-              description: parsedFrontmatter.description || `Command: ${filename}`,
+              description: extractStringField(parsed.data, "description", `Command: ${filename}`),
               globs: ["**/*"]
             };
           } catch {
@@ -4439,6 +4676,170 @@ async function parseSettingsFile(settingsPath, tool) {
   };
 }
 
+// src/parsers/amazonqcli.ts
+async function parseAmazonqcliConfiguration(baseDir = process.cwd()) {
+  return parseMemoryBasedConfiguration(baseDir, {
+    tool: "amazonqcli",
+    mainFileName: ".amazonq/rules/main.md",
+    memoryDirPath: ".amazonq/rules",
+    settingsPath: ".amazonq/mcp.json",
+    mainDescription: "Main Amazon Q Developer CLI configuration",
+    memoryDescription: "Amazon Q rule",
+    filenamePrefix: "amazonq"
+  });
+}
+
+// src/parsers/augmentcode.ts
+var import_node_path16 = require("path");
+
+// src/utils/parser-helpers.ts
+function createParseResult() {
+  return { rules: [], errors: [] };
+}
+function addError(result, error) {
+  result.errors.push(error);
+}
+function addRule(result, rule) {
+  if (!result.rules) {
+    result.rules = [];
+  }
+  result.rules.push(rule);
+}
+function addRules(result, rules) {
+  if (!result.rules) {
+    result.rules = [];
+  }
+  result.rules.push(...rules);
+}
+async function safeReadFile(operation, errorContext) {
+  try {
+    const result = await operation();
+    return createSuccessResult(result);
+  } catch (error) {
+    return createErrorResult(error, errorContext);
+  }
+}
+
+// src/parsers/augmentcode.ts
+async function parseAugmentcodeConfiguration(baseDir = process.cwd()) {
+  return parseUnifiedAugmentcode(baseDir, {
+    rulesDir: ".augment/rules",
+    targetName: "augmentcode",
+    filenamePrefix: "augmentcode"
+  });
+}
+async function parseAugmentcodeLegacyConfiguration(baseDir = process.cwd()) {
+  return parseUnifiedAugmentcode(baseDir, {
+    legacyFilePath: ".augment-guidelines",
+    targetName: "augmentcode-legacy",
+    filenamePrefix: "augmentcode-legacy"
+  });
+}
+async function parseUnifiedAugmentcode(baseDir, config) {
+  const result = createParseResult();
+  if (config.rulesDir) {
+    const rulesDir = (0, import_node_path16.join)(baseDir, config.rulesDir);
+    if (await fileExists(rulesDir)) {
+      const rulesResult = await parseAugmentRules(rulesDir, config);
+      addRules(result, rulesResult.rules);
+      result.errors.push(...rulesResult.errors);
+    } else {
+      addError(
+        result,
+        `No AugmentCode configuration found. Expected ${config.rulesDir} directory.`
+      );
+    }
+  }
+  if (config.legacyFilePath) {
+    const legacyPath = (0, import_node_path16.join)(baseDir, config.legacyFilePath);
+    if (await fileExists(legacyPath)) {
+      const legacyResult = await parseAugmentGuidelines(legacyPath, config);
+      if (legacyResult.rule) {
+        addRule(result, legacyResult.rule);
+      }
+      result.errors.push(...legacyResult.errors);
+    } else {
+      addError(
+        result,
+        `No AugmentCode legacy configuration found. Expected ${config.legacyFilePath} file.`
+      );
+    }
+  }
+  return { rules: result.rules || [], errors: result.errors };
+}
+async function parseAugmentRules(rulesDir, config) {
+  const rules = [];
+  const errors = [];
+  try {
+    const { readdir: readdir2 } = await import("fs/promises");
+    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);
+        try {
+          const rawContent = await readFileContent(filePath);
+          const parsed = parseFrontmatter(rawContent);
+          const ruleType = extractStringField(parsed.data, "type", "manual");
+          const description = extractStringField(parsed.data, "description", "");
+          const tags = extractArrayField(parsed.data, "tags");
+          const isRoot = ruleType === "always";
+          const filename = (0, import_node_path16.basename)(file, file.endsWith(".mdc") ? ".mdc" : ".md");
+          const frontmatter = {
+            root: isRoot,
+            targets: [config.targetName],
+            description,
+            globs: ["**/*"],
+            // AugmentCode doesn't use specific globs in the same way
+            ...tags.length > 0 && { tags }
+          };
+          rules.push({
+            frontmatter,
+            content: parsed.content.trim(),
+            filename: `${config.filenamePrefix}-${ruleType}-${filename}`,
+            filepath: filePath
+          });
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          errors.push(`Failed to parse ${filePath}: ${errorMessage}`);
+        }
+      }
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    errors.push(`Failed to read ${config.rulesDir || rulesDir} directory: ${errorMessage}`);
+  }
+  return { rules, errors };
+}
+async function parseAugmentGuidelines(guidelinesPath, config) {
+  const parseResult = await safeReadFile(
+    async () => {
+      const content = await readFileContent(guidelinesPath);
+      if (content.trim()) {
+        const frontmatter = {
+          root: true,
+          // Legacy guidelines become root rules
+          targets: [config.targetName],
+          description: "Legacy AugmentCode guidelines",
+          globs: ["**/*"]
+        };
+        return {
+          frontmatter,
+          content: content.trim(),
+          filename: `${config.filenamePrefix}-guidelines`,
+          filepath: guidelinesPath
+        };
+      }
+      return null;
+    },
+    `Failed to parse ${config.legacyFilePath || guidelinesPath}`
+  );
+  if (parseResult.success) {
+    return { rule: parseResult.result || null, errors: [] };
+  } else {
+    return { rule: null, errors: [parseResult.error || "Unknown error"] };
+  }
+}
+
 // src/parsers/claudecode.ts
 async function parseClaudeConfiguration(baseDir = process.cwd()) {
   return parseMemoryBasedConfiguration(baseDir, {
@@ -4474,7 +4875,7 @@ async function parseClineConfiguration(baseDir = process.cwd()) {
 }
 
 // src/parsers/codexcli.ts
-var import_node_path19 = require("path");
+var import_node_path17 = require("path");
 
 // src/parsers/copilot.ts
 async function parseCopilotConfiguration(baseDir = process.cwd()) {
@@ -4497,8 +4898,7 @@ async function parseCopilotConfiguration(baseDir = process.cwd()) {
 }
 
 // src/parsers/cursor.ts
-var import_node_path20 = require("path");
-var import_gray_matter5 = __toESM(require("gray-matter"), 1);
+var import_node_path18 = require("path");
 var import_js_yaml = require("js-yaml");
 var import_mini8 = require("zod/mini");
 var customMatterOptions = {
@@ -4622,12 +5022,12 @@ async function parseCursorConfiguration(baseDir = process.cwd()) {
   const rules = [];
   let ignorePatterns;
   let mcpServers;
-  const cursorFilePath = (0, import_node_path20.join)(baseDir, ".cursorrules");
+  const cursorFilePath = (0, import_node_path18.join)(baseDir, ".cursorrules");
   if (await fileExists(cursorFilePath)) {
     try {
       const rawContent = await readFileContent(cursorFilePath);
-      const parsed = (0, import_gray_matter5.default)(rawContent, customMatterOptions);
-      const content = parsed.content.trim();
+      const parsed = parseFrontmatter(rawContent, { matterOptions: customMatterOptions });
+      const content = parsed.content;
       if (content) {
         const frontmatter = convertCursorMdcFrontmatter(parsed.data, "cursorrules");
         frontmatter.targets = ["cursor"];
@@ -4643,20 +5043,20 @@ async function parseCursorConfiguration(baseDir = process.cwd()) {
       errors.push(`Failed to parse .cursorrules file: ${errorMessage}`);
     }
   }
-  const cursorRulesDir = (0, import_node_path20.join)(baseDir, ".cursor", "rules");
+  const cursorRulesDir = (0, import_node_path18.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_path20.join)(cursorRulesDir, file);
+          const filePath = (0, import_node_path18.join)(cursorRulesDir, file);
           try {
             const rawContent = await readFileContent(filePath);
-            const parsed = (0, import_gray_matter5.default)(rawContent, customMatterOptions);
-            const content = parsed.content.trim();
+            const parsed = parseFrontmatter(rawContent, { matterOptions: customMatterOptions });
+            const content = parsed.content;
             if (content) {
-              const filename = (0, import_node_path20.basename)(file, ".mdc");
+              const filename = (0, import_node_path18.basename)(file, ".mdc");
               const frontmatter = convertCursorMdcFrontmatter(parsed.data, filename);
               rules.push({
                 frontmatter,
@@ -4679,7 +5079,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_path20.join)(baseDir, ".cursorignore");
+  const cursorIgnorePath = (0, import_node_path18.join)(baseDir, ".cursorignore");
   if (await fileExists(cursorIgnorePath)) {
     try {
       const content = await readFileContent(cursorIgnorePath);
@@ -4692,7 +5092,7 @@ async function parseCursorConfiguration(baseDir = process.cwd()) {
       errors.push(`Failed to parse .cursorignore: ${errorMessage}`);
     }
   }
-  const cursorMcpPath = (0, import_node_path20.join)(baseDir, ".cursor", "mcp.json");
+  const cursorMcpPath = (0, import_node_path18.join)(baseDir, ".cursor", "mcp.json");
   if (await fileExists(cursorMcpPath)) {
     try {
       const content = await readFileContent(cursorMcpPath);
@@ -4742,11 +5142,11 @@ async function parseGeminiConfiguration(baseDir = process.cwd()) {
 }
 
 // src/parsers/junie.ts
-var import_node_path21 = require("path");
+var import_node_path19 = require("path");
 async function parseJunieConfiguration(baseDir = process.cwd()) {
   const errors = [];
   const rules = [];
-  const guidelinesPath = (0, import_node_path21.join)(baseDir, ".junie", "guidelines.md");
+  const guidelinesPath = (0, import_node_path19.join)(baseDir, ".junie", "guidelines.md");
   if (!await fileExists(guidelinesPath)) {
     errors.push(".junie/guidelines.md file not found");
     return { rules, errors };
@@ -4777,6 +5177,32 @@ async function parseJunieConfiguration(baseDir = process.cwd()) {
   return { rules, errors };
 }
 
+// src/parsers/opencode.ts
+async function parseOpCodeIgnore(opcodeignorePath) {
+  try {
+    const content = await readFileContent(opcodeignorePath);
+    const patterns = content.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
+    return patterns;
+  } catch {
+    return [];
+  }
+}
+async function parseOpenCodeConfiguration(baseDir = process.cwd()) {
+  return parseMemoryBasedConfiguration(baseDir, {
+    tool: "opencode",
+    mainFileName: "AGENTS.md",
+    memoryDirPath: ".opencode/memories",
+    settingsPath: "opencode.json",
+    mainDescription: "Main OpenCode configuration",
+    memoryDescription: "Memory file",
+    filenamePrefix: "opencode",
+    additionalIgnoreFile: {
+      path: ".opcodeignore",
+      parser: parseOpCodeIgnore
+    }
+  });
+}
+
 // src/parsers/roo.ts
 async function parseRooConfiguration(baseDir = process.cwd()) {
   return parseConfigurationFiles(baseDir, {
@@ -4799,10 +5225,11 @@ async function parseRooConfiguration(baseDir = process.cwd()) {
 
 // src/parsers/windsurf.ts
 var import_promises3 = require("fs/promises");
-var import_node_path22 = require("path");
-var import_gray_matter6 = __toESM(require("gray-matter"), 1);
+var import_node_path20 = require("path");
+init_logger();
 
 // src/core/importer.ts
+init_logger();
 async function importConfiguration(options) {
   const {
     tool,
@@ -4816,10 +5243,17 @@ async function importConfiguration(options) {
   let ignorePatterns;
   let mcpServers;
   if (verbose) {
-    console.log(`Importing ${tool} configuration from ${baseDir}...`);
+    logger.log(`Importing ${tool} configuration from ${baseDir}...`);
   }
   try {
     switch (tool) {
+      case "amazonqcli": {
+        const amazonqResult = await parseAmazonqcliConfiguration(baseDir);
+        rules = amazonqResult.rules;
+        errors.push(...amazonqResult.errors);
+        mcpServers = amazonqResult.mcpServers;
+        break;
+      }
       case "augmentcode": {
         const augmentResult = await parseAugmentcodeConfiguration(baseDir);
         rules = augmentResult.rules;
@@ -4880,6 +5314,14 @@ async function importConfiguration(options) {
         errors.push(...junieResult.errors);
         break;
       }
+      case "opencode": {
+        const opencodeResult = await parseOpenCodeConfiguration(baseDir);
+        rules = opencodeResult.rules;
+        errors.push(...opencodeResult.errors);
+        ignorePatterns = opencodeResult.ignorePatterns;
+        mcpServers = opencodeResult.mcpServers;
+        break;
+      }
       default:
         errors.push(`Unsupported tool: ${tool}`);
         return { success: false, rulesCreated: 0, errors };
@@ -4892,7 +5334,7 @@ async function importConfiguration(options) {
   if (rules.length === 0 && !ignorePatterns && !mcpServers) {
     return { success: false, rulesCreated: 0, errors };
   }
-  const rulesDirPath = (0, import_node_path23.join)(baseDir, rulesDir);
+  const rulesDirPath = (0, import_node_path21.join)(baseDir, rulesDir);
   try {
     const { mkdir: mkdir3 } = await import("fs/promises");
     await mkdir3(rulesDirPath, { recursive: true });
@@ -4907,22 +5349,22 @@ async function importConfiguration(options) {
       const baseFilename = rule.filename;
       let targetDir = rulesDirPath;
       if (rule.type === "command") {
-        targetDir = (0, import_node_path23.join)(rulesDirPath, "commands");
+        targetDir = (0, import_node_path21.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");
+          targetDir = (0, import_node_path21.join)(rulesDirPath, "rules");
           const { mkdir: mkdir3 } = await import("fs/promises");
           await mkdir3(targetDir, { recursive: true });
         }
       }
-      const filePath = (0, import_node_path23.join)(targetDir, `${baseFilename}.md`);
+      const filePath = (0, import_node_path21.join)(targetDir, `${baseFilename}.md`);
       const content = generateRuleFileContent(rule);
       await writeFileContent(filePath, content);
       rulesCreated++;
       if (verbose) {
-        console.log(`\u2705 Created rule file: ${filePath}`);
+        logger.success(`Created rule file: ${filePath}`);
       }
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -4932,13 +5374,13 @@ async function importConfiguration(options) {
   let ignoreFileCreated = false;
   if (ignorePatterns && ignorePatterns.length > 0) {
     try {
-      const rulesyncignorePath = (0, import_node_path23.join)(baseDir, ".rulesyncignore");
+      const rulesyncignorePath = (0, import_node_path21.join)(baseDir, ".rulesyncignore");
       const ignoreContent = `${ignorePatterns.join("\n")}
 `;
       await writeFileContent(rulesyncignorePath, ignoreContent);
       ignoreFileCreated = true;
       if (verbose) {
-        console.log(`\u2705 Created .rulesyncignore with ${ignorePatterns.length} patterns`);
+        logger.success(`Created .rulesyncignore with ${ignorePatterns.length} patterns`);
       }
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -4948,13 +5390,13 @@ async function importConfiguration(options) {
   let mcpFileCreated = false;
   if (mcpServers && Object.keys(mcpServers).length > 0) {
     try {
-      const mcpPath = (0, import_node_path23.join)(baseDir, rulesDir, ".mcp.json");
+      const mcpPath = (0, import_node_path21.join)(baseDir, rulesDir, ".mcp.json");
       const mcpContent = `${JSON.stringify({ mcpServers }, null, 2)}
 `;
       await writeFileContent(mcpPath, mcpContent);
       mcpFileCreated = true;
       if (verbose) {
-        console.log(`\u2705 Created .mcp.json with ${Object.keys(mcpServers).length} servers`);
+        logger.success(`Created .mcp.json with ${Object.keys(mcpServers).length} servers`);
       }
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -4975,17 +5417,19 @@ function generateRuleFileContent(rule) {
       description: rule.frontmatter.description,
       targets: rule.frontmatter.targets
     };
-    const frontmatter2 = import_gray_matter7.default.stringify("", simplifiedFrontmatter);
+    const frontmatter2 = import_gray_matter2.default.stringify("", simplifiedFrontmatter);
     return frontmatter2 + rule.content;
   }
-  const frontmatter = import_gray_matter7.default.stringify("", rule.frontmatter);
+  const frontmatter = import_gray_matter2.default.stringify("", rule.frontmatter);
   return frontmatter + rule.content;
 }
 
 // src/cli/commands/import.ts
+init_logger();
 async function importCommand(options = {}) {
   logger.setVerbose(options.verbose || false);
   const tools = [];
+  if (options.amazonqcli) tools.push("amazonqcli");
   if (options.augmentcode) tools.push("augmentcode");
   if (options["augmentcode-legacy"]) tools.push("augmentcode-legacy");
   if (options.claudecode) tools.push("claudecode");
@@ -4994,9 +5438,10 @@ async function importCommand(options = {}) {
   if (options.cline) tools.push("cline");
   if (options.roo) tools.push("roo");
   if (options.geminicli) tools.push("geminicli");
+  if (options.opencode) tools.push("opencode");
   if (tools.length === 0) {
     logger.error(
-      "\u274C Please specify one tool to import from (--augmentcode, --augmentcode-legacy, --claudecode, --cursor, --copilot, --cline, --roo, --geminicli)"
+      "\u274C Please specify one tool to import from (--amazonqcli, --augmentcode, --augmentcode-legacy, --claudecode, --cursor, --copilot, --cline, --roo, --geminicli, --opencode)"
     );
     process.exit(1);
   }
@@ -5044,23 +5489,24 @@ async function importCommand(options = {}) {
 }
 
 // src/cli/commands/init.ts
-var import_node_path24 = require("path");
+var import_node_path22 = require("path");
+init_logger();
 async function initCommand(options = {}) {
   const configResult = await loadConfig();
   const config = configResult.config;
   const aiRulesDir = config.aiRulesDir;
-  console.log("Initializing rulesync...");
+  logger.log("Initializing rulesync...");
   await ensureDir(aiRulesDir);
   const useLegacy = options.legacy ?? config.legacy ?? false;
-  const rulesDir = useLegacy ? aiRulesDir : (0, import_node_path24.join)(aiRulesDir, "rules");
+  const rulesDir = useLegacy ? aiRulesDir : (0, import_node_path22.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 ${rulesDir}/`);
-  console.log("2. Run 'rulesync generate' to create configuration files");
+  logger.success("rulesync initialized successfully!");
+  logger.log("\nNext steps:");
+  logger.log(`1. Edit rule files in ${rulesDir}/`);
+  logger.log("2. Run 'rulesync generate' to create configuration files");
 }
 async function createSampleFiles(rulesDir) {
   const sampleFile = {
@@ -5098,36 +5544,37 @@ globs: ["**/*"]
 - Follow single responsibility principle
 `
   };
-  const filepath = (0, import_node_path24.join)(rulesDir, sampleFile.filename);
+  const filepath = (0, import_node_path22.join)(rulesDir, sampleFile.filename);
   if (!await fileExists(filepath)) {
     await writeFileContent(filepath, sampleFile.content);
-    console.log(`Created ${filepath}`);
+    logger.success(`Created ${filepath}`);
   } else {
-    console.log(`Skipped ${filepath} (already exists)`);
+    logger.log(`Skipped ${filepath} (already exists)`);
   }
 }
 
 // src/cli/commands/status.ts
+init_logger();
 async function statusCommand() {
   const config = getDefaultConfig();
-  console.log("rulesync Status");
-  console.log("===============");
+  logger.log("rulesync Status");
+  logger.log("===============");
   const rulesyncExists = await fileExists(config.aiRulesDir);
-  console.log(`
+  logger.log(`
 \u{1F4C1} .rulesync directory: ${rulesyncExists ? "\u2705 Found" : "\u274C Not found"}`);
   if (!rulesyncExists) {
-    console.log("\n\u{1F4A1} Run 'rulesync init' to get started");
+    logger.log("\n\u{1F4A1} Run 'rulesync init' to get started");
     return;
   }
   try {
     const rules = await parseRulesFromDirectory(config.aiRulesDir);
-    console.log(`
+    logger.log(`
 \u{1F4CB} Rules: ${rules.length} total`);
     if (rules.length > 0) {
       const rootRules = rules.filter((r) => r.frontmatter.root).length;
       const nonRootRules = rules.length - rootRules;
-      console.log(`   - Root rules: ${rootRules}`);
-      console.log(`   - Non-root rules: ${nonRootRules}`);
+      logger.log(`   - Root rules: ${rootRules}`);
+      logger.log(`   - Non-root rules: ${nonRootRules}`);
       const targetCounts = { copilot: 0, cursor: 0, cline: 0, claudecode: 0, roo: 0 };
       for (const rule of rules) {
         const targets = rule.frontmatter.targets[0] === "*" ? config.defaultTargets : rule.frontmatter.targets;
@@ -5139,73 +5586,75 @@ async function statusCommand() {
           else if (target === "roo") targetCounts.roo++;
         }
       }
-      console.log("\n\u{1F3AF} Target tool coverage:");
-      console.log(`   - Copilot: ${targetCounts.copilot} rules`);
-      console.log(`   - Cursor: ${targetCounts.cursor} rules`);
-      console.log(`   - Cline: ${targetCounts.cline} rules`);
-      console.log(`   - Claude Code: ${targetCounts.claudecode} rules`);
-      console.log(`   - Roo: ${targetCounts.roo} rules`);
-    }
-    console.log("\n\u{1F4E4} Generated files:");
+      logger.log("\n\u{1F3AF} Target tool coverage:");
+      logger.log(`   - Copilot: ${targetCounts.copilot} rules`);
+      logger.log(`   - Cursor: ${targetCounts.cursor} rules`);
+      logger.log(`   - Cline: ${targetCounts.cline} rules`);
+      logger.log(`   - Claude Code: ${targetCounts.claudecode} rules`);
+      logger.log(`   - Roo: ${targetCounts.roo} rules`);
+    }
+    logger.log("\n\u{1F4E4} Generated files:");
     for (const [tool, outputPath] of Object.entries(config.outputPaths)) {
       const outputExists = await fileExists(outputPath);
-      console.log(`   - ${tool}: ${outputExists ? "\u2705 Generated" : "\u274C Not found"}`);
+      logger.log(`   - ${tool}: ${outputExists ? "\u2705 Generated" : "\u274C Not found"}`);
     }
     if (rules.length > 0) {
-      console.log("\n\u{1F4A1} Run 'rulesync generate' to update configuration files");
+      logger.log("\n\u{1F4A1} Run 'rulesync generate' to update configuration files");
     }
   } catch (error) {
-    console.error("\n\u274C Failed to get status:", error);
+    logger.error("\nFailed to get status:", error);
   }
 }
 
 // src/cli/commands/validate.ts
+init_logger();
 async function validateCommand() {
   const config = getDefaultConfig();
-  console.log("Validating rulesync configuration...");
+  logger.log("Validating rulesync configuration...");
   if (!await fileExists(config.aiRulesDir)) {
-    console.error("\u274C .rulesync directory not found. Run 'rulesync init' first.");
+    logger.error(".rulesync directory not found. Run 'rulesync init' first.");
     process.exit(1);
   }
   try {
     const rules = await parseRulesFromDirectory(config.aiRulesDir);
     if (rules.length === 0) {
-      console.warn("\u26A0\uFE0F  No rules found in .rulesync directory");
+      logger.warn("No rules found in .rulesync directory");
       return;
     }
-    console.log(`Found ${rules.length} rule(s), validating...`);
+    logger.log(`Found ${rules.length} rule(s), validating...`);
     const validation = await validateRules(rules);
     if (validation.warnings.length > 0) {
-      console.log("\n\u26A0\uFE0F  Warnings:");
+      logger.log("\n\u26A0\uFE0F  Warnings:");
       for (const warning of validation.warnings) {
-        console.log(`  - ${warning}`);
+        logger.log(`  - ${warning}`);
       }
     }
     if (validation.errors.length > 0) {
-      console.log("\n\u274C Errors:");
+      logger.log("\nErrors:");
       for (const error of validation.errors) {
-        console.log(`  - ${error}`);
+        logger.log(`  - ${error}`);
       }
     }
     if (validation.isValid) {
-      console.log("\n\u2705 All rules are valid!");
+      logger.success("\nAll rules are valid!");
     } else {
-      console.log(`
-\u274C Validation failed with ${validation.errors.length} error(s)`);
+      logger.log(`
+Validation failed with ${validation.errors.length} error(s)`);
       process.exit(1);
     }
   } catch (error) {
-    console.error("\u274C Failed to validate rules:", error);
+    logger.error("Failed to validate rules:", error);
     process.exit(1);
   }
 }
 
 // src/cli/commands/watch.ts
 var import_chokidar = require("chokidar");
+init_logger();
 async function watchCommand() {
   const config = getDefaultConfig();
-  console.log("\u{1F440} Watching for changes in .rulesync directory...");
-  console.log("Press Ctrl+C to stop watching");
+  logger.log("\u{1F440} Watching for changes in .rulesync directory...");
+  logger.log("Press Ctrl+C to stop watching");
   await generateCommand({ verbose: false });
   const watcher = (0, import_chokidar.watch)(`${config.aiRulesDir}/**/*.md`, {
     ignoreInitial: true,
@@ -5215,26 +5664,26 @@ async function watchCommand() {
   const handleChange = async (path5) => {
     if (isGenerating) return;
     isGenerating = true;
-    console.log(`
+    logger.log(`
 \u{1F4DD} Detected change in ${path5}`);
     try {
       await generateCommand({ verbose: false });
-      console.log("\u2705 Regenerated configuration files");
+      logger.success("Regenerated configuration files");
     } catch (error) {
-      console.error("\u274C Failed to regenerate:", error);
+      logger.error("Failed to regenerate:", error);
     } finally {
       isGenerating = false;
     }
   };
   watcher.on("change", handleChange).on("add", handleChange).on("unlink", (path5) => {
-    console.log(`
+    logger.log(`
 \u{1F5D1}\uFE0F  Removed ${path5}`);
     handleChange(path5);
   }).on("error", (error) => {
-    console.error("\u274C Watcher error:", error);
+    logger.error("Watcher error:", error);
   });
   process.on("SIGINT", () => {
-    console.log("\n\n\u{1F44B} Stopping watcher...");
+    logger.log("\n\n\u{1F44B} Stopping watcher...");
     watcher.close();
     process.exit(0);
   });
@@ -5242,12 +5691,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.62.0");
+program.name("rulesync").description("Unified AI rules management CLI tool").version("0.64.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").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(
+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("--opencode", "Import from OpenCode (AGENTS.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("--opencode", "Generate only for OpenCode").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) => {
@@ -5263,6 +5712,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.opencode) tools.push("opencode");
   if (options.windsurf) tools.push("windsurf");
   const generateOptions = {
     verbose: options.verbose,