telegram-claude-mcp 2.0.2 → 2.0.3

package/bin/setup.js

@@ -162,7 +162,11 @@ RESPONSE=$(curl -s -X POST "$HOOK_URL" \\
 if [ $? -eq 0 ]; then
   DECISION=$(echo "$RESPONSE" | jq -r '.decision // empty')
   REASON=$(echo "$RESPONSE" | jq -r '.reason // empty')
-  [ "$DECISION" = "block" ] && [ -n "$REASON" ] && echo "$RESPONSE"
+  if [ "$DECISION" = "block" ] && [ -n "$REASON" ]; then
+    echo "$RESPONSE"
+    # Exit code 2 tells Claude Code to continue with the reason as instructions
+    exit 2
+  fi
 fi
 `;
 

package/hooks-v2/hooks-config-example.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "_comment": "Example Claude Code hooks configuration for progress tracking. Copy relevant sections to ~/.claude/settings.json or .claude/settings.json in your project.",
+
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "*",
+        "command": "SESSION_NAME=${SESSION_NAME:-$(basename \"$PWD\")} /path/to/call-me/server/hooks-v2/progress-pre-tool.sh"
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "*",
+        "command": "SESSION_NAME=${SESSION_NAME:-$(basename \"$PWD\")} /path/to/call-me/server/hooks-v2/progress-post-tool.sh"
+      }
+    ],
+    "Stop": [
+      {
+        "command": "SESSION_NAME=${SESSION_NAME:-$(basename \"$PWD\")} /path/to/call-me/server/hooks-v2/progress-stop.sh"
+      },
+      {
+        "_comment": "Optional: Interactive stop hook (waits for user response)",
+        "command": "SESSION_NAME=${SESSION_NAME:-$(basename \"$PWD\")} /path/to/call-me/server/hooks-v2/stop-hook.sh"
+      }
+    ]
+  }
+}

package/hooks-v2/progress-post-tool.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+# PostToolUse progress hook for telegram-claude-daemon
+# Sends tool completion events to update progress display
+#
+# This hook is fire-and-forget - it doesn't block Claude's execution
+
+DAEMON_PORT="${TELEGRAM_CLAUDE_PORT:-3333}"
+DAEMON_HOST="${TELEGRAM_CLAUDE_HOST:-localhost}"
+HOOK_URL="http://${DAEMON_HOST}:${DAEMON_PORT}/progress"
+
+# Read input from stdin
+INPUT=$(cat)
+
+# Extract tool info
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // .toolName // .name // empty')
+TOOL_RESULT=$(echo "$INPUT" | jq -c '.tool_result // .result // {}')
+
+# Check if tool succeeded
+IS_ERROR=$(echo "$INPUT" | jq -r '.is_error // .isError // false')
+if [ "$IS_ERROR" = "true" ]; then
+  SUCCESS="false"
+else
+  SUCCESS="true"
+fi
+
+# Skip if no tool name
+if [ -z "$TOOL_NAME" ]; then
+  exit 0
+fi
+
+# Skip progress updates for Telegram tools (would be recursive)
+case "$TOOL_NAME" in
+  mcp__telegram__*|send_message|continue_chat|notify_user|end_chat)
+    exit 0
+    ;;
+esac
+
+# Build payload
+PAYLOAD=$(jq -n \
+  --arg type "post_tool" \
+  --arg session_name "${SESSION_NAME:-default}" \
+  --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 - send in background and don't wait
+(curl -s -X POST "$HOOK_URL" \
+  -H "Content-Type: application/json" \
+  -H "X-Session-Name: ${SESSION_NAME:-default}" \
+  -d "$PAYLOAD" \
+  --max-time 2 2>/dev/null) &
+
+# Exit immediately - don't block Claude
+exit 0

package/hooks-v2/progress-pre-tool.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+# PreToolUse progress hook for telegram-claude-daemon
+# Sends tool start events to update progress display
+#
+# This hook is fire-and-forget - it doesn't block Claude's execution
+
+DAEMON_PORT="${TELEGRAM_CLAUDE_PORT:-3333}"
+DAEMON_HOST="${TELEGRAM_CLAUDE_HOST:-localhost}"
+HOOK_URL="http://${DAEMON_HOST}:${DAEMON_PORT}/progress"
+
+# Read input from stdin
+INPUT=$(cat)
+
+# Extract tool info
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // .toolName // .name // empty')
+TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input // .toolInput // .input // .arguments // {}')
+
+# Skip if no tool name
+if [ -z "$TOOL_NAME" ]; then
+  exit 0
+fi
+
+# Skip progress updates for Telegram tools (would be recursive)
+case "$TOOL_NAME" in
+  mcp__telegram__*|send_message|continue_chat|notify_user|end_chat)
+    exit 0
+    ;;
+esac
+
+# Build payload
+PAYLOAD=$(jq -n \
+  --arg type "pre_tool" \
+  --arg session_name "${SESSION_NAME:-default}" \
+  --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 - send in background and don't wait
+(curl -s -X POST "$HOOK_URL" \
+  -H "Content-Type: application/json" \
+  -H "X-Session-Name: ${SESSION_NAME:-default}" \
+  -d "$PAYLOAD" \
+  --max-time 2 2>/dev/null) &
+
+# Exit immediately - don't block Claude
+exit 0

package/hooks-v2/progress-stop.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Stop progress hook for telegram-claude-daemon
+# Sends stop events to finalize progress display
+#
+# This hook is fire-and-forget - it doesn't block Claude's execution
+# Note: This is separate from stop-hook.sh which handles interactive stop
+
+DAEMON_PORT="${TELEGRAM_CLAUDE_PORT:-3333}"
+DAEMON_HOST="${TELEGRAM_CLAUDE_HOST:-localhost}"
+HOOK_URL="http://${DAEMON_HOST}:${DAEMON_PORT}/progress"
+
+# Read input from stdin (if any)
+INPUT=$(cat)
+
+# Build payload
+PAYLOAD=$(jq -n \
+  --arg type "stop" \
+  --arg session_name "${SESSION_NAME:-default}" \
+  --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+  '{
+    type: $type,
+    session_name: $session_name,
+    timestamp: $timestamp
+  }')
+
+# Fire and forget - send in background and don't wait
+(curl -s -X POST "$HOOK_URL" \
+  -H "Content-Type: application/json" \
+  -H "X-Session-Name: ${SESSION_NAME:-default}" \
+  -d "$PAYLOAD" \
+  --max-time 2 2>/dev/null) &
+
+# Exit immediately - don't block Claude
+exit 0

package/package.json

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

package/src/daemon/index.ts

@@ -13,6 +13,7 @@ import { existsSync, unlinkSync, writeFileSync, mkdirSync } from 'fs';
 import { dirname } from 'path';
 import { SessionManager } from './session-manager.js';
 import { MultiTelegramManager, type HookEvent } from './telegram-multi.js';
+import { ProgressTracker, type ProgressEvent } from './progress-tracker.js';
 import {
   DAEMON_SOCKET_PATH,
   DAEMON_PID_FILE,
@@ -96,6 +97,16 @@ async function main() {
 
   telegram.start();
 
+  // Create progress tracker
+  const progressTracker = new ProgressTracker(
+    telegram.getBot(),
+    telegram.getChatId(),
+    sessionManager
+  );
+
+  // Register progress tracker's callback handler for mute buttons
+  telegram.registerCallbackInterceptor((query) => progressTracker.handleCallback(query));
+
   // Track socket buffers for each connection
   const socketBuffers = new Map<net.Socket, string>();
 
@@ -223,6 +234,41 @@ async function main() {
         return;
       }
 
+      // Progress tracking endpoint
+      if (url === '/progress' || url === '/hooks/progress') {
+        const event = data as ProgressEvent;
+
+        console.error(`[HTTP] Progress: ${event.type} - ${event.tool_name || ''} (session: ${sessionName})`);
+
+        try {
+          switch (event.type) {
+            case 'start':
+              await progressTracker.handleSessionStart(sessionName);
+              break;
+            case 'pre_tool':
+              await progressTracker.handlePreTool(sessionName, event.tool_name!, event.tool_input);
+              break;
+            case 'post_tool':
+              await progressTracker.handlePostTool(sessionName, event.tool_name!, event.success ?? true);
+              break;
+            case 'stop':
+              await progressTracker.handleStop(sessionName);
+              break;
+            case 'notification':
+              await progressTracker.handleNotification(sessionName, event.tool_name || '');
+              break;
+          }
+
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ ok: true }));
+        } catch (error) {
+          console.error('[HTTP] Progress error:', error);
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ ok: true })); // Don't fail hooks
+        }
+        return;
+      }
+
       // Status endpoint
       if (url === '/status') {
         res.writeHead(200, { 'Content-Type': 'application/json' });
@@ -284,9 +330,10 @@ async function main() {
   process.on('SIGINT', shutdown);
   process.on('SIGTERM', shutdown);
 
-  // Periodic cleanup of dead sessions
+  // Periodic cleanup of dead sessions and progress state
   setInterval(() => {
     sessionManager.cleanup();
+    progressTracker.cleanup();
   }, 30000);
 }
 

package/src/daemon/telegram-multi.ts

@@ -54,6 +54,7 @@ export class MultiTelegramManager {
   private pendingPermissions: Map<string, PendingPermission> = new Map();
   private messageToSession: Map<number, string> = new Map(); // messageId -> sessionId
   private isRunning = false;
+  private callbackInterceptors: Array<(query: TelegramBot.CallbackQuery) => Promise<boolean>> = [];
 
   constructor(config: MultiTelegramConfig, sessionManager: SessionManager) {
     this.config = {
@@ -68,6 +69,28 @@ export class MultiTelegramManager {
     this.setupCallbackHandler();
   }
 
+  /**
+   * Get the underlying bot instance for advanced operations.
+   */
+  getBot(): TelegramBot {
+    return this.bot;
+  }
+
+  /**
+   * Get the configured chat ID.
+   */
+  getChatId(): number {
+    return this.config.chatId;
+  }
+
+  /**
+   * Register a callback interceptor that handles callback queries before the default handler.
+   * Return true to indicate the query was handled and stop further processing.
+   */
+  registerCallbackInterceptor(handler: (query: TelegramBot.CallbackQuery) => Promise<boolean>): void {
+    this.callbackInterceptors.push(handler);
+  }
+
   start(): void {
     this.isRunning = true;
     console.error('[MultiTelegram] Bot started');
@@ -544,6 +567,16 @@ export class MultiTelegramManager {
     this.bot.on('callback_query', async (query) => {
       if (!query.data || !query.message) return;
 
+      // Check interceptors first
+      for (const interceptor of this.callbackInterceptors) {
+        try {
+          const handled = await interceptor(query);
+          if (handled) return;
+        } catch (error) {
+          console.error('[MultiTelegram] Callback interceptor error:', error);
+        }
+      }
+
       const [action, messageId] = query.data.split(':');
       const key = messageId;