telegram-claude-mcp 2.0.3 → 2.0.4

package/bin/daemon-ctl.js

@@ -76,12 +76,13 @@ async function start() {
 
   // Determine which script to run
   let script = daemonScript;
-  let runner = 'node';
+  let args = [script];
 
   if (!existsSync(daemonScript)) {
     if (existsSync(daemonSrc)) {
       script = daemonSrc;
-      runner = 'bun';
+      // Use node with tsx for TypeScript support
+      args = ['--import', 'tsx', script];
     } else {
       console.error('Error: Daemon script not found. Run `npm run build` first.');
       process.exit(1);
@@ -90,7 +91,7 @@ async function start() {
 
   console.log('Starting telegram-claude-daemon...');
 
-  const child = spawn(runner, [script], {
+  const child = spawn('node', args, {
     detached: true,
     stdio: ['ignore', 'pipe', 'pipe'],
     env: process.env,

package/bin/setup.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Setup script for telegram-claude-mcp hooks integration
+ * Setup script for telegram-claude-mcp hooks integration (v2 - Daemon Architecture)
  *
  * Usage: npx telegram-claude-mcp setup
  *
@@ -22,202 +22,101 @@ const CLAUDE_DIR = join(homedir(), '.claude');
 const HOOKS_DIR = join(CLAUDE_DIR, 'hooks');
 const SETTINGS_FILE = join(CLAUDE_DIR, 'settings.json');
 
-// Hook scripts content - with SESSION_NAME support for multi-session setups
-const PERMISSION_HOOK = `#!/bin/bash
-#
-# Claude Code Permission Hook - forwards permission requests to Telegram
-# Set SESSION_NAME env var to target a specific session (for multi-session setups)
-#
-
-SESSION_DIR="/tmp/telegram-claude-sessions"
-
-find_session() {
-  if [ -n "$SESSION_NAME" ]; then
-    local specific_file="$SESSION_DIR/\${SESSION_NAME}.info"
-    if [ -f "$specific_file" ]; then
-      local pid
-      pid=$(jq -r '.pid // empty' "$specific_file" 2>/dev/null)
-      if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
-        echo "$specific_file"
-        return
-      fi
-    fi
-    return
-  fi
+// Default daemon configuration
+const DAEMON_PORT = 3333;
+const DAEMON_HOST = 'localhost';
 
-  local latest_file=""
-  local latest_time=0
-  [ -d "$SESSION_DIR" ] || return
-
-  for info_file in "$SESSION_DIR"/*.info; do
-    [ -e "$info_file" ] || continue
-    local pid
-    pid=$(jq -r '.pid // empty' "$info_file" 2>/dev/null)
-    if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
-      local file_time
-      file_time=$(stat -f %m "$info_file" 2>/dev/null || stat -c %Y "$info_file" 2>/dev/null)
-      if [ "$file_time" -gt "$latest_time" ]; then
-        latest_time=$file_time
-        latest_file=$info_file
-      fi
-    fi
-  done
-  echo "$latest_file"
-}
+// Hook scripts content - v2 daemon architecture
+// These hooks communicate with a single daemon process via HTTP
 
-INFO_FILE=$(find_session)
-[ -z "$INFO_FILE" ] || [ ! -f "$INFO_FILE" ] && exit 0
+const PERMISSION_HOOK = `#!/bin/bash
+# Permission hook for telegram-claude-daemon (v2)
+# Sends permission requests to the daemon for Telegram approval
+
+DAEMON_PORT="\${TELEGRAM_CLAUDE_PORT:-${DAEMON_PORT}}"
+DAEMON_HOST="\${TELEGRAM_CLAUDE_HOST:-${DAEMON_HOST}}"
+HOOK_URL="http://\${DAEMON_HOST}:\${DAEMON_PORT}/permission"
 
-HOOK_PORT=$(jq -r '.port' "$INFO_FILE")
-HOOK_HOST=$(jq -r '.host // "localhost"' "$INFO_FILE")
-HOOK_URL="http://\${HOOK_HOST}:\${HOOK_PORT}/permission"
+# Auto-detect project name from current working directory
+PROJECT_NAME=$(basename "$(pwd)")
+BASE_SESSION="\${SESSION_NAME:-default}"
+FULL_SESSION_NAME="\${BASE_SESSION}:\${PROJECT_NAME}"
 
 INPUT=$(cat)
-TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // empty')
-TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input // {}')
 
-if [ -z "$TOOL_NAME" ]; then
-  TOOL_NAME=$(echo "$INPUT" | jq -r '.toolName // .name // empty')
-  TOOL_INPUT=$(echo "$INPUT" | jq -c '.toolInput // .input // .arguments // {}')
-fi
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // .toolName // .name // empty')
+TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input // .toolInput // .input // .arguments // {}')
+
+[ -z "$TOOL_NAME" ] && exit 0
 
 PAYLOAD=$(jq -n \\
   --arg tool_name "$TOOL_NAME" \\
   --argjson tool_input "$TOOL_INPUT" \\
-  '{tool_name: $tool_name, tool_input: $tool_input}')
+  --arg session_name "$FULL_SESSION_NAME" \\
+  '{tool_name: $tool_name, tool_input: $tool_input, session_name: $session_name}')
 
 RESPONSE=$(curl -s -X POST "$HOOK_URL" \\
   -H "Content-Type: application/json" \\
+  -H "X-Session-Name: $FULL_SESSION_NAME" \\
   -d "$PAYLOAD" \\
-  --max-time 600)
+  --max-time 600 2>/dev/null)
 
-[ $? -eq 0 ] && echo "$RESPONSE"
+[ $? -eq 0 ] && [ -n "$RESPONSE" ] && echo "$RESPONSE"
 `;
 
 const STOP_HOOK = `#!/bin/bash
-#
-# Claude Code Interactive Stop Hook - sends stop notification and waits for reply
-# Set SESSION_NAME env var to target a specific session (for multi-session setups)
-#
-
-SESSION_DIR="/tmp/telegram-claude-sessions"
-
-find_session() {
-  if [ -n "$SESSION_NAME" ]; then
-    local specific_file="$SESSION_DIR/\${SESSION_NAME}.info"
-    if [ -f "$specific_file" ]; then
-      local pid
-      pid=$(jq -r '.pid // empty' "$specific_file" 2>/dev/null)
-      if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
-        echo "$specific_file"
-        return
-      fi
-    fi
-    return
-  fi
+# Stop hook for telegram-claude-daemon (v2)
+# Sends stop notification and waits for user response
 
-  local latest_file=""
-  local latest_time=0
-  [ -d "$SESSION_DIR" ] || return
-
-  for info_file in "$SESSION_DIR"/*.info; do
-    [ -e "$info_file" ] || continue
-    local pid
-    pid=$(jq -r '.pid // empty' "$info_file" 2>/dev/null)
-    if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
-      local file_time
-      file_time=$(stat -f %m "$info_file" 2>/dev/null || stat -c %Y "$info_file" 2>/dev/null)
-      if [ "$file_time" -gt "$latest_time" ]; then
-        latest_time=$file_time
-        latest_file=$info_file
-      fi
-    fi
-  done
-  echo "$latest_file"
-}
+DAEMON_PORT="\${TELEGRAM_CLAUDE_PORT:-${DAEMON_PORT}}"
+DAEMON_HOST="\${TELEGRAM_CLAUDE_HOST:-${DAEMON_HOST}}"
+HOOK_URL="http://\${DAEMON_HOST}:\${DAEMON_PORT}/stop"
+
+# Auto-detect project name from current working directory
+PROJECT_NAME=$(basename "$(pwd)")
+BASE_SESSION="\${SESSION_NAME:-default}"
+FULL_SESSION_NAME="\${BASE_SESSION}:\${PROJECT_NAME}"
 
 INPUT=$(cat)
 
+# Prevent recursion
 STOP_HOOK_ACTIVE=$(echo "$INPUT" | jq -r '.stop_hook_active // false')
 [ "$STOP_HOOK_ACTIVE" = "true" ] && exit 0
 
-INFO_FILE=$(find_session)
-[ -z "$INFO_FILE" ] || [ ! -f "$INFO_FILE" ] && exit 0
-
-HOOK_PORT=$(jq -r '.port' "$INFO_FILE")
-HOOK_HOST=$(jq -r '.host // "localhost"' "$INFO_FILE")
-HOOK_URL="http://\${HOOK_HOST}:\${HOOK_PORT}/stop"
-
 TRANSCRIPT_PATH=$(echo "$INPUT" | jq -r '.transcript_path // empty')
 
 PAYLOAD=$(jq -n \\
   --arg transcript_path "$TRANSCRIPT_PATH" \\
-  '{transcript_path: $transcript_path}')
+  --arg session_name "$FULL_SESSION_NAME" \\
+  '{transcript_path: $transcript_path, session_name: $session_name}')
 
 RESPONSE=$(curl -s -X POST "$HOOK_URL" \\
   -H "Content-Type: application/json" \\
+  -H "X-Session-Name: $FULL_SESSION_NAME" \\
   -d "$PAYLOAD" \\
-  --max-time 300)
+  --max-time 300 2>/dev/null)
 
-if [ $? -eq 0 ]; then
+if [ $? -eq 0 ] && [ -n "$RESPONSE" ]; then
   DECISION=$(echo "$RESPONSE" | jq -r '.decision // empty')
-  REASON=$(echo "$RESPONSE" | jq -r '.reason // empty')
-  if [ "$DECISION" = "block" ] && [ -n "$REASON" ]; then
+  if [ "$DECISION" = "block" ]; then
     echo "$RESPONSE"
-    # Exit code 2 tells Claude Code to continue with the reason as instructions
     exit 2
   fi
 fi
 `;
 
 const NOTIFY_HOOK = `#!/bin/bash
-#
-# Claude Code Notification Hook - sends notifications to Telegram
-# Set SESSION_NAME env var to target a specific session (for multi-session setups)
-#
-
-SESSION_DIR="/tmp/telegram-claude-sessions"
-
-find_session() {
-  if [ -n "$SESSION_NAME" ]; then
-    local specific_file="$SESSION_DIR/\${SESSION_NAME}.info"
-    if [ -f "$specific_file" ]; then
-      local pid
-      pid=$(jq -r '.pid // empty' "$specific_file" 2>/dev/null)
-      if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
-        echo "$specific_file"
-        return
-      fi
-    fi
-    return
-  fi
+# Notification hook for telegram-claude-daemon (v2)
+# Sends notifications to the daemon (fire-and-forget)
 
-  local latest_file=""
-  local latest_time=0
-  [ -d "$SESSION_DIR" ] || return
-
-  for info_file in "$SESSION_DIR"/*.info; do
-    [ -e "$info_file" ] || continue
-    local pid
-    pid=$(jq -r '.pid // empty' "$info_file" 2>/dev/null)
-    if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
-      local file_time
-      file_time=$(stat -f %m "$info_file" 2>/dev/null || stat -c %Y "$info_file" 2>/dev/null)
-      if [ "$file_time" -gt "$latest_time" ]; then
-        latest_time=$file_time
-        latest_file=$info_file
-      fi
-    fi
-  done
-  echo "$latest_file"
-}
+DAEMON_PORT="\${TELEGRAM_CLAUDE_PORT:-${DAEMON_PORT}}"
+DAEMON_HOST="\${TELEGRAM_CLAUDE_HOST:-${DAEMON_HOST}}"
+HOOK_URL="http://\${DAEMON_HOST}:\${DAEMON_PORT}/notify"
 
-INFO_FILE=$(find_session)
-[ -z "$INFO_FILE" ] || [ ! -f "$INFO_FILE" ] && exit 0
-
-HOOK_PORT=$(jq -r '.port' "$INFO_FILE")
-HOOK_HOST=$(jq -r '.host // "localhost"' "$INFO_FILE")
-HOOK_URL="http://\${HOOK_HOST}:\${HOOK_PORT}/notify"
+# Auto-detect project name from current working directory
+PROJECT_NAME=$(basename "$(pwd)")
+BASE_SESSION="\${SESSION_NAME:-default}"
+FULL_SESSION_NAME="\${BASE_SESSION}:\${PROJECT_NAME}"
 
 INPUT=$(cat)
 MESSAGE=$(echo "$INPUT" | jq -r '.message // "Notification from Claude"')
@@ -225,12 +124,137 @@ MESSAGE=$(echo "$INPUT" | jq -r '.message // "Notification from Claude"')
 PAYLOAD=$(jq -n \\
   --arg type "notification" \\
   --arg message "$MESSAGE" \\
-  '{type: $type, message: $message}')
+  --arg session_name "$FULL_SESSION_NAME" \\
+  '{type: $type, message: $message, session_name: $session_name}')
 
 curl -s -X POST "$HOOK_URL" \\
   -H "Content-Type: application/json" \\
+  -H "X-Session-Name: $FULL_SESSION_NAME" \\
   -d "$PAYLOAD" \\
-  --max-time 10 > /dev/null 2>&1
+  --max-time 10 >/dev/null 2>&1
+`;
+
+// Progress tracking hooks - fire-and-forget for real-time progress updates
+
+const PROGRESS_PRE_TOOL_HOOK = `#!/bin/bash
+# PreToolUse progress hook for telegram-claude-daemon
+# Sends tool start events to update progress display (fire-and-forget)
+
+DAEMON_PORT="\${TELEGRAM_CLAUDE_PORT:-${DAEMON_PORT}}"
+DAEMON_HOST="\${TELEGRAM_CLAUDE_HOST:-${DAEMON_HOST}}"
+HOOK_URL="http://\${DAEMON_HOST}:\${DAEMON_PORT}/progress"
+
+# Auto-detect project name from current working directory
+PROJECT_NAME=$(basename "$(pwd)")
+BASE_SESSION="\${SESSION_NAME:-default}"
+FULL_SESSION_NAME="\${BASE_SESSION}:\${PROJECT_NAME}"
+
+INPUT=$(cat)
+
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // .toolName // .name // empty')
+TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input // .toolInput // .input // .arguments // {}')
+
+[ -z "$TOOL_NAME" ] && exit 0
+
+# Skip progress for Telegram tools (would be recursive)
+case "$TOOL_NAME" in
+  mcp__telegram__*|send_message|continue_chat|notify_user|end_chat)
+    exit 0
+    ;;
+esac
+
+PAYLOAD=$(jq -n \\
+  --arg type "pre_tool" \\
+  --arg session_name "$FULL_SESSION_NAME" \\
+  --arg tool_name "$TOOL_NAME" \\
+  --argjson tool_input "$TOOL_INPUT" \\
+  --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \\
+  '{type: $type, session_name: $session_name, tool_name: $tool_name, tool_input: $tool_input, timestamp: $timestamp}')
+
+# Fire and forget
+(curl -s -X POST "$HOOK_URL" \\
+  -H "Content-Type: application/json" \\
+  -H "X-Session-Name: $FULL_SESSION_NAME" \\
+  -d "$PAYLOAD" \\
+  --max-time 2 2>/dev/null) &
+
+exit 0
+`;
+
+const PROGRESS_POST_TOOL_HOOK = `#!/bin/bash
+# PostToolUse progress hook for telegram-claude-daemon
+# Sends tool completion events to update progress display (fire-and-forget)
+
+DAEMON_PORT="\${TELEGRAM_CLAUDE_PORT:-${DAEMON_PORT}}"
+DAEMON_HOST="\${TELEGRAM_CLAUDE_HOST:-${DAEMON_HOST}}"
+HOOK_URL="http://\${DAEMON_HOST}:\${DAEMON_PORT}/progress"
+
+# Auto-detect project name from current working directory
+PROJECT_NAME=$(basename "$(pwd)")
+BASE_SESSION="\${SESSION_NAME:-default}"
+FULL_SESSION_NAME="\${BASE_SESSION}:\${PROJECT_NAME}"
+
+INPUT=$(cat)
+
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // .toolName // .name // empty')
+
+IS_ERROR=$(echo "$INPUT" | jq -r '.is_error // .isError // false')
+[ "$IS_ERROR" = "true" ] && SUCCESS="false" || SUCCESS="true"
+
+[ -z "$TOOL_NAME" ] && exit 0
+
+# Skip progress for Telegram tools
+case "$TOOL_NAME" in
+  mcp__telegram__*|send_message|continue_chat|notify_user|end_chat)
+    exit 0
+    ;;
+esac
+
+PAYLOAD=$(jq -n \\
+  --arg type "post_tool" \\
+  --arg session_name "$FULL_SESSION_NAME" \\
+  --arg tool_name "$TOOL_NAME" \\
+  --argjson success "$SUCCESS" \\
+  --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \\
+  '{type: $type, session_name: $session_name, tool_name: $tool_name, success: $success, timestamp: $timestamp}')
+
+# Fire and forget
+(curl -s -X POST "$HOOK_URL" \\
+  -H "Content-Type: application/json" \\
+  -H "X-Session-Name: $FULL_SESSION_NAME" \\
+  -d "$PAYLOAD" \\
+  --max-time 2 2>/dev/null) &
+
+exit 0
+`;
+
+const PROGRESS_STOP_HOOK = `#!/bin/bash
+# Stop progress hook for telegram-claude-daemon
+# Sends stop event to finalize progress display (fire-and-forget)
+
+DAEMON_PORT="\${TELEGRAM_CLAUDE_PORT:-${DAEMON_PORT}}"
+DAEMON_HOST="\${TELEGRAM_CLAUDE_HOST:-${DAEMON_HOST}}"
+HOOK_URL="http://\${DAEMON_HOST}:\${DAEMON_PORT}/progress"
+
+# Auto-detect project name from current working directory
+PROJECT_NAME=$(basename "$(pwd)")
+BASE_SESSION="\${SESSION_NAME:-default}"
+FULL_SESSION_NAME="\${BASE_SESSION}:\${PROJECT_NAME}"
+
+PAYLOAD=$(jq -n \\
+  --arg type "stop" \\
+  --arg session_name "$FULL_SESSION_NAME" \\
+  --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \\
+  '{type: $type, session_name: $session_name, timestamp: $timestamp}')
+
+# Fire and forget
+(curl -s -X POST "$HOOK_URL" \\
+  -H "Content-Type: application/json" \\
+  -H "X-Session-Name: $FULL_SESSION_NAME" \\
+  -d "$PAYLOAD" \\
+  --max-time 2 2>/dev/null) &
+
+exit 0
 `;
 
 // Generate hooks configuration for Claude settings
@@ -238,6 +262,7 @@ curl -s -X POST "$HOOK_URL" \\
 function generateHooksConfig(sessionName = 'default') {
   const envPrefix = `SESSION_NAME=${sessionName}`;
   return {
+    // Permission request handling
     PermissionRequest: [
       {
         matcher: '*',
@@ -249,17 +274,23 @@ function generateHooksConfig(sessionName = 'default') {
         ]
       }
     ],
+    // Stop hook with interactive continue option
     Stop: [
       {
         matcher: '*',
         hooks: [
           {
             type: 'command',
-            command: `${envPrefix} ~/.claude/hooks/stop-hook.sh`
+            command: `${envPrefix} ~/.claude/hooks/progress-stop-hook.sh`  // Progress finalization
+          },
+          {
+            type: 'command',
+            command: `${envPrefix} ~/.claude/hooks/stop-hook.sh`  // Interactive stop
           }
         ]
       }
     ],
+    // Notification forwarding
     Notification: [
       {
         matcher: '*',
@@ -270,6 +301,30 @@ function generateHooksConfig(sessionName = 'default') {
           }
         ]
       }
+    ],
+    // Progress tracking - PreToolUse
+    PreToolUse: [
+      {
+        matcher: '*',
+        hooks: [
+          {
+            type: 'command',
+            command: `${envPrefix} ~/.claude/hooks/progress-pre-tool-hook.sh`
+          }
+        ]
+      }
+    ],
+    // Progress tracking - PostToolUse
+    PostToolUse: [
+      {
+        matcher: '*',
+        hooks: [
+          {
+            type: 'command',
+            command: `${envPrefix} ~/.claude/hooks/progress-post-tool-hook.sh`
+          }
+        ]
+      }
     ]
   };
 }
@@ -284,7 +339,7 @@ function setup() {
     console.log('✓ Created ~/.claude/hooks/');
   }
 
-  // Write hook scripts
+  // Write hook scripts - core hooks
   const permissionHookPath = join(HOOKS_DIR, 'permission-hook.sh');
   writeFileSync(permissionHookPath, PERMISSION_HOOK);
   chmodSync(permissionHookPath, 0o755);
@@ -300,6 +355,22 @@ function setup() {
   chmodSync(notifyHookPath, 0o755);
   console.log('✓ Installed notify-hook.sh');
 
+  // Write hook scripts - progress tracking
+  const progressPreToolPath = join(HOOKS_DIR, 'progress-pre-tool-hook.sh');
+  writeFileSync(progressPreToolPath, PROGRESS_PRE_TOOL_HOOK);
+  chmodSync(progressPreToolPath, 0o755);
+  console.log('✓ Installed progress-pre-tool-hook.sh');
+
+  const progressPostToolPath = join(HOOKS_DIR, 'progress-post-tool-hook.sh');
+  writeFileSync(progressPostToolPath, PROGRESS_POST_TOOL_HOOK);
+  chmodSync(progressPostToolPath, 0o755);
+  console.log('✓ Installed progress-post-tool-hook.sh');
+
+  const progressStopPath = join(HOOKS_DIR, 'progress-stop-hook.sh');
+  writeFileSync(progressStopPath, PROGRESS_STOP_HOOK);
+  chmodSync(progressStopPath, 0o755);
+  console.log('✓ Installed progress-stop-hook.sh');
+
   // Update Claude settings
   let settings = {};
   if (existsSync(SETTINGS_FILE)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telegram-claude-mcp",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "MCP server that lets Claude message you on Telegram with hooks support",
   "author": "Geravant",
   "license": "MIT",