sticky-note-cli 2.6.4 → 2.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sticky-note-cli",
-  "version": "2.6.4",
+  "version": "2.6.6",
   "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

@@ -186,6 +186,27 @@ after. A raw `git checkout` or `git switch` will fail if sticky-note
 files have uncommitted changes. The alias `git sw <branch>` also works
 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:
+
+```
+⚠️ Overlap detected: [user] is working on [files] — [narrative summary]
+   Status: [STUCK/OPEN] | Resume: npx sticky-note resume [id]
+```
+
+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..."
+- Then continue with the user's actual request normally
+
+This pattern exists to prevent two teammates from wasting hours on the
+same problem. Treat it like a system alert, not optional context.
+
 ### `[STICKY-NOTE]` tags
 
 All sticky-note hooks prefix their output with `[STICKY-NOTE]`. When you

package/templates/copilot-instructions.md

@@ -168,17 +168,29 @@ if set up by `npx sticky-note init`.
 
 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** immediately tell the user:
+in your injected context, you **MUST** start your response with this
+exact banner format before doing ANYTHING else:
 
-1. Which teammates are working on overlapping files
-2. What they're working on (the thread narrative)
-3. Whether they're stuck (and what failed)
-4. How to coordinate (resume command)
+```
+⚠️ Overlap detected: [user] is working on [files] — [narrative summary]
+   Status: [STUCK/OPEN] | Resume: npx sticky-note resume [id]
+```
+
+Example:
+```
+⚠️ Overlap detected: alice is working on session-start.js, cli.js — fixing auth token refresh
+   Status: STUCK (tried retry logic, tokens expire mid-request) | Resume: npx sticky-note resume demo-ali
+```
+
+Rules:
+- This banner MUST be the **very first thing** in your response
+- 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..."
+- Then continue with the user's actual request normally
 
-**Do NOT silently absorb this context.** The overlap warning exists to
-prevent two people from wasting hours on the same problem. Surface it
-BEFORE doing any other work, even if the user asked you to do something
-else first.
+This pattern exists to prevent two teammates from wasting hours on the
+same problem. Treat it like a system alert, not optional context.
 
 ### `[STICKY-NOTE]` tags
 

package/templates/hooks/inject-context.js

@@ -442,7 +442,7 @@ function main() {
   const scored = [];
   for (const t of live) {
     // V2.5: Skip threads already injected this session by PreToolUse or session-start
-    if (isThreadInjected(t.id)) continue;
+    if (isThreadInjected(t.id, sessionId)) continue;
 
     let s = scoreThread(t, recentlyModified, currentBranch, currentUser, keywords);
     if (resumeThreadId && t.id === resumeThreadId) {

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

@@ -169,7 +169,7 @@ function main() {
 
   // Filter out already-injected threads
   const newThreads = fileAttr.threads.filter(
-    (t) => !isThreadInjected(t.thread ? t.thread.id : t.id)
+    (t) => !isThreadInjected(t.thread ? t.thread.id : t.id, sessionId)
   );
 
   if (newThreads.length === 0) {

package/templates/hooks/sticky-utils.js

@@ -569,8 +569,14 @@ function clearInjectedSet() {
   }
 }
 
-function isThreadInjected(threadId) {
+function isThreadInjected(threadId, sessionId) {
   const data = loadInjectedSet();
+  // Only consider threads injected in the SAME session — the file is shared
+  // across concurrent sessions and stale entries from other sessions must
+  // not suppress injection.
+  if (sessionId && data.session_id && data.session_id !== sessionId) {
+    return false;
+  }
   return (data.thread_ids || []).includes(threadId);
 }