@wbern/claude-instructions 1.8.0 → 1.8.1

package/bin/cli.js

@@ -38,19 +38,48 @@ function truncatePathFromLeft(pathStr, maxLength) {
   return ELLIPSIS + truncated;
 }
 var VARIANT_OPTIONS = [
-  { value: VARIANTS.WITH_BEADS, label: "With Beads", hint: "Includes Beads task tracking" },
-  { value: VARIANTS.WITHOUT_BEADS, label: "Without Beads", hint: "Standard commands only" }
+  {
+    value: VARIANTS.WITH_BEADS,
+    label: "With Beads",
+    hint: "Includes Beads task tracking"
+  },
+  {
+    value: VARIANTS.WITHOUT_BEADS,
+    label: "Without Beads",
+    hint: "Standard commands only"
+  }
 ];
 function getScopeOptions(terminalWidth = 80) {
-  const projectPath = path.join(process.cwd(), DIRECTORIES.CLAUDE, DIRECTORIES.COMMANDS);
-  const userPath = path.join(os.homedir(), DIRECTORIES.CLAUDE, DIRECTORIES.COMMANDS);
+  const projectPath = path.join(
+    process.cwd(),
+    DIRECTORIES.CLAUDE,
+    DIRECTORIES.COMMANDS
+  );
+  const userPath = path.join(
+    os.homedir(),
+    DIRECTORIES.CLAUDE,
+    DIRECTORIES.COMMANDS
+  );
   return [
-    { value: SCOPES.PROJECT, label: "Project/Repository", hint: truncatePathFromLeft(projectPath, terminalWidth) },
-    { value: SCOPES.USER, label: "User (Global)", hint: truncatePathFromLeft(userPath, terminalWidth) }
+    {
+      value: SCOPES.PROJECT,
+      label: "Project/Repository",
+      hint: truncatePathFromLeft(projectPath, terminalWidth)
+    },
+    {
+      value: SCOPES.USER,
+      label: "User (Global)",
+      hint: truncatePathFromLeft(userPath, terminalWidth)
+    }
   ];
 }
 async function getCommandsGroupedByCategory(variant) {
-  const sourcePath = path.join(__dirname, "..", DIRECTORIES.DOWNLOADS, variant || VARIANTS.WITH_BEADS);
+  const sourcePath = path.join(
+    __dirname,
+    "..",
+    DIRECTORIES.DOWNLOADS,
+    variant || VARIANTS.WITH_BEADS
+  );
   const metadataPath = path.join(sourcePath, "commands-metadata.json");
   const metadataContent = await fs.readFile(metadataPath, "utf-8");
   const metadata = JSON.parse(metadataContent);
@@ -87,21 +116,29 @@ function getDestinationPath(outputPath, scope) {
   return void 0;
 }
 function extractTemplateBlocks(content) {
-  const matchWithCommands = content.match(/<claude-commands-template\s+commands="([^"]+)">([\s\S]*?)<\/claude-commands-template>/);
-  if (matchWithCommands) {
-    return {
-      content: matchWithCommands[2].trim(),
-      commands: matchWithCommands[1].split(",").map((c) => c.trim())
-    };
+  const blocks = [];
+  const withCommandsRegex = /<claude-commands-template\s+commands="([^"]+)">([\s\S]*?)<\/claude-commands-template>/g;
+  for (const match of content.matchAll(withCommandsRegex)) {
+    blocks.push({
+      content: match[2].trim(),
+      commands: match[1].split(",").map((c) => c.trim())
+    });
   }
-  const match = content.match(/<claude-commands-template>([\s\S]*?)<\/claude-commands-template>/);
-  if (!match) {
-    return null;
+  const withoutCommandsRegex = /<claude-commands-template>([\s\S]*?)<\/claude-commands-template>/g;
+  for (const match of content.matchAll(withoutCommandsRegex)) {
+    blocks.push({
+      content: match[1].trim()
+    });
   }
-  return { content: match[1].trim() };
+  return blocks;
 }
 async function generateToDirectory(outputPath, variant, scope, options) {
-  const sourcePath = path.join(__dirname, "..", DIRECTORIES.DOWNLOADS, variant || VARIANTS.WITH_BEADS);
+  const sourcePath = path.join(
+    __dirname,
+    "..",
+    DIRECTORIES.DOWNLOADS,
+    variant || VARIANTS.WITH_BEADS
+  );
   const destinationPath = getDestinationPath(outputPath, scope);
   if (!destinationPath) {
     throw new Error("Either outputPath or scope must be provided");
@@ -111,7 +148,10 @@ async function generateToDirectory(outputPath, variant, scope, options) {
   if (options?.commands) {
     await fs.ensureDir(destinationPath);
     for (const file of files) {
-      await fs.copy(path.join(sourcePath, file), path.join(destinationPath, file));
+      await fs.copy(
+        path.join(sourcePath, file),
+        path.join(destinationPath, file)
+      );
     }
   } else {
     await fs.copy(sourcePath, destinationPath, {});
@@ -135,17 +175,24 @@ async function generateToDirectory(outputPath, variant, scope, options) {
     }
     if (templateSourcePath) {
       const sourceContent = await fs.readFile(templateSourcePath, "utf-8");
-      const template = extractTemplateBlocks(sourceContent);
-      if (template) {
+      const templates = extractTemplateBlocks(sourceContent);
+      if (templates.length > 0) {
         for (const file of files) {
           const commandName = path.basename(file, ".md");
-          if (template.commands && !template.commands.includes(commandName)) {
-            continue;
-          }
           const actualFileName = options?.commandPrefix ? options.commandPrefix + file : file;
           const filePath = path.join(destinationPath, actualFileName);
-          const content = await fs.readFile(filePath, "utf-8");
-          await fs.writeFile(filePath, content + "\n\n" + template.content);
+          let content = await fs.readFile(filePath, "utf-8");
+          let modified = false;
+          for (const template of templates) {
+            if (template.commands && !template.commands.includes(commandName)) {
+              continue;
+            }
+            content = content + "\n\n" + template.content;
+            modified = true;
+          }
+          if (modified) {
+            await fs.writeFile(filePath, content);
+          }
         }
         templateInjected = true;
       }

package/downloads/without-beads/cycle.md

@@ -16,10 +16,7 @@ $ARGUMENTS
 - Write natural, descriptive code without meta-commentary about the development process
 - The code should speak for itself - TDD is the process, not the product
 
-(If there was no info above, fallback to:
-
-1. Context of the conversation, if there's an immediate thing
-2. `bd ready` to see what to work on next and start from there)
+(If there was no info above, fallback to the context of the conversation)
 
 ## TDD Fundamentals
 

package/downloads/without-beads/green.md

@@ -16,10 +16,7 @@ $ARGUMENTS
 - Write natural, descriptive code without meta-commentary about the development process
 - The code should speak for itself - TDD is the process, not the product
 
-(If there was no info above, fallback to:
-
-1. Context of the conversation, if there's an immediate thing
-2. `bd ready` to see what to work on next and start from there)
+(If there was no info above, fallback to the context of the conversation)
 
 ## TDD Fundamentals
 

package/downloads/without-beads/red.md

@@ -16,10 +16,7 @@ $ARGUMENTS
 - Write natural, descriptive code without meta-commentary about the development process
 - The code should speak for itself - TDD is the process, not the product
 
-(If there was no info above, fallback to:
-
-1. Context of the conversation, if there's an immediate thing
-2. `bd ready` to see what to work on next and start from there)
+(If there was no info above, fallback to the context of the conversation)
 
 ## TDD Fundamentals
 

package/downloads/without-beads/refactor.md

@@ -14,10 +14,7 @@ Apply this document (specifically the Refactor phase), to the info given by user
 - Write natural, descriptive code without meta-commentary about the development process
 - The code should speak for itself - TDD is the process, not the product
 
-(If there was no info above, fallback to:
-
-1. Context of the conversation, if there's an immediate thing
-2. `bd ready` to see what to work on next and start from there)
+(If there was no info above, fallback to the context of the conversation)
 
 ## TDD Fundamentals
 

package/downloads/without-beads/spike.md

@@ -16,10 +16,7 @@ $ARGUMENTS
 - Write natural, descriptive code without meta-commentary about the development process
 - The code should speak for itself - TDD is the process, not the product
 
-(If there was no info above, fallback to:
-
-1. Context of the conversation, if there's an immediate thing
-2. `bd ready` to see what to work on next and start from there)
+(If there was no info above, fallback to the context of the conversation)
 
 ## TDD Fundamentals
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbern/claude-instructions",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "TDD workflow commands for Claude Code CLI",
   "type": "module",
   "bin": "./bin/cli.js",