@wbern/claude-instructions 1.20.0 → 1.21.0

package/README.md

@@ -134,7 +134,7 @@ Only the first file found is used.
 
 ### Main Workflow
 
-Follow this workflow from planning to shipping:
+This is the core TDD workflow. Additional utility commands (worktrees, spikes, etc.) are listed in [Available Commands](#available-commands) below.
 
 ```mermaid
 flowchart TB
@@ -179,28 +179,6 @@ flowchart TB
     style Done fill:#c8e6c9
 ```
 
-### Other Commands
-
-Available anytime during your workflow:
-
-```mermaid
-flowchart TB
-    Utils[<b>UTILITIES</b>]
-    Utils --> Spike[🔬 /spike<br/>Exploratory coding before TDD]
-    Utils --> TDD[📚 /tdd<br/>Remind agent about TDD]
-    Utils --> AddCommand[➕ /add-command<br/>Create custom commands]
-    Utils --> Summarize[📄 /summarize<br/>Summarize conversation<br/><i>Optional: Beads MCP</i>]
-    Utils --> Gap[🔍 /gap<br/>Find unaddressed items<br/><i>Optional: Beads MCP</i>]
-    Utils --> Beepboop[🤖 /beepboop<br/>AI attribution]
-
-    Worktree[<b>WORKTREE MANAGEMENT</b>]
-    Worktree --> WorktreeAdd[➕ /worktree-add<br/>Create new worktree<br/><i>Requires: GitHub MCP</i>]
-    Worktree --> WorktreeCleanup[🧹 /worktree-cleanup<br/>Clean up merged worktrees<br/><i>Requires: GitHub MCP</i>]
-
-    style Utils fill:#fff9c4
-    style Worktree fill:#f3e5f5
-```
-
 ## Available Commands
 
 ### Planning

package/bin/cli.js

@@ -742,8 +742,7 @@ var CLI_OPTIONS = [
     key: "prefix",
     type: "string",
     description: "Add prefix to command names",
-    example: "--prefix=my-",
-    requiredForNonInteractive: true
+    example: "--prefix=my-"
   },
   {
     flag: "--commands",
@@ -926,10 +925,10 @@ async function main(args) {
   let selectedCommands;
   let selectedAllowedTools;
   let cachedExistingFiles;
-  if (args?.variant && args?.scope && args?.prefix !== void 0) {
+  if (args?.variant && args?.scope) {
     variant = args.variant;
     scope = args.scope;
-    commandPrefix = args.prefix;
+    commandPrefix = args.prefix ?? "";
     selectedCommands = args.commands;
     if (args.updateExisting) {
       cachedExistingFiles = await checkExistingFiles(
@@ -1034,7 +1033,14 @@ async function main(args) {
     allowedTools: selectedAllowedTools
   });
   const skipFiles = [];
-  if (!args?.overwrite && !args?.skipOnConflict) {
+  const shouldSkipConflicts = args?.skipOnConflict || !isInteractiveTTY();
+  if (args?.overwrite) {
+    for (const file of existingFiles) {
+      if (!file.isIdentical) {
+        log.info(`Overwriting ${file.filename}`);
+      }
+    }
+  } else if (!shouldSkipConflicts) {
     const conflictingFiles = existingFiles.filter((f) => !f.isIdentical);
     const hasMultipleConflicts = conflictingFiles.length > 1;
     let overwriteAllSelected = false;
@@ -1089,12 +1095,18 @@ async function main(args) {
         }
       }
     }
-  } else if (args?.skipOnConflict) {
+  } else if (shouldSkipConflicts) {
     for (const file of existingFiles) {
       if (!file.isIdentical) {
         skipFiles.push(file.filename);
+        log.warn(`Skipping ${file.filename} (conflict)`);
       }
     }
+    if (skipFiles.length > 0 && !isInteractiveTTY()) {
+      log.info(
+        "To resolve conflicts, run interactively or use --overwrite to overwrite"
+      );
+    }
   }
   const result = await generateToDirectory(
     void 0,

package/package.json

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