@codihaus/claude-skills 1.6.5 → 1.6.6

package/README.md

@@ -138,8 +138,8 @@ Creates BRD + Use Cases
 
 Skills are installed to `.claude/skills/`. You can customize:
 
-- **`.claude/settings.local.json`** - Claude Code permissions
-- **`.claude/hooks.json`** - Automation hooks
+- **`.claude/settings.json`** - Automation hooks (checked into git for team)
+- **`.claude/settings.local.json`** - Claude Code permissions (gitignored, personal)
 - **`CLAUDE.md`** - Project-specific instructions
 
 ## Updating

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codihaus/claude-skills",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "Claude Code skills for software development workflow",
   "main": "src/index.js",
   "bin": {

package/src/utils/config.js

@@ -57,13 +57,14 @@ const DEFAULT_SETTINGS = {
   }
 };
 
-// Hooks are now configured in settings.json (see DEFAULT_SETTINGS)
+// Hooks are configured in BOTH settings.json AND settings.local.json
+// settings.json = team-shared (checked in), settings.local.json = personal (gitignored)
+// Claude Code merges them, with settings.local.json taking precedence
 
 /**
  * Set up Claude Code settings
- * Creates TWO files:
- * - settings.json (with hooks, checked into git)
- * - settings.local.json (with permissions, gitignored)
+ * Creates BOTH settings.json (with hooks for team) AND settings.local.json (with hooks+permissions)
+ * This ensures hooks work regardless of which file Claude Code prioritizes
  */
 export async function setupSettings(projectPath, options = {}) {
   const claudePath = path.join(projectPath, '.claude');
@@ -72,23 +73,20 @@ export async function setupSettings(projectPath, options = {}) {
 
   await fs.ensureDir(claudePath);
 
-  // Create settings.json with hooks (for team, checked in)
-  const settingsJsonContent = {
+  // Create settings.json with hooks (for team, checked into git)
+  const settingsJson = {
     hooks: DEFAULT_SETTINGS.hooks
   };
+  await fs.writeJson(settingsPath, settingsJson, { spaces: 2 });
 
-  await fs.writeJson(settingsPath, settingsJsonContent, { spaces: 2 });
-
-  // Create/update settings.local.json with permissions (personal, gitignored)
-  let localSettings = {
-    permissions: DEFAULT_SETTINGS.permissions
-  };
+  // Create/merge settings.local.json with hooks + permissions (personal, gitignored)
+  let settingsLocal = DEFAULT_SETTINGS;
 
   // Merge with existing if present
   if (await fs.pathExists(settingsLocalPath)) {
     try {
       const existing = await fs.readJson(settingsLocalPath);
-      localSettings = {
+      settingsLocal = {
         permissions: {
           allow: [...new Set([
             ...(existing.permissions?.allow || []),
@@ -98,24 +96,25 @@ export async function setupSettings(projectPath, options = {}) {
             ...(existing.permissions?.deny || []),
             ...(DEFAULT_SETTINGS.permissions?.deny || [])
           ])]
-        }
+        },
+        hooks: DEFAULT_SETTINGS.hooks
       };
     } catch (e) {
       // Invalid JSON, use defaults
     }
   }
 
-  await fs.writeJson(settingsLocalPath, localSettings, { spaces: 2 });
+  await fs.writeJson(settingsLocalPath, settingsLocal, { spaces: 2 });
 
   return {
     settingsPath,
     settingsLocalPath,
-    settings: { ...settingsJsonContent, ...localSettings }
+    settings: settingsLocal
   };
 }
 
 /**
- * Set up hook scripts (hooks config is in settings.json)
+ * Set up hook scripts (hooks config is in both settings.json and settings.local.json)
  */
 export async function setupHooks(projectPath, options = {}) {
   if (options.noHooks) return null;

package/templates/HOOK_TRIGGER_TEST.md

@@ -124,11 +124,11 @@ After running `npx @codihaus/claude-skills init`, verify:
 
 ```bash
 # Check hook configuration
-cat .claude/hooks.json | jq '.postToolUse[0].matcher.path'
-# Should output: "plans/**/*.md"
+cat .claude/settings.json | jq '.hooks.PostToolUse[0].matcher'
+# Should output: "Write|Edit"
 
-cat .claude/hooks.json | jq '.postToolUse[0].command'
-# Should output: "bash .claude/scripts/safe-graph-update.sh $PATH"
+cat .claude/settings.json | jq '.hooks.PostToolUse[0].hooks[0].command'
+# Should contain: "bash .claude/scripts/safe-graph-update.sh"
 
 # Test the safe wrapper script
 bash .claude/scripts/safe-graph-update.sh plans/brd/README.md

package/templates/hooks-guide.md

@@ -17,34 +17,34 @@ Hooks allow you to run commands automatically in response to Claude Code events.
 
 ## Best Practices
 
-### 1. Always Add Retry Limits
+### 1. Correct Hook Structure
+
+Hooks go in `.claude/settings.json`:
 
 ```json
 {
-  "postToolUse": [{
-    "matcher": {
-      "toolName": "Write|Edit",
-      "path": "plans/**/*.md"
-    },
-    "command": "bash .claude/scripts/safe-graph-update.sh $PATH",
-    "retries": {
-      "maxAttempts": 3,
-      "backoff": "exponential",
-      "failureAction": "warn"
-    },
-    "timeout": 5000
-  }]
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Write|Edit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "jq -r '.tool_input.file_path // empty' | { read file_path; if [ -n \"$file_path\" ] && echo \"$file_path\" | grep -q 'plans/.*\\.md$'; then bash .claude/scripts/safe-graph-update.sh \"$file_path\" 2>/dev/null || true; fi; }"
+          }
+        ]
+      }
+    ]
+  }
 }
 ```
 
-**Key Fields:**
-- `maxAttempts`: Stop after N failures (recommended: 2-3)
-- `backoff`: Wait strategy ("none", "linear", "exponential")
-- `failureAction`: What to do after max attempts
-  - `"warn"` - Show warning, continue (recommended)
-  - `"error"` - Stop and ask user for help
-  - `"ignore"` - Silent failure (not recommended)
-- `timeout`: Kill hook after N milliseconds (recommended: 5000-10000)
+**Key Points:**
+- Hooks are in `settings.json` (checked into git for team)
+- Command uses bash subshell with `read` to capture file path
+- Includes `|| true` for graceful failure (non-blocking)
+- Filters to only run on `plans/**/*.md` files
+- Redirects stderr with `2>/dev/null` to avoid noise
 
 ### 2. Make Commands Fail Gracefully
 
@@ -161,7 +161,7 @@ fi
 timeout 10s python3 .claude/scripts/graph.py --check-path "$1" || true
 ```
 
-Then in hooks.json:
+Then in settings.json:
 ```json
 {
   "command": "bash .claude/scripts/safe-graph-update.sh $PATH"
@@ -251,7 +251,7 @@ To temporarily disable a problematic hook:
 }
 ```
 
-Or delete `.claude/hooks.json` entirely (hooks are optional).
+Or delete `.claude/settings.json` entirely (hooks are optional).
 
 ## Example: Robust Hook Configuration