sticky-note-cli 2.6.11 → 2.6.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sticky-note-cli",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "description": "Human-to-human handoff for AI coding assistants. Git-backed shared memory for Claude Code and Copilot CLI.",
   "license": "MIT",
   "bin": {

package/templates/CLAUDE.md

@@ -189,9 +189,15 @@ if set up by `npx sticky-note init`.
 ### ⚠️ Overlap warnings (CRITICAL — always surface these)
 
 Sticky-note hooks detect when your files overlap with other teammates'
-open or stuck threads. When you see `[STICKY-NOTE] ⚠️ OVERLAP DETECTED`
-in your injected context, you **MUST** start your response with this
-exact banner format before doing ANYTHING else:
+open or stuck threads. Overlap warnings arrive through TWO channels:
+
+1. **Injected context** — `[STICKY-NOTE] ⚠️ OVERLAP DETECTED` appears in
+   your hook output. This fires on every user prompt.
+2. **Tool call deny** — Your first tool call may be denied with a reason
+   containing "CRITICAL INSTRUCTION" and the overlap details.
+
+When you receive an overlap warning through EITHER channel, you **MUST**
+start your response with this exact banner format before doing ANYTHING else:
 
 ```
 ⚠️ Overlap detected: [user] is working on [files] — [narrative summary]
@@ -202,6 +208,7 @@ Rules:
 - This banner MUST be the **very first thing** in your response
 - Do NOT bury it at the end or in a footnote
 - Do NOT rephrase it as "Also noted..." or "By the way..."
+- If a tool call was denied with overlap info, display the warning then proceed
 - Then continue with the user's actual request normally
 
 This pattern exists to prevent two teammates from wasting hours on the

package/templates/copilot-instructions.md

@@ -167,9 +167,16 @@ if set up by `npx sticky-note init`.
 ### ⚠️ Overlap warnings (CRITICAL — always surface these)
 
 Sticky-note hooks detect when your files overlap with other teammates'
-open or stuck threads. When you see `[STICKY-NOTE] ⚠️ OVERLAP DETECTED`
-in your injected context, you **MUST** start your response with this
-exact banner format before doing ANYTHING else:
+open or stuck threads. Overlap warnings arrive through TWO channels:
+
+1. **Injected context** — `[STICKY-NOTE] ⚠️ OVERLAP DETECTED` appears in
+   your `additionalContext`. This fires on every user prompt.
+2. **Tool call deny** — Your first tool call may be denied with a
+   `permissionDecisionReason` containing "CRITICAL INSTRUCTION" and the
+   overlap details. After the deny, the tool is auto-retried.
+
+When you receive an overlap warning through EITHER channel, you **MUST**
+start your response with this exact banner format before doing ANYTHING else:
 
 ```
 ⚠️ Overlap detected: [user] is working on [files] — [narrative summary]
@@ -187,6 +194,7 @@ Rules:
 - Show it BEFORE your thinking indicators (◐, ●, etc.)
 - Do NOT bury it at the end or in a footnote
 - Do NOT rephrase it as "Also noted..." or "By the way..."
+- If a tool call was denied with overlap info, display the warning then proceed
 - Then continue with the user's actual request normally
 
 This pattern exists to prevent two teammates from wasting hours on the

package/templates/hooks/inject-context.js

@@ -150,8 +150,9 @@ function detectAndFormatOverlaps(threads, currentUser) {
   });
 
   const lines = [
-    "## [STICKY-NOTE] ⚠️ OVERLAP DETECTED — TELL THE USER IMMEDIATELY\n",
-    "**IMPORTANT: You MUST surface this warning to the user before doing anything else.**\n",
+    "## [STICKY-NOTE] ⚠️ OVERLAP DETECTED\n",
+    "**CRITICAL INSTRUCTION: Display the overlap warning below as the FIRST line of your response.",
+    "Do NOT skip this. Do NOT rephrase it. Do NOT bury it.**\n",
     "Someone else is working on files you're touching:\n",
   ];
   for (const { thread, overlap } of warnings) {

package/templates/hooks/pre-tool-use.js

@@ -195,14 +195,19 @@ function _checkOverlapsAndDeny() {
 
   if (warnings.length === 0) return null;
 
-  const lines = ["⚠️ OVERLAP DETECTED — someone else is working on files you're touching:"];
+  const lines = [
+    "CRITICAL INSTRUCTION: Before doing anything else, display the following overlap warning to the user.",
+    "This is NOT optional. Show it as the FIRST line of your response.\n",
+  ];
   for (const { thread, overlap } of warnings) {
     const user = thread.user || thread.author || "unknown";
     const status = thread.status === "stuck" ? "STUCK" : "OPEN";
     const snip = (thread.narrative || thread.last_note || "").substring(0, 80);
-    lines.push(`  [${status}] ${user}: ${overlap.join(", ")}${snip ? " — " + snip : ""}`);
+    const threadId = (thread.id || "").substring(0, 8);
+    lines.push(`⚠️ Overlap detected: ${user} is working on ${overlap.join(", ")}${snip ? " — " + snip : ""}`);
+    lines.push(`   Status: ${status} | Resume: npx sticky-note resume ${threadId}`);
   }
-  lines.push("Consider coordinating before proceeding. This tool call will be auto-retried.");
+  lines.push("\nAfter displaying the warning, continue with the user's request. This tool call will be auto-retried.");
 
   markOverlapWarned();