sticky-note-cli 2.6.12 → 2.6.14

package/README.md

@@ -42,7 +42,14 @@ their next session by relevance.
 
 ---
 
-## What's New in V2.5
+## What's New in V2.6
+
+- **Overlap detection**: Warns when you're working on files another teammate has open/stuck threads on. Three delivery channels: injected context, stderr banner, and preToolUse deny (Copilot CLI)
+- **File claiming**: `npx sticky-note-cli claim src/auth.ts "refactoring auth flow"` — declare intent to work on files
+- **Auto-close Copilot CLI threads**: Threads from Copilot CLI sessions auto-close after configurable inactivity (default 24h), since Copilot CLI has no session-end signal
+- **PID-keyed session isolation**: Concurrent Copilot CLI sessions get independent overlap dedup via `COPILOT_LOADER_PID`
+
+### What's New in V2.5
 
 - **Smart injection (two-tier)**: Stuck threads injected eagerly at session start; all other threads injected lazily when you first touch a file they authored — via built-in git blame attribution
 - **Thread resume (local)**: `npx sticky-note-cli resume-thread --query "auth fix" --user alice` — natural language thread discovery with text similarity + file attribution ranking
@@ -148,7 +155,7 @@ injects the top 3–5 (under token budget) as additional context.
 
 | Signal | Weight | Description |
 |--------|--------|-------------|
-| File overlap | 3 | Thread files match your recent git changes |
+| File overlap | 3 per file (max 5) | Thread files match your recent git changes |
 | Branch match | 2 | Thread is on your current branch |
 | Recency | 2 | Decays 0.2 per day from last activity |
 | Stuck status | +2 | Boost for threads marked stuck |
@@ -321,6 +328,8 @@ npx sticky-note-cli resume --clear # Cancel active resume
 npx sticky-note-cli resume-thread  # Smart resume: --query, --user, --file (V2.5)
 npx sticky-note-cli audit          # Query merged audit trail (all users)
 npx sticky-note-cli who            # Show active and recent team members
+npx sticky-note-cli overlap        # Detect file overlaps with teammates (V2.6)
+npx sticky-note-cli claim <files>  # Declare intent to work on files (V2.6)
 npx sticky-note-cli switch <branch> # Safe branch switch (auto-stashes data)
 npx sticky-note-cli gc             # Tombstone expired threads
 npx sticky-note-cli reset          # Wipe all threads (--force, --keep-audit)
@@ -349,16 +358,20 @@ Edit `.sticky-note/sticky-note-config.json`:
 ```json
 {
   "stale_days": 14,
+  "copilot_cli_auto_close_hours": 24,
+  "inject_token_budget": 1000,
   "mcp_servers": [],
   "skills": [],
   "conventions": ["Use TypeScript strict mode", "Test before commit"],
-  "hook_version": "2.5.0"
+  "hook_version": "2.6.12"
 }
 ```
 
 | Key            | Description                              | Default |
 |----------------|------------------------------------------|---------|
 | `stale_days`   | Days before threads expire + gc cleanup  | `14`    |
+| `copilot_cli_auto_close_hours` | Hours before idle Copilot CLI threads auto-close | `24` |
+| `inject_token_budget` | Max tokens for per-prompt thread injection | `1000` |
 | `mcp_servers`  | Shared MCP server references             | `[]`    |
 | `skills`       | Team skill definitions                   | `[]`    |
 | `conventions`  | Team coding conventions (injected)       | `[]`    |

package/bin/cli.js

@@ -526,12 +526,29 @@ async function cmdInit() {
     gitignoreContent = fs.readFileSync(gitignorePath, "utf-8");
   }
 
+  // Fix overly broad .claude/ ignore that blocks hook sharing
+  let gitignoreChanged = false;
+  if (gitignoreContent) {
+    const lines = gitignoreContent.split(/\r?\n/);
+    const filtered = lines.filter((line) => {
+      const trimmed = line.trim();
+      // Remove lines that ignore all of .claude/ (but keep targeted entries)
+      return trimmed !== ".claude/" && trimmed !== ".claude";
+    });
+    if (filtered.length !== lines.length) {
+      gitignoreContent = filtered.join("\n");
+      fs.writeFileSync(gitignorePath, gitignoreContent);
+      gitignoreChanged = true;
+      print("  [OK] .gitignore: removed broad .claude/ ignore (hooks will be shared via git)");
+    }
+  }
+
   const missingEntries = ignoreAdditions.filter((e) => !gitignoreContent.includes(e.trim()));
   if (missingEntries.length > 0) {
     const block = "\n# Sticky Note\n" + missingEntries.join("\n") + "\n";
     fs.appendFileSync(gitignorePath, block);
     print("  [OK] .gitignore updated");
-  } else {
+  } else if (!gitignoreChanged) {
     print("  ⏭️  .gitignore already configured");
   }
 
@@ -623,6 +640,17 @@ async function cmdInit() {
     print("  [OK] .git/hooks/post-rewrite (attribution survives rebase)");
   }
 
+  // Force-add .claude/hooks/ and .claude/settings.json so git tracks them
+  // (needed if .claude/ was previously in .gitignore)
+  try {
+    execFileSync("git", ["add", "--force", ".claude/hooks/", ".claude/settings.json"], {
+      cwd: process.cwd(), stdio: ["pipe", "pipe", "pipe"],
+    });
+    print("  [OK] .claude/hooks/ and .claude/settings.json staged for git");
+  } catch (err) {
+    debugLog("git add --force .claude/ failed: " + (err.message || err));
+  }
+
   // Done!
   print("\n  ✨ Sticky Note V2 initialized!\n");
   print("  Next steps:");
@@ -699,6 +727,44 @@ function cmdUpdate() {
 
   // Upgrade .gitattributes from merge=union to custom driver
   const gitattrsPath = path.join(process.cwd(), ".gitattributes");
+
+  // Fix overly broad .claude/ gitignore that blocks hook sharing
+  const gitignorePath = path.join(process.cwd(), ".gitignore");
+  if (fs.existsSync(gitignorePath)) {
+    let gitignoreContent = fs.readFileSync(gitignorePath, "utf-8");
+    const lines = gitignoreContent.split(/\r?\n/);
+    const filtered = lines.filter((line) => {
+      const trimmed = line.trim();
+      return trimmed !== ".claude/" && trimmed !== ".claude";
+    });
+    if (filtered.length !== lines.length) {
+      fs.writeFileSync(gitignorePath, filtered.join("\n"));
+      print("  [OK] .gitignore: removed broad .claude/ ignore (hooks will be shared via git)");
+
+      // Ensure targeted ignores are present
+      const ignoreAdditions = fs
+        .readFileSync(path.join(TEMPLATES_DIR, "gitignore-additions.txt"), "utf-8")
+        .trim()
+        .split(/\r?\n/)
+        .filter((l) => l.trim() && !l.startsWith("#"));
+      const updatedContent = fs.readFileSync(gitignorePath, "utf-8");
+      const missing = ignoreAdditions.filter((e) => !updatedContent.includes(e.trim()));
+      if (missing.length > 0) {
+        fs.appendFileSync(gitignorePath, "\n# Sticky Note\n" + missing.join("\n") + "\n");
+      }
+
+      // Force-add previously ignored hook files so git starts tracking them
+      try {
+        execFileSync("git", ["add", "--force", ".claude/hooks/", ".claude/settings.json"], {
+          cwd: process.cwd(), stdio: ["pipe", "pipe", "pipe"],
+        });
+        print("  [OK] git add --force .claude/hooks/ .claude/settings.json");
+      } catch (err) {
+        debugLog("git add --force .claude/ failed: " + (err.message || err));
+      }
+    }
+  }
+
   if (fs.existsSync(gitattrsPath)) {
     let gitattrsContent = fs.readFileSync(gitattrsPath, "utf-8");
     const oldRule = ".sticky-note/sticky-note.json merge=union";
@@ -788,7 +854,7 @@ function cmdStatus() {
   if (fs.existsSync(memoryPath)) {
     try {
       const memory = JSON.parse(fs.readFileSync(memoryPath, "utf-8"));
-      const threads = memory.threads || [];
+      const threads = (memory.threads || []).filter(Boolean);
       const schemaVersion = memory.version || "2";
 
       const openThreads = threads.filter((t) => t.status === "open").length;
@@ -933,7 +999,7 @@ function cmdThreads() {
   }
 
   const memory = readJsonSafe(memoryPath, { threads: [] });
-  const threads = memory.threads || [];
+  const threads = (memory.threads || []).filter(Boolean);
 
   // Filter: show open, stuck, closed (not expired)
   const live = threads.filter((t) => ["open", "stuck", "closed", "stale"].includes(t.status));
@@ -991,7 +1057,7 @@ function cmdResume() {
   // resume --list: show resumable threads
   if (args.includes("--list") || args.length === 0) {
     const memory = readJsonSafe(memoryPath, { threads: [] });
-    const threads = memory.threads || [];
+    const threads = (memory.threads || []).filter(Boolean);
     const resumable = threads.filter((t) =>
       ["closed", "stuck", "open", "stale"].includes(t.status)
     );
@@ -1032,9 +1098,7 @@ function cmdResume() {
   // resume <thread-id>: set the resume signal
   const threadId = args[0];
   const memory = readJsonSafe(memoryPath, { threads: [] });
-  const threads = memory.threads || [];
-
-  // Support partial ID matching (first 8 chars)
+  const threads = (memory.threads || []).filter(Boolean);
   const match = threads.find((t) =>
     t.id === threadId || t.id.startsWith(threadId)
   );
@@ -1130,7 +1194,7 @@ function cmdReset() {
   const force = args.includes("--force");
 
   const memory = readJsonSafe(memoryPath, { version: "2", threads: [] });
-  const threadCount = (memory.threads || []).length;
+  const threadCount = (memory.threads || []).filter(Boolean).length;
 
   if (threadCount === 0) {
     print("  Nothing to reset -- 0 threads.");
@@ -1437,7 +1501,7 @@ function cmdOverlap() {
   const isMe = (user) => currentUserNames.has(user || "");
   const memory = readJsonSafe(memoryPath, { threads: [] });
   const threads = (memory.threads || []).filter(
-    (t) => t.status === "open" || t.status === "stuck"
+    (t) => t && (t.status === "open" || t.status === "stuck")
   );
 
   // Find overlaps
@@ -1786,7 +1850,7 @@ function cmdResumeThread() {
   }
 
   const memory = readJsonSafe(memoryPath, { threads: [] });
-  const threads = (memory.threads || []).filter((t) => t.status !== "expired");
+  const threads = (memory.threads || []).filter((t) => t && t.status !== "expired");
 
   // Load attribution engine for search
   let attribution;
@@ -2146,7 +2210,7 @@ function cmdGc() {
   const memory = readJsonSafe(memoryPath, { version: "2", threads: [] });
   const config = readJsonSafe(configPath, { stale_days: 14 });
   const staleDays = config.stale_days ?? 14;
-  const threads = memory.threads || [];
+  const threads = (memory.threads || []).filter(Boolean);
   const now = new Date();
 
   let tombstoned = 0;

package/package.json

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

package/templates/hooks/inject-context.js

@@ -408,7 +408,7 @@ function main() {
   }
 
   const memory = loadJson(getMemoryPath(), { version: "2", threads: [] });
-  const threads = memory.threads || [];
+  const threads = (memory.threads || []).filter(Boolean);
 
   const live = threads.filter(
     (t) => t.status === "open" || t.status === "stuck" || t.status === "closed"

package/templates/hooks/on-stop.js

@@ -213,7 +213,7 @@ async function main() {
   const narrative = buildNarrativeFromAudit(auditData);
   const workType = classifyWorkType(auditData);
 
-  const threads = memory.threads || [];
+  const threads = (memory.threads || []).filter(Boolean);
   let found = false;
 
   for (const thread of threads) {

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

@@ -175,7 +175,7 @@ function _checkOverlapsAndDeny() {
   let threads;
   try {
     const data = loadJson(getMemoryPath());
-    threads = data.threads || [];
+    threads = (data.threads || []).filter(Boolean);
   } catch (_) {
     return null;
   }

package/templates/hooks/session-end.js

@@ -765,7 +765,7 @@ function main() {
     filesTouched = [...new Set([...filesTouched, ...gitFiles])];
   }
 
-  const threads = memory.threads || [];
+  const threads = (memory.threads || []).filter(Boolean);
   memory.threads = threads;
   let existing = null;
 

package/templates/hooks/session-start.js

@@ -68,7 +68,7 @@ const {
 function ageStaleThreads(memory, staleDays) {
   const now = Date.now();
   let changed = false;
-  for (const thread of memory.threads || []) {
+  for (const thread of (memory.threads || []).filter(Boolean)) {
     if (thread.status !== "open" && thread.status !== "stuck") continue;
     const tsField =
       thread.last_activity_at || thread.updated_at || thread.created_at || "";
@@ -95,7 +95,7 @@ function ageStaleThreads(memory, staleDays) {
 function autoCloseCopilotCliThreads(memory, autoCloseHours) {
   const now = Date.now();
   let changed = false;
-  for (const thread of memory.threads || []) {
+  for (const thread of (memory.threads || []).filter(Boolean)) {
     if (thread.status !== "open") continue;
     if (thread.tool !== "copilot-cli") continue;
     const tsField =
@@ -468,7 +468,7 @@ function main() {
   const resumeThreadId = getResumeThreadId();
   let resumedThread = null;
   if (resumeThreadId) {
-    const threads = memory.threads || [];
+    const threads = (memory.threads || []).filter(Boolean);
     resumedThread = findThreadById(threads, resumeThreadId);
     if (resumedThread) {
       resumedThread.status = "open";
@@ -494,13 +494,13 @@ function main() {
   }
 
   // ── Build context pieces ──────────────────────────────
-  const threadResult = formatThreadsForInjection(memory.threads || []);
+  const threadResult = formatThreadsForInjection((memory.threads || []).filter(Boolean));
   const threadContext = threadResult.text;
   const configContext = formatConfigForInjection(config);
   const presenceData = loadAllPresence();
-  const presenceContext = formatPresence(presenceData, memory.threads || []);
+  const presenceContext = formatPresence(presenceData, (memory.threads || []).filter(Boolean));
   const overlapContext = formatOverlapWarnings(
-    memory.threads || [], getUser(), memory
+    (memory.threads || []).filter(Boolean), getUser(), memory
   );
 
   // V2.5: Mark eagerly-injected stuck threads so PreToolUse won't re-inject.

package/templates/hooks/sticky-attribution.js

@@ -165,7 +165,7 @@ function resolveViaHeuristic(sha, file) {
   const results = [];
   const normalizedFile = file ? normalizeSep(file) : null;
 
-  for (const thread of memory.threads || []) {
+  for (const thread of (memory.threads || []).filter(Boolean)) {
     if (thread.status === "expired") continue;
     if (!normalizedFile) continue;
 
@@ -230,7 +230,7 @@ function resolveThreads(attributionEntries) {
   const memory = utils.loadJson(utils.getMemoryPath(), { version: "2", threads: [] });
   const threads = [];
 
-  for (const thread of memory.threads || []) {
+  for (const thread of (memory.threads || []).filter(Boolean)) {
     if (thread.status === "expired") continue;
     if (sessionIds.has(thread.session_id) || sessionIds.has(thread.id)) {
       threads.push(thread);

package/templates/hooks/sticky-utils.js

@@ -214,8 +214,8 @@ function saveJson(filePath, data) {
 function saveMemoryMerged(memoryPath, memory) {
   try {
     const onDisk = loadJson(memoryPath, { threads: [] });
-    const onDiskThreads = Array.isArray(onDisk.threads) ? onDisk.threads : [];
-    const inMemoryThreads = Array.isArray(memory.threads) ? memory.threads : [];
+    const onDiskThreads = Array.isArray(onDisk.threads) ? onDisk.threads.filter(Boolean) : [];
+    const inMemoryThreads = Array.isArray(memory.threads) ? memory.threads.filter(Boolean) : [];
     const inMemoryIds = new Set(inMemoryThreads.map((t) => t.id));
 
     for (const diskThread of onDiskThreads) {