fathom-mcp 0.5.17 → 0.5.19

package/package.json

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

package/scripts/hook-toast.sh

@@ -1,22 +1,20 @@
 #!/bin/bash
-# hook-toast.sh — tmux popup notifications for agent hooks.
+# hook-toast.sh — tmux status-line notifications for agent hooks.
+#
+# Uses tmux display-message — non-modal, no keyboard stealing.
+# Each toast targets the originating session via -t.
 #
 # Usage:
-#   hook-toast.sh <system> <message>          # queued toast (shows for 2s each)
-#   hook-toast.sh <system> --status <id>      # start a multi-stage toast (poll mode)
+#   hook-toast.sh <system> <message>          # show toast for 3s
+#   hook-toast.sh <system> --status <id>      # start a multi-stage toast (persistent)
 #   hook-toast.sh --update <id> <message>     # update a running toast
-#   hook-toast.sh --close <id>                # close a running toast (after delay)
+#   hook-toast.sh --close <id>                # show final message, then clear
 #
 # Built-in systems: fathom, memento
-#   fathom  → 📝 purple (colour141)
-#   memento → 🧠 teal (colour37)
-#
-# Any other system name works too — gets a default icon and grey border.
+#   fathom  → 📝
+#   memento → 🧠
 #
-# One-shot toasts are queued per-session — multiple hooks can fire toasts
-# without clobbering each other. A single popup reads from the queue,
-# showing each message for 2s before advancing. Popups target the session
-# that spawned them via -t, so they stay in the right terminal.
+# Any other system name works too — gets a default 📌 icon.
 #
 # Multi-stage example (PreCompact):
 #   hook-toast.sh memento --status precompact
@@ -30,25 +28,15 @@ if ! tmux info &>/dev/null; then
     exit 0
 fi
 
-# Derive session name — used for per-session queue isolation and -t targeting
+# Derive session name — used for -t targeting
 SESSION=$(tmux display-message -p '#{session_name}' 2>/dev/null)
 if [ -z "$SESSION" ]; then
     exit 0
 fi
 
 TOAST_DIR="/tmp/hook-toast/${SESSION}"
-QUEUE_FILE="$TOAST_DIR/queue"
-READER_PID_FILE="$TOAST_DIR/reader.pid"
 mkdir -p "$TOAST_DIR"
 
-get_style() {
-    case "$1" in
-        memento) echo "colour37" ;;
-        fathom)  echo "colour141" ;;
-        *)       echo "colour245" ;;
-    esac
-}
-
 get_icon() {
     case "$1" in
         memento) echo "🧠" ;;
@@ -65,94 +53,59 @@ get_title() {
     esac
 }
 
-# Check if the queue reader popup is still alive
-reader_alive() {
-    local pid
-    pid=$(cat "$READER_PID_FILE" 2>/dev/null) || return 1
-    [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null
-}
-
-# Queued one-shot toast — append to queue, spawn reader if needed
+# One-shot toast — display in status line for 3 seconds
 toast_oneshot() {
     local system="$1"
     local message="$2"
-    local icon
+    local icon title
     icon=$(get_icon "$system")
+    title=$(get_title "$system")
 
-    # Append to queue: icon|colour|title|message
-    echo "${icon}|$(get_style "$system")|$(get_title "$system")|$message" >> "$QUEUE_FILE"
-
-    # If reader is already running, it will pick up the new entry
-    if reader_alive; then
-        return
-    fi
-
-    # Spawn a reader popup targeting this session
-    (tmux display-popup -t "$SESSION" -x R -y 0 -w 42 -h 3 \
-        -s "fg=colour245" -E "
-        echo \$\$ > '$READER_PID_FILE'
-        while true; do
-            LINE=\$(head -1 '$QUEUE_FILE' 2>/dev/null)
-            if [ -z \"\$LINE\" ]; then
-                rm -f '$READER_PID_FILE'
-                break
-            fi
-            TAIL=\$(tail -n +2 '$QUEUE_FILE' 2>/dev/null)
-            if [ -n \"\$TAIL\" ]; then
-                echo \"\$TAIL\" > '$QUEUE_FILE'
-            else
-                > '$QUEUE_FILE'
-            fi
-            ICON=\$(echo \"\$LINE\" | cut -d'|' -f1)
-            MSG=\$(echo \"\$LINE\" | cut -d'|' -f4-)
-            clear
-            echo \"  \$ICON \$MSG\"
-            sleep 2
-        done
-        rm -f '$QUEUE_FILE' '$READER_PID_FILE'
-    " &>/dev/null &)
+    tmux display-message -t "$SESSION" -d 3000 "$icon $title: $message"
 }
 
-# Start a multi-stage toast (polling status file) — targets this session
+# Start a multi-stage toast — persistent until --close
 toast_start() {
     local system="$1"
     local id="$2"
-    local status_file="$TOAST_DIR/$id"
-    local colour icon title
-    colour=$(get_style "$system")
+    local meta_file="$TOAST_DIR/$id"
+    local icon title
     icon=$(get_icon "$system")
     title=$(get_title "$system")
 
-    echo "⏳ Starting..." > "$status_file"
+    # Save system info for --update to use
+    echo "$icon|$title" > "$meta_file"
 
-    (tmux display-popup -t "$SESSION" -x R -y 0 -w 42 -h 3 \
-        -s "fg=$colour" -T " $icon $title " -E "
-        LAST=''
-        while [ -f '$status_file' ]; do
-            MSG=\$(cat '$status_file' 2>/dev/null)
-            if [ \"\$MSG\" != \"\$LAST\" ]; then
-                clear
-                echo \"  \$MSG\"
-                LAST=\"\$MSG\"
-            fi
-            case \"\$MSG\" in ✓*|✗*) sleep 2; break ;; esac
-            sleep 0.2
-        done
-    " &>/dev/null &)
+    tmux display-message -t "$SESSION" -d 0 "$icon $title: ⏳ Starting..."
 }
 
-# Update a running toast
+# Update a running toast — replace the status line message
 toast_update() {
     local id="$1"
     local message="$2"
-    echo "$message" > "$TOAST_DIR/$id"
+    local meta_file="$TOAST_DIR/$id"
+
+    if [ -f "$meta_file" ]; then
+        local icon title
+        icon=$(cut -d'|' -f1 "$meta_file")
+        title=$(cut -d'|' -f2 "$meta_file")
+        tmux display-message -t "$SESSION" -d 0 "$icon $title: $message"
+    else
+        # Fallback — no meta file, just show raw message
+        tmux display-message -t "$SESSION" -d 0 "📌 $message"
+    fi
 }
 
-# Close a running toast (remove status file — popup exits on next poll)
+# Close a running toast — show final message briefly, then clear
 toast_close() {
     local id="$1"
-    sleep 2
-    rm -f "$TOAST_DIR/$id"
+    local meta_file="$TOAST_DIR/$id"
+
+    # Let the last --update message linger for 3s, then clean up
+    sleep 3
+    rm -f "$meta_file"
+    # Clear the display-message by showing empty briefly
+    tmux display-message -t "$SESSION" -d 1 ""
 }
 
 # --- Argument parsing ---

package/src/agents.js

@@ -83,7 +83,7 @@ export function isAgentRunning(name, entry) {
  */
 export function defaultCommand(agentType) {
   const cmds = {
-    "claude-code": "claude --model opus --permission-mode bypassPermissions",
+    "claude-code": "claude --continue",
     codex: "codex",
     gemini: "gemini",
     opencode: "opencode",
@@ -94,16 +94,34 @@ export function defaultCommand(agentType) {
 /**
  * Check if a Claude Code project has any previous conversations to --continue from.
  * Claude stores conversations as .jsonl files in ~/.claude/projects/<encoded-path>/.
+ *
+ * The encoded directory name uses the *resolved* path that Claude sees at runtime,
+ * which may differ from agents.json projectDir (e.g., container bind-mounts).
+ * We resolve the real path and also check the literal path as a fallback.
  */
 function hasPreviousConversation(projectDir) {
-  const encoded = projectDir.replace(/^\//, "").replace(/\//g, "-");
-  const convDir = path.join(process.env.HOME || "/tmp", ".claude", "projects", encoded);
+  const claudeProjectsDir = path.join(process.env.HOME || "/tmp", ".claude", "projects");
+
+  // Try both the literal path and the real (resolved symlink/bind-mount) path
+  const candidates = new Set([projectDir]);
   try {
-    const files = fs.readdirSync(convDir);
-    return files.some((f) => f.endsWith(".jsonl"));
+    candidates.add(fs.realpathSync(projectDir));
   } catch {
-    return false;
+    // projectDir might not exist on this machine (e.g., host path checked from container)
+  }
+
+  for (const dir of candidates) {
+    const encoded = dir.replace(/\//g, "-");
+    const convDir = path.join(claudeProjectsDir, encoded);
+    try {
+      const files = fs.readdirSync(convDir);
+      if (files.some((f) => f.endsWith(".jsonl"))) return true;
+    } catch {
+      // continue to next candidate
+    }
   }
+
+  return false;
 }
 
 export function startAgent(name, entry) {

package/src/cli.js

@@ -576,17 +576,36 @@ async function runInit(flags = {}) {
   appendToGitignore(cwd, [".fathom.json"]);
   console.log("  ✓ .gitignore");
 
-  // Register with server
+  // Register with server — use provision endpoint to get API key + create settings.json entry
   if (serverReachable) {
-    const regResult = await regClient.registerWorkspace(workspace, cwd, {
+    const provResult = await regClient.provisionWorkspace(workspace, cwd, {
       vault,
       agents: selectedAgents,
-      type: selectedAgents[0] || "local",
+      type: vaultMode,
+      execution: "local",
     });
-    if (regResult.ok) {
+    if (provResult.ok) {
       console.log(`  ✓ Registered workspace "${workspace}" with server`);
-    } else if (regResult.error) {
-      console.log(`  · Server registration: ${regResult.error}`);
+      // Use the server-provisioned API key (overwrites any manually entered one)
+      if (provResult.api_key) {
+        apiKey = provResult.api_key;
+        configData.apiKey = apiKey;
+        writeConfig(cwd, configData);
+        console.log(`  ✓ API key provisioned by server`);
+      }
+    } else if (provResult.error) {
+      console.log(`  · Server registration: ${provResult.error}`);
+      // Fall back to old registration endpoint (server may be older version)
+      const regResult = await regClient.registerWorkspace(workspace, cwd, {
+        vault,
+        agents: selectedAgents,
+        type: vaultMode,
+      });
+      if (regResult.ok) {
+        console.log(`  ✓ Registered workspace "${workspace}" with server (legacy)`);
+      } else if (regResult.error) {
+        console.log(`  · Server registration: ${regResult.error}`);
+      }
     }
   }
 

package/src/server-client.js

@@ -129,6 +129,17 @@ export function createClient(config) {
     return request("POST", "/api/workspaces", { body });
   }
 
+  async function provisionWorkspace(name, projectPath, { vault, description, agents, type, execution, ssh } = {}) {
+    const body = { name, path: projectPath };
+    if (vault) body.vault = vault;
+    if (description) body.description = description;
+    if (agents && agents.length > 0) body.agents = agents;
+    if (type) body.type = type;
+    if (execution) body.execution = execution;
+    if (ssh) body.ssh = ssh;
+    return request("POST", "/api/workspaces/provision", { body });
+  }
+
   // --- Access tracking -------------------------------------------------------
 
   async function notifyAccess(filePath, ws) {
@@ -345,6 +356,7 @@ export function createClient(config) {
     sendToWorkspace,
     listWorkspaces,
     registerWorkspace,
+    provisionWorkspace,
     notifyAccess,
     vaultList,
     vaultFolder,