fathom-mcp 0.4.4 → 0.4.5

package/package.json

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

package/scripts/fathom-precompact.sh

@@ -33,29 +33,23 @@ if [ "$HOOK_ENABLED" != "True" ] && [ "$HOOK_ENABLED" != "true" ]; then
   exit 0
 fi
 
-# Toast: start multi-stage
-"$TOAST" memento --status precompact &>/dev/null
-"$TOAST" --update precompact "⏳ Getting context..." &>/dev/null
+# Toast: progress via queue (one-shot)
+"$TOAST" fathom "⏳ Snapshotting vault..." &>/dev/null
 
 # Read PreCompact input (contains transcript_path)
 INPUT=$(cat)
 TRANSCRIPT_PATH=$(echo "$INPUT" | python3 -c "import json,sys; print(json.load(sys.stdin).get('transcript_path',''))" 2>/dev/null || echo "")
 
 if [ -z "$TRANSCRIPT_PATH" ] || [ ! -f "$TRANSCRIPT_PATH" ]; then
-  "$TOAST" --update precompact "✗ No transcript found" &>/dev/null
-  "$TOAST" --close precompact &>/dev/null &
+  "$TOAST" fathom "✗ No transcript found" &>/dev/null
   exit 0
 fi
 
-# Toast: extracting
-"$TOAST" --update precompact "⏳ Extracting memories..." &>/dev/null
-
 # Extract vault file paths from transcript
 VAULT_FILES=$(grep -oP 'vault/[a-zA-Z0-9_/.-]+\.md' "$TRANSCRIPT_PATH" 2>/dev/null | sort -u || echo "")
 
 if [ -z "$VAULT_FILES" ]; then
-  "$TOAST" --update precompact "✓ No vault files to record" &>/dev/null
-  ("$TOAST" --close precompact &>/dev/null &)
+  "$TOAST" fathom "✓ No vault files to record" &>/dev/null
   exit 0
 fi
 
@@ -75,8 +69,7 @@ done
 FILE_COUNT=$(echo "$VAULT_FILES" | wc -l)
 
 # Toast: done
-"$TOAST" --update precompact "✓ Stored ${FILE_COUNT} vault file(s)" &>/dev/null
-("$TOAST" --close precompact &>/dev/null &)
+"$TOAST" fathom "✓ Stored ${FILE_COUNT} vault file(s)" &>/dev/null
 
 python3 -c "
 import json, sys

package/scripts/hook-toast.sh

@@ -2,7 +2,7 @@
 # hook-toast.sh — tmux popup notifications for agent hooks.
 #
 # Usage:
-#   hook-toast.sh <system> <message>          # one-shot toast (auto-closes after 2s)
+#   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 --update <id> <message>     # update a running toast
 #   hook-toast.sh --close <id>                # close a running toast (after delay)
@@ -13,6 +13,11 @@
 #
 # Any other system name works too — gets a default icon and grey border.
 #
+# 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.
+#
 # Multi-stage example (PreCompact):
 #   hook-toast.sh memento --status precompact
 #   hook-toast.sh --update precompact "⏳ Getting context..."
@@ -20,14 +25,22 @@
 #   hook-toast.sh --update precompact "✓ Stored 7 memories"
 #   hook-toast.sh --close precompact
 
-TOAST_DIR="/tmp/hook-toast"
-mkdir -p "$TOAST_DIR"
-
 # Bail silently if not in tmux
 if ! tmux info &>/dev/null; then
     exit 0
 fi
 
+# Derive session name — used for per-session queue isolation and -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" ;;
@@ -52,21 +65,55 @@ get_title() {
     esac
 }
 
-# One-shot toast
+# 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
 toast_oneshot() {
     local system="$1"
     local message="$2"
-    local colour icon title
-    colour=$(get_style "$system")
+    local icon
     icon=$(get_icon "$system")
-    title=$(get_title "$system")
 
-    (tmux display-popup -x R -y 0 -w 42 -h 3 \
-        -s "fg=$colour" -T " $icon $title " -E \
-        "echo '  $message'; sleep 2" &>/dev/null &)
+    # 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 &)
 }
 
-# Start a multi-stage toast (polling status file)
+# Start a multi-stage toast (polling status file) — targets this session
 toast_start() {
     local system="$1"
     local id="$2"
@@ -78,7 +125,7 @@ toast_start() {
 
     echo "⏳ Starting..." > "$status_file"
 
-    (tmux display-popup -x R -y 0 -w 42 -h 3 \
+    (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
@@ -104,7 +151,6 @@ toast_update() {
 # Close a running toast (remove status file — popup exits on next poll)
 toast_close() {
     local id="$1"
-    # Give the popup time to display the final message
     sleep 2
     rm -f "$TOAST_DIR/$id"
 }