sticky-note-cli 3.1.25 → 3.1.27

package/bin/cli.js

@@ -369,6 +369,30 @@ function ensureMcpInCopilotCliConfig(serverName, serverConfig) {
   }
 }
 
+// ──────────────────────────────────────────────
+// Sticky dir resolution (mirrors mcp-server.js stickyDir())
+// ──────────────────────────────────────────────
+
+// Returns the active sticky-note data directory for the current project.
+// Mirrors the same logic as stickyDir() in mcp-server.js: prefers the
+// data-branch worktree at <git-dir>/sticky-note/ if it has sticky-note.json,
+// falls back to the in-tree .sticky-note/ directory.
+function getActiveStickyDir(cwd) {
+  const root = cwd || process.cwd();
+  try {
+    const gitDir = execFileSync("git", ["rev-parse", "--absolute-git-dir"], {
+      encoding: "utf-8", timeout: 3000, stdio: ["pipe", "pipe", "pipe"], cwd: root,
+    }).trim();
+    const dataBranchDir = path.join(gitDir, "sticky-note");
+    if (fs.existsSync(path.join(dataBranchDir, "sticky-note.json"))) {
+      return dataBranchDir;
+    }
+  } catch (_) {
+    // not a git repo or git unavailable — fall through
+  }
+  return path.join(root, ".sticky-note");
+}
+
 // ──────────────────────────────────────────────
 // Auto-detection
 // ──────────────────────────────────────────────
@@ -1088,8 +1112,9 @@ async function cmdInit() {
   print("  [OK] Skipping git pre/post-commit hooks (data branch sync handles this now)");
   print("       Run `npx sticky-note migrate` to migrate existing .sticky-note/ data.");
 
-  // Create environment directory structure
-  const envDir = path.join(stickyNoteDir, "environment");
+  // Create environment directory structure.
+  // Uses getActiveStickyDir() so re-runs on repos with a data branch write to the right place.
+  const envDir = path.join(getActiveStickyDir(), "environment");
   const envManifestDest = path.join(envDir, "manifest.json");
   mkdirSafe(path.join(envDir, "skills"));
   mkdirSafe(path.join(envDir, "agents"));
@@ -1394,20 +1419,23 @@ function cmdUpdate() {
     print("  [OK] .claude/sticky-note-mcp.js (MCP entry point updated)");
   }
 
-  // Migrate .mcp.json to use "node .claude/sticky-note-mcp.js" instead of npx subcommand.
+  // Ensure .mcp.json has a correct sticky-note entry using "node .claude/sticky-note-mcp.js".
   // The old npx approach goes through multiple .cmd shim layers on Windows, causing
   // Claude Code to silently skip the server. The node approach is a direct single process.
   const correctMcpEntry = { type: "stdio", command: "node", args: [".claude/sticky-note-mcp.js"] };
   try {
     const mcpJsonPath = path.join(process.cwd(), ".mcp.json");
-    if (fs.existsSync(mcpJsonPath)) {
-      const mcpJson = readJsonSafe(mcpJsonPath, {});
-      const projectEntry = mcpJson.mcpServers && mcpJson.mcpServers["sticky-note"];
-      if (projectEntry && (projectEntry.command !== "node" || JSON.stringify(projectEntry.args) !== JSON.stringify(correctMcpEntry.args))) {
-        mcpJson.mcpServers["sticky-note"] = correctMcpEntry;
-        fs.writeFileSync(mcpJsonPath, JSON.stringify(mcpJson, null, 2) + "\n");
-        print("  [OK] .mcp.json: migrated sticky-note to direct node invocation (Windows MCP fix)");
-      }
+    const mcpJson = fs.existsSync(mcpJsonPath) ? readJsonSafe(mcpJsonPath, {}) : {};
+    if (!mcpJson.mcpServers) mcpJson.mcpServers = {};
+    const projectEntry = mcpJson.mcpServers["sticky-note"];
+    if (!projectEntry) {
+      mcpJson.mcpServers["sticky-note"] = correctMcpEntry;
+      fs.writeFileSync(mcpJsonPath, JSON.stringify(mcpJson, null, 2) + "\n");
+      print("  [OK] .mcp.json: added sticky-note MCP entry");
+    } else if (projectEntry.command !== "node" || JSON.stringify(projectEntry.args) !== JSON.stringify(correctMcpEntry.args)) {
+      mcpJson.mcpServers["sticky-note"] = correctMcpEntry;
+      fs.writeFileSync(mcpJsonPath, JSON.stringify(mcpJson, null, 2) + "\n");
+      print("  [OK] .mcp.json: migrated sticky-note to direct node invocation (Windows MCP fix)");
     }
   } catch (_) { /* non-fatal */ }
 
@@ -1423,8 +1451,10 @@ function cmdUpdate() {
     }
   } catch (_) { /* non-fatal */ }
 
-  // Create environment directory if missing (idempotent — skips if manifest already exists)
-  const envDir = path.join(stickyDir, "environment");
+  // Create environment directory if missing (idempotent — skips if manifest already exists).
+  // Uses getActiveStickyDir() to resolve the data-branch worktree path when applicable,
+  // so it matches the same path the MCP server's stickyDir() resolves.
+  const envDir = path.join(getActiveStickyDir(), "environment");
   const envManifestDest = path.join(envDir, "manifest.json");
   mkdirSafe(path.join(envDir, "skills"));
   mkdirSafe(path.join(envDir, "agents"));

package/package.json

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

package/templates/sticky-note-mcp.js

@@ -2,4 +2,7 @@
 // sticky-note MCP server entry point
 // Auto-generated by sticky-note-cli init/update. Do not edit manually.
 // Runs the sticky-note MCP server in-process using the installed package.
+// Injects --project so the server always reads from this project's root,
+// regardless of the CWD Claude Code uses when spawning the MCP process.
+process.argv.push("--project", require("path").resolve(__dirname, ".."));
 require("sticky-note-cli/bin/mcp-server.js");