@spardutti/claude-skills 1.27.5 → 1.28.1

package/lib/setup-hook.mjs

@@ -2,25 +2,15 @@ import { mkdir, writeFile, readFile, chmod } from "node:fs/promises";
 import { join, resolve } from "node:path";
 
 // PreToolUse gate on Write|Edit|MultiEdit. Blocks the tool call unless
-// a per-prompt marker file exists at /tmp/claude-skill-gate-<UUID>,
-// where <UUID> is the uuid of the most recent typed user prompt. The
-// assistant creates the marker via Bash; Bash output is flushed
-// synchronously, so the marker is race-free against the message-buffering
-// behavior that broke the earlier text-sentinel approach (Claude Code
-// writes assistant content blocks to JSONL only after the turn completes,
-// so [skills-checked] text emitted in the same message as a tool_use is
-// invisible to PreToolUse). /tmp keeps the marker out of the project
-// directory so it can't leak into commits.
-//
-// LAST_PROMPT_UUID is detected by matching user-role lines whose content
-// is a JSON string ("role":"user","content":"..."), which excludes
-// tool_results, skill loads, task notifications, and slash-command
-// payloads (all of which use array content).
+// a per-session marker file exists at /tmp/claude-skill-gate-<SESSION_ID>.
+// Per-session (not per-prompt) so simple confirmations like "yes" don't
+// re-lock the gate after evaluation has already happened in the session.
+// The PostToolUse hook on Skill creates the marker automatically; for
+// all-SKIP cases the model can `touch` the path manually.
 //
 // Pass-through cases:
 //   - project has no .claude/skills/*/SKILL.md files
-//   - transcript_path missing or unreadable
-//   - no typed user prompt found in transcript
+//   - session_id missing from hook input
 const GATE_SCRIPT = `#!/bin/bash
 # PreToolUse gate: forces skill evaluation before file-writing tools run.
 
@@ -33,41 +23,53 @@ if ! find "$PROJECT_DIR" -path '*/.claude/skills/*/SKILL.md' 2>/dev/null | grep
   exit 0
 fi
 
-TRANSCRIPT=$(printf '%s' "$INPUT" | grep -o '"transcript_path":"[^"]*"' | head -1 | sed 's/"transcript_path":"//; s/"$//')
-if [ -z "$TRANSCRIPT" ] || [ ! -f "$TRANSCRIPT" ]; then
+SESSION_ID=$(printf '%s' "$INPUT" | grep -o '"session_id":"[^"]*"' | head -1 | sed 's/"session_id":"//; s/"$//')
+if [ -z "$SESSION_ID" ]; then
   exit 0
 fi
 
-LAST_LINE=$(grep -E '"role":"user","content":"' "$TRANSCRIPT" 2>/dev/null | tail -1)
-LAST_PROMPT_UUID=$(printf '%s' "$LAST_LINE" | grep -o '"uuid":"[^"]*"' | head -1 | sed 's/"uuid":"//;s/"$//')
-if [ -z "$LAST_PROMPT_UUID" ]; then
-  exit 0
-fi
-
-MARKER="/tmp/claude-skill-gate-$LAST_PROMPT_UUID"
+MARKER="/tmp/claude-skill-gate-$SESSION_ID"
 if [ -f "$MARKER" ]; then
-  find /tmp -maxdepth 1 -name 'claude-skill-gate-*' ! -name "claude-skill-gate-$LAST_PROMPT_UUID" -delete 2>/dev/null
   exit 0
 fi
 
 cat <<EOF
-{"hookSpecificOutput":{"hookEventName":"PreToolUse","permissionDecision":"deny","permissionDecisionReason":"Skill evaluation required before file edits. (1) List each available skill as ACTIVATE or SKIP with a one-line reason. (2) Call Skill() for any ACTIVATE entries. (3) Run this exact Bash command to record approval: touch /tmp/claude-skill-gate-$LAST_PROMPT_UUID  (4) Then retry the file edit. The marker is unique to this user prompt and is auto-cleaned on the next prompt."}}
+{"hookSpecificOutput":{"hookEventName":"PreToolUse","permissionDecision":"deny","permissionDecisionReason":"Skill evaluation required before file edits in this session. (1) List each available skill as ACTIVATE or SKIP with a one-line reason. (2) Call Skill() for any ACTIVATE entries — this auto-clears the gate for the rest of the session. If all skills are SKIP, run this exact Bash command instead: touch /tmp/claude-skill-gate-$SESSION_ID  (3) Then retry the file edit."}}
 EOF
 exit 0
 `;
 
+// PostToolUse on Skill: auto-creates the per-session gate marker.
+const AUTO_MARK_SCRIPT = `#!/bin/bash
+# PostToolUse on Skill: auto-marks the skill-gate as satisfied for the session.
+
+INPUT=$(cat)
+
+SESSION_ID=$(printf '%s' "$INPUT" | grep -o '"session_id":"[^"]*"' | head -1 | sed 's/"session_id":"//; s/"$//')
+if [ -z "$SESSION_ID" ]; then
+  exit 0
+fi
+
+touch "/tmp/claude-skill-gate-$SESSION_ID"
+exit 0
+`;
+
 const GATE_FILENAME = "skill-gate.sh";
+const AUTO_MARK_FILENAME = "skill-gate-automark.sh";
 const LEGACY_EVAL_FILENAME = "skill-forced-eval-hook.sh";
 
 export async function setupHook(targetDir = process.cwd()) {
   const resolved = resolve(targetDir);
   const hooksDir = join(resolved, ".claude", "hooks");
   const gatePath = join(hooksDir, GATE_FILENAME);
+  const autoMarkPath = join(hooksDir, AUTO_MARK_FILENAME);
   const settingsPath = join(resolved, ".claude", "settings.json");
 
   await mkdir(hooksDir, { recursive: true });
   await writeFile(gatePath, GATE_SCRIPT, { mode: 0o755 });
   await chmod(gatePath, 0o755);
+  await writeFile(autoMarkPath, AUTO_MARK_SCRIPT, { mode: 0o755 });
+  await chmod(autoMarkPath, 0o755);
 
   let settings = {};
   try {
@@ -103,8 +105,25 @@ export async function setupHook(targetDir = process.cwd()) {
     settings.hooks.PreToolUse = [gateEntry];
   }
 
+  // Register PostToolUse auto-mark on Skill.
+  const autoMarkCommand = `$CLAUDE_PROJECT_DIR/.claude/hooks/${AUTO_MARK_FILENAME}`;
+  const autoMarkEntry = {
+    matcher: "Skill",
+    hooks: [{ type: "command", command: autoMarkCommand }],
+  };
+
+  if (Array.isArray(settings.hooks.PostToolUse)) {
+    const exists = settings.hooks.PostToolUse.some((entry) =>
+      entry.hooks?.some((h) => h.command?.endsWith(AUTO_MARK_FILENAME))
+    );
+    if (!exists) settings.hooks.PostToolUse.push(autoMarkEntry);
+  } else {
+    settings.hooks.PostToolUse = [autoMarkEntry];
+  }
+
   await writeFile(settingsPath, JSON.stringify(settings, null, 2) + "\n", { mode: 0o644 });
 
   console.log(`  Hook installed: .claude/hooks/${GATE_FILENAME}`);
+  console.log(`  Hook installed: .claude/hooks/${AUTO_MARK_FILENAME}`);
   console.log(`  Settings updated: .claude/settings.json`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spardutti/claude-skills",
-  "version": "1.27.5",
+  "version": "1.28.1",
   "description": "CLI to install Claude Code skills from the claude-skills collection",
   "type": "module",
   "bin": {