fathom-mcp 0.6.2 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fathom-mcp",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "MCP server for Fathom — vault operations, search, rooms, and cross-workspace communication",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -154,19 +154,32 @@ function copyScripts(targetDir) {
   }
 }
 
-function buildIntegrationPrompt(blob) {
-  return [
-    "The following instructions were generated by fathom-mcp init for this project.",
-    "Add them to the file where you store persistent behavioral instructions",
-    "(e.g. CLAUDE.md for Claude Code). If the file exists, read it first and",
-    "integrate the new section without removing existing content. If a section",
-    "with the same heading already exists, replace it. If no instructions file",
-    "exists yet, create one.",
-    "",
-    "--- INSTRUCTIONS ---",
-    blob,
-    "--- END ---",
-  ].join("\n");
+// ---------------------------------------------------------------------------
+// CLAUDE.md integration
+// ---------------------------------------------------------------------------
+
+const FATHOM_MD_MARKER_START = "<!-- BEGIN fathom-mcp -->";
+const FATHOM_MD_MARKER_END = "<!-- END fathom-mcp -->";
+
+function appendToClaudeMd(cwd, blob) {
+  const mdPath = path.join(cwd, "CLAUDE.md");
+  let content = "";
+  try { content = fs.readFileSync(mdPath, "utf-8"); } catch { /* new file */ }
+
+  const wrappedBlob = `${FATHOM_MD_MARKER_START}\n${blob}\n${FATHOM_MD_MARKER_END}`;
+
+  const markerRe = new RegExp(
+    `${FATHOM_MD_MARKER_START.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s\\S]*?${FATHOM_MD_MARKER_END.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`,
+  );
+
+  if (markerRe.test(content)) {
+    content = content.replace(markerRe, wrappedBlob);
+  } else {
+    content = content.trimEnd() + "\n\n" + wrappedBlob + "\n";
+  }
+
+  fs.writeFileSync(mdPath, content, "utf-8");
+  return mdPath;
 }
 
 /**
@@ -182,29 +195,6 @@ function detectFathomServer() {
   }
 }
 
-// Agent commands for non-interactive prompt integration (init --non-interactive)
-const AGENT_PROMPT_CMDS = {
-  "claude-code": (prompt) => ["claude", "-p", "--dangerously-skip-permissions", prompt],
-  "gemini":      (prompt) => ["gemini", prompt],
-};
-
-function runAgentPrompt(agentKey, prompt) {
-  const cmdBuilder = AGENT_PROMPT_CMDS[agentKey];
-  if (!cmdBuilder) return null;
-  const [cmd, ...args] = cmdBuilder(prompt);
-  try {
-    const result = execFileSync(cmd, args, {
-      cwd: process.cwd(),
-      encoding: "utf8",
-      stdio: ["pipe", "pipe", "inherit"],
-      timeout: 60000,
-    });
-    return result;
-  } catch {
-    return null;
-  }
-}
-
 // --- CLI flag parsing --------------------------------------------------------
 
 function parseFlags(argv) {
@@ -683,60 +673,31 @@ async function runInit(flags = {}) {
     console.log(`\n  Non-interactive equivalent:\n    ${parts.join(" ")}\n`);
   }
 
-  // Auto-integrate agent instructions
-  const agentMdPath = agentMdDest;
+  // Append agent instructions to CLAUDE.md
   let instructionsBlob = "";
   try {
-    instructionsBlob = fs.readFileSync(agentMdPath, "utf-8");
-  } catch { /* file wasn't created — use empty */ }
-
-  const primaryAgent = selectedAgents[0];
+    instructionsBlob = fs.readFileSync(agentMdDest, "utf-8");
+  } catch { /* template wasn't created — skip */ }
 
   if (instructionsBlob) {
-    const prompt = buildIntegrationPrompt(instructionsBlob);
-    const cmdBuilder = AGENT_PROMPT_CMDS[primaryAgent];
-
     if (nonInteractive) {
-      if (cmdBuilder) {
-        console.log(`\n  Integrating instructions via ${AGENTS[primaryAgent].name}...`);
-        const result = runAgentPrompt(primaryAgent, prompt);
-        if (result !== null) {
-          console.log(result);
-        } else {
-          console.log("  Agent integration failed — paste these instructions manually:\n");
-          printInstructionsFallback(agentMdPath, selectedAgents);
-        }
-      } else {
-        printInstructionsFallback(agentMdPath, selectedAgents);
-      }
+      const mdPath = appendToClaudeMd(cwd, instructionsBlob);
+      console.log(`\n  ✓ Instructions written to ${path.relative(cwd, mdPath)}\n`);
     } else {
-      if (cmdBuilder) {
-        const [cmd, ...sampleArgs] = cmdBuilder("<prompt>");
-        const flagArgs = sampleArgs.slice(0, -1).join(" ");
-        const displayCmd = `${cmd} ${flagArgs} <prompt>`;
-        const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
-        console.log("\n" + "─".repeat(60));
-        const integrate = await askYesNo(
-          rl2,
-          `\n  Auto-integrate instructions into your project?\n  This will run: ${displayCmd}\n\n  ⚠  This uses --dangerously-skip-permissions so the agent can\n  write to CLAUDE.md without prompting. If you prefer, decline\n  and we'll print the instructions for you to add manually.\n\n  Proceed?`,
-          true,
-        );
-        rl2.close();
-
-        if (integrate) {
-          console.log(`\n  Running ${AGENTS[primaryAgent].name}...`);
-          const result = runAgentPrompt(primaryAgent, prompt);
-          if (result !== null) {
-            console.log(result);
-          } else {
-            console.log("  Agent integration failed — paste these instructions manually:\n");
-            printInstructionsFallback(agentMdPath, selectedAgents);
-          }
-        } else {
-          printInstructionsFallback(agentMdPath, selectedAgents);
-        }
+      const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
+      console.log("\n" + "─".repeat(60));
+      const integrate = await askYesNo(
+        rl2,
+        "\n  Append Fathom instructions to CLAUDE.md?",
+        true,
+      );
+      rl2.close();
+
+      if (integrate) {
+        const mdPath = appendToClaudeMd(cwd, instructionsBlob);
+        console.log(`\n  ✓ Instructions written to ${path.relative(cwd, mdPath)}\n`);
       } else {
-        printInstructionsFallback(agentMdPath, selectedAgents);
+        printInstructionsFallback(agentMdDest, selectedAgents);
       }
     }
   } else {

package/src/index.js

@@ -253,77 +253,6 @@ const tools = [
   },
 ];
 
-// --- Telegram tools (primary agent only) -------------------------------------
-
-const telegramTools = [
-  {
-    name: "fathom_telegram_contacts",
-    description:
-      "List Telegram contacts who have messaged. Returns name, username, chat_id, " +
-      "last_message time, and unread count.",
-    inputSchema: { type: "object", properties: {} },
-  },
-  {
-    name: "fathom_telegram_read",
-    description:
-      "Read recent Telegram messages from a contact. Same windowing as fathom_room_read — " +
-      "anchored to latest message, default 60 minutes. Use start to look further back.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        contact: { type: "string", description: "Contact name, @username, or chat_id" },
-        minutes: { type: "number", description: "Window duration in minutes. Default: 60." },
-        start: { type: "number", description: "Offset in minutes from latest message. Default: 0." },
-        mark_read: { type: "boolean", description: "Mark messages as read. Default: true." },
-      },
-      required: ["contact"],
-    },
-  },
-  {
-    name: "fathom_telegram_send",
-    description:
-      "Send a Telegram message to a contact via the persistent Telethon client.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        contact: { type: "string", description: "Contact name, @username, or chat_id" },
-        message: { type: "string", description: "Message text to send" },
-      },
-      required: ["contact", "message"],
-    },
-  },
-  {
-    name: "fathom_telegram_image",
-    description:
-      "Read a Telegram message's attached image and return it as base64 so Claude can perceive it. " +
-      "Use after fathom_telegram_read shows a message has media: true. " +
-      "Supports jpg, jpeg, png, gif, webp. Max 5MB.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        message_id: { type: "number", description: "The message ID from fathom_telegram_read results" },
-      },
-      required: ["message_id"],
-    },
-  },
-  {
-    name: "fathom_telegram_send_image",
-    description:
-      "Send an image to a Telegram contact via the persistent Telethon client. " +
-      "Provide an absolute file path to a local image. Optionally include a caption. " +
-      "Contact can be a name, @username, or chat_id number.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        contact: { type: "string", description: "Contact name, @username, or chat_id" },
-        file_path: { type: "string", description: "Absolute path to the image file to send" },
-        caption: { type: "string", description: "Optional caption text for the image (max 1024 chars)" },
-      },
-      required: ["contact", "file_path"],
-    },
-  },
-];
-
 // --- Policy evaluation tool (permission-prompt-tool for stream-json) ---------
 
 const policyTools = [
@@ -362,7 +291,6 @@ const policyTools = [
 
 // --- Primary-agent-only tools (reserved for future use) ----------------------
 
-const primaryAgentTools = [];
 
 // --- Policy evaluation -------------------------------------------------------
 
@@ -433,17 +361,7 @@ const server = new Server(
 );
 
 server.setRequestHandler(ListToolsRequestSchema, async () => {
-  // Telegram tools only visible to primary agent workspace + human workspaces
-  let showTelegram = false;
-  try {
-    const settings = await client.getSettings();
-    const primaryAgent = settings.default_workspace;
-    const wsType = settings.workspaces?.[config.workspace]?.type;
-    showTelegram = config.workspace === primaryAgent || wsType === 'human';
-  } catch {
-    // If settings unavailable, hide telegram tools
-  }
-  const allTools = [...tools, ...policyTools, ...(showTelegram ? [...telegramTools, ...primaryAgentTools] : [])];
+  const allTools = [...tools, ...policyTools];
   return { tools: allTools };
 });
 
@@ -553,99 +471,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       break;
     }
 
-    // --- Telegram ---
-    case "fathom_telegram_contacts":
-      result = await client.telegramContacts(config.workspace);
-      break;
-    case "fathom_telegram_read": {
-      // Resolve contact name to chat_id via contacts list
-      const contacts = await client.telegramContacts(config.workspace);
-      const contactList = contacts?.contacts || [];
-      const contactArg = (args.contact || "").trim();
-      let chatId = parseInt(contactArg, 10);
-      if (isNaN(chatId)) {
-        const lower = contactArg.toLowerCase().replace(/^@/, "");
-        const match = contactList.find(c =>
-          (c.username || "").toLowerCase() === lower ||
-          (c.first_name || "").toLowerCase() === lower ||
-          (c.first_name || "").toLowerCase().includes(lower)
-        );
-        chatId = match ? match.chat_id : null;
-      }
-      if (!chatId) {
-        result = { error: `Contact not found: ${contactArg}. Use fathom_telegram_contacts to list known contacts.` };
-      } else {
-        result = await client.telegramRead(
-          chatId, args.minutes, args.start,
-          args.mark_read !== false ? config.workspace : undefined,
-          args.mark_read,
-        );
-      }
-      break;
-    }
-    case "fathom_telegram_send": {
-      const sendContacts = await client.telegramContacts(config.workspace);
-      const sendList = sendContacts?.contacts || [];
-      const sendArg = (args.contact || "").trim();
-      let sendChatId = parseInt(sendArg, 10);
-      if (isNaN(sendChatId)) {
-        const lower = sendArg.toLowerCase().replace(/^@/, "");
-        const match = sendList.find(c =>
-          (c.username || "").toLowerCase() === lower ||
-          (c.first_name || "").toLowerCase() === lower ||
-          (c.first_name || "").toLowerCase().includes(lower)
-        );
-        sendChatId = match ? match.chat_id : null;
-      }
-      if (!sendChatId) {
-        result = { error: `Contact not found: ${sendArg}. Use fathom_telegram_contacts to list known contacts.` };
-      } else {
-        result = await client.telegramSend(sendChatId, args.message);
-      }
-      break;
-    }
-    case "fathom_telegram_image": {
-      const msgId = args.message_id;
-      if (!msgId) {
-        result = { error: "message_id is required" };
-      } else {
-        // Check local WebSocket cache first (avoids HTTP round-trip for pushed images)
-        const cached = wsConn?.getCachedImage(msgId);
-        if (cached) {
-          result = { _image: true, data: cached.data, mimeType: cached.mimeType };
-        } else {
-          result = await client.telegramImage(msgId);
-          if (result?.data && result?.mimeType) {
-            result = { _image: true, data: result.data, mimeType: result.mimeType };
-          }
-        }
-      }
-      break;
-    }
-    case "fathom_telegram_send_image": {
-      const imgContactArg = args.contact;
-      if (!imgContactArg) { result = { error: "contact is required" }; break; }
-      if (!args.file_path) { result = { error: "file_path is required" }; break; }
-
-      const imgContacts = await client.telegramContacts(config.workspace);
-      const imgList = imgContacts?.contacts || [];
-      let imgChatId = parseInt(imgContactArg, 10);
-      if (isNaN(imgChatId)) {
-        const lower = imgContactArg.toLowerCase().replace(/^@/, "");
-        const match = imgList.find(c =>
-          (c.username || "").toLowerCase() === lower ||
-          (c.first_name || "").toLowerCase() === lower ||
-          (c.first_name || "").toLowerCase().includes(lower)
-        );
-        imgChatId = match ? match.chat_id : null;
-      }
-      if (!imgChatId) {
-        result = { error: `Contact not found: ${imgContactArg}. Use fathom_telegram_contacts to list known contacts.` };
-      } else {
-        result = await client.telegramSendImage(imgChatId, args.file_path, args.caption);
-      }
-      break;
-    }
     // --- Policy evaluation (permission-prompt-tool for stream-json agents) ---
     case "policy_evaluate": {
       result = await evaluatePermission(args.tool_name, args.input || {});

package/src/server-client.js

@@ -228,46 +228,6 @@ export function createClient(config) {
     return request("POST", `/api/workspaces/${encodeURIComponent(ws)}/heartbeat`, { body });
   }
 
-  // --- Telegram --------------------------------------------------------------
-
-  async function telegramContacts(ws) {
-    return request("GET", "/api/telegram/contacts", {
-      params: { workspace: ws },
-    });
-  }
-
-  async function telegramRead(chatId, minutes, start, ws, markRead) {
-    return request("GET", `/api/telegram/messages/${chatId}`, {
-      params: { minutes, start, workspace: ws, mark_read: markRead },
-    });
-  }
-
-  async function telegramSend(chatId, message) {
-    return request("POST", `/api/telegram/send/${chatId}`, {
-      body: { message },
-    });
-  }
-
-  async function telegramImage(messageId) {
-    return request("GET", `/api/telegram/image/${messageId}`);
-  }
-
-  async function telegramSendImage(chatId, filePath, caption) {
-    return request("POST", `/api/telegram/send-image/${chatId}`, {
-      body: { file_path: filePath, caption: caption || "" },
-    });
-  }
-
-  async function telegramSendVoice(chatId, filePath, caption) {
-    return request("POST", `/api/telegram/send-voice/${chatId}`, {
-      body: { file_path: filePath, caption: caption || "" },
-    });
-  }
-
-  async function telegramStatus() {
-    return request("GET", "/api/telegram/status");
-  }
-
   // --- TTS ------------------------------------------------------------------
 
   async function speak({ text, file, speed, play, format } = {}) {
@@ -333,13 +293,6 @@ export function createClient(config) {
     deleteRoutine,
     fireRoutine,
     heartbeat,
-    telegramContacts,
-    telegramRead,
-    telegramSend,
-    telegramImage,
-    telegramSendImage,
-    telegramSendVoice,
-    telegramStatus,
     speak,
     voiceReply,
     getSettings,

package/src/ws-connection.js

@@ -2,7 +2,6 @@
  * WebSocket push channel — receives server-pushed messages and handles them locally.
  *
  * Connects to fathom-server's /ws/agent/{workspace} endpoint. Receives:
- *   - image → cache base64 data to .fathom/telegram-cache/
  *   - ping → respond with pong
  *
  * Stream-json agents handle inject/ping_fire via subprocess stdin — the server
@@ -11,19 +10,15 @@
  * Auto-reconnects with exponential backoff (1s → 60s cap).
  */
 
-import fs from "fs";
-import os from "os";
-import path from "path";
 import WebSocket from "ws";
 
 const KEEPALIVE_INTERVAL_MS = 30_000;
 const INITIAL_RECONNECT_MS = 1_000;
 const MAX_RECONNECT_MS = 60_000;
-const IMAGE_CACHE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000; // 7 days
 
 /**
  * @param {object} config — resolved config from config.js
- * @returns {{ getCachedImage: (messageId: number) => {data: string, mimeType: string} | null, close: () => void }}
+ * @returns {{ close: () => void }}
  */
 export function createWSConnection(config) {
   const workspace = config.workspace;
@@ -37,17 +32,11 @@ export function createWSConnection(config) {
     .replace(/^https:/, "wss:")
     + `/ws/agent/${encodeURIComponent(workspace)}`;
 
-  // Image cache directory
-  const cacheDir = path.join(os.homedir(), ".fathom", "telegram-cache");
-
   let ws = null;
   let reconnectDelay = INITIAL_RECONNECT_MS;
   let keepaliveTimer = null;
   let closed = false;
 
-  // Clean up old cached images on startup
-  cleanupImageCache();
-
   connect();
 
   function connect() {
@@ -98,10 +87,6 @@ export function createWSConnection(config) {
           console.error(`[ws] received ${msg.type} (${(msg.text || "").length} chars) — handled by server subprocess`);
           break;
 
-        case "image":
-          cacheImage(msg);
-          break;
-
         case "ping":
           safeSend({ type: "pong" });
           break;
@@ -158,57 +143,6 @@ export function createWSConnection(config) {
     reconnectDelay = Math.min(reconnectDelay * 2, MAX_RECONNECT_MS);
   }
 
-  // ── Image cache ─────────────────────────────────────────────────────────────
-
-  function cacheImage(msg) {
-    if (!msg.message_id || !msg.data) return;
-
-    try {
-      fs.mkdirSync(cacheDir, { recursive: true });
-      const ext = (msg.filename || "").split(".").pop() || "jpg";
-      const filename = `${msg.message_id}.${ext}`;
-      const filePath = path.join(cacheDir, filename);
-      fs.writeFileSync(filePath, Buffer.from(msg.data, "base64"));
-    } catch {
-      // Cache write failure is non-fatal
-    }
-  }
-
-  function getCachedImage(messageId) {
-    try {
-      const dir = fs.readdirSync(cacheDir);
-      const match = dir.find(f => f.startsWith(`${messageId}.`));
-      if (!match) return null;
-
-      const filePath = path.join(cacheDir, match);
-      const data = fs.readFileSync(filePath);
-      const ext = path.extname(match).slice(1).toLowerCase();
-      const mimeMap = { jpg: "image/jpeg", jpeg: "image/jpeg", png: "image/png", gif: "image/gif", webp: "image/webp" };
-      return {
-        data: data.toString("base64"),
-        mimeType: mimeMap[ext] || "image/jpeg",
-      };
-    } catch {
-      return null;
-    }
-  }
-
-  function cleanupImageCache() {
-    try {
-      if (!fs.existsSync(cacheDir)) return;
-      const now = Date.now();
-      for (const file of fs.readdirSync(cacheDir)) {
-        const filePath = path.join(cacheDir, file);
-        const stat = fs.statSync(filePath);
-        if (now - stat.mtimeMs > IMAGE_CACHE_MAX_AGE_MS) {
-          fs.unlinkSync(filePath);
-        }
-      }
-    } catch {
-      // Cleanup failure is non-fatal
-    }
-  }
-
   function close() {
     closed = true;
     stopKeepalive();
@@ -218,5 +152,5 @@ export function createWSConnection(config) {
     }
   }
 
-  return { getCachedImage, close };
+  return { close };
 }