sticky-note-cli 2.6.15 → 2.7.1

package/templates/hooks/session-start.js

@@ -354,68 +354,375 @@ function formatOverlapWarnings(threads, currentUser, memory) {
 
   if (warnings.length === 0 && claims.length === 0) return "";
 
+  const bar = "━".repeat(52);
   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",
-    "Someone else is working on files you're touching:\n",
+    "## [STICKY-NOTE] ⚠️ OVERLAP DETECTED\n",
+    "**You MUST display the banner below as the FIRST thing in your response.**\n",
+    "```",
+    `⚠️ ━━━ OVERLAP DETECTED ${bar.substring(0, 28)}`,
   ];
 
   for (const { thread, overlap } of warnings) {
     const user = thread.user || thread.author || "unknown";
-    const status = thread.status === "stuck" ? "[STUCK]" : "[OPEN]";
+    const statusEmoji = thread.status === "stuck" ? "🔴" : "🟡";
+    const statusLabel = thread.status === "stuck" ? "STUCK" : "OPEN";
     const narrative = thread.narrative || thread.last_note || "";
     const narrativeSnip = narrative.length > 100
       ? narrative.substring(0, 100) + "…"
       : narrative;
-    const branch = thread.branch ? ` on \`${thread.branch}\`` : "";
+    const branch = thread.branch ? ` · ${thread.branch}` : "";
     const threadId = (thread.id || "").substring(0, 8);
 
-    lines.push(`- ${status} **${user}**${branch}: ${overlap.join(", ")}`);
-    if (narrativeSnip) lines.push(`  _${narrativeSnip}_`);
+    lines.push("");
+    lines.push(`  ${statusEmoji} ${user} (${statusLabel})${branch}`);
+    lines.push(`     Files: ${overlap.join(", ")}`);
+    if (narrativeSnip) lines.push(`     "${narrativeSnip}"`);
     const failed = thread.failed_approaches || [];
     if (failed.length > 0) {
-      lines.push(`  ⚠️ ${failed.length} failed approach(es):`);
+      lines.push(`     ⚠️ ${failed.length} failed approach(es):`);
       for (const fa of failed.slice(0, 2)) {
-        lines.push(`    - ${(fa.description || "").substring(0, 80)}`);
+        lines.push(`       • ${(fa.description || "").substring(0, 80)}`);
       }
     }
-    if (threadId) {
-      lines.push(`  → Resume: \`npx sticky-note resume ${threadId}\``);
-    }
+    lines.push(`     → Resume: npx sticky-note resume ${threadId}`);
   }
 
   for (const claim of claims) {
-    const ago = claim.claimed_at || "";
-    lines.push(
-      `- 📌 **${claim.user}** claimed: ${(claim.files || []).join(", ")}` +
-        (claim.description ? ` — "${claim.description}"` : "")
-    );
+    lines.push("");
+    lines.push(`  📌 ${claim.user} (CLAIMED)`);
+    lines.push(`     Files: ${(claim.files || []).join(", ")}`);
+    if (claim.description) lines.push(`     "${claim.description}"`);
   }
 
+  lines.push("");
+  lines.push(bar);
+  lines.push("```");
   lines.push(
     "\n**Consider coordinating with these teammates before starting work.**"
   );
 
-  // Write a visible banner directly to stderr so the user sees it
-  const stderrLines = ["\n⚠️  OVERLAP DETECTED — someone else is touching your files:"];
+  // Write a styled banner to stderr so the user sees it in their terminal
+  const R = "\x1b[0m";
+  const Y = "\x1b[33m";
+  const BY = "\x1b[1;33m";
+  const BR = "\x1b[1;31m";
+  const BG = "\x1b[1;32m";
+  const B = "\x1b[1m";
+  const C = "\x1b[36m";
+  const D = "\x1b[2m";
+  const stderrLines = [
+    "",
+    `${Y}${bar}${R}`,
+    `${BY}  ⚠️  OVERLAP DETECTED${R}`,
+    `${Y}${bar}${R}`,
+  ];
   for (const { thread, overlap } of warnings) {
     const user = thread.user || thread.author || "unknown";
-    const status = thread.status === "stuck" ? "STUCK" : "OPEN";
+    const statusColor = thread.status === "stuck" ? BR : BG;
+    const statusLabel = thread.status === "stuck" ? "STUCK" : "OPEN";
     const narrative = thread.narrative || thread.last_note || "";
     const narrativeSnip = narrative.length > 80
       ? narrative.substring(0, 80) + "…"
       : narrative;
-    stderrLines.push(
-      `   [${status}] ${user}: ${overlap.join(", ")}` +
-      (narrativeSnip ? ` — ${narrativeSnip}` : "")
-    );
+    const branchStr = thread.branch ? ` ${D}·${R} ${C}${thread.branch}${R}` : "";
+    stderrLines.push(`${Y}  ┃${R}  ${statusColor}[${statusLabel}]${R} ${B}${user}${R}${branchStr}`);
+    stderrLines.push(`${Y}  ┃${R}    Files: ${overlap.join(", ")}`);
+    if (narrativeSnip) stderrLines.push(`${Y}  ┃${R}    ${D}"${narrativeSnip}"${R}`);
+    const threadId = (thread.id || "").substring(0, 8);
+    stderrLines.push(`${Y}  ┃${R}    → Resume: ${C}npx sticky-note resume ${threadId}${R}`);
   }
-  stderrLines.push("");
+  stderrLines.push(`${Y}${bar}${R}`, "");
   process.stderr.write(stderrLines.join("\n") + "\n");
 
   return lines.join("\n");
 }
 
+// ── MCP Server Auto-Registration ──────────────────────────
+
+// ── Backward compatibility migration ─────────────────────
+// Migrates old sticky-note-config.json arrays (mcp_servers, skills)
+// to the new .sticky-note/environment/ manifest format.
+function migrateOldEnvironmentConfig() {
+  const fs = require("fs");
+  const cwd = process.cwd();
+  const configPath = getConfigPath();
+  const config = loadJson(configPath, null);
+  if (!config) return;
+
+  // Only run once — skip if already migrated
+  if (config.environment_version) return;
+
+  const envDir = path.join(cwd, ".sticky-note", "environment");
+  const manifestPath = path.join(envDir, "manifest.json");
+
+  let changed = false;
+
+  // Migrate mcp_servers array to manifest.json keyed format
+  if (Array.isArray(config.mcp_servers) && config.mcp_servers.length > 0) {
+    fs.mkdirSync(envDir, { recursive: true });
+    const manifest = loadJson(manifestPath, { version: "1", mcp_servers: {} });
+    if (!manifest.mcp_servers) manifest.mcp_servers = {};
+    for (const entry of config.mcp_servers) {
+      if (!entry || !entry.name) continue;
+      if (manifest.mcp_servers[entry.name]) continue; // already present
+      const def = {};
+      if (entry.type) def.type = entry.type;
+      if (entry.command) def.command = entry.command;
+      if (entry.args) def.args = entry.args;
+      if (entry.env) def.env = entry.env;
+      manifest.mcp_servers[entry.name] = def;
+    }
+    saveJson(manifestPath, manifest);
+    changed = true;
+  }
+
+  // Migrate skills array to placeholder .md files
+  if (Array.isArray(config.skills) && config.skills.length > 0) {
+    const skillsDir = path.join(envDir, "skills");
+    fs.mkdirSync(skillsDir, { recursive: true });
+    for (const skill of config.skills) {
+      if (!skill || typeof skill !== "string") continue;
+      const skillFile = path.join(skillsDir, skill + ".md");
+      if (fs.existsSync(skillFile)) continue;
+      fs.writeFileSync(skillFile, `# ${skill}\n\nTODO: Add skill instructions here.\n`, "utf-8");
+    }
+    changed = true;
+  }
+
+  if (changed) {
+    config.environment_version = "1";
+    saveJson(configPath, config);
+  }
+}
+
+function ensureMcpServerRegistered() {
+  try {
+    const fs = require("fs");
+    const cwd = process.env.STICKY_CWD || process.cwd();
+    const mcpPath = path.join(cwd, ".mcp.json");
+
+    let mcp = {};
+    if (fs.existsSync(mcpPath)) {
+      try {
+        mcp = JSON.parse(fs.readFileSync(mcpPath, "utf-8"));
+      } catch (_) {
+        mcp = {};
+      }
+    }
+
+    mcp.mcpServers = mcp.mcpServers || {};
+    if (mcp.mcpServers["sticky-note"]) return; // already registered
+
+    mcp.mcpServers["sticky-note"] = {
+      type: "stdio",
+      command: "npx",
+      args: ["-y", "-p", "sticky-note-cli", "sticky-note", "mcp-server"],
+    };
+
+    fs.writeFileSync(mcpPath, JSON.stringify(mcp, null, 2) + "\n");
+  } catch (_) {
+    // Non-fatal — MCP server registration is best-effort
+  }
+}
+
+// ── Environment provisioning ──────────────────────────────
+
+function hasEnvPlaceholders(obj) {
+  if (obj == null) return false;
+  if (typeof obj === "string") return obj.includes("${");
+  if (Array.isArray(obj)) return obj.some(hasEnvPlaceholders);
+  if (typeof obj === "object") {
+    return Object.values(obj).some(hasEnvPlaceholders);
+  }
+  return false;
+}
+
+function ensureEnvironmentProvisioned() {
+  const fs = require("fs");
+  const cwd = process.cwd();
+  const envDir = path.join(cwd, ".sticky-note", "environment");
+  const hashFile = path.join(cwd, ".sticky-note", ".env-provision-hash");
+  const debug = !!process.env.STICKY_DEBUG;
+
+  if (!fs.existsSync(envDir)) return;
+
+  // Hash all files in .sticky-note/environment/ recursively
+  function hashDir(dir) {
+    const hash = crypto.createHash("sha256");
+    let entries;
+    try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch (_) { return hash; }
+    entries.sort((a, b) => a.name.localeCompare(b.name));
+    for (const ent of entries) {
+      const full = path.join(dir, ent.name);
+      if (ent.isDirectory()) {
+        hash.update("d:" + ent.name + "\n");
+        hash.update(hashDir(full).digest());
+      } else if (ent.isFile()) {
+        hash.update("f:" + ent.name + "\n");
+        try { hash.update(fs.readFileSync(full)); } catch (_) { /* skip */ }
+      }
+    }
+    return hash;
+  }
+
+  const currentHash = hashDir(envDir).digest("hex");
+
+  // Skip if hash matches (idempotent)
+  try {
+    const stored = fs.readFileSync(hashFile, "utf-8").trim();
+    if (stored === currentHash) {
+      if (debug) process.stderr.write("[sticky-note] environment unchanged, skipping provisioning\n");
+      return;
+    }
+  } catch (_) { /* no hash file yet */ }
+
+  if (debug) process.stderr.write("[sticky-note] provisioning team environment...\n");
+
+  const manifest = loadJson(path.join(envDir, "manifest.json"), {});
+
+  // ── MCP server provisioning (secret-free only) ──
+  const mcpServers = manifest.mcp_servers || {};
+  if (Object.keys(mcpServers).length > 0) {
+    const mcpPath = path.join(cwd, ".mcp.json");
+    const mcpConfig = loadJson(mcpPath, { mcpServers: {} });
+    if (!mcpConfig.mcpServers) mcpConfig.mcpServers = {};
+    let mcpChanged = false;
+    for (const [name, serverDef] of Object.entries(mcpServers)) {
+      if (mcpConfig.mcpServers[name]) continue; // already present
+      if (hasEnvPlaceholders(serverDef)) {
+        if (debug) process.stderr.write(`[sticky-note] skipping MCP server "${name}" (has placeholders)\n`);
+        continue;
+      }
+      mcpConfig.mcpServers[name] = serverDef;
+      mcpChanged = true;
+      if (debug) process.stderr.write(`[sticky-note] added MCP server "${name}"\n`);
+    }
+    if (mcpChanged) saveJson(mcpPath, mcpConfig);
+  }
+
+  // ── Skill provisioning ──
+  const skillsDir = path.join(envDir, "skills");
+  if (fs.existsSync(skillsDir)) {
+    let skillFiles;
+    try { skillFiles = fs.readdirSync(skillsDir).filter((f) => f.endsWith(".md")); } catch (_) { skillFiles = []; }
+    for (const file of skillFiles) {
+      const name = path.basename(file, ".md");
+      const content = fs.readFileSync(path.join(skillsDir, file), "utf-8");
+
+      // Claude Code format
+      const claudeSkillDir = path.join(cwd, ".claude", "plugins", "sticky-note-team", "skills", name);
+      fs.mkdirSync(claudeSkillDir, { recursive: true });
+      fs.writeFileSync(path.join(claudeSkillDir, "SKILL.md"), content, "utf-8");
+
+      // Copilot CLI format
+      const copilotSkillDir = path.join(cwd, ".github", "extensions", "sticky-note-team", "skills");
+      fs.mkdirSync(copilotSkillDir, { recursive: true });
+      fs.writeFileSync(path.join(copilotSkillDir, name + ".md"), content, "utf-8");
+    }
+  }
+
+  // Auto-generate plugin.json for Claude Code
+  const pluginJsonDir = path.join(cwd, ".claude", "plugins", "sticky-note-team", ".claude-plugin");
+  fs.mkdirSync(pluginJsonDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(pluginJsonDir, "plugin.json"),
+    JSON.stringify({
+      name: "sticky-note-team",
+      version: "1.0.0",
+      description: "Team skills, agents, and commands provisioned by sticky-note",
+    }, null, 2) + "\n",
+    "utf-8"
+  );
+
+  // Auto-generate extension.mjs for Copilot CLI
+  const extDir = path.join(cwd, ".github", "extensions", "sticky-note-team");
+  fs.mkdirSync(extDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(extDir, "extension.mjs"),
+    [
+      "// Auto-generated by sticky-note environment provisioning",
+      "export default {",
+      '  name: "sticky-note-team",',
+      '  version: "1.0.0",',
+      '  description: "Team skills, agents, and commands provisioned by sticky-note",',
+      "};",
+      "",
+    ].join("\n"),
+    "utf-8"
+  );
+  fs.writeFileSync(
+    path.join(extDir, "package.json"),
+    JSON.stringify({
+      name: "sticky-note-team",
+      version: "1.0.0",
+      description: "Team skills, agents, and commands provisioned by sticky-note",
+      type: "module",
+      main: "extension.mjs",
+    }, null, 2) + "\n",
+    "utf-8"
+  );
+
+  // ── Agent provisioning ──
+  const agentsDir = path.join(envDir, "agents");
+  if (fs.existsSync(agentsDir)) {
+    let agentFiles;
+    try { agentFiles = fs.readdirSync(agentsDir).filter((f) => f.endsWith(".md")); } catch (_) { agentFiles = []; }
+    for (const file of agentFiles) {
+      const name = path.basename(file, ".md");
+      const content = fs.readFileSync(path.join(agentsDir, file), "utf-8");
+
+      const claudeAgentDir = path.join(cwd, ".claude", "plugins", "sticky-note-team", "agents");
+      fs.mkdirSync(claudeAgentDir, { recursive: true });
+      fs.writeFileSync(path.join(claudeAgentDir, name + ".md"), content, "utf-8");
+
+      const copilotAgentDir = path.join(cwd, ".github", "extensions", "sticky-note-team", "agents");
+      fs.mkdirSync(copilotAgentDir, { recursive: true });
+      fs.writeFileSync(path.join(copilotAgentDir, name + ".md"), content, "utf-8");
+    }
+  }
+
+  // ── Command provisioning ──
+  const commandsDir = path.join(envDir, "commands");
+  if (fs.existsSync(commandsDir)) {
+    let commandFiles;
+    try { commandFiles = fs.readdirSync(commandsDir).filter((f) => f.endsWith(".md")); } catch (_) { commandFiles = []; }
+    for (const file of commandFiles) {
+      const name = path.basename(file, ".md");
+      const content = fs.readFileSync(path.join(commandsDir, file), "utf-8");
+
+      const claudeCmdDir = path.join(cwd, ".claude", "plugins", "sticky-note-team", "commands");
+      fs.mkdirSync(claudeCmdDir, { recursive: true });
+      fs.writeFileSync(path.join(claudeCmdDir, name + ".md"), content, "utf-8");
+
+      const copilotCmdDir = path.join(cwd, ".github", "extensions", "sticky-note-team", "commands");
+      fs.mkdirSync(copilotCmdDir, { recursive: true });
+      fs.writeFileSync(path.join(copilotCmdDir, name + ".md"), content, "utf-8");
+    }
+  }
+
+  // ── Permission merging ──
+  const permissions = manifest.permissions;
+  if (Array.isArray(permissions) && permissions.length > 0) {
+    const settingsPath = path.join(cwd, ".claude", "settings.local.json");
+    const settings = loadJson(settingsPath, {});
+    if (!Array.isArray(settings.allowedTools)) settings.allowedTools = [];
+    let permChanged = false;
+    for (const perm of permissions) {
+      if (!settings.allowedTools.includes(perm)) {
+        settings.allowedTools.push(perm);
+        permChanged = true;
+      }
+    }
+    if (permChanged) saveJson(settingsPath, settings);
+  }
+
+  // Write provision hash after all provisioning succeeds
+  fs.mkdirSync(path.dirname(hashFile), { recursive: true });
+  fs.writeFileSync(hashFile, currentHash + "\n", "utf-8");
+
+  if (debug) process.stderr.write("[sticky-note] environment provisioning complete\n");
+}
+
 // ── Main ──────────────────────────────────────────────────
 
 function main() {
@@ -449,6 +756,15 @@ function main() {
   // Migrate legacy single-file audit/presence to per-user dirs
   migrateAuditAndPresence();
 
+  // Migrate old config arrays to environment directory format
+  try { migrateOldEnvironmentConfig(); } catch (_) { /* migration must not break session */ }
+
+  // Auto-provision team environment from .sticky-note/environment/
+  try { ensureEnvironmentProvisioned(); } catch (_) { /* provisioning must not break session */ }
+
+  // Auto-register sticky-note MCP server in .mcp.json
+  ensureMcpServerRegistered();
+
   const memoryPath = getMemoryPath();
   const memory = loadJson(memoryPath, {
     version: "2",

package/templates/hooks.json

@@ -4,43 +4,43 @@
     "sessionStart": [
       {
         "type": "command",
-        "bash": "COPILOT_CLI=1 node .claude/hooks/session-start.js --copilot-cli",
-        "powershell": "$env:COPILOT_CLI='1'; node .claude/hooks/session-start.js --copilot-cli"
+        "bash": "COPILOT_CLI=1 node \"$(git rev-parse --show-toplevel)/.claude/hooks/session-start.js\" --copilot-cli",
+        "powershell": "$env:COPILOT_CLI='1'; node \"$(git rev-parse --show-toplevel)/.claude/hooks/session-start.js\" --copilot-cli"
       }
     ],
     "sessionEnd": [
       {
         "type": "command",
-        "bash": "COPILOT_CLI=1 node .claude/hooks/session-end.js --copilot-cli",
-        "powershell": "$env:COPILOT_CLI='1'; node .claude/hooks/session-end.js --copilot-cli"
+        "bash": "COPILOT_CLI=1 node \"$(git rev-parse --show-toplevel)/.claude/hooks/session-end.js\" --copilot-cli",
+        "powershell": "$env:COPILOT_CLI='1'; node \"$(git rev-parse --show-toplevel)/.claude/hooks/session-end.js\" --copilot-cli"
       }
     ],
     "userPromptSubmitted": [
       {
         "type": "command",
-        "bash": "COPILOT_CLI=1 node .claude/hooks/inject-context.js --copilot-cli",
-        "powershell": "$env:COPILOT_CLI='1'; node .claude/hooks/inject-context.js --copilot-cli"
+        "bash": "COPILOT_CLI=1 node \"$(git rev-parse --show-toplevel)/.claude/hooks/inject-context.js\" --copilot-cli",
+        "powershell": "$env:COPILOT_CLI='1'; node \"$(git rev-parse --show-toplevel)/.claude/hooks/inject-context.js\" --copilot-cli"
       }
     ],
     "preToolUse": [
       {
         "type": "command",
-        "bash": "COPILOT_CLI=1 node .claude/hooks/pre-tool-use.js --copilot-cli",
-        "powershell": "$env:COPILOT_CLI='1'; node .claude/hooks/pre-tool-use.js --copilot-cli"
+        "bash": "COPILOT_CLI=1 node \"$(git rev-parse --show-toplevel)/.claude/hooks/pre-tool-use.js\" --copilot-cli",
+        "powershell": "$env:COPILOT_CLI='1'; node \"$(git rev-parse --show-toplevel)/.claude/hooks/pre-tool-use.js\" --copilot-cli"
       }
     ],
     "postToolUse": [
       {
         "type": "command",
-        "bash": "COPILOT_CLI=1 node .claude/hooks/track-work.js --copilot-cli",
-        "powershell": "$env:COPILOT_CLI='1'; node .claude/hooks/track-work.js --copilot-cli"
+        "bash": "COPILOT_CLI=1 node \"$(git rev-parse --show-toplevel)/.claude/hooks/track-work.js\" --copilot-cli",
+        "powershell": "$env:COPILOT_CLI='1'; node \"$(git rev-parse --show-toplevel)/.claude/hooks/track-work.js\" --copilot-cli"
       }
     ],
     "errorOccurred": [
       {
         "type": "command",
-        "bash": "COPILOT_CLI=1 node .claude/hooks/on-error.js --copilot-cli",
-        "powershell": "$env:COPILOT_CLI='1'; node .claude/hooks/on-error.js --copilot-cli"
+        "bash": "COPILOT_CLI=1 node \"$(git rev-parse --show-toplevel)/.claude/hooks/on-error.js\" --copilot-cli",
+        "powershell": "$env:COPILOT_CLI='1'; node \"$(git rev-parse --show-toplevel)/.claude/hooks/on-error.js\" --copilot-cli"
       }
     ]
   }

package/templates/settings.json

@@ -6,7 +6,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/session-start.js"
+            "command": "node \"$(git rev-parse --show-toplevel)/.claude/hooks/session-start.js\""
           }
         ]
       }
@@ -17,7 +17,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/session-end.js"
+            "command": "node \"$(git rev-parse --show-toplevel)/.claude/hooks/session-end.js\""
           }
         ]
       }
@@ -28,7 +28,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/inject-context.js"
+            "command": "node \"$(git rev-parse --show-toplevel)/.claude/hooks/inject-context.js\""
           }
         ]
       }
@@ -39,7 +39,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/pre-tool-use.js"
+            "command": "node \"$(git rev-parse --show-toplevel)/.claude/hooks/pre-tool-use.js\""
           }
         ]
       }
@@ -50,7 +50,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/track-work.js"
+            "command": "node \"$(git rev-parse --show-toplevel)/.claude/hooks/track-work.js\""
           }
         ]
       }
@@ -61,7 +61,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/on-stop.js"
+            "command": "node \"$(git rev-parse --show-toplevel)/.claude/hooks/on-stop.js\""
           }
         ]
       }
@@ -72,7 +72,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/on-error.js"
+            "command": "node \"$(git rev-parse --show-toplevel)/.claude/hooks/on-error.js\""
           }
         ]
       }