* feat: add security logging and fix framework regressions This commit implements comprehensive security event logging and resolves critical regressions in the core framework. Security Logging: - Enhanced `pkg/log` with a `Security` level and helper. - Added `log.Username()` to consistently identify the executing user. - Instrumented GitHub CLI auth, Agentic configuration, filesystem sandbox, MCP handlers, and MCP TCP transport with security logs. - Added `SecurityStyle` to the CLI for consistent visual representation of security events. UniFi Security (CodeQL): - Refactored `pkg/unifi` to remove hardcoded `InsecureSkipVerify`, resolving a high-severity alert. - Added a `--verify-tls` flag and configuration option to control TLS verification. - Updated command handlers to support the new verification parameter. Framework Fixes: - Restored original signatures for `MustServiceFor`, `Config()`, and `Display()` in `pkg/framework/core`, which had been corrupted during a merge. - Fixed `pkg/framework/framework.go` and `pkg/framework/core/runtime_pkg.go` to match the restored signatures. - These fixes resolve project-wide compilation errors caused by the signature mismatches. I encountered significant blockers due to a corrupted state of the `dev` branch after a merge, which introduced breaking changes in the core framework's DI system. I had to manually reconcile these signatures with the expected usage across the codebase to restore build stability. * feat(mcp): add RAG tools (query, ingest, collections) Add vector database tools to the MCP server for RAG operations: - rag_query: Search for relevant documentation using semantic similarity - rag_ingest: Ingest files or directories into the vector database - rag_collections: List available collections Uses existing internal/cmd/rag exports (QueryDocs, IngestDirectory, IngestFile) and pkg/rag for Qdrant client access. Default collection is "hostuk-docs" with topK=5 for queries. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(mcp): add metrics tools (record, query) Add MCP tools for recording and querying AI/security metrics events. The metrics_record tool writes events to daily JSONL files, and the metrics_query tool provides aggregated statistics by type, repo, and agent. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat: add 'core mcp serve' command Add CLI command to start the MCP server for AI tool integration. - Create internal/cmd/mcpcmd package with serve subcommand - Support --workspace flag for directory restriction - Handle SIGINT/SIGTERM for clean shutdown - Register in full.go build variant Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(ws): add WebSocket hub package for real-time streaming Add pkg/ws package implementing a hub pattern for WebSocket connections: - Hub manages client connections, broadcasts, and channel subscriptions - Client struct represents connected WebSocket clients - Message types: process_output, process_status, event, error, ping/pong - Channel-based subscription system (subscribe/unsubscribe) - SendProcessOutput and SendProcessStatus for process streaming integration - Full test coverage including concurrency tests Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(mcp): add process management and WebSocket MCP tools Add MCP tools for process management: - process_start: Start a new external process - process_stop: Gracefully stop a running process - process_kill: Force kill a process - process_list: List all managed processes - process_output: Get captured process output - process_input: Send input to process stdin Add MCP tools for WebSocket: - ws_start: Start WebSocket server for real-time streaming - ws_info: Get hub statistics (clients, channels) Update Service struct with optional process.Service and ws.Hub fields, new WithProcessService and WithWSHub options, getter methods, and Shutdown method for cleanup. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(webview): add browser automation package via Chrome DevTools Protocol Add pkg/webview package for browser automation: - webview.go: Main interface with Connect, Navigate, Click, Type, QuerySelector, Screenshot, Evaluate - cdp.go: Chrome DevTools Protocol WebSocket client implementation - actions.go: DOM action types (Click, Type, Hover, Scroll, etc.) and ActionSequence builder - console.go: Console message capture and filtering with ConsoleWatcher and ExceptionWatcher - angular.go: Angular-specific helpers for router navigation, component access, and Zone.js stability Add MCP tools for webview: - webview_connect/disconnect: Connection management - webview_navigate: Page navigation - webview_click/type/query/wait: DOM interaction - webview_console: Console output capture - webview_eval: JavaScript execution - webview_screenshot: Screenshot capture Add documentation: - docs/mcp/angular-testing.md: Guide for Angular application testing Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * docs: document new packages and BugSETI application - Update CLAUDE.md with documentation for: - pkg/ws (WebSocket hub for real-time streaming) - pkg/webview (Browser automation via CDP) - pkg/mcp (MCP server tools: process, ws, webview) - BugSETI application overview - Add comprehensive README for BugSETI with: - Installation and configuration guide - Usage workflow documentation - Architecture overview - Contributing guidelines Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(bugseti): add BugSETI system tray app with auto-update BugSETI - Distributed Bug Fixing like SETI@home but for code Features: - System tray app with Wails v3 - GitHub issue fetching with label filters - Issue queue with priority management - AI context seeding via seed-agent-developer skill - Automated PR submission flow - Stats tracking and leaderboard - Cross-platform notifications - Self-updating with stable/beta/nightly channels Includes: - cmd/bugseti: Main application with Angular frontend - internal/bugseti: Core services (fetcher, queue, seeder, submit, config, stats, notify) - internal/bugseti/updater: Auto-update system (checker, downloader, installer) - .github/workflows/bugseti-release.yml: CI/CD for all platforms Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: resolve import cycle and code duplication - Remove pkg/log import from pkg/io/local to break import cycle (pkg/log/rotation.go imports pkg/io, creating circular dependency) - Use stderr logging for security events in sandbox escape detection - Remove unused sync/atomic import from core.go - Fix duplicate LogSecurity function declarations in cli/log.go - Update workspace/service.go Crypt() call to match interface Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: update tests for new function signatures and format code - Update core_test.go: Config(), Display() now panic instead of returning error - Update runtime_pkg_test.go: sr.Config() now panics instead of returning error - Update MustServiceFor tests to use assert.Panics - Format BugSETI, MCP tools, and webview packages with gofmt Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Snider <631881+Snider@users.noreply.github.com> Co-authored-by: Claude <developers@lethean.io> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
215 lines
6.1 KiB
Go
215 lines
6.1 KiB
Go
package mcp
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/host-uk/core/pkg/ai"
|
|
"github.com/host-uk/core/pkg/log"
|
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
)
|
|
|
|
// Default values for metrics operations.
|
|
const (
|
|
DefaultMetricsSince = "7d"
|
|
DefaultMetricsLimit = 10
|
|
)
|
|
|
|
// MetricsRecordInput contains parameters for recording a metrics event.
|
|
type MetricsRecordInput struct {
|
|
Type string `json:"type"` // Event type (required)
|
|
AgentID string `json:"agent_id,omitempty"` // Agent identifier
|
|
Repo string `json:"repo,omitempty"` // Repository name
|
|
Data map[string]any `json:"data,omitempty"` // Additional event data
|
|
}
|
|
|
|
// MetricsRecordOutput contains the result of recording a metrics event.
|
|
type MetricsRecordOutput struct {
|
|
Success bool `json:"success"`
|
|
Timestamp time.Time `json:"timestamp"`
|
|
}
|
|
|
|
// MetricsQueryInput contains parameters for querying metrics.
|
|
type MetricsQueryInput struct {
|
|
Since string `json:"since,omitempty"` // Time range like "7d", "24h", "30m" (default: "7d")
|
|
}
|
|
|
|
// MetricsQueryOutput contains the results of a metrics query.
|
|
type MetricsQueryOutput struct {
|
|
Total int `json:"total"`
|
|
ByType []MetricCount `json:"by_type"`
|
|
ByRepo []MetricCount `json:"by_repo"`
|
|
ByAgent []MetricCount `json:"by_agent"`
|
|
Events []MetricEventBrief `json:"events"` // Most recent 10 events
|
|
}
|
|
|
|
// MetricCount represents a count for a specific key.
|
|
type MetricCount struct {
|
|
Key string `json:"key"`
|
|
Count int `json:"count"`
|
|
}
|
|
|
|
// MetricEventBrief represents a brief summary of an event.
|
|
type MetricEventBrief struct {
|
|
Type string `json:"type"`
|
|
Timestamp time.Time `json:"timestamp"`
|
|
AgentID string `json:"agent_id,omitempty"`
|
|
Repo string `json:"repo,omitempty"`
|
|
}
|
|
|
|
// registerMetricsTools adds metrics tools to the MCP server.
|
|
func (s *Service) registerMetricsTools(server *mcp.Server) {
|
|
mcp.AddTool(server, &mcp.Tool{
|
|
Name: "metrics_record",
|
|
Description: "Record a metrics event for AI/security tracking. Events are stored in daily JSONL files.",
|
|
}, s.metricsRecord)
|
|
|
|
mcp.AddTool(server, &mcp.Tool{
|
|
Name: "metrics_query",
|
|
Description: "Query metrics events and get aggregated statistics by type, repo, and agent.",
|
|
}, s.metricsQuery)
|
|
}
|
|
|
|
// metricsRecord handles the metrics_record tool call.
|
|
func (s *Service) metricsRecord(ctx context.Context, req *mcp.CallToolRequest, input MetricsRecordInput) (*mcp.CallToolResult, MetricsRecordOutput, error) {
|
|
s.logger.Info("MCP tool execution", "tool", "metrics_record", "type", input.Type, "agent_id", input.AgentID, "repo", input.Repo, "user", log.Username())
|
|
|
|
// Validate input
|
|
if input.Type == "" {
|
|
return nil, MetricsRecordOutput{}, fmt.Errorf("type cannot be empty")
|
|
}
|
|
|
|
// Create the event
|
|
event := ai.Event{
|
|
Type: input.Type,
|
|
Timestamp: time.Now(),
|
|
AgentID: input.AgentID,
|
|
Repo: input.Repo,
|
|
Data: input.Data,
|
|
}
|
|
|
|
// Record the event
|
|
if err := ai.Record(event); err != nil {
|
|
log.Error("mcp: metrics record failed", "type", input.Type, "err", err)
|
|
return nil, MetricsRecordOutput{}, fmt.Errorf("failed to record metrics: %w", err)
|
|
}
|
|
|
|
return nil, MetricsRecordOutput{
|
|
Success: true,
|
|
Timestamp: event.Timestamp,
|
|
}, nil
|
|
}
|
|
|
|
// metricsQuery handles the metrics_query tool call.
|
|
func (s *Service) metricsQuery(ctx context.Context, req *mcp.CallToolRequest, input MetricsQueryInput) (*mcp.CallToolResult, MetricsQueryOutput, error) {
|
|
// Apply defaults
|
|
since := input.Since
|
|
if since == "" {
|
|
since = DefaultMetricsSince
|
|
}
|
|
|
|
s.logger.Info("MCP tool execution", "tool", "metrics_query", "since", since, "user", log.Username())
|
|
|
|
// Parse the duration
|
|
duration, err := parseDuration(since)
|
|
if err != nil {
|
|
return nil, MetricsQueryOutput{}, fmt.Errorf("invalid since value: %w", err)
|
|
}
|
|
|
|
sinceTime := time.Now().Add(-duration)
|
|
|
|
// Read events
|
|
events, err := ai.ReadEvents(sinceTime)
|
|
if err != nil {
|
|
log.Error("mcp: metrics query failed", "since", since, "err", err)
|
|
return nil, MetricsQueryOutput{}, fmt.Errorf("failed to read metrics: %w", err)
|
|
}
|
|
|
|
// Get summary
|
|
summary := ai.Summary(events)
|
|
|
|
// Build output
|
|
output := MetricsQueryOutput{
|
|
Total: summary["total"].(int),
|
|
ByType: convertMetricCounts(summary["by_type"]),
|
|
ByRepo: convertMetricCounts(summary["by_repo"]),
|
|
ByAgent: convertMetricCounts(summary["by_agent"]),
|
|
Events: make([]MetricEventBrief, 0, DefaultMetricsLimit),
|
|
}
|
|
|
|
// Get recent events (last 10, most recent first)
|
|
startIdx := len(events) - DefaultMetricsLimit
|
|
if startIdx < 0 {
|
|
startIdx = 0
|
|
}
|
|
for i := len(events) - 1; i >= startIdx; i-- {
|
|
ev := events[i]
|
|
output.Events = append(output.Events, MetricEventBrief{
|
|
Type: ev.Type,
|
|
Timestamp: ev.Timestamp,
|
|
AgentID: ev.AgentID,
|
|
Repo: ev.Repo,
|
|
})
|
|
}
|
|
|
|
return nil, output, nil
|
|
}
|
|
|
|
// convertMetricCounts converts the summary map format to MetricCount slice.
|
|
func convertMetricCounts(data any) []MetricCount {
|
|
if data == nil {
|
|
return []MetricCount{}
|
|
}
|
|
|
|
items, ok := data.([]map[string]any)
|
|
if !ok {
|
|
return []MetricCount{}
|
|
}
|
|
|
|
result := make([]MetricCount, len(items))
|
|
for i, item := range items {
|
|
key, _ := item["key"].(string)
|
|
count, _ := item["count"].(int)
|
|
result[i] = MetricCount{Key: key, Count: count}
|
|
}
|
|
return result
|
|
}
|
|
|
|
// parseDuration parses a duration string like "7d", "24h", "30m".
|
|
func parseDuration(s string) (time.Duration, error) {
|
|
if s == "" {
|
|
return 0, fmt.Errorf("duration cannot be empty")
|
|
}
|
|
|
|
s = strings.TrimSpace(s)
|
|
if len(s) < 2 {
|
|
return 0, fmt.Errorf("invalid duration format: %q", s)
|
|
}
|
|
|
|
// Get the numeric part and unit
|
|
unit := s[len(s)-1]
|
|
numStr := s[:len(s)-1]
|
|
|
|
num, err := strconv.Atoi(numStr)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("invalid duration number: %q", numStr)
|
|
}
|
|
|
|
if num <= 0 {
|
|
return 0, fmt.Errorf("duration must be positive: %d", num)
|
|
}
|
|
|
|
switch unit {
|
|
case 'd':
|
|
return time.Duration(num) * 24 * time.Hour, nil
|
|
case 'h':
|
|
return time.Duration(num) * time.Hour, nil
|
|
case 'm':
|
|
return time.Duration(num) * time.Minute, nil
|
|
default:
|
|
return 0, fmt.Errorf("invalid duration unit: %q (expected d, h, or m)", string(unit))
|
|
}
|
|
}
|