fathom-mcp 0.5.0 → 0.5.2

package/package.json

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

package/scripts/fathom-start.sh

@@ -0,0 +1,226 @@
+#!/usr/bin/env bash
+#
+# fathom-start.sh — Launch an agent in a correctly-named tmux session.
+#
+# Reads .fathom.json for workspace name and agent, creates
+# {workspace}_fathom-session, saves pane ID for WebSocket push injection.
+#
+# Usage:
+#   fathom-start.sh              Start agent, save pane ID, attach
+#   fathom-start.sh --detach     Start agent, save pane ID, don't attach
+#   fathom-start.sh --agent X    Override agent (claude-code|codex|gemini|opencode)
+#   fathom-start.sh --kill       Kill existing session
+#   fathom-start.sh --status     Show session status
+
+set -euo pipefail
+
+if ! command -v tmux &>/dev/null; then
+  echo "Error: tmux is not installed. Install it first:" >&2
+  echo "  apt install tmux  |  brew install tmux  |  dnf install tmux" >&2
+  exit 1
+fi
+
+# ── Defaults ──────────────────────────────────────────────────────────────────
+
+ATTACH=true
+AGENT_OVERRIDE=""
+ACTION="start"
+
+# ── Parse flags ───────────────────────────────────────────────────────────────
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --detach)   ATTACH=false; shift ;;
+    --attach)   ATTACH=true; shift ;;
+    --agent)    AGENT_OVERRIDE="$2"; shift 2 ;;
+    --kill)     ACTION="kill"; shift ;;
+    --status)   ACTION="status"; shift ;;
+    -h|--help)
+      echo "Usage: fathom-start.sh [--attach] [--detach] [--agent NAME] [--kill] [--status]"
+      echo ""
+      echo "  (default)    Start agent in tmux, save pane ID, attach"
+      echo "  --detach     Start but don't attach"
+      echo "  --agent X    Override agent: claude-code, codex, gemini, opencode"
+      echo "  --kill       Kill existing session"
+      echo "  --status     Show if session is running"
+      exit 0
+      ;;
+    *)
+      echo "Unknown flag: $1" >&2
+      exit 1
+      ;;
+  esac
+done
+
+# ── Find .fathom.json ────────────────────────────────────────────────────────
+
+find_config() {
+  local dir="$PWD"
+  while [[ "$dir" != "/" ]]; do
+    if [[ -f "$dir/.fathom.json" ]]; then
+      echo "$dir/.fathom.json"
+      return 0
+    fi
+    dir="$(dirname "$dir")"
+  done
+  return 1
+}
+
+CONFIG_FILE=$(find_config) || {
+  echo "Error: No .fathom.json found (searched from $PWD to /)" >&2
+  echo "Run 'npx fathom-mcp init' first." >&2
+  exit 1
+}
+
+PROJECT_DIR="$(dirname "$CONFIG_FILE")"
+
+# ── Parse config ──────────────────────────────────────────────────────────────
+
+read_json_field() {
+  local file="$1" field="$2"
+  if command -v jq &>/dev/null; then
+    jq -r ".$field // empty" "$file" 2>/dev/null
+  else
+    # Fallback: simple grep/sed for flat string fields
+    sed -n "s/.*\"$field\"[[:space:]]*:[[:space:]]*\"\([^\"]*\)\".*/\1/p" "$file" | head -1
+  fi
+}
+
+read_json_array_first() {
+  local file="$1" field="$2"
+  if command -v jq &>/dev/null; then
+    jq -r ".$field[0] // empty" "$file" 2>/dev/null
+  else
+    # Fallback: grab first quoted string after the array field
+    sed -n "/\"$field\"/,/\]/{ s/.*\"\([^\"]*\)\".*/\1/p; }" "$file" | head -1
+  fi
+}
+
+WORKSPACE=$(read_json_field "$CONFIG_FILE" "workspace")
+if [[ -z "$WORKSPACE" ]]; then
+  WORKSPACE="$(basename "$PROJECT_DIR")"
+fi
+
+SESSION="${WORKSPACE}_fathom-session"
+PANE_DIR="$HOME/.config/fathom"
+PANE_FILE="$PANE_DIR/${WORKSPACE}-pane-id"
+
+# ── Resolve agent command ─────────────────────────────────────────────────────
+
+resolve_agent_cmd() {
+  local agent="${AGENT_OVERRIDE:-}"
+  if [[ -z "$agent" ]]; then
+    agent=$(read_json_array_first "$CONFIG_FILE" "agents")
+  fi
+  if [[ -z "$agent" ]]; then
+    agent="claude-code"
+  fi
+
+  case "$agent" in
+    claude-code)
+      echo "claude --model opus --permission-mode bypassPermissions"
+      ;;
+    codex)
+      echo "codex"
+      ;;
+    gemini)
+      echo "gemini"
+      ;;
+    opencode)
+      echo "opencode"
+      ;;
+    *)
+      echo "Warning: Unknown agent '$agent', falling back to claude" >&2
+      echo "claude"
+      ;;
+  esac
+}
+
+# ── Save pane ID ──────────────────────────────────────────────────────────────
+
+save_pane_id() {
+  local pane_id
+  pane_id=$(tmux list-panes -t "$SESSION" -F '#{pane_id}' 2>/dev/null | head -1)
+  if [[ -n "$pane_id" ]]; then
+    mkdir -p "$PANE_DIR"
+    echo "$pane_id" > "$PANE_FILE"
+    echo "Pane ID: $pane_id → $PANE_FILE"
+  fi
+}
+
+# ── Session check ─────────────────────────────────────────────────────────────
+
+session_exists() {
+  tmux has-session -t "$SESSION" 2>/dev/null
+}
+
+# ── Actions ───────────────────────────────────────────────────────────────────
+
+do_status() {
+  echo "Workspace: $WORKSPACE"
+  echo "Session:   $SESSION"
+  if session_exists; then
+    echo "Status:    running"
+    if [[ -f "$PANE_FILE" ]]; then
+      echo "Pane ID:   $(cat "$PANE_FILE")"
+    fi
+  else
+    echo "Status:    not running"
+  fi
+}
+
+do_kill() {
+  if session_exists; then
+    tmux kill-session -t "$SESSION"
+    rm -f "$PANE_FILE"
+    echo "Killed session: $SESSION"
+  else
+    echo "Session not running: $SESSION"
+  fi
+}
+
+do_start() {
+  if session_exists; then
+    echo "Session already running: $SESSION"
+    save_pane_id
+    if [[ "$ATTACH" == true ]]; then
+      exec tmux attach-session -t "$SESSION"
+    fi
+    return 0
+  fi
+
+  local agent_cmd
+  agent_cmd=$(resolve_agent_cmd)
+
+  echo "Starting: $SESSION"
+  echo "Agent:    $agent_cmd"
+  echo "Dir:      $PROJECT_DIR"
+
+  # Unset CLAUDECODE to avoid nested session detection
+  unset CLAUDECODE 2>/dev/null || true
+
+  # Create detached tmux session running the agent
+  tmux new-session -d -s "$SESSION" -c "$PROJECT_DIR" $agent_cmd
+
+  # Wait briefly for session to stabilize
+  sleep 2
+
+  if session_exists; then
+    save_pane_id
+    echo "Session started."
+    if [[ "$ATTACH" == true ]]; then
+      exec tmux attach-session -t "$SESSION"
+    fi
+  else
+    echo "Error: Session failed to start" >&2
+    exit 1
+  fi
+}
+
+# ── Main ──────────────────────────────────────────────────────────────────────
+
+case "$ACTION" in
+  status) do_status ;;
+  kill)   do_kill ;;
+  start)  do_start ;;
+esac

package/src/cli.js

@@ -845,6 +845,35 @@ async function runUpdate() {
   console.log("  Restart your agent session to pick up changes.\n");
 }
 
+// --- Start command -----------------------------------------------------------
+
+function runStart(argv) {
+  // Find the installed fathom-start.sh script
+  const found = findConfigFile(process.cwd());
+  const projectDir = found?.dir || process.cwd();
+
+  // Check .fathom/scripts/ first (installed by init/update), then package scripts/
+  const localScript = path.join(projectDir, ".fathom", "scripts", "fathom-start.sh");
+  const packageScript = path.join(SCRIPTS_DIR, "fathom-start.sh");
+  const script = fs.existsSync(localScript) ? localScript : packageScript;
+
+  if (!fs.existsSync(script)) {
+    console.error("  Error: fathom-start.sh not found. Run `npx fathom-mcp update` first.");
+    process.exit(1);
+  }
+
+  // Pass remaining args through to the shell script
+  try {
+    execFileSync("bash", [script, ...argv], {
+      cwd: projectDir,
+      stdio: "inherit",
+    });
+  } catch (e) {
+    // Script already printed its own errors; just propagate exit code
+    process.exit(e.status || 1);
+  }
+}
+
 // --- Main --------------------------------------------------------------------
 
 // Guard: only run CLI when this module is the entry point (not when imported by tests)
@@ -871,12 +900,14 @@ if (isMain) {
       console.error(`Error: ${e.message}`);
       process.exit(1);
     });
+  } else if (command === "start") {
+    runStart(process.argv.slice(3));
   } else if (!command || command === "serve") {
     // Default: start MCP server
     import("./index.js");
   } else {
     console.error(`Unknown command: ${command}`);
-    console.error(`Usage: fathom-mcp [init|status|update|serve]
+    console.error(`Usage: fathom-mcp [init|status|update|start|serve]
 
   fathom-mcp init                                    Interactive setup
   fathom-mcp init -y --api-key KEY                   Non-interactive setup
@@ -884,6 +915,9 @@ if (isMain) {
   fathom-mcp init -y --api-key KEY --workspace NAME  Custom workspace name
   fathom-mcp status                                  Check connection status
   fathom-mcp update                                  Update hooks + version
+  fathom-mcp start                                   Start agent in tmux session
+  fathom-mcp start --detach                          Start without attaching
+  fathom-mcp start --kill                            Kill agent session
   fathom-mcp                                         Start MCP server`);
     process.exit(1);
   }