openalmanac 0.2.27 → 0.2.29

package/dist/setup.js

@@ -127,7 +127,8 @@ const vis = (s) => s.replace(/\x1b\[[0-9;]*m/g, "").length;
 const w = (s) => process.stdout.write(s + "\n");
 /* ── File helpers ───────────────────────────────────────────────── */
 const CLAUDE_DIR = join(homedir(), ".claude");
-const CLAUDE_JSON = join(homedir(), ".claude.json");
+const CLAUDE_JSON = join(homedir(), ".claude.json"); // Claude Desktop
+const CLAUDE_CODE_MCP = join(CLAUDE_DIR, "mcp.json"); // Claude Code
 const SETTINGS_JSON = join(CLAUDE_DIR, "settings.json");
 function ensureDir(dir) {
     if (!existsSync(dir))
@@ -145,19 +146,35 @@ function writeJson(path, data) {
     writeFileSync(path, JSON.stringify(data, null, 2) + "\n");
 }
 /* ── Step 1 — MCP server ───────────────────────────────────────── */
+const ALMANAC_MCP_ENTRY = { command: "npx", args: ["-y", "openalmanac@latest"] };
+function isAlmanacCurrent(server) {
+    return (server?.command === "npx" &&
+        JSON.stringify(server.args) === JSON.stringify(ALMANAC_MCP_ENTRY.args));
+}
 function configureMcp() {
+    let changed = false;
+    // Claude Desktop — ~/.claude.json
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const desktop = readJson(CLAUDE_JSON);
+    if (!desktop.mcpServers)
+        desktop.mcpServers = {};
+    if (!isAlmanacCurrent(desktop.mcpServers.almanac)) {
+        desktop.mcpServers.almanac = { ...ALMANAC_MCP_ENTRY };
+        writeJson(CLAUDE_JSON, desktop);
+        changed = true;
+    }
+    // Claude Code — ~/.claude/mcp.json
+    ensureDir(CLAUDE_DIR);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const cfg = readJson(CLAUDE_JSON);
-    if (!cfg.mcpServers)
-        cfg.mcpServers = {};
-    const cur = cfg.mcpServers.almanac;
-    if (cur?.command === "npx" &&
-        JSON.stringify(cur.args) === JSON.stringify(["-y", "openalmanac"])) {
-        return false; // already set
+    const code = readJson(CLAUDE_CODE_MCP);
+    if (!code.mcpServers)
+        code.mcpServers = {};
+    if (!isAlmanacCurrent(code.mcpServers.almanac)) {
+        code.mcpServers.almanac = { ...ALMANAC_MCP_ENTRY };
+        writeJson(CLAUDE_CODE_MCP, code);
+        changed = true;
     }
-    cfg.mcpServers.almanac = { command: "npx", args: ["-y", "openalmanac@latest"] };
-    writeJson(CLAUDE_JSON, cfg);
-    return true;
+    return changed;
 }
 /* ── Step 2 — Permissions ──────────────────────────────────────── */
 function configurePermissions(tools) {
@@ -260,7 +277,7 @@ async function runLoginStep(agent, mcpChanged, toolCount) {
     const priorSteps = () => {
         stepDone(`Agent \u2192 ${WHITE_BOLD}${agent}${RST}`);
         w(BAR);
-        stepDone(`MCP server ${mcpChanged ? `added to ${DIM}~/.claude.json${RST}` : `${DIM}already configured${RST}`}`);
+        stepDone(`MCP server ${mcpChanged ? "configured" : `${DIM}already configured${RST}`}`);
         w(BAR);
         stepDone(`${BLUE}${toolCount}${RST} tool${toolCount !== 1 ? "s" : ""} allowed`);
         w(BAR);
@@ -414,7 +431,7 @@ function renderToolSelect(selected, cursor, agent, mcpChanged) {
     w("");
     stepDone(`Agent \u2192 ${WHITE_BOLD}${agent}${RST}`);
     w(BAR);
-    stepDone(`MCP server ${mcpChanged ? `added to ${DIM}~/.claude.json${RST}` : `${DIM}already configured${RST}`}`);
+    stepDone(`MCP server ${mcpChanged ? "configured" : `${DIM}already configured${RST}`}`);
     w(BAR);
     stepActive(`Select tool permissions  ${DIM}deselect any you'd rather approve manually${RST}`);
     w(BAR);
@@ -483,7 +500,7 @@ function printResult(agent, loginResult, mcpChanged, toolCount) {
     w("");
     stepDone(`Agent \u2192 ${WHITE_BOLD}${agent}${RST}`);
     w(BAR);
-    stepDone(`MCP server ${mcpChanged ? `added to ${DIM}~/.claude.json${RST}` : `${DIM}already configured${RST}`}`);
+    stepDone(`MCP server ${mcpChanged ? "configured" : `${DIM}already configured${RST}`}`);
     w(BAR);
     stepDone(`${BLUE}${toolCount}${RST} tool${toolCount !== 1 ? "s" : ""} allowed in ${DIM}~/.claude/settings.json${RST}`);
     w(BAR);
@@ -492,7 +509,7 @@ function printResult(agent, loginResult, mcpChanged, toolCount) {
     stepDone(`${BLUE}Setup complete${RST}`);
     w("");
     // Next steps box
-    const innerW = 52;
+    const innerW = 62;
     const row = (content) => {
         const padding = Math.max(0, innerW - vis(content));
         return `  ${BLUE_DIM}\u2502${RST}${content}${" ".repeat(padding)}${BLUE_DIM}\u2502${RST}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openalmanac",
-  "version": "0.2.27",
+  "version": "0.2.29",
   "description": "OpenAlmanac — pull, edit, and push articles to the open knowledge base",
   "type": "module",
   "bin": {