@oh-my-pi/pi-coding-agent 12.9.0 → 12.10.0

package/src/discovery/cline.ts

@@ -10,8 +10,7 @@ import { readDirEntries, readFile } from "../capability/fs";
 import type { Rule } from "../capability/rule";
 import { ruleCapability } from "../capability/rule";
 import type { LoadContext, LoadResult } from "../capability/types";
-import { parseFrontmatter } from "../utils/frontmatter";
-import { createSourceMeta, loadFilesFromDir } from "./helpers";
+import { buildRuleFromMarkdown, createSourceMeta, loadFilesFromDir } from "./helpers";
 
 const PROVIDER_ID = "cline";
 const DISPLAY_NAME = "Cline";
@@ -53,29 +52,8 @@ async function loadRules(ctx: LoadContext): Promise<LoadResult<Rule>> {
 		// Directory format: load all *.md files
 		const result = await loadFilesFromDir(ctx, found.path, PROVIDER_ID, "project", {
 			extensions: ["md"],
-			transform: (name, content, path, source) => {
-				const { frontmatter, body } = parseFrontmatter(content, { source: path });
-				const ruleName = name.replace(/\.md$/, "");
-
-				// Parse globs (can be array or single string)
-				let globs: string[] | undefined;
-				if (Array.isArray(frontmatter.globs)) {
-					globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
-				} else if (typeof frontmatter.globs === "string") {
-					globs = [frontmatter.globs];
-				}
-
-				return {
-					name: ruleName,
-					path,
-					content: body,
-					globs,
-					alwaysApply: typeof frontmatter.alwaysApply === "boolean" ? frontmatter.alwaysApply : undefined,
-					description: typeof frontmatter.description === "string" ? frontmatter.description : undefined,
-					ttsrTrigger: typeof frontmatter.ttsr_trigger === "string" ? frontmatter.ttsr_trigger : undefined,
-					_source: source,
-				};
-			},
+			transform: (name, content, path, source) =>
+				buildRuleFromMarkdown(name, content, path, source, { stripNamePattern: /\.md$/ }),
 		});
 
 		items.push(...result.items);
@@ -88,27 +66,8 @@ async function loadRules(ctx: LoadContext): Promise<LoadResult<Rule>> {
 			return { items, warnings };
 		}
 
-		const { frontmatter, body } = parseFrontmatter(content, { source: found.path });
 		const source = createSourceMeta(PROVIDER_ID, found.path, "project");
-
-		// Parse globs (can be array or single string)
-		let globs: string[] | undefined;
-		if (Array.isArray(frontmatter.globs)) {
-			globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
-		} else if (typeof frontmatter.globs === "string") {
-			globs = [frontmatter.globs];
-		}
-
-		items.push({
-			name: "clinerules",
-			path: found.path,
-			content: body,
-			globs,
-			alwaysApply: typeof frontmatter.alwaysApply === "boolean" ? frontmatter.alwaysApply : undefined,
-			description: typeof frontmatter.description === "string" ? frontmatter.description : undefined,
-			ttsrTrigger: typeof frontmatter.ttsr_trigger === "string" ? frontmatter.ttsr_trigger : undefined,
-			_source: source,
-		});
+		items.push(buildRuleFromMarkdown("clinerules.md", content, found.path, source, { ruleName: "clinerules" }));
 	}
 
 	return { items, warnings };

package/src/discovery/cursor.ts

@@ -21,8 +21,8 @@ import { ruleCapability } from "../capability/rule";
 import type { Settings } from "../capability/settings";
 import { settingsCapability } from "../capability/settings";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
-import { parseFrontmatter } from "../utils/frontmatter";
 import {
+	buildRuleFromMarkdown,
 	createSourceMeta,
 	expandEnvVarsDeep,
 	getProjectPath,
@@ -137,34 +137,7 @@ async function loadRules(ctx: LoadContext): Promise<LoadResult<Rule>> {
 }
 
 function transformMDCRule(name: string, content: string, path: string, source: SourceMeta): Rule {
-	const { frontmatter, body } = parseFrontmatter(content, { source: path });
-
-	// Extract frontmatter fields
-	const description = typeof frontmatter.description === "string" ? frontmatter.description : undefined;
-	const alwaysApply = frontmatter.alwaysApply === true;
-	const ttsrTrigger = typeof frontmatter.ttsr_trigger === "string" ? frontmatter.ttsr_trigger : undefined;
-
-	// Parse globs (can be array or single string)
-	let globs: string[] | undefined;
-	if (Array.isArray(frontmatter.globs)) {
-		globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
-	} else if (typeof frontmatter.globs === "string") {
-		globs = [frontmatter.globs];
-	}
-
-	// Derive name from filename (strip extension)
-	const ruleName = name.replace(/\.(mdc|md)$/, "");
-
-	return {
-		name: ruleName,
-		path,
-		content: body,
-		description,
-		alwaysApply,
-		globs,
-		ttsrTrigger,
-		_source: source,
-	};
+	return buildRuleFromMarkdown(name, content, path, source, { stripNamePattern: /\.(mdc|md)$/ });
 }
 
 // =============================================================================

package/src/discovery/helpers.ts

@@ -7,6 +7,7 @@ import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { FileType, glob } from "@oh-my-pi/pi-natives";
 import { CONFIG_DIR_NAME } from "@oh-my-pi/pi-utils/dirs";
 import { readFile } from "../capability/fs";
+import { parseRuleConditionAndScope, type Rule, type RuleFrontmatter } from "../capability/rule";
 import type { Skill, SkillFrontmatter } from "../capability/skill";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
 import { parseFrontmatter } from "../utils/frontmatter";
@@ -163,6 +164,43 @@ export function parseArrayOrCSV(value: unknown): string[] | undefined {
 	return undefined;
 }
 
+/**
+ * Build a canonical rule item from a markdown/markdown-frontmatter document.
+ */
+export function buildRuleFromMarkdown(
+	name: string,
+	content: string,
+	filePath: string,
+	source: SourceMeta,
+	options?: {
+		ruleName?: string;
+		stripNamePattern?: RegExp;
+	},
+): Rule {
+	const { frontmatter, body } = parseFrontmatter(content, { source: filePath });
+	const { condition, scope } = parseRuleConditionAndScope(frontmatter as RuleFrontmatter);
+
+	let globs: string[] | undefined;
+	if (Array.isArray(frontmatter.globs)) {
+		globs = frontmatter.globs.filter((item): item is string => typeof item === "string");
+	} else if (typeof frontmatter.globs === "string") {
+		globs = [frontmatter.globs];
+	}
+
+	const resolvedName = options?.ruleName ?? name.replace(options?.stripNamePattern ?? /\.(md|mdc)$/, "");
+	return {
+		name: resolvedName,
+		path: filePath,
+		content: body,
+		globs,
+		alwaysApply: frontmatter.alwaysApply === true,
+		description: typeof frontmatter.description === "string" ? frontmatter.description : undefined,
+		condition,
+		scope,
+		_source: source,
+	};
+}
+
 /**
  * Parse model field into a prioritized list.
  */

package/src/discovery/windsurf.ts

@@ -15,8 +15,8 @@ import { readFile } from "../capability/fs";
 import { type MCPServer, mcpCapability } from "../capability/mcp";
 import { type Rule, ruleCapability } from "../capability/rule";
 import type { LoadContext, LoadResult } from "../capability/types";
-import { parseFrontmatter } from "../utils/frontmatter";
 import {
+	buildRuleFromMarkdown,
 	createSourceMeta,
 	expandEnvVarsDeep,
 	getProjectPath,
@@ -104,26 +104,8 @@ async function loadRules(ctx: LoadContext): Promise<LoadResult<Rule>> {
 	if (userPath) {
 		const content = await readFile(userPath);
 		if (content) {
-			const { frontmatter, body } = parseFrontmatter(content, { source: userPath });
-
-			// Validate and normalize globs
-			let globs: string[] | undefined;
-			if (Array.isArray(frontmatter.globs)) {
-				globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
-			} else if (typeof frontmatter.globs === "string") {
-				globs = [frontmatter.globs];
-			}
-
-			items.push({
-				name: "global_rules",
-				path: userPath,
-				content: body,
-				globs,
-				alwaysApply: frontmatter.alwaysApply as boolean | undefined,
-				description: frontmatter.description as string | undefined,
-				ttsrTrigger: typeof frontmatter.ttsr_trigger === "string" ? frontmatter.ttsr_trigger : undefined,
-				_source: createSourceMeta(PROVIDER_ID, userPath, "user"),
-			});
+			const source = createSourceMeta(PROVIDER_ID, userPath, "user");
+			items.push(buildRuleFromMarkdown("global_rules.md", content, userPath, source, { ruleName: "global_rules" }));
 		}
 	}
 
@@ -132,29 +114,8 @@ async function loadRules(ctx: LoadContext): Promise<LoadResult<Rule>> {
 	if (projectRulesDir) {
 		const result = await loadFilesFromDir<Rule>(ctx, projectRulesDir, PROVIDER_ID, "project", {
 			extensions: ["md"],
-			transform: (name, content, path, source) => {
-				const { frontmatter, body } = parseFrontmatter(content, { source: path });
-				const ruleName = name.replace(/\.md$/, "");
-
-				// Validate and normalize globs
-				let globs: string[] | undefined;
-				if (Array.isArray(frontmatter.globs)) {
-					globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
-				} else if (typeof frontmatter.globs === "string") {
-					globs = [frontmatter.globs];
-				}
-
-				return {
-					name: ruleName,
-					path,
-					content: body,
-					globs,
-					alwaysApply: frontmatter.alwaysApply as boolean | undefined,
-					description: frontmatter.description as string | undefined,
-					ttsrTrigger: typeof frontmatter.ttsr_trigger === "string" ? frontmatter.ttsr_trigger : undefined,
-					_source: source,
-				};
-			},
+			transform: (name, content, path, source) =>
+				buildRuleFromMarkdown(name, content, path, source, { stripNamePattern: /\.md$/ }),
 		});
 		items.push(...result.items);
 		if (result.warnings) warnings.push(...result.warnings);