@plur-ai/mcp 0.21.0 → 0.21.2

package/dist/{chunk-WA3JKTZ7.js → chunk-OQDR6UF6.js}

@@ -1,5 +1,5 @@
 // src/version.ts
-var VERSION = "0.21.0";
+var VERSION = "0.21.2";
 
 export {
   VERSION

package/dist/index.d.ts

@@ -48,6 +48,13 @@ interface HookEntry {
         async?: boolean;
     }>;
 }
+/**
+ * Write the PLUR section into CLAUDE.md with core's `upsertInstructionSection`
+ * — the same logic as `plur init`: only a section PLUR shipped is replaced,
+ * one the user wrote or edited is kept and the new one added beside it, and a
+ * timestamped backup precedes any change to an existing file.
+ */
+declare function installClaudeMd(claudeMdPath?: string): Promise<string>;
 /**
  * Merge PLUR hooks into Claude Code settings (#1279). No I/O apart from
  * reading plur-hook.meta.json for the exec-form check.
@@ -72,4 +79,4 @@ declare function applyPlurHooks(settings: Settings, hooksMap: Record<string, Hoo
     status: 'installed' | 'healed' | 'already';
 };
 
-export { type HookEntry, type Settings, applyPlurHooks, buildPlurHooks, compareSemver, extractManifestVersion };
+export { type HookEntry, type Settings, applyPlurHooks, buildPlurHooks, compareSemver, extractManifestVersion, installClaudeMd };

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   VERSION
-} from "./chunk-WA3JKTZ7.js";
+} from "./chunk-OQDR6UF6.js";
 
 // src/index.ts
 import { existsSync, readFileSync as readFileSync2, writeFileSync, mkdirSync, readdirSync, statSync } from "fs";
@@ -169,6 +169,8 @@ function buildPlurHooks(cli) {
   };
 }
 var PLUR_HOOKS = buildPlurHooks(CLI);
+var PLUR_INSTRUCTIONS_MARKER = "<!-- plur-instructions-v4 -->";
+var MEMORY_FOOTER_RULE = "End every reply with one short line: `Memory \u2014 recalled N \xB7 used: ENG-\u2026, ENG-\u2026 \xB7 written: ENG-\u2026` (recalled as a count; used and written as ids only, no statements), or `Memory \u2014 none`. Only count/list ids you actually saw this turn; never invent an id. Give details only if the user asks.";
 var CLAUDE_MD_SECTION = `## PLUR Memory
 
 You have persistent memory via PLUR. Corrections, preferences, and conventions persist across sessions as engrams.
@@ -189,37 +191,59 @@ Hooks inject engrams automatically on every first message \u2014 you do not need
 
 Do not ask permission to use these tools \u2014 they are your memory system.
 
+### Memory line on every reply
+
+${MEMORY_FOOTER_RULE}
+
 ### When corrected
 
 When the user corrects you ("no, use X not Y", "that's wrong"):
 1. Call \`plur_learn\` immediately \u2014 before continuing the task
 2. Call \`plur_feedback\` with negative signal on the wrong engram if one was injected
 3. Then continue with the corrected approach
+
+${PLUR_INSTRUCTIONS_MARKER}
 `;
-function installClaudeMd() {
-  const marker = "## PLUR Memory";
+function defaultClaudeMdPath() {
   const projectClaudeMd = join2(process.cwd(), "CLAUDE.md");
   const globalClaudeMd = join2(homedir2(), "CLAUDE.md");
-  const claudeMdPath = existsSync(projectClaudeMd) ? projectClaudeMd : existsSync(globalClaudeMd) ? globalClaudeMd : projectClaudeMd;
-  if (existsSync(claudeMdPath)) {
-    const content = readFileSync2(claudeMdPath, "utf8");
-    if (content.includes(marker)) {
-      return `already in ${claudeMdPath}`;
-    }
-    writeFileSync(claudeMdPath, content.trimEnd() + "\n\n" + CLAUDE_MD_SECTION);
-    return `added to ${claudeMdPath}`;
-  }
-  writeFileSync(claudeMdPath, `# CLAUDE.md
-
-${CLAUDE_MD_SECTION}`);
-  return `created ${claudeMdPath}`;
+  return existsSync(projectClaudeMd) ? projectClaudeMd : existsSync(globalClaudeMd) ? globalClaudeMd : projectClaudeMd;
 }
-function findMcpConfig() {
-  const projectMcp = join2(process.cwd(), ".mcp.json");
-  if (existsSync(projectMcp)) return projectMcp;
-  const globalMcp = join2(homedir2(), ".claude", "mcp.json");
-  if (existsSync(globalMcp)) return globalMcp;
-  return projectMcp;
+async function installClaudeMd(claudeMdPath = defaultClaudeMdPath()) {
+  const { upsertInstructionSection, writeWithBackup, SHIPPED_PLUR_SECTIONS } = await import("@plur-ai/core");
+  const existing = existsSync(claudeMdPath) ? readFileSync2(claudeMdPath, "utf8") : null;
+  const r = upsertInstructionSection(existing, {
+    section: CLAUDE_MD_SECTION,
+    title: "# CLAUDE.md",
+    heading: "## PLUR Memory",
+    marker: PLUR_INSTRUCTIONS_MARKER,
+    shipped: SHIPPED_PLUR_SECTIONS
+  });
+  if (r.status === "skipped") return `not written to ${claudeMdPath}: ${r.skipReason}`;
+  let backup;
+  try {
+    backup = r.status === "already" ? null : writeWithBackup(claudeMdPath, r.content, existing);
+  } catch (err) {
+    if (err.code === "PLUR_REFUSED") return `not written to ${claudeMdPath}: ${err.message}`;
+    throw err;
+  }
+  const head = {
+    created: `created ${claudeMdPath}`,
+    added: `added to ${claudeMdPath}`,
+    upgraded: `upgraded in ${claudeMdPath}`,
+    already: `already in ${claudeMdPath}`
+  }[r.status];
+  const notes = [];
+  if (backup) notes.push(`backup: ${backup}`);
+  if (r.keptSections > 0) {
+    notes.push(
+      `left ${r.keptSections} older "## PLUR Memory" section${r.keptSections === 1 ? "" : "s"} untouched because ${r.keptSections === 1 ? "it has" : "they have"} text PLUR did not write \u2014 remove it yourself once you have kept what you need`
+    );
+  }
+  if (r.closedOpenBlock) {
+    notes.push(`closed the ${r.closedOpenBlock === "fence" ? "code block" : "HTML comment"} left open at the end of the file before adding the section`);
+  }
+  return notes.length ? `${head} (${notes.join("; ")})` : head;
 }
 function readJsonObjectForWrite(path) {
   if (!existsSync(path)) return { data: {}, ok: true };
@@ -232,34 +256,46 @@ function readJsonObjectForWrite(path) {
   }
   return { data: {}, ok: false };
 }
-function writeMcpConfig(configPath) {
-  const { data, ok } = readJsonObjectForWrite(configPath);
-  if (!ok) {
-    return `skipped \u2014 ${configPath} exists but is not a JSON object; writing would discard your other MCP servers. Fix it by hand, then re-run \`plur-mcp init\``;
-  }
-  const config = data;
-  const servers = config.mcpServers ?? {};
+function healRaceyEntry(servers) {
   const existing = servers.plur;
-  if (existing) {
-    const args = existing.args ?? [];
-    const spec = args.filter((a) => a !== "-y" && !a.startsWith("-"))[0] ?? "";
-    if (existing.command === "npx" && /^@plur-ai\/mcp(@latest)?$/.test(spec)) {
-      const healed = { ...existing, ...MCP_SERVER_CONFIG };
-      if (JSON.stringify(healed) !== JSON.stringify(existing)) {
-        servers.plur = healed;
-        config.mcpServers = servers;
-        writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
-        return `upgraded stale npx entry in ${configPath}`;
-      }
-    }
-    return `already configured in ${configPath}`;
+  if (!existing || typeof existing !== "object") return false;
+  const args = existing.args ?? [];
+  const spec = args.filter((a) => a !== "-y" && !a.startsWith("-"))[0] ?? "";
+  if (existing.command !== "npx" || !/^@plur-ai\/mcp(@latest)?$/.test(spec)) return false;
+  const healed = { ...existing, ...MCP_SERVER_CONFIG };
+  if (JSON.stringify(healed) === JSON.stringify(existing)) return false;
+  servers.plur = healed;
+  return true;
+}
+async function installClaudeUserMcp() {
+  const { writeWithBackup, registerClaudeUserMcp } = await import("@plur-ai/core");
+  const legacyPath = join2(homedir2(), ".claude", "mcp.json");
+  const legacyRaw = existsSync(legacyPath) ? readFileSync2(legacyPath, "utf8") : null;
+  const legacy = readJsonObjectForWrite(legacyPath);
+  const oldServers = legacy.ok ? legacy.data.mcpServers : void 0;
+  const oldEntry = oldServers && typeof oldServers === "object" && !Array.isArray(oldServers) ? oldServers.plur : void 0;
+  const r = registerClaudeUserMcp({
+    userPath: join2(homedir2(), ".claude.json"),
+    entry: () => ({ ...MCP_SERVER_CONFIG }),
+    heal: (config) => healRaceyEntry(config.mcpServers) ? "upgraded stale npx entry" : null,
+    legacyEntry: oldEntry,
+    legacyPath,
+    rerunCommand: "plur-mcp init"
+  });
+  if (!r.ok || oldEntry === void 0) return { ok: r.ok, status: r.message };
+  let status = r.message;
+  const next = { ...legacy.data };
+  const rest = { ...oldServers };
+  delete rest.plur;
+  if (Object.keys(rest).length > 0) next.mcpServers = rest;
+  else delete next.mcpServers;
+  try {
+    const backup = writeWithBackup(legacyPath, JSON.stringify(next, null, 2) + "\n", legacyRaw);
+    status += `; removed the unused entry from ${legacyPath}${backup ? ` (backup: ${backup})` : ""}`;
+  } catch (err) {
+    status += `; could not remove the unused entry from ${legacyPath} (${err.message}) \u2014 Claude Code ignores it, remove it by hand`;
   }
-  servers.plur = MCP_SERVER_CONFIG;
-  config.mcpServers = servers;
-  const dir = join2(configPath, "..");
-  mkdirSync(dir, { recursive: true });
-  writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
-  return `added to ${configPath}`;
+  return { ok: true, status };
 }
 function isPlurCommandHook(h) {
   return typeof h.command === "string" && isPlurHookSpec({ command: h.command, args: h.args });
@@ -356,12 +392,13 @@ async function runInit() {
   } catch {
   }
   results.push(`Search:   ${searchMode}`);
-  const mcpConfigPath = findMcpConfig();
-  const mcpStatus = writeMcpConfig(mcpConfigPath);
+  const mcp = await installClaudeUserMcp();
+  const mcpStatus = mcp.status;
+  if (!mcp.ok) process.exitCode = 1;
   results.push(`MCP:      ${mcpStatus}`);
   const hooksStatus = installHooks();
   results.push(`Hooks:    ${hooksStatus}`);
-  const claudeMdStatus = installClaudeMd();
+  const claudeMdStatus = await installClaudeMd();
   results.push(`CLAUDE.md: ${claudeMdStatus}`);
   const { Plur } = await import("@plur-ai/core");
   const plur = new Plur({ path: paths.root });
@@ -441,14 +478,14 @@ if (arg === "--version" || arg === "-v") {
 }
 if (arg === "init") {
   await runInit();
-  process.exit(0);
+  process.exit(process.exitCode ?? 0);
 }
 if (arg === "packs") {
   await runPacks();
   process.exit(0);
 }
 if (arg === "serve" || arg === void 0) {
-  const { runStdio } = await import("./server-EUMEOVXB.js");
+  const { runStdio } = await import("./server-QOHVV2Z7.js");
   runStdio().catch((err) => {
     console.error("Failed to start PLUR MCP server:", err);
     process.exit(1);
@@ -462,5 +499,6 @@ export {
   applyPlurHooks,
   buildPlurHooks,
   compareSemver,
-  extractManifestVersion
+  extractManifestVersion,
+  installClaudeMd
 };