@promptscript/cli 1.0.0-alpha.2 → 1.0.0-alpha.4

package/index.js

@@ -1,7 +1,7 @@
 // packages/cli/src/cli.ts
 import { Command } from "commander";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { dirname as dirname5 } from "path";
+import { dirname as dirname7 } from "path";
 
 // packages/core/src/types/constants.ts
 var BLOCK_TYPES = [
@@ -86,6 +86,13 @@ function isBuiltInConvention(name) {
   return name in BUILT_IN_CONVENTIONS;
 }
 
+// packages/core/src/types/prettier.ts
+var DEFAULT_PRETTIER_OPTIONS = {
+  proseWrap: "preserve",
+  tabWidth: 2,
+  printWidth: 80
+};
+
 // packages/core/src/errors/base.ts
 var PSError = class extends Error {
   /** Error code */
@@ -291,7 +298,7 @@ function getPackageVersion(baseDir, relativePath = "../package.json") {
 
 // packages/cli/src/commands/init.ts
 import { fileURLToPath } from "url";
-import { dirname } from "path";
+import { dirname as dirname2 } from "path";
 
 // packages/cli/src/services.ts
 import { writeFile, mkdir, readFile, readdir } from "fs/promises";
@@ -308,7 +315,8 @@ var defaultFileSystem = {
 var defaultPrompts = {
   input: prompts.input,
   confirm: prompts.confirm,
-  checkbox: prompts.checkbox
+  checkbox: prompts.checkbox,
+  select: prompts.select
 };
 var createDefaultServices = () => ({
   fs: defaultFileSystem,
@@ -378,6 +386,13 @@ var ConsoleOutput = {
     if (isQuiet()) return;
     console.log(chalk.yellow(`  \u26A0 ${message}`));
   },
+  /**
+   * Print a skipped file message.
+   */
+  skipped(message) {
+    if (isQuiet()) return;
+    console.log(chalk.yellow(`  \u2298 ${message}`));
+  },
   /**
    * Print an info message.
    */
@@ -680,9 +695,114 @@ function formatDetectionResults(detection) {
   return lines;
 }
 
+// packages/cli/src/prettier/loader.ts
+import { existsSync as existsSync2 } from "fs";
+import { readFile as readFile2 } from "fs/promises";
+import { join as join2, dirname, resolve } from "path";
+import { parse as parseYaml } from "yaml";
+var PRETTIER_CONFIG_FILES = [
+  ".prettierrc",
+  ".prettierrc.json",
+  ".prettierrc.yaml",
+  ".prettierrc.yml"
+];
+function findPrettierConfig(startDir = process.cwd()) {
+  let currentDir = resolve(startDir);
+  const root2 = dirname(currentDir);
+  while (currentDir !== root2) {
+    for (const configFile of PRETTIER_CONFIG_FILES) {
+      const configPath = join2(currentDir, configFile);
+      if (existsSync2(configPath)) {
+        return configPath;
+      }
+    }
+    currentDir = dirname(currentDir);
+  }
+  for (const configFile of PRETTIER_CONFIG_FILES) {
+    const configPath = join2(currentDir, configFile);
+    if (existsSync2(configPath)) {
+      return configPath;
+    }
+  }
+  return null;
+}
+async function loadPrettierConfig(configPath) {
+  try {
+    const content = await readFile2(configPath, "utf-8");
+    const isYaml = configPath.endsWith(".yaml") || configPath.endsWith(".yml");
+    let parsed;
+    if (isYaml || configPath.endsWith(".prettierrc")) {
+      try {
+        parsed = parseYaml(content);
+      } catch {
+        parsed = JSON.parse(content);
+      }
+    } else {
+      parsed = JSON.parse(content);
+    }
+    if (!parsed || typeof parsed !== "object") {
+      return null;
+    }
+    const config = parsed;
+    const result = {};
+    if (typeof config["proseWrap"] === "string") {
+      const proseWrap = config["proseWrap"];
+      if (proseWrap === "always" || proseWrap === "never" || proseWrap === "preserve") {
+        result.proseWrap = proseWrap;
+      }
+    }
+    if (typeof config["tabWidth"] === "number") {
+      result.tabWidth = config["tabWidth"];
+    }
+    if (typeof config["printWidth"] === "number") {
+      result.printWidth = config["printWidth"];
+    }
+    return result;
+  } catch {
+    return null;
+  }
+}
+async function resolvePrettierOptions(config, basePath = process.cwd()) {
+  const formatting = config?.formatting;
+  if (!formatting) {
+    return { ...DEFAULT_PRETTIER_OPTIONS };
+  }
+  const result = { ...DEFAULT_PRETTIER_OPTIONS };
+  const prettier = formatting.prettier;
+  if (prettier === true) {
+    const configPath = findPrettierConfig(basePath);
+    if (configPath) {
+      const loadedOptions = await loadPrettierConfig(configPath);
+      if (loadedOptions) {
+        Object.assign(result, loadedOptions);
+      }
+    }
+  } else if (typeof prettier === "string") {
+    const configPath = resolve(basePath, prettier);
+    if (existsSync2(configPath)) {
+      const loadedOptions = await loadPrettierConfig(configPath);
+      if (loadedOptions) {
+        Object.assign(result, loadedOptions);
+      }
+    }
+  } else if (prettier && typeof prettier === "object") {
+    Object.assign(result, prettier);
+  }
+  if (formatting.proseWrap !== void 0) {
+    result.proseWrap = formatting.proseWrap;
+  }
+  if (formatting.tabWidth !== void 0) {
+    result.tabWidth = formatting.tabWidth;
+  }
+  if (formatting.printWidth !== void 0) {
+    result.printWidth = formatting.printWidth;
+  }
+  return result;
+}
+
 // packages/cli/src/commands/init.ts
 var __filename = fileURLToPath(import.meta.url);
-var __dirname = dirname(__filename);
+var __dirname = dirname2(__filename);
 async function initCommand(options, services = createDefaultServices()) {
   const { fs: fs4 } = services;
   if (fs4.existsSync("promptscript.yaml") && !options.force) {
@@ -693,7 +813,14 @@ async function initCommand(options, services = createDefaultServices()) {
   try {
     const projectInfo = await detectProject(services);
     const aiToolsDetection = await detectAITools(services);
-    const config = await resolveConfig(options, projectInfo, aiToolsDetection, services);
+    const prettierConfigPath = findPrettierConfig(process.cwd());
+    const config = await resolveConfig(
+      options,
+      projectInfo,
+      aiToolsDetection,
+      prettierConfigPath,
+      services
+    );
     const spinner = createSpinner("Creating PromptScript configuration...").start();
     await fs4.mkdir(".promptscript", { recursive: true });
     const configContent = generateConfig(config);
@@ -716,6 +843,14 @@ async function initCommand(options, services = createDefaultServices()) {
       ConsoleOutput.muted(`  Registry: ${config.registry}`);
     }
     ConsoleOutput.newline();
+    if (config.prettierConfigPath) {
+      ConsoleOutput.info(`Prettier config detected: ${config.prettierConfigPath}`);
+      ConsoleOutput.muted("  Output formatting will respect your Prettier settings");
+    } else {
+      ConsoleOutput.muted("No Prettier config found");
+      ConsoleOutput.muted("  Default formatting options added to config (tabWidth: 2)");
+    }
+    ConsoleOutput.newline();
     console.log("Next steps:");
     ConsoleOutput.muted("1. Edit .promptscript/project.prs to customize your AI instructions");
     ConsoleOutput.muted("2. Run: prs compile");
@@ -729,14 +864,15 @@ async function initCommand(options, services = createDefaultServices()) {
     process.exit(1);
   }
 }
-async function resolveConfig(options, projectInfo, aiToolsDetection, services) {
+async function resolveConfig(options, projectInfo, aiToolsDetection, prettierConfigPath, services) {
   if (options.yes) {
     return {
       projectId: options.name ?? projectInfo.name,
       team: options.team,
       inherit: options.inherit,
       registry: options.registry ?? "./registry",
-      targets: options.targets ?? getSuggestedTargets(aiToolsDetection)
+      targets: options.targets ?? getSuggestedTargets(aiToolsDetection),
+      prettierConfigPath
     };
   }
   if (!options.interactive && options.name && options.targets) {
@@ -745,12 +881,19 @@ async function resolveConfig(options, projectInfo, aiToolsDetection, services) {
       team: options.team,
       inherit: options.inherit,
       registry: options.registry,
-      targets: options.targets
+      targets: options.targets,
+      prettierConfigPath
     };
   }
-  return await runInteractivePrompts(options, projectInfo, aiToolsDetection, services);
+  return await runInteractivePrompts(
+    options,
+    projectInfo,
+    aiToolsDetection,
+    prettierConfigPath,
+    services
+  );
 }
-async function runInteractivePrompts(options, projectInfo, aiToolsDetection, services) {
+async function runInteractivePrompts(options, projectInfo, aiToolsDetection, prettierConfigPath, services) {
   const { prompts: prompts2 } = services;
   ConsoleOutput.newline();
   console.log("\u{1F680} PromptScript Setup");
@@ -768,6 +911,9 @@ async function runInteractivePrompts(options, projectInfo, aiToolsDetection, ser
   for (const line of detectionLines) {
     ConsoleOutput.muted(line);
   }
+  if (prettierConfigPath) {
+    ConsoleOutput.muted(`Prettier: ${prettierConfigPath}`);
+  }
   ConsoleOutput.newline();
   const projectId = await prompts2.input({
     message: "Project name:",
@@ -829,7 +975,8 @@ async function runInteractivePrompts(options, projectInfo, aiToolsDetection, ser
     team,
     inherit,
     registry,
-    targets
+    targets,
+    prettierConfigPath
   };
 }
 function formatTargetName(target) {
@@ -862,7 +1009,18 @@ function generateConfig(config) {
   for (const target of config.targets) {
     lines.push(`  - ${target}`);
   }
-  lines.push("", "validation:", "  rules:", "    empty-block: warn", "");
+  lines.push("", "validation:", "  rules:", "    empty-block: warn");
+  lines.push("");
+  if (config.prettierConfigPath) {
+    lines.push("formatting:", "  prettier: true  # Auto-detected from project");
+  } else {
+    lines.push(
+      "formatting:",
+      "  tabWidth: 2",
+      "  proseWrap: preserve  # 'always' | 'never' | 'preserve'"
+    );
+  }
+  lines.push("");
   return lines.join("\n");
 }
 function generateProjectPs(config, projectInfo) {
@@ -912,15 +1070,15 @@ ${frameworksLine}
 }
 
 // packages/cli/src/commands/compile.ts
-import { resolve as resolve2, dirname as dirname3 } from "path";
-import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
-import { existsSync as existsSync6 } from "fs";
+import { resolve as resolve4, dirname as dirname5 } from "path";
+import { writeFile as writeFile2, mkdir as mkdir2, readFile as readFile6 } from "fs/promises";
+import { existsSync as existsSync7 } from "fs";
 import chokidar from "chokidar";
 
 // packages/cli/src/config/loader.ts
-import { readFile as readFile2 } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
-import { parse as parseYaml } from "yaml";
+import { readFile as readFile3 } from "fs/promises";
+import { existsSync as existsSync3 } from "fs";
+import { parse as parseYaml2 } from "yaml";
 var CONFIG_FILES = [
   "promptscript.yaml",
   "promptscript.yml",
@@ -943,14 +1101,14 @@ function interpolateEnvVars(text) {
 }
 function findConfigFile(customPath) {
   if (customPath) {
-    return existsSync2(customPath) ? customPath : null;
+    return existsSync3(customPath) ? customPath : null;
   }
   const envConfig = process.env["PROMPTSCRIPT_CONFIG"];
-  if (envConfig && existsSync2(envConfig)) {
+  if (envConfig && existsSync3(envConfig)) {
     return envConfig;
   }
   for (const file of CONFIG_FILES) {
-    if (existsSync2(file)) {
+    if (existsSync3(file)) {
       return file;
     }
   }
@@ -964,10 +1122,10 @@ async function loadConfig(customPath) {
     }
     throw new Error("No PromptScript configuration found. Run: prs init");
   }
-  let content = await readFile2(configFile, "utf-8");
+  let content = await readFile3(configFile, "utf-8");
   content = interpolateEnvVars(content);
   try {
-    return parseYaml(content);
+    return parseYaml2(content);
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown parse error";
     throw new Error(`Failed to parse ${configFile}: ${message}`);
@@ -977,7 +1135,17 @@ async function loadConfig(customPath) {
 // packages/formatters/src/convention-renderer.ts
 var ConventionRenderer = class {
   convention;
-  constructor(convention = "xml") {
+  prettierOptions;
+  constructor(conventionOrOptions = "xml") {
+    let convention;
+    let prettier;
+    if (typeof conventionOrOptions === "object" && ("convention" in conventionOrOptions || "prettier" in conventionOrOptions)) {
+      const opts = conventionOrOptions;
+      convention = opts.convention ?? "xml";
+      prettier = opts.prettier;
+    } else {
+      convention = conventionOrOptions;
+    }
     if (typeof convention === "string") {
       if (isBuiltInConvention(convention)) {
         this.convention = BUILT_IN_CONVENTIONS[convention];
@@ -989,6 +1157,16 @@ var ConventionRenderer = class {
     } else {
       this.convention = convention;
     }
+    this.prettierOptions = {
+      ...DEFAULT_PRETTIER_OPTIONS,
+      ...prettier
+    };
+  }
+  /**
+   * Get the current Prettier options.
+   */
+  getPrettierOptions() {
+    return this.prettierOptions;
   }
   /**
    * Get the current convention.
@@ -1008,16 +1186,24 @@ var ConventionRenderer = class {
     const transformedName = this.transformName(name, renderer.nameTransform);
     const start = this.applyTemplate(renderer.start, { name: transformedName, level });
     const end = renderer.end ? this.applyTemplate(renderer.end, { name: transformedName, level }) : "";
-    const trimmedContent = content.trim();
+    let trimmedContent = content.trim();
     if (!trimmedContent) {
       return end ? `${start}
 ${end}` : start;
     }
+    if (this.convention.name === "markdown") {
+      trimmedContent = this.escapeMarkdownSpecialChars(trimmedContent);
+    }
     const indentedContent = this.indentContent(trimmedContent, renderer, level);
     if (end) {
       return `${start}
 ${indentedContent}
 ${end}`;
+    }
+    if (this.convention.name === "markdown") {
+      return `${start}
+
+${indentedContent}`;
     }
     return `${start}
 ${indentedContent}`;
@@ -1105,13 +1291,22 @@ ${this.convention.rootWrapper.end}`;
     }
     return result;
   }
+  /**
+   * Escape markdown special characters for Prettier compatibility.
+   * - Escapes __ to \_\_ (to avoid emphasis)
+   * - Escapes /* to /\* (to avoid glob patterns being interpreted)
+   */
+  escapeMarkdownSpecialChars(content) {
+    return content.replace(/__/g, "\\_\\_").replace(/\/\*/g, "/\\*");
+  }
   indentContent(content, renderer, level) {
     const indent = renderer.indent ?? "";
     if (!indent) {
       return content;
     }
     if (this.convention.name === "xml") {
-      const baseIndent = indent.repeat(level);
+      const indentStr = " ".repeat(this.prettierOptions.tabWidth);
+      const baseIndent = indentStr.repeat(level);
       return content.split("\n").map((line) => line.trim() ? `${baseIndent}${line}` : line).join("\n");
     }
     return content;
@@ -1130,7 +1325,19 @@ var BaseFormatter = class {
    */
   createRenderer(options) {
     const convention = options?.convention ?? this.defaultConvention;
-    return new ConventionRenderer(convention);
+    return new ConventionRenderer({
+      convention,
+      prettier: options?.prettier
+    });
+  }
+  /**
+   * Get resolved Prettier options, merging provided options with defaults.
+   */
+  getPrettierOptions(options) {
+    return {
+      ...DEFAULT_PRETTIER_OPTIONS,
+      ...options?.prettier
+    };
   }
   /**
    * Get the output path, respecting options override.
@@ -1183,6 +1390,14 @@ var BaseFormatter = class {
         return {};
     }
   }
+  /**
+   * Format standards list from array of values (pass-through).
+   * Returns array of strings for rendering as bullet list.
+   */
+  formatStandardsList(items) {
+    if (!Array.isArray(items)) return [];
+    return items.map((item) => this.valueToString(item)).filter((s) => s.length > 0);
+  }
   /**
    * Format an array as comma-separated string.
    */
@@ -1248,6 +1463,136 @@ var BaseFormatter = class {
     const endPos = endCodeBlock + 3;
     return text.substring(headerIndex, endPos);
   }
+  /**
+   * Normalize markdown content to match Prettier formatting.
+   * - Strips common leading indentation from lines
+   * - Trims trailing whitespace from lines
+   * - Normalizes markdown table formatting
+   * - Adds blank lines before lists when preceded by text
+   * - Escapes markdown special characters in paths
+   */
+  normalizeMarkdownForPrettier(content) {
+    const lines = content.split("\n");
+    let minIndent = Infinity;
+    let inCodeBlock = false;
+    for (const line of lines) {
+      const trimmed = line.trimEnd();
+      if (trimmed.startsWith("```")) {
+        inCodeBlock = !inCodeBlock;
+        continue;
+      }
+      if (inCodeBlock) continue;
+      if (trimmed.length === 0) continue;
+      const match = line.match(/^(\s*)/);
+      const leadingSpaces = match?.[1]?.length ?? 0;
+      minIndent = Math.min(minIndent, leadingSpaces);
+    }
+    if (minIndent === Infinity) minIndent = 0;
+    const result = [];
+    let inTable = false;
+    let tableLines = [];
+    inCodeBlock = false;
+    for (const line of lines) {
+      const trimmedLine = line.trimEnd();
+      if (trimmedLine.trimStart().startsWith("```")) {
+        inCodeBlock = !inCodeBlock;
+      }
+      const unindentedLine = minIndent > 0 ? trimmedLine.slice(minIndent) : trimmedLine;
+      if (inCodeBlock || unindentedLine.startsWith("```")) {
+        result.push(unindentedLine);
+        continue;
+      }
+      let processedLine = unindentedLine;
+      processedLine = processedLine.replace(/__([^_]+)__/g, "\\_\\_$1\\_\\_");
+      processedLine = processedLine.replace(/\/\*/g, "/\\*");
+      if (processedLine.trimStart().startsWith("|") && processedLine.trimEnd().endsWith("|")) {
+        inTable = true;
+        tableLines.push(processedLine.trim());
+      } else {
+        if (inTable && tableLines.length > 0) {
+          result.push(...this.formatMarkdownTable(tableLines));
+          tableLines = [];
+          inTable = false;
+        }
+        const prevLine = result.length > 0 ? result[result.length - 1] : "";
+        const isListItem = processedLine.trimStart().startsWith("- ");
+        if (isListItem && prevLine && !prevLine.trimStart().startsWith("- ")) {
+          result.push("");
+        }
+        result.push(processedLine);
+      }
+    }
+    if (tableLines.length > 0) {
+      result.push(...this.formatMarkdownTable(tableLines));
+    }
+    return result.join("\n");
+  }
+  /**
+   * Strip all leading indentation from markdown content.
+   * Used for AGENTS.md where content from multiple sources has inconsistent indentation.
+   * Preserves indentation inside code blocks.
+   */
+  stripAllIndent(content) {
+    const lines = content.split("\n");
+    const result = [];
+    let inCodeBlock = false;
+    for (const line of lines) {
+      const trimmedEnd = line.trimEnd();
+      if (trimmedEnd.trimStart().startsWith("```")) {
+        if (!inCodeBlock) {
+          const prevLine2 = result.length > 0 ? result[result.length - 1] : "";
+          if (prevLine2 && prevLine2.trim()) {
+            result.push("");
+          }
+        }
+        inCodeBlock = !inCodeBlock;
+        result.push(trimmedEnd.trimStart());
+        continue;
+      }
+      if (inCodeBlock) {
+        result.push(trimmedEnd);
+        continue;
+      }
+      let stripped = trimmedEnd.trimStart();
+      stripped = stripped.replace(/__/g, "\\_\\_");
+      stripped = stripped.replace(/\/\*/g, "/\\*");
+      const prevLine = result.length > 0 ? result[result.length - 1] : "";
+      if (stripped.startsWith("- ") && prevLine && !prevLine.startsWith("- ")) {
+        result.push("");
+      }
+      result.push(stripped);
+    }
+    return result.join("\n");
+  }
+  /**
+   * Format a markdown table to match Prettier output.
+   * Prettier removes trailing whitespace from cells.
+   */
+  formatMarkdownTable(tableLines) {
+    if (tableLines.length === 0) return [];
+    const rows = tableLines.map(
+      (line) => line.split("|").slice(1, -1).map((cell) => cell.trim())
+    );
+    const colCount = rows[0]?.length ?? 0;
+    const colWidths = new Array(colCount).fill(0);
+    for (const row of rows) {
+      for (let i = 0; i < row.length; i++) {
+        const cell = row[i] ?? "";
+        const width = cell.match(/^-+$/) ? 3 : cell.length;
+        colWidths[i] = Math.max(colWidths[i] ?? 0, width);
+      }
+    }
+    return rows.map((row) => {
+      const cells = row.map((cell, colIndex) => {
+        const width = colWidths[colIndex] ?? 0;
+        if (cell.match(/^-+$/)) {
+          return "-".repeat(width);
+        }
+        return cell.padEnd(width);
+      });
+      return "| " + cells.join(" | ") + " |";
+    });
+  }
 };
 
 // packages/formatters/src/registry.ts
@@ -1327,6 +1672,51 @@ var GITHUB_VERSIONS = {
     outputPath: ".github/copilot-instructions.md"
   }
 };
+var TOOL_NAME_MAPPING = {
+  // Read tools
+  Read: "read",
+  NotebookRead: "read",
+  // Edit tools
+  Edit: "edit",
+  MultiEdit: "edit",
+  Write: "edit",
+  NotebookEdit: "edit",
+  // Search tools
+  Grep: "search",
+  Glob: "search",
+  // Execute tools
+  Bash: "execute",
+  // Web tools
+  WebFetch: "web",
+  WebSearch: "web",
+  // Agent tools
+  Task: "agent",
+  // Todo tools
+  TodoWrite: "todo",
+  TodoRead: "todo"
+};
+var MODEL_NAME_MAPPING = {
+  // Claude models - default aliases map to latest versions (4.5)
+  sonnet: "Claude Sonnet 4.5",
+  opus: "Claude Opus 4.5",
+  haiku: "Claude Haiku 4.5",
+  // Explicit version mappings
+  "sonnet-4": "Claude Sonnet 4",
+  "sonnet-4.5": "Claude Sonnet 4.5",
+  "opus-4": "Claude Opus 4",
+  "opus-4.5": "Claude Opus 4.5",
+  "haiku-4": "Claude Haiku 4",
+  "haiku-4.5": "Claude Haiku 4.5",
+  // OpenAI models (pass through if already in correct format)
+  "gpt-4o": "GPT-4o",
+  "gpt-4.1": "GPT-4.1",
+  "gpt-5": "GPT-5",
+  "gpt-5-mini": "GPT-5 mini",
+  // Special values
+  inherit: "",
+  // Empty string means omit the model property
+  auto: "Auto"
+};
 var GitHubFormatter = class extends BaseFormatter {
   name = "github";
   outputPath = ".github/copilot-instructions.md";
@@ -1368,7 +1758,7 @@ var GitHubFormatter = class extends BaseFormatter {
     this.addCommonSections(ast, renderer, sections);
     return {
       path: this.getOutputPath(options),
-      content: sections.join("\n\n")
+      content: sections.join("\n\n") + "\n"
     };
   }
   // ============================================================
@@ -1392,7 +1782,7 @@ var GitHubFormatter = class extends BaseFormatter {
     this.addCommonSections(ast, renderer, sections);
     return {
       path: this.getOutputPath(options),
-      content: sections.join("\n\n"),
+      content: sections.join("\n\n") + "\n",
       additionalFiles: additionalFiles.length > 0 ? additionalFiles : void 0
     };
   }
@@ -1429,7 +1819,7 @@ var GitHubFormatter = class extends BaseFormatter {
     this.addCommonSections(ast, renderer, sections);
     return {
       path: this.getOutputPath(options),
-      content: sections.join("\n\n"),
+      content: sections.join("\n\n") + "\n",
       additionalFiles: additionalFiles.length > 0 ? additionalFiles : void 0
     };
   }
@@ -1600,10 +1990,9 @@ var GitHubFormatter = class extends BaseFormatter {
     if (config.mode === "agent") {
       lines.push("mode: agent");
       if (config.tools && config.tools.length > 0) {
-        lines.push("tools:");
-        for (const tool of config.tools) {
-          lines.push(`  - ${tool}`);
-        }
+        const mappedTools = config.tools.map((tool) => TOOL_NAME_MAPPING[tool] ?? tool.toLowerCase()).filter((t, i, arr) => arr.indexOf(t) === i);
+        const toolsArray = mappedTools.map((t) => `'${t}'`).join(", ");
+        lines.push(`tools: [${toolsArray}]`);
       }
     }
     lines.push("---");
@@ -1646,19 +2035,21 @@ var GitHubFormatter = class extends BaseFormatter {
   generateSkillFile(config) {
     const lines = [];
     lines.push("---");
-    lines.push(`name: "${config.name}"`);
-    lines.push(`description: "${config.description}"`);
+    lines.push(`name: '${config.name}'`);
+    const descQuote = config.description.includes("'") ? '"' : "'";
+    lines.push(`description: ${descQuote}${config.description}${descQuote}`);
     if (config.disableModelInvocation) {
       lines.push("disable-model-invocation: true");
     }
     lines.push("---");
     lines.push("");
     if (config.content) {
-      lines.push(config.content);
+      const normalizedContent = this.normalizeMarkdownForPrettier(config.content);
+      lines.push(normalizedContent);
     }
     return {
       path: `.github/skills/${config.name}/SKILL.md`,
-      content: lines.join("\n")
+      content: lines.join("\n") + "\n"
     };
   }
   // ============================================================
@@ -1673,13 +2064,11 @@ var GitHubFormatter = class extends BaseFormatter {
     const lines = [];
     lines.push("# Agent Instructions");
     lines.push("");
-    lines.push("> Auto-generated by PromptScript");
-    lines.push("");
     const identityText = this.extractText(identity2.content);
     if (identityText) {
       lines.push("## Identity");
       lines.push("");
-      lines.push(identityText);
+      lines.push(this.stripAllIndent(identityText));
       lines.push("");
     }
     const context = this.findBlock(ast, "context");
@@ -1688,7 +2077,7 @@ var GitHubFormatter = class extends BaseFormatter {
       if (contextText) {
         lines.push("## Context");
         lines.push("");
-        lines.push(contextText);
+        lines.push(this.stripAllIndent(contextText));
         lines.push("");
       }
     }
@@ -1701,12 +2090,11 @@ var GitHubFormatter = class extends BaseFormatter {
         for (const item of items) {
           lines.push(`- ${item}`);
         }
-        lines.push("");
       }
     }
     return {
       path: "AGENTS.md",
-      content: lines.join("\n")
+      content: lines.join("\n") + "\n"
     };
   }
   /**
@@ -1757,12 +2145,26 @@ var GitHubFormatter = class extends BaseFormatter {
     return agents;
   }
   /**
-   * Parse tools array from a Value.
+   * Parse tools array from a Value and map to GitHub Copilot canonical names.
+   *
+   * @see https://docs.github.com/en/copilot/reference/custom-agents-configuration
    */
   parseToolsArray(value) {
     if (!value || !Array.isArray(value)) return void 0;
-    const arr = value.map((v) => this.valueToString(v)).filter((s) => s.length > 0);
-    return arr.length > 0 ? arr : void 0;
+    const mapped = value.map((v) => this.valueToString(v)).filter((s) => s.length > 0).map((tool) => TOOL_NAME_MAPPING[tool] ?? tool.toLowerCase());
+    const unique = [...new Set(mapped)];
+    return unique.length > 0 ? unique : void 0;
+  }
+  /**
+   * Map a model name from PromptScript/Claude Code format to GitHub Copilot format.
+   *
+   * @returns The mapped model name, or undefined if the model should be omitted (e.g., "inherit")
+   */
+  mapModelName(model) {
+    if (!model) return void 0;
+    const mapped = MODEL_NAME_MAPPING[model.toLowerCase()];
+    if (mapped === "") return void 0;
+    return mapped ?? model;
   }
   /**
    * Generate a .github/agents/<name>.md file.
@@ -1775,13 +2177,12 @@ var GitHubFormatter = class extends BaseFormatter {
     lines.push(`name: ${config.name}`);
     lines.push(`description: ${config.description}`);
     if (config.tools && config.tools.length > 0) {
-      lines.push("tools:");
-      for (const tool of config.tools) {
-        lines.push(`  - ${tool}`);
-      }
+      const toolsArray = config.tools.map((t) => `'${t}'`).join(", ");
+      lines.push(`tools: [${toolsArray}]`);
     }
-    if (config.model) {
-      lines.push(`model: ${config.model}`);
+    const mappedModel = this.mapModelName(config.model);
+    if (mappedModel) {
+      lines.push(`model: ${mappedModel}`);
     }
     lines.push("---");
     lines.push("");
@@ -1790,7 +2191,7 @@ var GitHubFormatter = class extends BaseFormatter {
     }
     return {
       path: `.github/agents/${config.name}.md`,
-      content: lines.join("\n")
+      content: lines.join("\n") + "\n"
     };
   }
   // ============================================================
@@ -1822,22 +2223,14 @@ var GitHubFormatter = class extends BaseFormatter {
     const knowledge = this.knowledge(ast, renderer);
     if (knowledge) sections.push(knowledge);
   }
-  header(ast) {
-    const id = this.getMetaField(ast, "id") ?? "unknown";
-    const syntax = this.getMetaField(ast, "syntax") ?? "0.0.0";
-    return `# GitHub Copilot Instructions
-
-> Auto-generated by PromptScript
-> Source: ${id} (syntax ${syntax})
-> Generated: ${(/* @__PURE__ */ new Date()).toISOString()}
->
-> **Do not edit manually**`;
+  header(_ast) {
+    return `# GitHub Copilot Instructions`;
   }
   project(ast, renderer) {
     const identity2 = this.findBlock(ast, "identity");
     if (!identity2) return null;
     const content = this.extractText(identity2.content);
-    return renderer.renderSection("project", content);
+    return renderer.renderSection("project", this.stripAllIndent(content));
   }
   techStack(ast, renderer) {
     const context = this.findBlock(ast, "context");
@@ -1875,50 +2268,30 @@ var GitHubFormatter = class extends BaseFormatter {
     const archMatch = this.extractSectionWithCodeBlock(text, "## Architecture");
     if (!archMatch) return null;
     const content = archMatch.replace("## Architecture", "").trim();
-    return renderer.renderSection("architecture", content);
+    return renderer.renderSection("architecture", this.stripAllIndent(content));
   }
   codeStandards(ast, renderer) {
     const standards = this.findBlock(ast, "standards");
     if (!standards) return null;
     const props = this.getProps(standards.content);
     const subsections = [];
-    this.addStandardsSubsection(
-      subsections,
-      renderer,
-      props["typescript"],
-      "typescript",
-      this.formatStandardsObject.bind(this)
-    );
-    this.addStandardsSubsection(
-      subsections,
-      renderer,
-      props["naming"],
-      "naming",
-      this.formatNamingStandards.bind(this)
-    );
-    this.addStandardsSubsection(
-      subsections,
-      renderer,
-      props["errors"],
-      "error-handling",
-      this.formatErrorStandards.bind(this)
-    );
-    this.addStandardsSubsection(
-      subsections,
-      renderer,
-      props["testing"],
-      "testing",
-      this.formatTestingStandards.bind(this)
-    );
-    if (subsections.length === 0) return null;
-    return renderer.renderSection("code-standards", subsections.join("\n"));
-  }
-  addStandardsSubsection(subsections, renderer, value, name, formatter) {
-    if (!value || typeof value !== "object" || Array.isArray(value)) return;
-    const items = formatter(value);
-    if (items.length > 0) {
-      subsections.push(renderer.renderSection(name, renderer.renderList(items), 2));
+    const sectionMap = {
+      typescript: "typescript",
+      naming: "naming",
+      errors: "error-handling",
+      testing: "testing"
+    };
+    for (const [key, sectionName] of Object.entries(sectionMap)) {
+      const value = props[key];
+      if (Array.isArray(value)) {
+        const items = this.formatStandardsList(value);
+        if (items.length > 0) {
+          subsections.push(renderer.renderSection(sectionName, renderer.renderList(items), 2));
+        }
+      }
     }
+    if (subsections.length === 0) return null;
+    return renderer.renderSection("code-standards", subsections.join("\n\n"));
   }
   commands(ast, renderer) {
     const knowledge = this.findBlock(ast, "knowledge");
@@ -1927,7 +2300,7 @@ var GitHubFormatter = class extends BaseFormatter {
     const commandsMatch = this.extractSectionWithCodeBlock(text, "## Development Commands");
     if (!commandsMatch) return null;
     const content = commandsMatch.replace("## Development Commands", "").trim();
-    return renderer.renderSection("commands", content);
+    return renderer.renderSection("commands", this.stripAllIndent(content));
   }
   gitCommits(ast, renderer) {
     const standards = this.findBlock(ast, "standards");
@@ -1978,7 +2351,7 @@ var GitHubFormatter = class extends BaseFormatter {
       subsections.push(renderer.renderSection("vite-vitest", `Vite root: ${value}`, 2));
     }
     if (subsections.length === 0) return null;
-    return renderer.renderSection("configuration-files", subsections.join("\n"));
+    return renderer.renderSection("configuration-files", subsections.join("\n\n"));
   }
   documentation(ast, renderer) {
     const standards = this.findBlock(ast, "standards");
@@ -2014,8 +2387,11 @@ var GitHubFormatter = class extends BaseFormatter {
     if (!postMatch) return null;
     const intro = "After completing any code changes, run the following commands to ensure code quality:";
     const content = postMatch.replace("## Post-Work Verification", "").trim();
-    return renderer.renderSection("post-work-verification", `${intro}
-${content}`);
+    return renderer.renderSection(
+      "post-work-verification",
+      `${intro}
+${this.stripAllIndent(content)}`
+    );
   }
   restrictions(ast, renderer) {
     const block = this.findBlock(ast, "restrictions");
@@ -2070,47 +2446,6 @@ ${content}`);
   formatTechItem(arr) {
     return arr.map(String).join(", ");
   }
-  formatStandardsObject(obj) {
-    const items = [];
-    if (obj["strictMode"]) items.push("Strict mode enabled, no `any` types");
-    if (obj["useUnknown"]) items.push(`Use \`unknown\` ${this.valueToString(obj["useUnknown"])}`);
-    if (obj["interfaces"])
-      items.push(`Prefer \`interface\` ${this.valueToString(obj["interfaces"])}`);
-    if (obj["types"]) items.push(`Use \`type\` ${this.valueToString(obj["types"])}`);
-    if (obj["exports"]) items.push(`${this.capitalize(this.valueToString(obj["exports"]))}`);
-    if (obj["returnTypes"])
-      items.push(`Explicit return types ${this.valueToString(obj["returnTypes"])}`);
-    return items;
-  }
-  formatNamingStandards(obj) {
-    const items = [];
-    if (obj["files"]) items.push(`Files: \`${this.valueToString(obj["files"])}\``);
-    if (obj["classes"]) items.push(`Classes/Interfaces: \`${this.valueToString(obj["classes"])}\``);
-    if (obj["functions"])
-      items.push(`Functions/Variables: \`${this.valueToString(obj["functions"])}\``);
-    if (obj["constants"]) items.push(`Constants: \`${this.valueToString(obj["constants"])}\``);
-    return items;
-  }
-  formatErrorStandards(obj) {
-    const items = [];
-    if (obj["customClasses"])
-      items.push(
-        `Use custom error classes extending \`${this.valueToString(obj["customClasses"])}\``
-      );
-    if (obj["locationInfo"]) items.push("Always include location information");
-    if (obj["messages"])
-      items.push(`Provide ${this.valueToString(obj["messages"])} error messages`);
-    return items;
-  }
-  formatTestingStandards(obj) {
-    const items = [];
-    if (obj["filePattern"]) items.push(`Test files: \`${this.valueToString(obj["filePattern"])}\``);
-    if (obj["pattern"]) items.push(`Follow ${this.valueToString(obj["pattern"])} pattern`);
-    if (obj["coverage"])
-      items.push(`Target >${this.valueToString(obj["coverage"])}% coverage for libraries`);
-    if (obj["fixtures"]) items.push(`Use fixtures ${this.valueToString(obj["fixtures"])}`);
-    return items;
-  }
   formatRestriction(text) {
     const formatted = text.replace(/^-\s*/, "").replace(/^"/, "").replace(/"$/, "").replace(/^Never\s+/i, "Don't ");
     return formatted;
@@ -2385,8 +2720,9 @@ var ClaudeFormatter = class extends BaseFormatter {
   generateSkillFile(config) {
     const lines = [];
     lines.push("---");
-    lines.push(`name: "${config.name}"`);
-    lines.push(`description: "${config.description}"`);
+    lines.push(`name: '${config.name}'`);
+    const descQuote = config.description.includes("'") ? '"' : "'";
+    lines.push(`description: ${descQuote}${config.description}${descQuote}`);
     if (config.context) {
       lines.push(`context: ${config.context}`);
     }
@@ -2405,11 +2741,12 @@ var ClaudeFormatter = class extends BaseFormatter {
     lines.push("---");
     lines.push("");
     if (config.content) {
-      lines.push(config.content);
+      const normalizedContent = this.normalizeMarkdownForPrettier(config.content);
+      lines.push(normalizedContent);
     }
     return {
       path: `.claude/skills/${config.name}/SKILL.md`,
-      content: lines.join("\n")
+      content: lines.join("\n") + "\n"
     };
   }
   // ============================================================
@@ -2518,7 +2855,7 @@ var ClaudeFormatter = class extends BaseFormatter {
     }
     return {
       path: `.claude/agents/${config.name}.md`,
-      content: lines.join("\n")
+      content: lines.join("\n") + "\n"
     };
   }
   // ============================================================
@@ -3567,7 +3904,7 @@ var AntigravityFormatter = class extends BaseFormatter {
     if (diagrams) sections.push(diagrams);
     const restrictions = this.restrictions(ast, renderer);
     if (restrictions) sections.push(restrictions);
-    const content = sections.join("\n\n");
+    const content = sections.join("\n\n") + "\n";
     this.validateContentLength(content);
     const mainOutput = {
       path: this.getOutputPath(options),
@@ -3721,17 +4058,8 @@ var AntigravityFormatter = class extends BaseFormatter {
   formatWorkflowTitle(name) {
     return name.replace(/^\//, "").split(/[-_]/).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
   }
-  header(ast) {
-    const id = this.getMetaField(ast, "id") ?? "unknown";
-    const syntax = this.getMetaField(ast, "syntax") ?? "0.0.0";
-    return `# Project Rules
-
-> Auto-generated by PromptScript
-> Source: ${id} (syntax ${syntax})
-> Generated: ${(/* @__PURE__ */ new Date()).toISOString()}
->
-> **Do not edit manually** - these rules are generated from PromptScript.
-> To modify, update the source .prs file and recompile.`;
+  header(_ast) {
+    return `# Project Rules`;
   }
   identity(ast, _renderer) {
     const identity2 = this.findBlock(ast, "identity");
@@ -3740,7 +4068,7 @@ var AntigravityFormatter = class extends BaseFormatter {
     if (!content) return null;
     return `## Project Identity
 
-${content}`;
+${this.stripAllIndent(content)}`;
   }
   /**
    * Extract tech stack from @context block (same as GitHub/Cursor).
@@ -3794,7 +4122,7 @@ ${items.join("\n")}`;
         const content = archMatch.replace("## Architecture", "").trim();
         return `## Architecture
 
-${content}`;
+${this.stripAllIndent(content)}`;
       }
       const props = this.getProps(context.content);
       const arch = props["architecture"];
@@ -3803,7 +4131,7 @@ ${content}`;
         if (archText.trim()) {
           return `## Architecture
 
-${archText.trim()}`;
+${this.stripAllIndent(archText.trim())}`;
         }
       }
     }
@@ -3813,53 +4141,35 @@ ${archText.trim()}`;
       if (content) {
         return `## Architecture
 
-${content}`;
+${this.stripAllIndent(content)}`;
       }
     }
     return null;
   }
   /**
-   * Extract code standards from @standards block (same as GitHub/Cursor).
+   * Extract code standards from @standards block.
+   * Expects arrays of strings (pass-through format).
    */
   codeStandards(ast, _renderer) {
     const standards = this.findBlock(ast, "standards");
     if (!standards) return null;
     const props = this.getProps(standards.content);
     const subsections = [];
-    const typescript = props["typescript"];
-    if (typescript && typeof typescript === "object" && !Array.isArray(typescript)) {
-      const items = this.formatTypeScriptStandards(typescript);
-      if (items.length > 0) {
-        subsections.push(`### TypeScript
-
-${items.map((i) => "- " + i).join("\n")}`);
-      }
-    }
-    const naming = props["naming"];
-    if (naming && typeof naming === "object" && !Array.isArray(naming)) {
-      const items = this.formatNamingStandards(naming);
-      if (items.length > 0) {
-        subsections.push(`### Naming Conventions
-
-${items.map((i) => "- " + i).join("\n")}`);
-      }
-    }
-    const errors = props["errors"];
-    if (errors && typeof errors === "object" && !Array.isArray(errors)) {
-      const items = this.formatErrorStandards(errors);
-      if (items.length > 0) {
-        subsections.push(`### Error Handling
-
-${items.map((i) => "- " + i).join("\n")}`);
-      }
-    }
-    const testing = props["testing"];
-    if (testing && typeof testing === "object" && !Array.isArray(testing)) {
-      const items = this.formatTestingStandards(testing);
-      if (items.length > 0) {
-        subsections.push(`### Testing
+    const sectionMap = {
+      typescript: "TypeScript",
+      naming: "Naming Conventions",
+      errors: "Error Handling",
+      testing: "Testing"
+    };
+    for (const [key, title] of Object.entries(sectionMap)) {
+      const value = props[key];
+      if (Array.isArray(value)) {
+        const items = this.formatStandardsList(value);
+        if (items.length > 0) {
+          subsections.push(`### ${title}
 
 ${items.map((i) => "- " + i).join("\n")}`);
+        }
       }
     }
     if (subsections.length === 0) return null;
@@ -3922,7 +4232,7 @@ ${items.map((i) => "- " + i).join("\n")}`;
     }
     const vite = configObj["viteRoot"];
     if (vite) {
-      const value = this.valueToString(vite);
+      const value = this.valueToString(vite).replace(/__/g, "\\_\\_").replace(/\/\*/g, "/\\*");
       subsections.push(`### Vite/Vitest
 
 - Vite root: ${value}`);
@@ -3944,7 +4254,11 @@ ${subsections.join("\n\n")}`;
     for (const [key, value] of Object.entries(props)) {
       if (this.isWorkflow(value)) continue;
       const valueStr = this.valueToString(value);
-      lines.push(`- **${key}**: ${valueStr}`);
+      if (valueStr) {
+        lines.push(`- **${key}**: ${valueStr}`);
+      } else {
+        lines.push(`- **${key}**:`);
+      }
     }
     if (lines.length === 0) return null;
     return `## Commands
@@ -3963,7 +4277,7 @@ ${lines.join("\n")}`;
     const content = commandsMatch.replace("## Development Commands", "").trim();
     return `## Development Commands
 
-${content}`;
+${this.stripAllIndent(content)}`;
   }
   /**
    * Extract post-work verification from @knowledge block (same as GitHub/Cursor).
@@ -3979,7 +4293,7 @@ ${content}`;
     return `## Post-Work Verification
 
 ${intro}
-${content}`;
+${this.stripAllIndent(content)}`;
   }
   /**
    * Extract documentation standards from @standards.documentation (same as GitHub/Cursor).
@@ -4025,9 +4339,8 @@ ${items.map((i) => "- " + i).join("\n")}`;
     const items = [];
     const format2 = diagObj["format"];
     if (format2) {
-      items.push(
-        `Always use **${this.valueToString(format2)}** syntax for diagrams in documentation`
-      );
+      const formatValue = this.valueToString(format2).replace(/__/g, "\\_\\_").replace(/\/\*/g, "/\\*");
+      items.push(`Always use **${formatValue}** syntax for diagrams in documentation`);
     }
     const types = diagObj["types"];
     if (types && Array.isArray(types)) {
@@ -4072,55 +4385,6 @@ ${items.map((i) => "- " + i).join("\n")}`;
   formatRestriction(text) {
     return text.replace(/^-\s*/, "").replace(/^"/, "").replace(/"$/, "").replace(/^Never\s+/i, "Don't ");
   }
-  // Helper methods for formatting standards
-  formatTypeScriptStandards(obj) {
-    const items = [];
-    if (obj["strictMode"]) items.push("Strict mode enabled, no `any` types");
-    if (obj["noAny"]) items.push("Never use `any` type - use `unknown` with type guards");
-    if (obj["useUnknown"]) items.push(`Use \`unknown\` ${this.valueToString(obj["useUnknown"])}`);
-    if (obj["interfaces"])
-      items.push(`Prefer \`interface\` ${this.valueToString(obj["interfaces"])}`);
-    if (obj["types"]) items.push(`Use \`type\` ${this.valueToString(obj["types"])}`);
-    if (obj["exports"]) items.push(`${this.capitalize(this.valueToString(obj["exports"]))}`);
-    if (obj["returnTypes"])
-      items.push(`Explicit return types ${this.valueToString(obj["returnTypes"])}`);
-    return items;
-  }
-  formatNamingStandards(obj) {
-    const items = [];
-    if (obj["files"]) items.push(`Files: \`${this.valueToString(obj["files"])}\``);
-    if (obj["classes"]) items.push(`Classes/Interfaces: \`${this.valueToString(obj["classes"])}\``);
-    if (obj["interfaces"]) items.push(`Interfaces: \`${this.valueToString(obj["interfaces"])}\``);
-    if (obj["functions"])
-      items.push(`Functions/Variables: \`${this.valueToString(obj["functions"])}\``);
-    if (obj["variables"]) items.push(`Variables: \`${this.valueToString(obj["variables"])}\``);
-    if (obj["constants"]) items.push(`Constants: \`${this.valueToString(obj["constants"])}\``);
-    return items;
-  }
-  formatErrorStandards(obj) {
-    const items = [];
-    if (obj["customClasses"])
-      items.push(
-        `Use custom error classes extending \`${this.valueToString(obj["customClasses"])}\``
-      );
-    if (obj["locationInfo"]) items.push("Always include location information");
-    if (obj["messages"])
-      items.push(`Provide ${this.valueToString(obj["messages"])} error messages`);
-    return items;
-  }
-  formatTestingStandards(obj) {
-    const items = [];
-    if (obj["filePattern"]) items.push(`Test files: \`${this.valueToString(obj["filePattern"])}\``);
-    if (obj["pattern"]) items.push(`Follow ${this.valueToString(obj["pattern"])} pattern`);
-    if (obj["framework"]) items.push(`Framework: ${this.valueToString(obj["framework"])}`);
-    if (obj["coverage"])
-      items.push(`Target >${this.valueToString(obj["coverage"])}% coverage for libraries`);
-    if (obj["fixtures"]) items.push(`Use fixtures ${this.valueToString(obj["fixtures"])}`);
-    return items;
-  }
-  capitalize(str) {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-  }
 };
 
 // packages/formatters/src/index.ts
@@ -14277,8 +14541,8 @@ function parse(source, options = {}) {
 }
 
 // packages/resolver/src/loader.ts
-import { readFile as readFile3 } from "fs/promises";
-import { resolve, dirname as dirname2, isAbsolute, join as join2 } from "path";
+import { readFile as readFile4 } from "fs/promises";
+import { resolve as resolve2, dirname as dirname3, isAbsolute } from "path";
 var FileLoader = class {
   registryPath;
   localPath;
@@ -14295,7 +14559,7 @@ var FileLoader = class {
    */
   async load(path) {
     try {
-      return await readFile3(path, "utf-8");
+      return await readFile4(path, "utf-8");
     } catch (err) {
       if (err.code === "ENOENT") {
         throw new FileNotFoundError(path);
@@ -14324,11 +14588,11 @@ var FileLoader = class {
         const namespace = match[1];
         const segments = match[2];
         const fileName2 = segments.endsWith(".prs") ? segments : `${segments}.prs`;
-        return resolve(this.registryPath, `@${namespace}`, fileName2);
+        return resolve2(this.registryPath, `@${namespace}`, fileName2);
       }
     }
     const fileName = path.endsWith(".prs") ? path : `${path}.prs`;
-    return resolve(this.localPath, fileName);
+    return resolve2(this.localPath, fileName);
   }
   /**
    * Resolve a PathReference to an absolute path.
@@ -14339,9 +14603,9 @@ var FileLoader = class {
    */
   resolveRef(ref, fromFile) {
     if (ref.isRelative) {
-      const dir = dirname2(fromFile);
-      const fileName = join2(...ref.segments) + ".prs";
-      return resolve(dir, fileName);
+      const dir = dirname3(fromFile);
+      const rawPath = ref.raw.endsWith(".prs") ? ref.raw : `${ref.raw}.prs`;
+      return resolve2(dir, rawPath);
     }
     return this.toAbsolutePath(ref.raw);
   }
@@ -14665,9 +14929,7 @@ function mergeProperties2(source, target) {
         sourceVal,
         targetVal
       );
-    } else if (typeof sourceVal === typeof targetVal) {
     } else {
-      result[key] = deepCloneValue2(targetVal);
     }
   }
   return result;
@@ -15001,6 +15263,115 @@ function uniqueConcat3(parent, child) {
   return result;
 }
 
+// packages/resolver/src/skills.ts
+import { readFile as readFile5, access } from "fs/promises";
+import { resolve as resolve3, dirname as dirname4 } from "path";
+function parseSkillMd(content) {
+  const lines = content.split("\n");
+  let inFrontmatter = false;
+  let frontmatterStart = -1;
+  let frontmatterEnd = -1;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]?.trim() ?? "";
+    if (line === "---") {
+      if (!inFrontmatter) {
+        inFrontmatter = true;
+        frontmatterStart = i;
+      } else {
+        frontmatterEnd = i;
+        break;
+      }
+    }
+  }
+  let name;
+  let description;
+  let bodyContent;
+  if (frontmatterStart >= 0 && frontmatterEnd > frontmatterStart) {
+    const frontmatterLines = lines.slice(frontmatterStart + 1, frontmatterEnd);
+    for (const line of frontmatterLines) {
+      const nameMatch = line.match(/^name:\s*(?:"([^"]+)"|'([^']+)'|(.+))\s*$/);
+      if (nameMatch) {
+        name = (nameMatch[1] ?? nameMatch[2] ?? nameMatch[3])?.trim();
+      }
+      const descMatch = line.match(/^description:\s*(?:"([^"]+)"|'([^']+)'|(.+))\s*$/);
+      if (descMatch) {
+        description = (descMatch[1] ?? descMatch[2] ?? descMatch[3])?.trim();
+      }
+    }
+    bodyContent = lines.slice(frontmatterEnd + 1).join("\n").trim();
+  } else {
+    bodyContent = content.trim();
+  }
+  return { name, description, content: bodyContent };
+}
+async function fileExists(path) {
+  try {
+    await access(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveNativeSkills(ast, registryPath, sourceFile) {
+  const skillsBlock = ast.blocks.find((b) => b.name === "skills");
+  if (!skillsBlock || skillsBlock.content.type !== "ObjectContent") {
+    return ast;
+  }
+  const skillsContent = skillsBlock.content;
+  const updatedProperties = { ...skillsContent.properties };
+  let hasUpdates = false;
+  const sourceDir = dirname4(sourceFile);
+  const isSkillsDir = sourceDir.includes("@skills");
+  for (const [skillName, skillValue] of Object.entries(skillsContent.properties)) {
+    if (typeof skillValue !== "object" || skillValue === null || Array.isArray(skillValue)) {
+      continue;
+    }
+    const skillObj = skillValue;
+    let skillMdPath = null;
+    if (isSkillsDir) {
+      const basePath = sourceDir;
+      skillMdPath = resolve3(basePath, skillName, "SKILL.md");
+    } else {
+      skillMdPath = resolve3(registryPath, "@skills", skillName, "SKILL.md");
+    }
+    if (skillMdPath && await fileExists(skillMdPath)) {
+      try {
+        const rawContent = await readFile5(skillMdPath, "utf-8");
+        const parsed = parseSkillMd(rawContent);
+        const updatedSkill = { ...skillObj };
+        if (parsed.content) {
+          updatedSkill["content"] = {
+            type: "TextContent",
+            value: parsed.content,
+            loc: { file: skillMdPath, line: 1, column: 1, offset: 0 }
+          };
+        }
+        if (parsed.description && (!skillObj["description"] || typeof skillObj["description"] === "string" && parsed.description.length > skillObj["description"].length)) {
+          updatedSkill["description"] = parsed.description;
+        }
+        updatedProperties[skillName] = updatedSkill;
+        hasUpdates = true;
+      } catch {
+      }
+    }
+  }
+  if (!hasUpdates) {
+    return ast;
+  }
+  const updatedSkillsBlock = {
+    ...skillsBlock,
+    content: {
+      ...skillsContent,
+      properties: updatedProperties
+    }
+  };
+  const updatedBlocks = ast.blocks.map((b) => b.name === "skills" ? updatedSkillsBlock : b);
+  return {
+    ...ast,
+    blocks: updatedBlocks
+  };
+}
+
 // packages/resolver/src/resolver.ts
 var Resolver = class {
   loader;
@@ -15053,6 +15424,7 @@ var Resolver = class {
     ast = await this.resolveInherit(ast, absPath, sources, errors);
     ast = await this.resolveImports(ast, absPath, sources, errors);
     ast = applyExtends(ast);
+    ast = await resolveNativeSkills(ast, this.loader.getRegistryPath(), absPath);
     return {
       ast,
       sources: [...new Set(sources)],
@@ -15146,7 +15518,7 @@ var Resolver = class {
 };
 
 // packages/resolver/src/registry.ts
-import { existsSync as existsSync3, promises as fs } from "fs";
+import { existsSync as existsSync4, promises as fs } from "fs";
 import { join as join3 } from "path";
 var FileSystemRegistry = class {
   rootPath;
@@ -15173,7 +15545,7 @@ var FileSystemRegistry = class {
   }
   async exists(path) {
     const fullPath = this.resolvePath(path);
-    return existsSync3(fullPath);
+    return existsSync4(fullPath);
   }
   async list(path) {
     const fullPath = this.resolvePath(path);
@@ -15229,7 +15601,7 @@ var HttpRegistry = class {
    * Sleep for specified milliseconds.
    */
   sleep(ms) {
-    return new Promise((resolve7) => setTimeout(resolve7, ms));
+    return new Promise((resolve9) => setTimeout(resolve9, ms));
   }
   /**
    * Fetch with timeout.
@@ -15371,12 +15743,12 @@ function createHttpRegistry(options) {
 }
 
 // packages/resolver/src/git-registry.ts
-import { existsSync as existsSync5, promises as fs3 } from "fs";
+import { existsSync as existsSync6, promises as fs3 } from "fs";
 import { join as join5 } from "path";
 import { simpleGit } from "simple-git";
 
 // packages/resolver/src/git-cache-manager.ts
-import { existsSync as existsSync4, promises as fs2 } from "fs";
+import { existsSync as existsSync5, promises as fs2 } from "fs";
 import { join as join4 } from "path";
 import { homedir } from "os";
 
@@ -15526,7 +15898,7 @@ var GitCacheManager = class {
    */
   async get(url, ref) {
     const cachePath = this.getCachePath(url, ref);
-    if (!existsSync4(cachePath)) {
+    if (!existsSync5(cachePath)) {
       return null;
     }
     const metadata = await this.readMetadata(cachePath);
@@ -15591,7 +15963,7 @@ var GitCacheManager = class {
    */
   async remove(url, ref) {
     const cachePath = this.getCachePath(url, ref);
-    if (existsSync4(cachePath)) {
+    if (existsSync5(cachePath)) {
       await fs2.rm(cachePath, { recursive: true, force: true });
     }
   }
@@ -15601,7 +15973,7 @@ var GitCacheManager = class {
    * @returns Array of cache entries
    */
   async list() {
-    if (!existsSync4(this.cacheDir)) {
+    if (!existsSync5(this.cacheDir)) {
       return [];
     }
     const entries = [];
@@ -15636,7 +16008,7 @@ var GitCacheManager = class {
    * Remove all cache entries.
    */
   async clear() {
-    if (existsSync4(this.cacheDir)) {
+    if (existsSync5(this.cacheDir)) {
       await fs2.rm(this.cacheDir, { recursive: true, force: true });
     }
   }
@@ -15646,7 +16018,7 @@ var GitCacheManager = class {
    * @returns Total cache size in bytes
    */
   async getSize() {
-    if (!existsSync4(this.cacheDir)) {
+    if (!existsSync5(this.cacheDir)) {
       return 0;
     }
     return this.calculateDirSize(this.cacheDir);
@@ -15673,7 +16045,7 @@ var GitCacheManager = class {
    */
   async readMetadata(cachePath) {
     const metadataPath = join4(cachePath, METADATA_FILE);
-    if (!existsSync4(metadataPath)) {
+    if (!existsSync5(metadataPath)) {
       return null;
     }
     try {
@@ -15756,7 +16128,7 @@ var GitRegistry = class {
     const ref = version ?? this.defaultRef;
     const repoPath = await this.ensureCloned(ref);
     const filePath = this.resolveFilePath(repoPath, basePath);
-    if (!existsSync5(filePath)) {
+    if (!existsSync6(filePath)) {
       throw new FileNotFoundError(path);
     }
     return fs3.readFile(filePath, "utf-8");
@@ -15773,7 +16145,7 @@ var GitRegistry = class {
       const ref = version ?? this.defaultRef;
       const repoPath = await this.ensureCloned(ref);
       const filePath = this.resolveFilePath(repoPath, basePath);
-      return existsSync5(filePath);
+      return existsSync6(filePath);
     } catch {
       return false;
     }
@@ -15790,7 +16162,7 @@ var GitRegistry = class {
       const ref = version ?? this.defaultRef;
       const repoPath = await this.ensureCloned(ref);
       const dirPath = this.resolveDirectoryPath(repoPath, basePath);
-      if (!existsSync5(dirPath)) {
+      if (!existsSync6(dirPath)) {
         return [];
       }
       const entries = await fs3.readdir(dirPath, { withFileTypes: true });
@@ -15852,7 +16224,7 @@ var GitRegistry = class {
    * Clone the repository to the specified path.
    */
   async clone(targetPath, ref) {
-    if (existsSync5(targetPath)) {
+    if (existsSync6(targetPath)) {
       await fs3.rm(targetPath, { recursive: true, force: true });
     }
     await fs3.mkdir(targetPath, { recursive: true });
@@ -16487,6 +16859,39 @@ var Validator = class {
 };
 
 // packages/compiler/src/compiler.ts
+function generateMarker() {
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  return `<!-- PromptScript ${timestamp} - do not edit -->`;
+}
+function addMarkerToOutput(output) {
+  const { content, path } = output;
+  if (content.includes("<!-- PromptScript")) {
+    return output;
+  }
+  const marker = generateMarker();
+  if (!path.endsWith(".md") && !path.endsWith(".mdc")) {
+    return output;
+  }
+  if (content.startsWith("---")) {
+    const closingIndex = content.indexOf("---", 3);
+    if (closingIndex !== -1) {
+      const beforeMarker = content.slice(0, closingIndex + 3);
+      const afterMarker = content.slice(closingIndex + 3);
+      const newContent = `${beforeMarker}
+
+${marker}
+${afterMarker.replace(/^\n+/, "\n")}`;
+      return { ...output, content: newContent };
+    }
+  }
+  const lines = content.split("\n");
+  if (lines[0]?.startsWith("# ")) {
+    lines.splice(1, 0, "", marker);
+  } else {
+    lines.unshift(marker, "");
+  }
+  return { ...output, content: lines.join("\n") };
+}
 var Compiler = class _Compiler {
   constructor(options) {
     this.options = options;
@@ -16557,10 +16962,10 @@ var Compiler = class _Compiler {
       try {
         const formatOptions = this.getFormatOptionsForTarget(formatter.name, config);
         const output = formatter.format(resolved.ast, formatOptions);
-        outputs.set(output.path, output);
+        outputs.set(output.path, addMarkerToOutput(output));
         if (output.additionalFiles) {
           for (const additionalFile of output.additionalFiles) {
-            outputs.set(additionalFile.path, additionalFile);
+            outputs.set(additionalFile.path, addMarkerToOutput(additionalFile));
           }
         }
       } catch (err) {
@@ -16644,12 +17049,12 @@ var Compiler = class _Compiler {
    */
   async watch(entryPath, options = {}) {
     const { default: chokidar2 } = await import("chokidar");
-    const { dirname: dirname6, resolve: resolve7 } = await import("path");
-    const baseDir = dirname6(resolve7(entryPath));
+    const { dirname: dirname8, resolve: resolve9 } = await import("path");
+    const baseDir = dirname8(resolve9(entryPath));
     const includePatterns = options.include ?? ["**/*.prs"];
     const excludePatterns = options.exclude ?? ["**/node_modules/**"];
     const debounceMs = options.debounce ?? 300;
-    const watchPatterns = includePatterns.map((p) => resolve7(baseDir, p));
+    const watchPatterns = includePatterns.map((p) => resolve9(baseDir, p));
     let debounceTimer = null;
     let pendingChanges = [];
     const handleChange = async (changedFiles) => {
@@ -16704,14 +17109,13 @@ var Compiler = class _Compiler {
    */
   getFormatOptionsForTarget(_targetName, config) {
     const customConventions = this.options.customConventions;
-    if (!config?.convention && !config?.version && !config?.output) {
-      return {};
-    }
-    const conventionName = config?.convention;
+    const prettierOptions = this.options.prettier;
     const options = {
       outputPath: config?.output,
-      version: config?.version
+      version: config?.version,
+      prettier: prettierOptions
     };
+    const conventionName = config?.convention;
     if (conventionName && customConventions?.[conventionName]) {
       options.convention = customConventions[conventionName];
     } else if (conventionName) {
@@ -16788,7 +17192,91 @@ var Compiler = class _Compiler {
   }
 };
 
+// packages/cli/src/output/pager.ts
+import { spawn } from "child_process";
+function isTTY() {
+  return process.stdout.isTTY === true;
+}
+function getPagerCommand() {
+  return process.env["PAGER"] ?? "less";
+}
+var Pager = class {
+  lines = [];
+  enabled;
+  constructor(enabled = true) {
+    this.enabled = enabled && isTTY();
+  }
+  /**
+   * Write a line to the pager buffer.
+   */
+  write(line) {
+    this.lines.push(line);
+  }
+  /**
+   * Write multiple lines to the pager buffer.
+   */
+  writeLines(lines) {
+    this.lines.push(...lines);
+  }
+  /**
+   * Flush all buffered content through the pager.
+   * If pager is disabled or not a TTY, just prints to stdout.
+   */
+  async flush() {
+    const content = this.lines.join("\n");
+    if (!this.enabled || this.lines.length === 0) {
+      if (content) {
+        console.log(content);
+      }
+      return;
+    }
+    return new Promise((resolve9) => {
+      const pagerCmd = getPagerCommand();
+      const [cmd, ...args] = pagerCmd.split(" ");
+      if (cmd === "less" && !args.includes("-R")) {
+        args.push("-R");
+      }
+      if (!cmd) {
+        console.log(content);
+        resolve9();
+        return;
+      }
+      const pager = spawn(cmd, args, {
+        stdio: ["pipe", "inherit", "inherit"],
+        env: {
+          ...process.env,
+          // Ensure less handles colors properly
+          LESS: process.env["LESS"] ?? "-R"
+        }
+      });
+      pager.on("error", (_err) => {
+        console.log(content);
+        resolve9();
+      });
+      pager.on("close", () => {
+        resolve9();
+      });
+      if (pager.stdin) {
+        pager.stdin.write(content);
+        pager.stdin.end();
+      } else {
+        console.log(content);
+        resolve9();
+      }
+    });
+  }
+};
+function createPager(enabled = true) {
+  return new Pager(enabled);
+}
+
 // packages/cli/src/commands/compile.ts
+var PROMPTSCRIPT_MARKERS = [
+  "<!-- PromptScript",
+  // Current marker (HTML comment with date)
+  "> Auto-generated by PromptScript"
+  // Legacy - for backwards compatibility
+];
 function parseTargets(targets) {
   return targets.map((entry) => {
     if (typeof entry === "string") {
@@ -16802,6 +17290,28 @@ function parseTargets(targets) {
     return { name, config };
   }).filter((target) => target.config?.enabled !== false);
 }
+async function isPromptScriptGenerated(filePath) {
+  try {
+    const content = await readFile6(filePath, "utf-8");
+    const lines = content.split("\n").slice(0, 10);
+    return lines.some((line) => PROMPTSCRIPT_MARKERS.some((marker) => line.includes(marker)));
+  } catch {
+    return false;
+  }
+}
+async function promptForOverwrite(filePath, services) {
+  const response = await services.prompts.select({
+    message: `File exists and was not generated by PromptScript: ${filePath}
+Overwrite?`,
+    choices: [
+      { name: "No (skip this file)", value: "no" },
+      { name: "Yes (overwrite this file)", value: "yes" },
+      { name: "All (overwrite all remaining files)", value: "all" }
+    ],
+    default: "no"
+  });
+  return response;
+}
 function printErrors(errors) {
   for (const err of errors) {
     ConsoleOutput.error(err.message);
@@ -16810,17 +17320,84 @@ function printErrors(errors) {
     }
   }
 }
-async function writeOutputs(outputs, options, _config) {
+async function writeOutputs(outputs, options, _config, services) {
+  const result = { written: [], skipped: [] };
+  let overwriteAll = false;
+  const conflicts = [];
   for (const output of outputs.values()) {
-    const outputPath = options.output ? resolve2(options.output, output.path) : resolve2(output.path);
+    const outputPath = options.output ? resolve4(options.output, output.path) : resolve4(output.path);
+    const fileExists2 = existsSync7(outputPath);
     if (options.dryRun) {
-      ConsoleOutput.dryRun(`Would write: ${outputPath}`);
-    } else {
-      await mkdir2(dirname3(outputPath), { recursive: true });
+      if (fileExists2) {
+        const isGenerated2 = await isPromptScriptGenerated(outputPath);
+        if (isGenerated2) {
+          ConsoleOutput.dryRun(`Would overwrite: ${outputPath}`);
+        } else {
+          ConsoleOutput.warning(`Would conflict: ${outputPath} (not generated by PromptScript)`);
+        }
+      } else {
+        ConsoleOutput.dryRun(`Would write: ${outputPath}`);
+      }
+      result.written.push(outputPath);
+      continue;
+    }
+    if (!fileExists2) {
+      await mkdir2(dirname5(outputPath), { recursive: true });
+      await writeFile2(outputPath, output.content, "utf-8");
+      ConsoleOutput.success(outputPath);
+      result.written.push(outputPath);
+      continue;
+    }
+    const isGenerated = await isPromptScriptGenerated(outputPath);
+    if (isGenerated) {
+      await mkdir2(dirname5(outputPath), { recursive: true });
+      await writeFile2(outputPath, output.content, "utf-8");
+      ConsoleOutput.success(outputPath);
+      result.written.push(outputPath);
+      continue;
+    }
+    if (options.force || overwriteAll) {
+      await mkdir2(dirname5(outputPath), { recursive: true });
       await writeFile2(outputPath, output.content, "utf-8");
       ConsoleOutput.success(outputPath);
+      result.written.push(outputPath);
+      continue;
+    }
+    if (!isTTY()) {
+      conflicts.push(outputPath);
+      continue;
     }
+    const response = await promptForOverwrite(outputPath, services);
+    switch (response) {
+      case "yes":
+        await mkdir2(dirname5(outputPath), { recursive: true });
+        await writeFile2(outputPath, output.content, "utf-8");
+        ConsoleOutput.success(outputPath);
+        result.written.push(outputPath);
+        break;
+      case "no":
+        ConsoleOutput.skipped(outputPath);
+        result.skipped.push(outputPath);
+        break;
+      case "all":
+        overwriteAll = true;
+        await mkdir2(dirname5(outputPath), { recursive: true });
+        await writeFile2(outputPath, output.content, "utf-8");
+        ConsoleOutput.success(outputPath);
+        result.written.push(outputPath);
+        break;
+    }
+  }
+  if (conflicts.length > 0) {
+    const fileList = conflicts.map((f) => `  - ${f}`).join("\n");
+    throw new Error(
+      `Cannot overwrite files not generated by PromptScript in non-interactive mode:
+${fileList}
+
+Use --force to overwrite these files.`
+    );
   }
+  return result;
 }
 function printStats(stats) {
   ConsoleOutput.newline();
@@ -16837,7 +17414,7 @@ function printWarnings(warnings) {
     }
   }
 }
-async function compileCommand(options) {
+async function compileCommand(options, services = createDefaultServices()) {
   const spinner = createSpinner("Loading configuration...").start();
   try {
     const config = await loadConfig(options.config);
@@ -16845,6 +17422,7 @@ async function compileCommand(options) {
     const selectedTarget = options.target ?? options.format;
     const targets = selectedTarget ? [{ name: selectedTarget }] : parseTargets(config.targets);
     const registryPath = options.registry ?? config.registry?.path ?? "./registry";
+    const prettierOptions = await resolvePrettierOptions(config, process.cwd());
     const compiler = new Compiler({
       resolver: {
         registryPath,
@@ -16852,10 +17430,11 @@ async function compileCommand(options) {
       },
       validator: config.validation,
       formatters: targets,
-      customConventions: config.customConventions
+      customConventions: config.customConventions,
+      prettier: prettierOptions
     });
-    const entryPath = resolve2("./.promptscript/project.prs");
-    if (!existsSync6(entryPath)) {
+    const entryPath = resolve4("./.promptscript/project.prs");
+    if (!existsSync7(entryPath)) {
       spinner.fail("Entry file not found");
       ConsoleOutput.error(`File not found: ${entryPath}`);
       ConsoleOutput.muted("Run: prs init");
@@ -16870,15 +17449,27 @@ async function compileCommand(options) {
     }
     spinner.succeed("Compilation successful");
     ConsoleOutput.newline();
-    await writeOutputs(result.outputs, options, config);
+    const writeResult = await writeOutputs(result.outputs, options, config, services);
+    if (writeResult.skipped.length > 0) {
+      ConsoleOutput.muted(`Skipped ${writeResult.skipped.length} file(s)`);
+    }
     printStats(result.stats);
     printWarnings(result.warnings);
     if (options.watch) {
       ConsoleOutput.newline();
       ConsoleOutput.info("Watching for changes... (Ctrl+C to stop)");
-      watchForChanges("./.promptscript", () => compileCommand({ ...options, watch: false }));
+      watchForChanges(
+        "./.promptscript",
+        () => compileCommand({ ...options, watch: false }, services)
+      );
     }
   } catch (error) {
+    if (error.name === "ExitPromptError") {
+      spinner.stop();
+      ConsoleOutput.newline();
+      ConsoleOutput.muted("Compilation cancelled");
+      return;
+    }
     spinner.fail("Error");
     ConsoleOutput.error(error.message);
     process.exit(1);
@@ -16919,8 +17510,8 @@ function watchForChanges(dir, callback) {
 }
 
 // packages/cli/src/commands/validate.ts
-import { resolve as resolve3 } from "path";
-import { existsSync as existsSync7 } from "fs";
+import { resolve as resolve5 } from "path";
+import { existsSync as existsSync8 } from "fs";
 function printValidationErrors(errors) {
   if (errors.length === 0) return;
   console.log(`Errors (${errors.length}):`);
@@ -17010,8 +17601,8 @@ async function validateCommand(options) {
       formatters: []
       // No formatters needed for validation only
     });
-    const entryPath = resolve3("./.promptscript/project.prs");
-    if (!existsSync7(entryPath)) {
+    const entryPath = resolve5("./.promptscript/project.prs");
+    if (!existsSync8(entryPath)) {
       handleEntryNotFound(entryPath, isJsonFormat, spinner);
     }
     const result = await compiler.compile(entryPath);
@@ -17051,8 +17642,8 @@ function outputJsonResult(result) {
 
 // packages/cli/src/commands/pull.ts
 import { mkdir as mkdir3, writeFile as writeFile3 } from "fs/promises";
-import { existsSync as existsSync8 } from "fs";
-import { resolve as resolve4, dirname as dirname4 } from "path";
+import { existsSync as existsSync9 } from "fs";
+import { resolve as resolve6, dirname as dirname6 } from "path";
 async function pullCommand(options) {
   const spinner = createSpinner("Loading configuration...").start();
   try {
@@ -17075,8 +17666,8 @@ async function pullCommand(options) {
     }
     spinner.text = `Fetching ${inheritPath}...`;
     const content = await registry.fetch(inheritPath);
-    const destPath = resolve4("./.promptscript/.inherited", inheritPath);
-    if (existsSync8(destPath) && !options.force && !options.dryRun) {
+    const destPath = resolve6("./.promptscript/.inherited", inheritPath);
+    if (existsSync9(destPath) && !options.force && !options.dryRun) {
       spinner.warn("File already exists (use --force to overwrite)");
       ConsoleOutput.muted(destPath);
       return;
@@ -17086,12 +17677,12 @@ async function pullCommand(options) {
       ConsoleOutput.newline();
       ConsoleOutput.dryRun(`Would fetch: ${config.inherit}`);
       ConsoleOutput.dryRun(`       to: ${destPath}`);
-      if (existsSync8(destPath)) {
+      if (existsSync9(destPath)) {
         ConsoleOutput.dryRun("(would overwrite existing file)");
       }
       return;
     }
-    await mkdir3(dirname4(destPath), { recursive: true });
+    await mkdir3(dirname6(destPath), { recursive: true });
     await writeFile3(destPath, content, "utf-8");
     spinner.succeed("Pulled from registry");
     ConsoleOutput.success(destPath);
@@ -17134,10 +17725,10 @@ async function createRegistry(config, options, spinner) {
   }
   const registryPath = config.registry?.path ?? "./registry";
   spinner.text = `Using local registry: ${registryPath}...`;
-  if (!existsSync8(registryPath)) {
+  if (!existsSync9(registryPath)) {
     throw new Error(`Local registry path not found: ${registryPath}`);
   }
-  return createFileSystemRegistry(resolve4(registryPath));
+  return createFileSystemRegistry(resolve6(registryPath));
 }
 function parseInheritPath(inheritPath) {
   const versionIndex = inheritPath.lastIndexOf("@");
@@ -17184,89 +17775,9 @@ function handlePullError(error, spinner) {
 }
 
 // packages/cli/src/commands/diff.ts
-import { resolve as resolve5 } from "path";
-import { readFile as readFile4 } from "fs/promises";
-import { existsSync as existsSync9 } from "fs";
-
-// packages/cli/src/output/pager.ts
-import { spawn } from "child_process";
-function isTTY() {
-  return process.stdout.isTTY === true;
-}
-function getPagerCommand() {
-  return process.env["PAGER"] ?? "less";
-}
-var Pager = class {
-  lines = [];
-  enabled;
-  constructor(enabled = true) {
-    this.enabled = enabled && isTTY();
-  }
-  /**
-   * Write a line to the pager buffer.
-   */
-  write(line) {
-    this.lines.push(line);
-  }
-  /**
-   * Write multiple lines to the pager buffer.
-   */
-  writeLines(lines) {
-    this.lines.push(...lines);
-  }
-  /**
-   * Flush all buffered content through the pager.
-   * If pager is disabled or not a TTY, just prints to stdout.
-   */
-  async flush() {
-    const content = this.lines.join("\n");
-    if (!this.enabled || this.lines.length === 0) {
-      if (content) {
-        console.log(content);
-      }
-      return;
-    }
-    return new Promise((resolve7) => {
-      const pagerCmd = getPagerCommand();
-      const [cmd, ...args] = pagerCmd.split(" ");
-      if (cmd === "less" && !args.includes("-R")) {
-        args.push("-R");
-      }
-      if (!cmd) {
-        console.log(content);
-        resolve7();
-        return;
-      }
-      const pager = spawn(cmd, args, {
-        stdio: ["pipe", "inherit", "inherit"],
-        env: {
-          ...process.env,
-          // Ensure less handles colors properly
-          LESS: process.env["LESS"] ?? "-R"
-        }
-      });
-      pager.on("error", (_err) => {
-        console.log(content);
-        resolve7();
-      });
-      pager.on("close", () => {
-        resolve7();
-      });
-      if (pager.stdin) {
-        pager.stdin.write(content);
-        pager.stdin.end();
-      } else {
-        console.log(content);
-        resolve7();
-      }
-    });
-  }
-};
-function createPager(enabled = true) {
-  return new Pager(enabled);
-}
-
-// packages/cli/src/commands/diff.ts
+import { resolve as resolve7 } from "path";
+import { readFile as readFile7 } from "fs/promises";
+import { existsSync as existsSync10 } from "fs";
 import chalk2 from "chalk";
 function configureColors(options) {
   if (options.color === false) {
@@ -17300,16 +17811,16 @@ function printNewFilePreview(content, showFull, pager) {
   }
 }
 async function compareOutput(_name, output, _config, showFull, pager) {
-  const outputPath = resolve5(output.path);
+  const outputPath = resolve7(output.path);
   const newContent = output.content;
-  if (!existsSync9(outputPath)) {
+  if (!existsSync10(outputPath)) {
     pager.write(chalk2.green(`+ ${outputPath} (new file)`));
     pager.write("");
     printNewFilePreview(newContent, showFull, pager);
     pager.write("");
     return true;
   }
-  const existingContent = await readFile4(outputPath, "utf-8");
+  const existingContent = await readFile7(outputPath, "utf-8");
   if (existingContent === newContent) {
     pager.write(chalk2.gray(`  ${outputPath} (no changes)`));
     return false;
@@ -17338,8 +17849,8 @@ async function diffCommand(options) {
       formatters: targets,
       customConventions: config.customConventions
     });
-    const entryPath = resolve5("./.promptscript/project.prs");
-    if (!existsSync9(entryPath)) {
+    const entryPath = resolve7("./.promptscript/project.prs");
+    if (!existsSync10(entryPath)) {
       spinner.fail("Entry file not found");
       ConsoleOutput.error(`File not found: ${entryPath}`);
       ConsoleOutput.muted("Run: prs init");
@@ -17405,8 +17916,8 @@ function printSimpleDiff(existingLines, newLines, showFull, pager) {
 }
 
 // packages/cli/src/commands/check.ts
-import { existsSync as existsSync10 } from "fs";
-import { resolve as resolve6 } from "path";
+import { existsSync as existsSync11 } from "fs";
+import { resolve as resolve8 } from "path";
 async function checkCommand(_options) {
   const spinner = createSpinner("Checking project health...").start();
   const results = [];
@@ -17468,7 +17979,7 @@ async function checkCommand(_options) {
       });
     }
     const entryPath = config.input?.entry ?? ".promptscript/project.prs";
-    if (existsSync10(entryPath)) {
+    if (existsSync11(entryPath)) {
       results.push({
         name: "Entry file",
         status: "ok",
@@ -17483,8 +17994,8 @@ async function checkCommand(_options) {
       hasErrors = true;
     }
     if (config.registry?.path) {
-      const registryPath = resolve6(config.registry.path);
-      if (existsSync10(registryPath)) {
+      const registryPath = resolve8(config.registry.path);
+      if (existsSync11(registryPath)) {
         results.push({
           name: "Registry path",
           status: "ok",
@@ -17567,7 +18078,7 @@ function printResults(results) {
 
 // packages/cli/src/cli.ts
 var __filename2 = fileURLToPath2(import.meta.url);
-var __dirname2 = dirname5(__filename2);
+var __dirname2 = dirname7(__filename2);
 var program = new Command();
 program.name("prs").description("PromptScript CLI - Standardize AI instructions").version(getPackageVersion(__dirname2, "./package.json")).option("--verbose", "Enable verbose output").option("--quiet", "Suppress non-error output").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
@@ -17581,7 +18092,7 @@ program.name("prs").description("PromptScript CLI - Standardize AI instructions"
   }
 });
 program.command("init").description("Initialize PromptScript in current directory").option("-n, --name <name>", "Project name (auto-detected from package.json, etc.)").option("-t, --team <team>", "Team namespace").option("--inherit <path>", "Inheritance path (e.g., @company/team)").option("--registry <path>", "Registry path").option("--targets <targets...>", "Target AI tools (github, claude, cursor)").option("-i, --interactive", "Force interactive mode").option("-y, --yes", "Skip prompts, use defaults").option("-f, --force", "Force reinitialize even if already initialized").action((opts) => initCommand(opts));
-program.command("compile").description("Compile PromptScript to target formats").option("-t, --target <target>", "Specific target (github, claude, cursor)").option("-f, --format <format>", "Output format (alias for --target)").option("-a, --all", "All configured targets", true).option("-w, --watch", "Watch mode").option("-o, --output <dir>", "Output directory").option("--dry-run", "Preview changes").option("--registry <path>", "Registry path (overrides config)").option("-c, --config <path>", "Path to custom config file").action(compileCommand);
+program.command("compile").description("Compile PromptScript to target formats").option("-t, --target <target>", "Specific target (github, claude, cursor)").option("-f, --format <format>", "Output format (alias for --target)").option("-a, --all", "All configured targets", true).option("-w, --watch", "Watch mode").option("-o, --output <dir>", "Output directory").option("--dry-run", "Preview changes").option("--registry <path>", "Registry path (overrides config)").option("-c, --config <path>", "Path to custom config file").option("--force", "Force overwrite existing files without prompts").action((opts) => compileCommand(opts));
 program.command("validate").description("Validate PromptScript files").option("--strict", "Treat warnings as errors").option("--format <format>", "Output format (text, json)", "text").action(validateCommand);
 program.command("pull").description("Pull updates from registry").option("-f, --force", "Force overwrite").option("--dry-run", "Preview changes without pulling").option("-b, --branch <name>", "Git branch to pull from").option("--tag <name>", "Git tag to pull from").option("--commit <hash>", "Git commit to pull from").option("--refresh", "Force re-fetch from remote (ignore cache)").action(pullCommand);
 program.command("diff").description("Show diff for compiled output").option("-t, --target <target>", "Specific target").option("-a, --all", "Show diff for all targets at once").option("--full", "Show full diff without truncation").option("--no-pager", "Disable pager output").option("--color", "Force colored output").option("--no-color", "Disable colored output").action(diffCommand);