Merge pull request #6138 from continuedev/pe/rule-updates-2

feat: move rule parsing to `config-yaml`

Author: sestinj

core/config/markdown/index.ts

@@ -1,3 +1 @@
-export * from "./createMarkdownRule";
 export * from "./loadMarkdownRules";
-export * from "./parseMarkdownRule";

core/config/markdown/loadCodebaseRules.ts

@@ -1,9 +1,11 @@
-import { ConfigValidationError } from "@continuedev/config-yaml";
+import {
+  ConfigValidationError,
+  markdownToRule,
+} from "@continuedev/config-yaml";
 import { IDE, RuleWithSource } from "../..";
 import { walkDirs } from "../../indexing/walkDir";
 import { RULES_MARKDOWN_FILENAME } from "../../llm/rules/constants";
 import { getUriPathBasename } from "../../util/uri";
-import { convertMarkdownRuleToContinueRule } from "./parseMarkdownRule";
 
 /**
  * Loads rules from rules.md files colocated in the codebase
@@ -29,9 +31,9 @@ export async function loadCodebaseRules(ide: IDE): Promise<{
     for (const filePath of rulesMdFiles) {
       try {
         const content = await ide.readFile(filePath);
-        const rule = convertMarkdownRuleToContinueRule(filePath, content);
+        const rule = markdownToRule(content, { uriType: "file", filePath });
 
-        rules.push(rule);
+        rules.push({ ...rule, source: "rules-block" });
       } catch (e) {
         errors.push({
           fatal: false,

core/config/markdown/loadCodebaseRules.vitest.ts

@@ -1,16 +1,16 @@
+import { markdownToRule } from "@continuedev/config-yaml";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { IDE } from "../..";
 import { walkDirs } from "../../indexing/walkDir";
 import { loadCodebaseRules } from "./loadCodebaseRules";
-import { convertMarkdownRuleToContinueRule } from "./parseMarkdownRule";
 
 // Mock dependencies
 vi.mock("../../indexing/walkDir", () => ({
   walkDirs: vi.fn(),
 }));
 
-vi.mock("./parseMarkdownRule", () => ({
-  convertMarkdownRuleToContinueRule: vi.fn(),
+vi.mock("@continuedev/config-yaml", () => ({
+  markdownToRule: vi.fn(),
 }));
 
 describe("loadCodebaseRules", () => {
@@ -82,10 +82,10 @@ describe("loadCodebaseRules", () => {
       return Promise.resolve(mockRuleContent[path] || "");
     });
 
-    // Mock convertMarkdownRuleToContinueRule to return converted rules
-    (convertMarkdownRuleToContinueRule as any).mockImplementation(
-      (path: string, content: string) => {
-        return mockConvertedRules[path];
+    // Mock markdownToRule to return converted rules
+    (markdownToRule as any).mockImplementation(
+      (content: string, options: any) => {
+        return mockConvertedRules[options.filePath];
       },
     );
   });
@@ -107,7 +107,7 @@ describe("loadCodebaseRules", () => {
     expect(mockIde.readFile).toHaveBeenCalledWith(".continue/rules.md");
 
     // Should convert all rules
-    expect(convertMarkdownRuleToContinueRule).toHaveBeenCalledTimes(4);
+    expect(markdownToRule).toHaveBeenCalledTimes(4);
 
     // Should return all rules
     expect(rules).toHaveLength(4);

core/config/markdown/loadMarkdownRules.ts

@@ -1,7 +1,9 @@
-import { ConfigValidationError } from "@continuedev/config-yaml";
+import {
+  ConfigValidationError,
+  markdownToRule,
+} from "@continuedev/config-yaml";
 import { IDE, RuleWithSource } from "../..";
 import { getAllDotContinueDefinitionFiles } from "../loadLocalAssistants";
-import { convertMarkdownRuleToContinueRule } from "./parseMarkdownRule";
 
 /**
  * Loads rules from markdown files in the .continue/rules directory
@@ -27,8 +29,11 @@ export async function loadMarkdownRules(ide: IDE): Promise<{
     // Process each markdown file
     for (const file of mdFiles) {
       try {
-        const rule = convertMarkdownRuleToContinueRule(file.path, file.content);
-        rules.push(rule);
+        const rule = markdownToRule(file.content, {
+          uriType: "file",
+          filePath: file.path,
+        });
+        rules.push({ ...rule, source: "rules-block" });
       } catch (e) {
         errors.push({
           fatal: false,

core/config/markdown/parseMarkdownRule.test.ts

@@ -0,0 +1,21 @@
+import {
+  RULE_FILE_EXTENSION,
+  sanitizeRuleName,
+} from "@continuedev/config-yaml";
+import { joinPathsToUri } from "../../util/uri";
+
+/**
+ * Creates the file path for a rule in the workspace .continue/rules directory
+ */
+export function createRuleFilePath(
+  workspaceDir: string,
+  ruleName: string,
+): string {
+  const safeRuleName = sanitizeRuleName(ruleName);
+  return joinPathsToUri(
+    workspaceDir,
+    ".continue",
+    "rules",
+    `${safeRuleName}.${RULE_FILE_EXTENSION}`,
+  );
+}

core/config/markdown/utils.ts

@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+import { createRuleFilePath } from "./utils";
+
+describe("createRuleFilePath", () => {
+  it("should create correct rule file path", () => {
+    const result = createRuleFilePath("/workspace", "My Test Rule");
+    expect(result).toBe("/workspace/.continue/rules/my-test-rule.md");
+  });
+
+  it("should handle special characters in rule name", () => {
+    const result = createRuleFilePath("/home/user", "Rule with @#$% chars");
+    expect(result).toBe("/home/user/.continue/rules/rule-with-chars.md");
+  });
+
+  it("should handle edge case rule names", () => {
+    const result = createRuleFilePath("/test", "   Multiple   Spaces   ");
+    expect(result).toBe("/test/.continue/rules/multiple-spaces.md");
+  });
+});

core/config/markdown/utils.vitest.ts

@@ -1,12 +1,10 @@
-import { BlockType } from "@continuedev/config-yaml";
+import { BlockType, RULE_FILE_EXTENSION } from "@continuedev/config-yaml";
 import { describe, expect, test } from "@jest/globals";
-import { RULE_FILE_EXTENSION } from "../markdown";
 import { findAvailableFilename, getFileContent } from "./workspaceBlocks";
 
 describe("getFileContent", () => {
   test("returns markdown content for rules block type", () => {
     const result = getFileContent("rules");
-    expect(result).toContain("# New Rule");
     expect(result).toContain("Your rule content");
     expect(result).toContain("A description of your rule");
   });

core/config/workspace/workspaceBlocks.test.ts

@@ -1,8 +1,12 @@
-import { BlockType, ConfigYaml } from "@continuedev/config-yaml";
+import {
+  BlockType,
+  ConfigYaml,
+  createRuleMarkdown,
+  RULE_FILE_EXTENSION,
+} from "@continuedev/config-yaml";
 import * as YAML from "yaml";
 import { IDE } from "../..";
 import { joinPathsToUri } from "../../util/uri";
-import { RULE_FILE_EXTENSION, createRuleMarkdown } from "../markdown";
 
 const BLOCK_TYPE_CONFIG: Record<
   BlockType,

core/config/workspace/workspaceBlocks.ts

@@ -134,6 +134,7 @@ async function loadConfigYaml(options: {
         rootPath,
       }),
       {
+        renderSecrets: true,
         currentUserSlug: "",
         onPremProxyUrl: null,
         orgScopeId,
@@ -142,9 +143,7 @@ async function loadConfigYaml(options: {
           controlPlaneClient,
           ide,
         ),
-        renderSecrets: true,
         injectBlocks: allLocalBlocks,
-        asConfigResult: true,
       },
     );
     config = unrollResult.config;