@wbern/claude-instructions 1.12.0 → 1.14.0

package/bin/cli.js

@@ -119,7 +119,6 @@ init_esm_shims();
 import {
   select,
   text,
-  multiselect,
   groupMultiselect,
   isCancel,
   intro,
@@ -469,16 +468,39 @@ async function checkExistingFiles(outputPath, variant, scope, options) {
   if (!destinationPath) {
     return [];
   }
-  const files = await fs.readdir(sourcePath);
+  const allFiles = await fs.readdir(sourcePath);
+  const files = options?.commands ? allFiles.filter((f) => options.commands.includes(f)) : allFiles;
   const existingFiles = [];
   const prefix = options?.commandPrefix || "";
+  let metadata = null;
+  let allowedToolsSet = null;
+  if (options?.allowedTools && options.allowedTools.length > 0) {
+    metadata = await loadCommandsMetadata(variant || VARIANTS.WITH_BEADS);
+    allowedToolsSet = new Set(options.allowedTools);
+  }
   for (const file of files) {
     const destFileName = prefix + file;
     const destFilePath = path2.join(destinationPath, destFileName);
     const sourceFilePath = path2.join(sourcePath, file);
     if (await fs.pathExists(destFilePath)) {
       const existingContent = await fs.readFile(destFilePath, "utf-8");
-      const newContent = await fs.readFile(sourceFilePath, "utf-8");
+      let newContent = await fs.readFile(sourceFilePath, "utf-8");
+      if (metadata && allowedToolsSet) {
+        const commandMetadata = metadata[file];
+        const requestedTools = commandMetadata?.["_requested-tools"] || [];
+        const toolsForCommand = requestedTools.filter(
+          (tool) => allowedToolsSet.has(tool)
+        );
+        if (toolsForCommand.length > 0) {
+          const allowedToolsYaml = `allowed-tools: ${toolsForCommand.join(", ")}`;
+          newContent = newContent.replace(
+            /^---\n/,
+            `---
+${allowedToolsYaml}
+`
+          );
+        }
+      }
       existingFiles.push({
         filename: destFileName,
         existingContent,
@@ -618,38 +640,42 @@ async function generateToDirectory(outputPath, variant, scope, options) {
   const allFiles = await fs.readdir(sourcePath);
   let files = options?.commands ? allFiles.filter((f) => options.commands.includes(f)) : allFiles;
   if (options?.skipFiles) {
-    files = files.filter((f) => !options.skipFiles.includes(f));
+    const prefix2 = options?.commandPrefix || "";
+    files = files.filter((f) => !options.skipFiles.includes(prefix2 + f));
   }
-  if (options?.commands || options?.skipFiles) {
+  const prefix = options?.commandPrefix || "";
+  if (options?.commands || options?.skipFiles || options?.commandPrefix) {
     await fs.ensureDir(destinationPath);
     for (const file of files) {
       await fs.copy(
         path2.join(sourcePath, file),
-        path2.join(destinationPath, file)
+        path2.join(destinationPath, prefix + file)
       );
     }
   } else {
     await fs.copy(sourcePath, destinationPath, {});
   }
   if (options?.allowedTools && options.allowedTools.length > 0) {
+    const metadata = await loadCommandsMetadata(variant || VARIANTS.WITH_BEADS);
+    const allowedToolsSet = new Set(options.allowedTools);
     for (const file of files) {
-      const filePath = path2.join(destinationPath, file);
-      const content = await fs.readFile(filePath, "utf-8");
-      const allowedToolsYaml = `allowed-tools: ${options.allowedTools.join(", ")}`;
-      const modifiedContent = content.replace(
-        /^---\n/,
-        `---
+      const commandMetadata = metadata[file];
+      const requestedTools = commandMetadata?.["_requested-tools"] || [];
+      const toolsForCommand = requestedTools.filter(
+        (tool) => allowedToolsSet.has(tool)
+      );
+      if (toolsForCommand.length > 0) {
+        const filePath = path2.join(destinationPath, prefix + file);
+        const content = await fs.readFile(filePath, "utf-8");
+        const allowedToolsYaml = `allowed-tools: ${toolsForCommand.join(", ")}`;
+        const modifiedContent = content.replace(
+          /^---\n/,
+          `---
 ${allowedToolsYaml}
 `
-      );
-      await fs.writeFile(filePath, modifiedContent);
-    }
-  }
-  if (options?.commandPrefix) {
-    for (const file of files) {
-      const oldPath = path2.join(destinationPath, file);
-      const newPath = path2.join(destinationPath, options.commandPrefix + file);
-      await fs.rename(oldPath, newPath);
+        );
+        await fs.writeFile(filePath, modifiedContent);
+      }
     }
   }
   let templateInjected = false;
@@ -696,6 +722,88 @@ ${allowedToolsYaml}
   };
 }
 
+// scripts/cli-options.ts
+init_esm_shims();
+var CLI_OPTIONS = [
+  {
+    flag: "--variant",
+    key: "variant",
+    type: "string",
+    description: "Command variant (with-beads, without-beads)",
+    example: "--variant=with-beads",
+    requiredForNonInteractive: true
+  },
+  {
+    flag: "--scope",
+    key: "scope",
+    type: "string",
+    description: "Installation scope (project, user)",
+    example: "--scope=project",
+    requiredForNonInteractive: true
+  },
+  {
+    flag: "--prefix",
+    key: "prefix",
+    type: "string",
+    description: "Add prefix to command names",
+    example: "--prefix=my-",
+    requiredForNonInteractive: true
+  },
+  {
+    flag: "--commands",
+    key: "commands",
+    type: "array",
+    description: "Install only specific commands",
+    example: "--commands=commit,red,green"
+  },
+  {
+    flag: "--skip-template-injection",
+    key: "skipTemplateInjection",
+    type: "boolean",
+    description: "Skip injecting project CLAUDE.md customizations"
+  },
+  {
+    flag: "--update-existing",
+    key: "updateExisting",
+    type: "boolean",
+    description: "Only update already-installed commands"
+  },
+  {
+    flag: "--overwrite",
+    key: "overwrite",
+    type: "boolean",
+    description: "Overwrite conflicting files without prompting"
+  },
+  {
+    flag: "--skip-on-conflict",
+    key: "skipOnConflict",
+    type: "boolean",
+    description: "Skip conflicting files without prompting"
+  }
+];
+function generateHelpText() {
+  const lines = [
+    "Usage: npx @wbern/claude-instructions [options]",
+    "",
+    "Options:"
+  ];
+  for (const opt of CLI_OPTIONS) {
+    const suffix = opt.type === "string" ? "=<value>" : opt.type === "array" ? "=<list>" : "";
+    const padding = 28 - (opt.flag.length + suffix.length);
+    lines.push(
+      `  ${opt.flag}${suffix}${" ".repeat(Math.max(1, padding))}${opt.description}`
+    );
+  }
+  lines.push("  --help, -h                  Show this help message");
+  return lines.join("\n");
+}
+
+// scripts/tty.ts
+init_esm_shims();
+function isInteractiveTTY() {
+  return process.stdout.isTTY === true;
+}
+
 // scripts/cli.ts
 var pc = process.env.FORCE_COLOR ? import_picocolors.default.createColors(true) : import_picocolors.default;
 function splitChangeIntoLines(value) {
@@ -840,6 +948,13 @@ async function main(args) {
       }
     }
   } else {
+    if (!isInteractiveTTY()) {
+      const requiredFlags = CLI_OPTIONS.filter(
+        (opt) => opt.requiredForNonInteractive
+      ).map((opt) => opt.flag).join(", ");
+      log.warn(`Non-interactive mode requires ${requiredFlags} arguments`);
+      return;
+    }
     variant = await select({
       message: "Select variant",
       options: [...VARIANT_OPTIONS]
@@ -904,9 +1019,11 @@ async function main(args) {
       variant
     );
     if (requestedToolsOptions.length > 0) {
-      selectedAllowedTools = await multiselect({
+      selectedAllowedTools = await groupMultiselect({
         message: "Select allowed tools for commands (optional)",
-        options: requestedToolsOptions,
+        options: {
+          "All tools": requestedToolsOptions
+        },
         required: false
       });
       if (isCancel(selectedAllowedTools)) {
@@ -916,7 +1033,8 @@ async function main(args) {
   }
   const existingFiles = cachedExistingFiles ?? await checkExistingFiles(void 0, variant, scope, {
     commandPrefix,
-    commands: selectedCommands
+    commands: selectedCommands,
+    allowedTools: selectedAllowedTools
   });
   const skipFiles = [];
   if (!args?.overwrite && !args?.skipOnConflict) {
@@ -999,83 +1117,12 @@ async function main(args) {
 
 If Claude Code is already running, restart it to pick up the new commands.
 
+Try it out: /red clicking submit with empty email shows validation error
+
 Happy TDD'ing!`
   );
 }
 
-// scripts/cli-options.ts
-init_esm_shims();
-var CLI_OPTIONS = [
-  {
-    flag: "--variant",
-    key: "variant",
-    type: "string",
-    description: "Command variant (with-beads, without-beads)",
-    example: "--variant=with-beads"
-  },
-  {
-    flag: "--scope",
-    key: "scope",
-    type: "string",
-    description: "Installation scope (project, user)",
-    example: "--scope=project"
-  },
-  {
-    flag: "--prefix",
-    key: "prefix",
-    type: "string",
-    description: "Add prefix to command names",
-    example: "--prefix=my-"
-  },
-  {
-    flag: "--commands",
-    key: "commands",
-    type: "array",
-    description: "Install only specific commands",
-    example: "--commands=commit,red,green"
-  },
-  {
-    flag: "--skip-template-injection",
-    key: "skipTemplateInjection",
-    type: "boolean",
-    description: "Skip injecting project CLAUDE.md customizations"
-  },
-  {
-    flag: "--update-existing",
-    key: "updateExisting",
-    type: "boolean",
-    description: "Only update already-installed commands"
-  },
-  {
-    flag: "--overwrite",
-    key: "overwrite",
-    type: "boolean",
-    description: "Overwrite conflicting files without prompting"
-  },
-  {
-    flag: "--skip-on-conflict",
-    key: "skipOnConflict",
-    type: "boolean",
-    description: "Skip conflicting files without prompting"
-  }
-];
-function generateHelpText() {
-  const lines = [
-    "Usage: npx @wbern/claude-instructions [options]",
-    "",
-    "Options:"
-  ];
-  for (const opt of CLI_OPTIONS) {
-    const suffix = opt.type === "string" ? "=<value>" : opt.type === "array" ? "=<list>" : "";
-    const padding = 28 - (opt.flag.length + suffix.length);
-    lines.push(
-      `  ${opt.flag}${suffix}${" ".repeat(Math.max(1, padding))}${opt.description}`
-    );
-  }
-  lines.push("  --help, -h                  Show this help message");
-  return lines.join("\n");
-}
-
 // scripts/bin.ts
 function parseArgs(argv) {
   const args = {};

package/package.json

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