@funkai/cli 0.1.4 → 0.2.0

package/src/lib/prompts/paths.ts

@@ -1,35 +1,45 @@
 import { existsSync, lstatSync, readdirSync, readFileSync } from "node:fs";
 import { basename, extname, join, resolve } from "node:path";
 
+import { parse as parseYaml } from "yaml";
+
 import { FRONTMATTER_RE, NAME_RE } from "./frontmatter.js";
 
 const MAX_DEPTH = 5;
 const PROMPT_EXT = ".prompt";
 
+/** A `.prompt` file discovered during directory scanning. */
 export interface DiscoveredPrompt {
   readonly name: string;
   readonly filePath: string;
 }
 
+// ---------------------------------------------------------------------------
+// Private
+// ---------------------------------------------------------------------------
+
 /**
  * Extract the `name` field from YAML frontmatter.
  *
- * This is a lightweight extraction that avoids pulling in a full YAML parser.
- * It looks for `name: <value>` in the frontmatter block.
+ * Uses a proper YAML parser to handle quoted values and edge cases.
+ *
+ * @private
  */
 function extractName(content: string): string | undefined {
-  const match = content.match(FRONTMATTER_RE);
-  if (!match) {
+  const fmMatch = content.match(FRONTMATTER_RE);
+  if (!fmMatch) {
     return undefined;
   }
 
-  const [, frontmatter] = match;
-  const nameLine = frontmatter.split("\n").find((line) => line.startsWith("name:"));
-  if (!nameLine) {
+  try {
+    const parsed = parseYaml(fmMatch[1]) as Record<string, unknown> | null;
+    if (parsed !== null && parsed !== undefined && typeof parsed.name === "string") {
+      return parsed.name;
+    }
+    return undefined;
+  } catch {
     return undefined;
   }
-
-  return nameLine.slice("name:".length).trim();
 }
 
 /**
@@ -37,6 +47,8 @@ function extractName(content: string): string | undefined {
  *
  * If the file is named `prompt.prompt`, uses the parent directory name.
  * Otherwise uses the file stem (e.g. `my-agent.prompt` -> `my-agent`).
+ *
+ * @private
  */
 function deriveNameFromPath(filePath: string): string {
   const stem = basename(filePath, PROMPT_EXT);
@@ -48,6 +60,8 @@ function deriveNameFromPath(filePath: string): string {
 
 /**
  * Recursively scan a directory for `.prompt` files.
+ *
+ * @private
  */
 function scanDirectory(dir: string, depth: number): DiscoveredPrompt[] {
   if (depth > MAX_DEPTH) {
@@ -102,7 +116,7 @@ function scanDirectory(dir: string, depth: number): DiscoveredPrompt[] {
  * @returns Sorted, deduplicated list of discovered prompts.
  * @throws If duplicate prompt names are found across roots.
  */
-export function discoverPrompts(roots: readonly string[]): DiscoveredPrompt[] {
+export function discoverPrompts(roots: readonly string[]): readonly DiscoveredPrompt[] {
   const all = roots.flatMap((root) => scanDirectory(resolve(root), 0));
 
   const byName = Map.groupBy(all, (prompt) => prompt.name);

package/src/lib/prompts/pipeline.ts

@@ -14,6 +14,7 @@ import { discoverPrompts } from "./paths.js";
 /**
  * Resolve the list of partial directories to search.
  *
+ * @private
  * @param customDir - Custom partials directory path.
  * @returns Array of directories to search for partials.
  */
@@ -55,8 +56,8 @@ export function runLintPipeline(options: LintPipelineOptions): LintPipelineResul
   const results = discovered.map((d) => {
     // oxlint-disable-next-line security/detect-non-literal-fs-filename -- safe: reading discovered prompt file
     const raw = readFileSync(d.filePath, "utf8");
-    const frontmatter = parseFrontmatter(raw, d.filePath);
-    const template = flattenPartials(clean(raw), partialsDirs);
+    const frontmatter = parseFrontmatter({ content: raw, filePath: d.filePath });
+    const template = flattenPartials({ template: clean(raw), partialsDirs });
     const templateVars = extractVariables(template);
     return lintPrompt(frontmatter.name, d.filePath, frontmatter.schema, templateVars);
   });
@@ -98,8 +99,8 @@ export function runGeneratePipeline(options: GeneratePipelineOptions): GenerateP
   const processed = discovered.map((d) => {
     // oxlint-disable-next-line security/detect-non-literal-fs-filename -- safe: reading discovered prompt file
     const raw = readFileSync(d.filePath, "utf8");
-    const frontmatter = parseFrontmatter(raw, d.filePath);
-    const template = flattenPartials(clean(raw), partialsDirs);
+    const frontmatter = parseFrontmatter({ content: raw, filePath: d.filePath });
+    const template = flattenPartials({ template: clean(raw), partialsDirs });
     const templateVars = extractVariables(template);
 
     return {