Skip to content

rpc/mcp: dedupe embedded and standalone servers; implement in-process resource handlers #22169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yperbasis merged 5 commits into from
Jul 3, 2026
Merged

rpc/mcp: dedupe embedded and standalone servers; implement in-process resource handlers #22169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a807e8
rpc/mcp: implement in-process resource handlers
yperbasis Jul 2, 2026
5968e7f
rpc/mcp: share tool/prompt/resource registration between servers
yperbasis Jul 2, 2026
9a4bc4e
rpc/mcp: panic on missing resource handlers; rename sortedKeys to map…
yperbasis Jul 2, 2026
b8a99da
rpc/mcp: reject non-matching URIs in extractURIParam
yperbasis Jul 2, 2026
2487382
rpc/mcp: pin nil-receipt transaction analysis status
yperbasis Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 32 additions & 55 deletions rpc/mcp/handlers_logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package mcp
import (
"bufio"
"context"
"errors"
"fmt"
"os"
"path/filepath"
Expand All @@ -11,42 +12,35 @@ import (
"github.com/mark3labs/mcp-go/mcp"
)

// handleLogsTail handles the logs_tail tool
func (e *ErigonMCPServer) handleLogsTail(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
logType := req.GetString("log_type", "erigon")
lines := req.GetInt("lines", 100)
filter := req.GetString("filter", "")
// logTools implements the logs_* tool handlers; it is embedded by both the
// embedded and standalone MCP servers.
type logTools struct {
logDir string
}

if lines <= 0 || lines > 10000 {
return mcp.NewToolResultError("lines must be between 1 and 10000"), nil
func (l logTools) resolveLogFile(logType string) (string, error) {
if l.logDir == "" {
return "", errors.New("log directory not configured (use --log.dir or --datadir)")
}

var logFile string
switch logType {
case "erigon":
logFile = filepath.Join(e.logDir, "erigon.log")
return filepath.Join(l.logDir, "erigon.log"), nil
case "torrent":
logFile = filepath.Join(e.logDir, "torrent.log")
return filepath.Join(l.logDir, "torrent.log"), nil
default:
return mcp.NewToolResultError("log_type must be 'erigon' or 'torrent'"), nil
}

logLines, err := readLogTail(logFile, lines, filter)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to read log: %v", err)), nil
return "", errors.New("log_type must be 'erigon' or 'torrent'")
}
}

result := fmt.Sprintf("Last %d lines from %s.log", len(logLines), logType)
if filter != "" {
result += fmt.Sprintf(" (filtered by: %s)", filter)
}
result += ":\n\n" + strings.Join(logLines, "\n")
func (l logTools) handleLogsTail(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
return l.readLogLines(req, "Last", readLogTail)
}

return mcp.NewToolResultText(result), nil
func (l logTools) handleLogsHead(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
return l.readLogLines(req, "First", readLogHead)
}

// handleLogsHead handles the logs_head tool
func (e *ErigonMCPServer) handleLogsHead(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
func (l logTools) readLogLines(req mcp.CallToolRequest, position string, read func(string, int, string) ([]string, error)) (*mcp.CallToolResult, error) {
logType := req.GetString("log_type", "erigon")
lines := req.GetInt("lines", 100)
filter := req.GetString("filter", "")
Expand All @@ -55,22 +49,17 @@ func (e *ErigonMCPServer) handleLogsHead(ctx context.Context, req mcp.CallToolRe
return mcp.NewToolResultError("lines must be between 1 and 10000"), nil
}

var logFile string
switch logType {
case "erigon":
logFile = filepath.Join(e.logDir, "erigon.log")
case "torrent":
logFile = filepath.Join(e.logDir, "torrent.log")
default:
return mcp.NewToolResultError("log_type must be 'erigon' or 'torrent'"), nil
logFile, err := l.resolveLogFile(logType)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}

logLines, err := readLogHead(logFile, lines, filter)
logLines, err := read(logFile, lines, filter)
if err != nil {
return mcp.NewToolResultError(fmt.Sprintf("Failed to read log: %v", err)), nil
}

result := fmt.Sprintf("First %d lines from %s.log", len(logLines), logType)
result := fmt.Sprintf("%s %d lines from %s.log", position, len(logLines), logType)
if filter != "" {
result += fmt.Sprintf(" (filtered by: %s)", filter)
}
Expand All @@ -79,8 +68,7 @@ func (e *ErigonMCPServer) handleLogsHead(ctx context.Context, req mcp.CallToolRe
return mcp.NewToolResultText(result), nil
}

// handleLogsGrep handles the logs_grep tool
func (e *ErigonMCPServer) handleLogsGrep(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
func (l logTools) handleLogsGrep(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
logType := req.GetString("log_type", "erigon")
pattern := req.GetString("pattern", "")
maxLines := req.GetInt("max_lines", 1000)
Expand All @@ -94,14 +82,9 @@ func (e *ErigonMCPServer) handleLogsGrep(ctx context.Context, req mcp.CallToolRe
return mcp.NewToolResultError("max_lines must be between 1 and 10000"), nil
}

var logFile string
switch logType {
case "erigon":
logFile = filepath.Join(e.logDir, "erigon.log")
case "torrent":
logFile = filepath.Join(e.logDir, "torrent.log")
default:
return mcp.NewToolResultError("log_type must be 'erigon' or 'torrent'"), nil
logFile, err := l.resolveLogFile(logType)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}

logLines, err := grepLog(logFile, pattern, maxLines, caseInsensitive)
Expand All @@ -115,18 +98,12 @@ func (e *ErigonMCPServer) handleLogsGrep(ctx context.Context, req mcp.CallToolRe
return mcp.NewToolResultText(result), nil
}

// handleLogsStats handles the logs_stats tool
func (e *ErigonMCPServer) handleLogsStats(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
func (l logTools) handleLogsStats(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
logType := req.GetString("log_type", "erigon")

var logFile string
switch logType {
case "erigon":
logFile = filepath.Join(e.logDir, "erigon.log")
case "torrent":
logFile = filepath.Join(e.logDir, "torrent.log")
default:
return mcp.NewToolResultError("log_type must be 'erigon' or 'torrent'"), nil
logFile, err := l.resolveLogFile(logType)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}

stats, err := getLogStats(logFile)
Expand Down
Loading
Loading