@promptscript/cli 1.14.2 → 1.15.0

package/index.js

@@ -840,6 +840,30 @@ var init_levenshtein = __esm({
   }
 });
 
+// packages/core/src/utils/markers.ts
+function stripPromptScriptMarkers(content) {
+  return content.replace(new RegExp(`${HTML_MARKER}\\n*`, "g"), "").replace(new RegExp(`${YAML_MARKER}[^\\n]+\\n*`, "g"), "");
+}
+function isGeneratedByPromptScript(content) {
+  const head = new RegExp(`^\\s*(?:${YAML_MARKER}|${HTML_MARKER})`);
+  return content.split("\n", 5).some((line) => head.test(line));
+}
+function stripFrontmatterMarkerLines(frontmatter) {
+  const markerLine = new RegExp(`^\\s*${YAML_MARKER}`);
+  return frontmatter.split("\n").filter((line) => !markerLine.test(line)).join("\n");
+}
+function stripLeadingHtmlMarker(body) {
+  return body.replace(new RegExp(`^\\s*${HTML_MARKER}\\n*`), "");
+}
+var HTML_MARKER, YAML_MARKER;
+var init_markers = __esm({
+  "packages/core/src/utils/markers.ts"() {
+    "use strict";
+    HTML_MARKER = "<!--\\s*PromptScript [^>]+-->";
+    YAML_MARKER = "#\\s*promptscript-generated:";
+  }
+});
+
 // packages/core/src/utils/index.ts
 var init_utils = __esm({
   "packages/core/src/utils/index.ts"() {
@@ -850,6 +874,7 @@ var init_utils = __esm({
     init_path();
     init_version();
     init_levenshtein();
+    init_markers();
   }
 });
 
@@ -26841,16 +26866,22 @@ function extractReservedParams(params) {
   const remaining = [];
   let only;
   let exclude;
+  let includes;
+  let excludes;
   for (const param of params) {
     if (param.name === "only" && Array.isArray(param.value)) {
       only = param.value.filter((v) => typeof v === "string");
     } else if (param.name === "exclude" && Array.isArray(param.value)) {
       exclude = param.value.filter((v) => typeof v === "string");
+    } else if (param.name === "includes" && Array.isArray(param.value)) {
+      includes = param.value.filter((v) => typeof v === "string");
+    } else if (param.name === "excludes" && Array.isArray(param.value)) {
+      excludes = param.value.filter((v) => typeof v === "string");
     } else {
       remaining.push(param);
     }
   }
-  return { only, exclude, remaining };
+  return { only, exclude, includes, excludes, remaining };
 }
 function filterBlocks(blocks, options) {
   if (options.only) {
@@ -26863,6 +26894,44 @@ function filterBlocks(blocks, options) {
   }
   return blocks;
 }
+function filterSkillsBlock(program2, options) {
+  if (!options.includes && !options.excludes) {
+    return program2;
+  }
+  const skillsBlock = program2.blocks.find((b) => b.name === "skills");
+  if (!skillsBlock || skillsBlock.content.type !== "ObjectContent") {
+    return program2;
+  }
+  const props = skillsBlock.content.properties;
+  const skillNames = Object.keys(props);
+  let filteredNames;
+  if (options.includes) {
+    const allowSet = new Set(options.includes);
+    filteredNames = skillNames.filter((name) => allowSet.has(name));
+  } else {
+    const denySet = new Set(options.excludes);
+    filteredNames = skillNames.filter((name) => !denySet.has(name));
+  }
+  if (filteredNames.length === skillNames.length) {
+    return program2;
+  }
+  const filteredProps = {};
+  for (const name of filteredNames) {
+    filteredProps[name] = deepCloneValue2(props[name]);
+  }
+  const newSkillsBlock = {
+    ...deepClone(skillsBlock),
+    content: {
+      type: "ObjectContent",
+      properties: filteredProps,
+      loc: skillsBlock.content.loc
+    }
+  };
+  return {
+    ...program2,
+    blocks: program2.blocks.map((b) => b.name === "skills" ? newSkillsBlock : b)
+  };
+}
 
 // packages/resolver/src/extensions.ts
 init_src();
@@ -27480,7 +27549,9 @@ function parseSkillMd(content) {
   let rawFrontmatter;
   let bodyContent;
   if (frontmatterStart >= 0 && frontmatterEnd > frontmatterStart) {
-    const frontmatterLines = lines.slice(frontmatterStart + 1, frontmatterEnd);
+    const frontmatterLines = stripFrontmatterMarkerLines(
+      lines.slice(frontmatterStart + 1, frontmatterEnd).join("\n")
+    ).split("\n");
     const parsed = parseFrontmatterFields(frontmatterLines);
     name = parsed.name;
     description = parsed.description;
@@ -27491,9 +27562,9 @@ function parseSkillMd(content) {
     scripts = parsed.scripts;
     license = parsed.license;
     rawFrontmatter = frontmatterLines.join("\n");
-    bodyContent = lines.slice(frontmatterEnd + 1).join("\n").trim();
+    bodyContent = stripLeadingHtmlMarker(lines.slice(frontmatterEnd + 1).join("\n")).trim();
   } else {
-    bodyContent = content.trim();
+    bodyContent = stripLeadingHtmlMarker(content).trim();
   }
   return {
     name,
@@ -28165,6 +28236,13 @@ async function fileExists(path2) {
     return false;
   }
 }
+async function isGeneratedOutput(filePath) {
+  try {
+    return isGeneratedByPromptScript(await readFile8(filePath, "utf-8"));
+  } catch {
+    return false;
+  }
+}
 async function discoverSkillDirs(basePath) {
   const result = /* @__PURE__ */ new Map();
   const queue = [{ dir: basePath, depth: 0 }];
@@ -28182,7 +28260,7 @@ async function discoverSkillDirs(basePath) {
       if (!isSafeSkillName(entry.name)) continue;
       const subDir = resolve9(dir, entry.name);
       const skillMd = resolve9(subDir, "SKILL.md");
-      if (await fileExists(skillMd)) {
+      if (await fileExists(skillMd) && !await isGeneratedOutput(skillMd)) {
         if (!result.has(entry.name)) {
           result.set(entry.name, subDir);
         }
@@ -28266,6 +28344,10 @@ async function resolveNativeSkills(ast, registryPath, sourceFile, localPath, opt
     if (skillMdPath && await fileExists(skillMdPath)) {
       try {
         const rawContent = await readFile8(skillMdPath, "utf-8");
+        if (isGeneratedByPromptScript(rawContent)) {
+          logger.verbose(`Ignoring generated SKILL.md for skill '${skillName}': ${skillMdPath}`);
+          continue;
+        }
         const parsed = parseSkillMd(rawContent);
         const updatedSkill = { ...skillObj };
         const skillArgs = extractSkillArgs(skillObj);
@@ -28396,6 +28478,10 @@ async function discoverCommandFiles(dir, logger = noopLogger2) {
           logger.verbose(`Skipping binary command file: ${entry.name}`);
           continue;
         }
+        if (isGeneratedByPromptScript(content)) {
+          logger.verbose(`Skipping generated command file: ${entry.name}`);
+          continue;
+        }
         commands[cmdName] = {
           type: "TextContent",
           value: content.trim(),
@@ -28474,8 +28560,8 @@ function parseAgentFrontmatter(content) {
     searchFrom = idx + 1;
   }
   if (endIdx === -1) return null;
-  const yamlStr = trimmed.slice(3, endIdx).trim();
-  const body = trimmed.slice(endIdx + 3).trim();
+  const yamlStr = stripFrontmatterMarkerLines(trimmed.slice(3, endIdx)).trim();
+  const body = stripLeadingHtmlMarker(trimmed.slice(endIdx + 3)).trim();
   const frontmatter = {};
   for (const line of yamlStr.split("\n")) {
     const colonIdx = line.indexOf(":");
@@ -28512,6 +28598,10 @@ async function discoverAgentFiles(dir, logger = noopLogger2) {
           logger.verbose(`Skipping binary agent file: ${entry.name}`);
           continue;
         }
+        if (isGeneratedByPromptScript(fileContent)) {
+          logger.verbose(`Skipping generated agent file: ${entry.name}`);
+          continue;
+        }
         const parsed = parseAgentFrontmatter(fileContent);
         if (!parsed) {
           logger.verbose(`Skipping agent file without frontmatter: ${entry.name}`);
@@ -31178,7 +31268,9 @@ var Resolver = class {
         errors.push(...imported.errors);
         if (imported.ast) {
           let resolvedImport = imported.ast;
-          const { only, exclude, remaining } = extractReservedParams(use.params);
+          const { only, exclude, includes, excludes, remaining } = extractReservedParams(
+            use.params
+          );
           if (imported.ast.meta?.params || remaining.length > 0) {
             this.logger.debug(`Binding template parameters for ${importPath}`);
             try {
@@ -31209,6 +31301,12 @@ var Resolver = class {
               blocks: filterBlocks(resolvedImport.blocks, { only, exclude })
             };
           }
+          if (includes || excludes) {
+            this.logger.debug(
+              `Filtering skills: ${includes ? `includes=[${includes.join(",")}]` : `excludes=[${excludes.join(",")}]`}`
+            );
+            resolvedImport = filterSkillsBlock(resolvedImport, { includes, excludes });
+          }
           let effectiveUse = use;
           const fromConfig = this.options.skillTargets?.[use.path.raw];
           if (use.outputDir && fromConfig && use.outputDir !== fromConfig) {
@@ -34384,18 +34482,21 @@ var duplicateSkills = {
 // packages/validator/src/rules/use-block-filter.ts
 init_src();
 var BLOCK_TYPE_SET = new Set(BLOCK_TYPES);
-var RESERVED_USE_PARAMS = ["only", "exclude"];
+var RESERVED_BLOCK_PARAMS = ["only", "exclude"];
+var RESERVED_SKILL_PARAMS = ["includes", "excludes"];
 var useBlockFilter = {
   id: "PS021",
   name: "use-block-filter",
-  description: "Validate only/exclude block filter parameters on @use directives",
+  description: "Validate only/exclude/includes/excludes filter parameters on @use directives",
   defaultSeverity: "error",
   validate: (ctx) => {
     for (const use of ctx.ast.uses) {
       if (!use.params || use.params.length === 0) continue;
       const onlyParam = use.params.find((p) => p.name === "only");
       const excludeParam = use.params.find((p) => p.name === "exclude");
-      if (!onlyParam && !excludeParam) continue;
+      const includesParam = use.params.find((p) => p.name === "includes");
+      const excludesParam = use.params.find((p) => p.name === "excludes");
+      if (!onlyParam && !excludeParam && !includesParam && !excludesParam) continue;
       if (onlyParam && excludeParam) {
         ctx.report({
           message: '"only" and "exclude" are mutually exclusive in @use',
@@ -34404,7 +34505,15 @@ var useBlockFilter = {
         });
         continue;
       }
-      for (const paramName of RESERVED_USE_PARAMS) {
+      if (includesParam && excludesParam) {
+        ctx.report({
+          message: '"includes" and "excludes" are mutually exclusive in @use',
+          location: use.loc,
+          suggestion: "Use either includes: [...] or excludes: [...], not both"
+        });
+        continue;
+      }
+      for (const paramName of RESERVED_BLOCK_PARAMS) {
         const param = paramName === "only" ? onlyParam : excludeParam;
         if (!param) continue;
         if (!Array.isArray(param.value)) {
@@ -34433,6 +34542,25 @@ var useBlockFilter = {
           }
         }
       }
+      for (const paramName of RESERVED_SKILL_PARAMS) {
+        const param = paramName === "includes" ? includesParam : excludesParam;
+        if (!param) continue;
+        if (!Array.isArray(param.value)) {
+          ctx.report({
+            message: `"${paramName}" expects an array, got ${typeof param.value}. Use ${paramName}: ["skillName"]`,
+            location: param.loc ?? use.loc
+          });
+          continue;
+        }
+        if (param.value.length === 0) {
+          ctx.report({
+            message: paramName === "includes" ? 'Empty "includes" filter imports nothing \u2014 consider removing this @use' : 'Empty "excludes" filter has no effect \u2014 consider removing the parameter',
+            location: param.loc ?? use.loc,
+            severity: "warning"
+          });
+          continue;
+        }
+      }
     }
   }
 };
@@ -36778,9 +36906,7 @@ async function resolveRegistryPath(config, options = {}) {
 import { parse as parseYaml5 } from "yaml";
 
 // packages/cli/src/utils/markers.ts
-function stripMarkers(content) {
-  return content.replace(/<!-- PromptScript [^>]+ -->\n*/g, "").replace(/# promptscript-generated: [^\n]+\n*/g, "");
-}
+init_src();
 
 // packages/cli/src/utils/conflict-detector.ts
 init_src();
@@ -37188,13 +37314,15 @@ function resolveCompileConfigPath(projectRoot, options) {
   }
   return configPath;
 }
-async function isPromptScriptGenerated3(filePath) {
+function hasPromptScriptMarker(content) {
+  const lines = content.split("\n").slice(0, 50);
+  return lines.some((line) => PROMPTSCRIPT_MARKERS2.some((marker) => line.includes(marker)));
+}
+async function readFileOrUndefined(filePath) {
   try {
-    const content = await readFile14(filePath, "utf-8");
-    const lines = content.split("\n").slice(0, 50);
-    return lines.some((line) => PROMPTSCRIPT_MARKERS2.some((marker) => line.includes(marker)));
+    return await readFile14(filePath, "utf-8");
   } catch {
-    return false;
+    return void 0;
   }
 }
 async function promptForOverwrite(filePath, services) {
@@ -37257,69 +37385,32 @@ async function writeOutputs(outputs, options, _config, services) {
   for (const output of outputs.values()) {
     const outputPath = options.output ? resolve17(options.output, output.path) : resolve17(output.path);
     const fileExists3 = existsSync13(outputPath);
+    const existingContent = fileExists3 ? await readFileOrUndefined(outputPath) : void 0;
+    const contentMatches = existingContent !== void 0 && stripPromptScriptMarkers(existingContent) === stripPromptScriptMarkers(output.content);
     if (options.dryRun) {
-      if (fileExists3) {
-        const isGenerated2 = await isPromptScriptGenerated3(outputPath);
-        if (isGenerated2) {
-          const existingContent = await readFile14(outputPath, "utf-8");
-          const existingWithoutMarker = stripMarkers(existingContent);
-          const newWithoutMarker = stripMarkers(output.content);
-          if (existingWithoutMarker === newWithoutMarker) {
-            ConsoleOutput.dryRun(`Unchanged: ${outputPath}`);
-            result.unchanged.push(outputPath);
-          } else {
-            ConsoleOutput.dryRun(`Would overwrite: ${outputPath}`);
-            result.written.push(outputPath);
-          }
-        } else {
-          const existingContent = await readFile14(outputPath, "utf-8");
-          if (existingContent === output.content) {
-            ConsoleOutput.dryRun(`Unchanged: ${outputPath}`);
-            result.unchanged.push(outputPath);
-          } else {
-            ConsoleOutput.warning(`Would conflict: ${outputPath} (not generated by PromptScript)`);
-            result.written.push(outputPath);
-          }
-        }
-      } else {
+      if (!fileExists3) {
         ConsoleOutput.dryRun(`Would write: ${outputPath}`);
         result.written.push(outputPath);
-      }
-      continue;
-    }
-    if (!fileExists3) {
-      if (await safeWrite(outputPath, output.content, output.mode)) {
-        ConsoleOutput.success(outputPath);
+      } else if (contentMatches) {
+        ConsoleOutput.dryRun(`Unchanged: ${outputPath}`);
+        result.unchanged.push(outputPath);
+      } else if (existingContent !== void 0 && hasPromptScriptMarker(existingContent)) {
+        ConsoleOutput.dryRun(`Would overwrite: ${outputPath}`);
+        result.written.push(outputPath);
+      } else {
+        ConsoleOutput.warning(`Would conflict: ${outputPath} (not generated by PromptScript)`);
         result.written.push(outputPath);
       }
       continue;
     }
-    const isGenerated = await isPromptScriptGenerated3(outputPath);
-    if (isGenerated) {
-      const existingContent = await readFile14(outputPath, "utf-8");
-      const existingWithoutMarker = stripMarkers(existingContent);
-      const newWithoutMarker = stripMarkers(output.content);
-      if (!options.force && existingWithoutMarker === newWithoutMarker) {
-        if (output.mode !== void 0) {
-          await chmod2(outputPath, output.mode);
-        }
-        ConsoleOutput.unchanged(outputPath);
-        result.unchanged.push(outputPath);
-        continue;
-      }
+    if (!fileExists3) {
       if (await safeWrite(outputPath, output.content, output.mode)) {
         ConsoleOutput.success(outputPath);
         result.written.push(outputPath);
       }
       continue;
     }
-    let contentMatches = false;
-    try {
-      const existingContent = await readFile14(outputPath, "utf-8");
-      contentMatches = existingContent === output.content;
-    } catch {
-    }
-    if (!options.force && contentMatches) {
+    if (contentMatches) {
       if (output.mode !== void 0) {
         await chmod2(outputPath, output.mode);
       }
@@ -37327,6 +37418,13 @@ async function writeOutputs(outputs, options, _config, services) {
       result.unchanged.push(outputPath);
       continue;
     }
+    if (existingContent !== void 0 && hasPromptScriptMarker(existingContent)) {
+      if (await safeWrite(outputPath, output.content, output.mode)) {
+        ConsoleOutput.success(outputPath);
+        result.written.push(outputPath);
+      }
+      continue;
+    }
     if (options.force || overwriteAll) {
       if (await safeWrite(outputPath, output.content, output.mode)) {
         ConsoleOutput.success(outputPath);
@@ -38302,8 +38400,8 @@ async function compareOutput(_name, output, _config, showFull, pager) {
     return true;
   }
   const existingContent = await readFile15(outputPath, "utf-8");
-  const existingStripped = stripMarkers(existingContent);
-  const newStripped = stripMarkers(newContent);
+  const existingStripped = stripPromptScriptMarkers(existingContent);
+  const newStripped = stripPromptScriptMarkers(newContent);
   if (existingStripped === newStripped) {
     pager.write(chalk2.gray(`  ${outputPath} (no changes)`));
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promptscript/cli",
-  "version": "1.14.2",
+  "version": "1.15.0",
   "description": "CLI for PromptScript - standardize AI instructions across GitHub Copilot, Claude, Cursor and other AI tools",
   "keywords": [
     "cli",

package/src/commands/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../../../packages/cli/src/commands/compile.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAkBlD,OAAO,EAAE,KAAK,WAAW,EAAyB,MAAM,gBAAgB,CAAC;AAijBzE;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,EACvB,QAAQ,GAAE,WAAqC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAEf"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../../../packages/cli/src/commands/compile.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAkBlD,OAAO,EAAE,KAAK,WAAW,EAAyB,MAAM,gBAAgB,CAAC;AAmhBzE;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,EACvB,QAAQ,GAAE,WAAqC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAEf"}

package/src/utils/markers.d.ts

@@ -2,15 +2,8 @@
  * PromptScript generation marker utilities.
  *
  * Markers are added to compiled output files so the compiler can identify
- * files it previously generated. These utilities strip markers before
- * content comparison to avoid false diffs from timestamp-only changes.
+ * files it previously generated. Stripping them before content comparison
+ * avoids false diffs from timestamp-only changes.
  */
-/**
- * Strip PromptScript generation markers from content for comparison purposes.
- * This allows comparing actual content changes while ignoring timestamp updates.
- *
- * Regex literals are inlined to avoid stateful module-level RegExp objects
- * with the `g` flag (which maintain a `lastIndex` cursor between calls).
- */
-export declare function stripMarkers(content: string): string;
+export { stripPromptScriptMarkers as stripMarkers } from '@promptscript/core';
 //# sourceMappingURL=markers.d.ts.map

package/src/utils/markers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../../../../../packages/cli/src/utils/markers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAIpD"}
+{"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../../../../../packages/cli/src/utils/markers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,wBAAwB,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAC"}