fathom-mcp 0.5.13 → 0.5.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fathom-mcp",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "description": "MCP server for Fathom — vault operations, search, rooms, and cross-workspace communication",
   "type": "module",
   "bin": {
@@ -9,7 +9,8 @@
   "main": "src/index.js",
   "files": [
     "src/",
-    "scripts/",
+    "scripts/*.sh",
+    "scripts/*.py",
     "fathom-agents.md",
     "README.md",
     "CHANGELOG.md",

package/src/agents.js

@@ -9,7 +9,7 @@ import fs from "fs";
 import path from "path";
 import { execSync, execFileSync } from "child_process";
 
-const CONFIG_DIR = path.join(process.env.HOME || "/tmp", ".config", "fathom-mcp");
+const CONFIG_DIR = process.env.FATHOM_CONFIG_DIR || path.join(process.env.HOME || "/tmp", ".config", "fathom-mcp");
 const AGENTS_FILE = path.join(CONFIG_DIR, "agents.json");
 
 const EMPTY_CONFIG = { version: 1, agents: {} };

package/src/cli.js

@@ -584,6 +584,11 @@ async function runInit(flags = {}) {
     }
   }
 
+  // Register in CLI agent registry (for ls/start/stop)
+  const entry = buildEntryFromConfig(cwd, configData);
+  registryAddAgent(workspace, entry);
+  console.log(`  ✓ Registered agent "${workspace}" in CLI registry`);
+
   // Context-aware next steps
   console.log(`\n  Done! Fathom MCP is configured for workspace "${workspace}".`);
   console.log(`  Vault mode: ${vaultMode}`);

package/src/config.js

@@ -20,7 +20,7 @@ const DEFAULTS = {
   workspace: "",
   vault: "vault",
   vaultMode: "local", // hosted | synced | local | none
-  server: "http://localhost:4243",
+  server: "http://127.0.0.1:4243",
   apiKey: "",
   description: "",
   agents: [],

package/src/index.js

@@ -483,6 +483,26 @@ const telegramTools = [
   },
 ];
 
+// --- Primary-agent-only tools (policy gate) ----------------------------------
+
+const primaryAgentTools = [
+  {
+    name: "fathom_session_inject",
+    description:
+      "Inject a keystroke into a workspace's tmux session. Primary agent only. " +
+      "Used by the policy gate to respond to permission prompts. " +
+      "Keys must be a single digit 1-9 (to select a numbered option) or a named key (Enter, Escape).",
+    inputSchema: {
+      type: "object",
+      properties: {
+        workspace: { type: "string", description: "Target workspace name (e.g. 'navier-stokes')" },
+        keys: { type: "string", description: "Keys to send — single digit 1-9 or named key (Enter, Escape)" },
+      },
+      required: ["workspace", "keys"],
+    },
+  },
+];
+
 // --- Server setup & dispatch -------------------------------------------------
 
 const server = new Server(
@@ -501,7 +521,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
   } catch {
     // If settings unavailable, hide telegram tools
   }
-  const allTools = [...tools, ...(showTelegram ? telegramTools : [])];
+  const allTools = [...tools, ...(showTelegram ? [...telegramTools, ...primaryAgentTools] : [])];
   return { tools: allTools };
 });
 
@@ -797,6 +817,13 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       }
       break;
     }
+    // --- Session injection (policy gate) ---
+    case "fathom_session_inject": {
+      if (!args.workspace) { result = { error: "workspace is required" }; break; }
+      if (!args.keys) { result = { error: "keys is required" }; break; }
+      result = await client.injectKeys(args.workspace, args.keys);
+      break;
+    }
     case "fathom_telegram_send_voice": {
       const voiceContactArg = args.contact;
       if (!voiceContactArg) { result = { error: "contact is required" }; break; }

package/src/server-client.js

@@ -298,6 +298,14 @@ export function createClient(config) {
     });
   }
 
+  // --- Session injection (policy gate) ----------------------------------------
+
+  async function injectKeys(targetWorkspace, keys) {
+    return request("POST", `/api/session/${encodeURIComponent(targetWorkspace)}/inject`, {
+      body: { keys },
+    });
+  }
+
   // --- Settings --------------------------------------------------------------
 
   async function getSettings() {
@@ -361,6 +369,7 @@ export function createClient(config) {
     telegramSendVoice,
     telegramStatus,
     speak,
+    injectKeys,
     getSettings,
     getApiKey,
     rotateKey,

package/src/ws-connection.js

@@ -54,14 +54,20 @@ export function createWSConnection(config) {
   function connect() {
     if (closed) return;
 
+    // Redact token from URL for logging
+    const redactedUrl = wsUrl.replace(/token=[^&]+/, "token=***");
+    console.error(`[ws] connecting to ${redactedUrl}`);
+
     try {
       ws = new WebSocket(wsUrl);
-    } catch {
+    } catch (err) {
+      console.error(`[ws] connection constructor failed: ${err.message}`);
       scheduleReconnect();
       return;
     }
 
     ws.on("open", () => {
+      console.error(`[ws] connected — sending hello (agent=${agent}, vault_mode=${vaultMode})`);
       reconnectDelay = INITIAL_RECONNECT_MS;
 
       // Send hello handshake
@@ -85,10 +91,12 @@ export function createWSConnection(config) {
 
       switch (msg.type) {
         case "welcome":
+          console.error(`[ws] welcome received — connection established for workspace=${workspace}`);
           break;
 
         case "inject":
         case "ping_fire":
+          console.error(`[ws] received ${msg.type} (${(msg.text || "").length} chars)`);
           injectMessage(msg.text || "");
           break;
 
@@ -101,18 +109,21 @@ export function createWSConnection(config) {
           break;
 
         case "error":
+          console.error(`[ws] server error: ${msg.message || JSON.stringify(msg)}`);
           // Server rejected us — don't reconnect immediately
           reconnectDelay = MAX_RECONNECT_MS;
           break;
       }
     });
 
-    ws.on("close", () => {
+    ws.on("close", (code, reason) => {
+      console.error(`[ws] closed (code=${code}, reason=${reason || "none"})`);
       stopKeepalive();
       if (!closed) scheduleReconnect();
     });
 
-    ws.on("error", () => {
+    ws.on("error", (err) => {
+      console.error(`[ws] error: ${err.message}`);
       // Error always followed by close event — reconnect handled there
       stopKeepalive();
     });
@@ -144,6 +155,7 @@ export function createWSConnection(config) {
 
   function scheduleReconnect() {
     if (closed) return;
+    console.error(`[ws] reconnecting in ${reconnectDelay}ms`);
     setTimeout(connect, reconnectDelay);
     reconnectDelay = Math.min(reconnectDelay * 2, MAX_RECONNECT_MS);
   }
@@ -177,8 +189,8 @@ export function createWSConnection(config) {
         timeout: 5000,
         stdio: "ignore",
       });
-    } catch {
-      // tmux not available or pane not found — non-fatal
+    } catch (err) {
+      console.error(`[ws] tmux inject failed for ${pane}: ${err.message}`);
     }
   }