rulesync 7.4.0 → 7.5.0

package/dist/cli/index.cjs

@@ -675,7 +675,7 @@ var SimulatedCommand = class _SimulatedCommand extends ToolCommand {
     return {
       baseDir,
       relativeDirPath: _SimulatedCommand.getSettablePaths().relativeDirPath,
-      relativeFilePath: (0, import_node_path4.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       validate
@@ -732,7 +732,7 @@ var AgentsmdCommand = class _AgentsmdCommand extends SimulatedCommand {
     return new _AgentsmdCommand({
       baseDir,
       relativeDirPath: _AgentsmdCommand.getSettablePaths().relativeDirPath,
-      relativeFilePath: (0, import_node_path5.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       validate
@@ -841,6 +841,16 @@ var RulesyncCommand = class _RulesyncCommand extends RulesyncFile {
   getBody() {
     return this.body;
   }
+  withRelativeFilePath(newRelativeFilePath) {
+    return new _RulesyncCommand({
+      baseDir: this.getBaseDir(),
+      relativeDirPath: this.getRelativeDirPath(),
+      relativeFilePath: newRelativeFilePath,
+      frontmatter: this.getFrontmatter(),
+      body: this.getBody(),
+      fileContent: this.getFileContent()
+    });
+  }
   validate() {
     if (!this.frontmatter) {
       return { success: true, error: null };
@@ -871,11 +881,10 @@ var RulesyncCommand = class _RulesyncCommand extends RulesyncFile {
     if (!result.success) {
       throw new Error(`Invalid frontmatter in ${relativeFilePath}: ${formatError(result.error)}`);
     }
-    const filename = (0, import_node_path6.basename)(relativeFilePath);
     return new _RulesyncCommand({
       baseDir: process.cwd(),
       relativeDirPath: _RulesyncCommand.getSettablePaths().relativeDirPath,
-      relativeFilePath: filename,
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       fileContent
@@ -1034,7 +1043,7 @@ ${body}${turboDirective}`;
     return new _AntigravityCommand({
       baseDir,
       relativeDirPath: _AntigravityCommand.getSettablePaths().relativeDirPath,
-      relativeFilePath: (0, import_node_path7.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       fileContent,
@@ -1180,7 +1189,7 @@ var ClaudecodeCommand = class _ClaudecodeCommand extends ToolCommand {
     return new _ClaudecodeCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path8.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       validate
@@ -1270,7 +1279,7 @@ var ClineCommand = class _ClineCommand extends ToolCommand {
     return new _ClineCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path9.basename)(relativeFilePath),
+      relativeFilePath,
       fileContent: content.trim(),
       validate
     });
@@ -1357,7 +1366,7 @@ var CodexcliCommand = class _CodexcliCommand extends ToolCommand {
     return new _CodexcliCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path10.basename)(relativeFilePath),
+      relativeFilePath,
       fileContent: content.trim(),
       validate
     });
@@ -1490,7 +1499,7 @@ var CopilotCommand = class _CopilotCommand extends ToolCommand {
     return new _CopilotCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path11.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       validate
@@ -1582,7 +1591,7 @@ var CursorCommand = class _CursorCommand extends ToolCommand {
     return new _CursorCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path12.basename)(relativeFilePath),
+      relativeFilePath,
       fileContent: content.trim(),
       validate
     });
@@ -1637,7 +1646,7 @@ var FactorydroidCommand = class _FactorydroidCommand extends SimulatedCommand {
     return new _FactorydroidCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path13.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       validate
@@ -1769,7 +1778,7 @@ ${geminiFrontmatter.prompt}
     return new _GeminiCliCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path14.basename)(relativeFilePath),
+      relativeFilePath,
       fileContent,
       validate
     });
@@ -1866,7 +1875,7 @@ var KiloCommand = class _KiloCommand extends ToolCommand {
     return new _KiloCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path15.basename)(relativeFilePath),
+      relativeFilePath,
       fileContent: content.trim(),
       validate
     });
@@ -1947,7 +1956,7 @@ var KiroCommand = class _KiroCommand extends ToolCommand {
     return new _KiroCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path16.basename)(relativeFilePath),
+      relativeFilePath,
       fileContent: content.trim(),
       validate
     });
@@ -2079,7 +2088,7 @@ var OpenCodeCommand = class _OpenCodeCommand extends ToolCommand {
     return new _OpenCodeCommand({
       baseDir,
       relativeDirPath: paths.relativeDirPath,
-      relativeFilePath: (0, import_node_path17.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       validate
@@ -2224,7 +2233,7 @@ var RooCommand = class _RooCommand extends ToolCommand {
     return new _RooCommand({
       baseDir,
       relativeDirPath: _RooCommand.getSettablePaths().relativeDirPath,
-      relativeFilePath: (0, import_node_path18.basename)(relativeFilePath),
+      relativeFilePath,
       frontmatter: result.data,
       body: content.trim(),
       fileContent,
@@ -2271,42 +2280,78 @@ var toolCommandFactories = /* @__PURE__ */ new Map([
     "agentsmd",
     {
       class: AgentsmdCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: false, isSimulated: true }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: false,
+        isSimulated: true,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
     "antigravity",
     {
       class: AntigravityCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: false, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: false,
+        isSimulated: false,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
     "claudecode",
     {
       class: ClaudecodeCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: true
+      }
     }
   ],
   [
     "claudecode-legacy",
     {
       class: ClaudecodeCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: true
+      }
     }
   ],
   [
     "cline",
     {
       class: ClineCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
     "codexcli",
     {
       class: CodexcliCommand,
-      meta: { extension: "md", supportsProject: false, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: false,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
@@ -2317,7 +2362,8 @@ var toolCommandFactories = /* @__PURE__ */ new Map([
         extension: "prompt.md",
         supportsProject: true,
         supportsGlobal: false,
-        isSimulated: false
+        isSimulated: false,
+        supportsSubdirectory: false
       }
     }
   ],
@@ -2325,49 +2371,91 @@ var toolCommandFactories = /* @__PURE__ */ new Map([
     "cursor",
     {
       class: CursorCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
     "factorydroid",
     {
       class: FactorydroidCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: true, isSimulated: true }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: true,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
     "geminicli",
     {
       class: GeminiCliCommand,
-      meta: { extension: "toml", supportsProject: true, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "toml",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: true
+      }
     }
   ],
   [
     "kilo",
     {
       class: KiloCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
     "kiro",
     {
       class: KiroCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: false, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: false,
+        isSimulated: false,
+        supportsSubdirectory: false
+      }
     }
   ],
   [
     "opencode",
     {
       class: OpenCodeCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: true, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: true,
+        isSimulated: false,
+        supportsSubdirectory: true
+      }
     }
   ],
   [
     "roo",
     {
       class: RooCommand,
-      meta: { extension: "md", supportsProject: true, supportsGlobal: false, isSimulated: false }
+      meta: {
+        extension: "md",
+        supportsProject: true,
+        supportsGlobal: false,
+        isSimulated: false,
+        supportsSubdirectory: true
+      }
     }
   ]
 ]);
@@ -2420,13 +2508,27 @@ var CommandsProcessor = class extends FeatureProcessor {
       (file) => file instanceof RulesyncCommand
     );
     const factory = this.getFactory(this.toolTarget);
+    const flattenedPathOrigins = /* @__PURE__ */ new Map();
     const toolCommands = rulesyncCommands.map((rulesyncCommand) => {
       if (!factory.class.isTargetedByRulesyncCommand(rulesyncCommand)) {
         return null;
       }
+      const originalRelativePath = rulesyncCommand.getRelativeFilePath();
+      const commandToConvert = factory.meta.supportsSubdirectory ? rulesyncCommand : this.flattenRelativeFilePath(rulesyncCommand);
+      if (!factory.meta.supportsSubdirectory) {
+        const flattenedPath = commandToConvert.getRelativeFilePath();
+        const firstOrigin = flattenedPathOrigins.get(flattenedPath);
+        if (firstOrigin && firstOrigin !== originalRelativePath) {
+          logger.warn(
+            `Command path collision detected while flattening for ${this.toolTarget}: "${firstOrigin}" and "${originalRelativePath}" both map to "${flattenedPath}". The later command will overwrite the earlier one.`
+          );
+        } else if (!firstOrigin) {
+          flattenedPathOrigins.set(flattenedPath, originalRelativePath);
+        }
+      }
       return factory.class.fromRulesyncCommand({
         baseDir: this.baseDir,
-        rulesyncCommand,
+        rulesyncCommand: commandToConvert,
         global: this.global
       });
     }).filter((command) => command !== null);
@@ -2441,17 +2543,26 @@ var CommandsProcessor = class extends FeatureProcessor {
     });
     return rulesyncCommands;
   }
+  flattenRelativeFilePath(rulesyncCommand) {
+    const flatPath = (0, import_node_path19.basename)(rulesyncCommand.getRelativeFilePath());
+    if (flatPath === rulesyncCommand.getRelativeFilePath()) return rulesyncCommand;
+    return rulesyncCommand.withRelativeFilePath(flatPath);
+  }
+  safeRelativePath(basePath, fullPath) {
+    const rel = (0, import_node_path19.relative)(basePath, fullPath);
+    checkPathTraversal({ relativePath: rel, intendedRootDir: basePath });
+    return rel;
+  }
   /**
    * Implementation of abstract method from FeatureProcessor
    * Load and parse rulesync command files from .rulesync/commands/ directory
    */
   async loadRulesyncFiles() {
-    const rulesyncCommandPaths = await findFilesByGlobs(
-      (0, import_node_path19.join)(RulesyncCommand.getSettablePaths().relativeDirPath, "*.md")
-    );
+    const basePath = RulesyncCommand.getSettablePaths().relativeDirPath;
+    const rulesyncCommandPaths = await findFilesByGlobs((0, import_node_path19.join)(basePath, "**", "*.md"));
     const rulesyncCommands = await Promise.all(
       rulesyncCommandPaths.map(
-        (path4) => RulesyncCommand.fromFile({ relativeFilePath: (0, import_node_path19.basename)(path4) })
+        (path4) => RulesyncCommand.fromFile({ relativeFilePath: this.safeRelativePath(basePath, path4) })
       )
     );
     logger.debug(`Successfully loaded ${rulesyncCommands.length} rulesync commands`);
@@ -2466,15 +2577,15 @@ var CommandsProcessor = class extends FeatureProcessor {
   } = {}) {
     const factory = this.getFactory(this.toolTarget);
     const paths = factory.class.getSettablePaths({ global: this.global });
-    const commandFilePaths = await findFilesByGlobs(
-      (0, import_node_path19.join)(this.baseDir, paths.relativeDirPath, `*.${factory.meta.extension}`)
-    );
+    const baseDirFull = (0, import_node_path19.join)(this.baseDir, paths.relativeDirPath);
+    const globPattern = factory.meta.supportsSubdirectory ? (0, import_node_path19.join)(baseDirFull, "**", `*.${factory.meta.extension}`) : (0, import_node_path19.join)(baseDirFull, `*.${factory.meta.extension}`);
+    const commandFilePaths = await findFilesByGlobs(globPattern);
     if (forDeletion) {
       const toolCommands2 = commandFilePaths.map(
         (path4) => factory.class.forDeletion({
           baseDir: this.baseDir,
           relativeDirPath: paths.relativeDirPath,
-          relativeFilePath: (0, import_node_path19.basename)(path4),
+          relativeFilePath: this.safeRelativePath(baseDirFull, path4),
           global: this.global
         })
       ).filter((cmd) => cmd.isDeletable());
@@ -2485,7 +2596,7 @@ var CommandsProcessor = class extends FeatureProcessor {
       commandFilePaths.map(
         (path4) => factory.class.fromFile({
           baseDir: this.baseDir,
-          relativeFilePath: (0, import_node_path19.basename)(path4),
+          relativeFilePath: this.safeRelativePath(baseDirFull, path4),
           global: this.global
         })
       )
@@ -18887,7 +18998,7 @@ async function updateCommand(currentVersion, options) {
 }
 
 // src/cli/index.ts
-var getVersion = () => "7.4.0";
+var getVersion = () => "7.5.0";
 var main = async () => {
   const program = new import_commander.Command();
   const version = getVersion();

package/dist/cli/index.js

@@ -60,7 +60,7 @@ import {
   removeTempDirectory,
   stringifyFrontmatter,
   writeFileContent
-} from "../chunk-UCC3WPDL.js";
+} from "../chunk-WZ7IUX6M.js";
 
 // src/cli/index.ts
 import { Command } from "commander";
@@ -3790,7 +3790,7 @@ async function updateCommand(currentVersion, options) {
 }
 
 // src/cli/index.ts
-var getVersion = () => "7.4.0";
+var getVersion = () => "7.5.0";
 var main = async () => {
   const program = new Command();
   const version = getVersion();