* 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>
235 lines
7.9 KiB
Go
235 lines
7.9 KiB
Go
package mcp
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
ragcmd "github.com/host-uk/core/internal/cmd/rag"
|
|
"github.com/host-uk/core/pkg/log"
|
|
"github.com/host-uk/core/pkg/rag"
|
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
)
|
|
|
|
// Default values for RAG operations.
|
|
const (
|
|
DefaultRAGCollection = "hostuk-docs"
|
|
DefaultRAGTopK = 5
|
|
)
|
|
|
|
// RAGQueryInput contains parameters for querying the RAG vector database.
|
|
type RAGQueryInput struct {
|
|
Question string `json:"question"` // The question or search query
|
|
Collection string `json:"collection,omitempty"` // Collection name (default: hostuk-docs)
|
|
TopK int `json:"topK,omitempty"` // Number of results to return (default: 5)
|
|
}
|
|
|
|
// RAGQueryResult represents a single query result.
|
|
type RAGQueryResult struct {
|
|
Content string `json:"content"`
|
|
Source string `json:"source"`
|
|
Section string `json:"section,omitempty"`
|
|
Category string `json:"category,omitempty"`
|
|
ChunkIndex int `json:"chunkIndex,omitempty"`
|
|
Score float32 `json:"score"`
|
|
}
|
|
|
|
// RAGQueryOutput contains the results of a RAG query.
|
|
type RAGQueryOutput struct {
|
|
Results []RAGQueryResult `json:"results"`
|
|
Query string `json:"query"`
|
|
Collection string `json:"collection"`
|
|
Context string `json:"context"`
|
|
}
|
|
|
|
// RAGIngestInput contains parameters for ingesting documents into the RAG database.
|
|
type RAGIngestInput struct {
|
|
Path string `json:"path"` // File or directory path to ingest
|
|
Collection string `json:"collection,omitempty"` // Collection name (default: hostuk-docs)
|
|
Recreate bool `json:"recreate,omitempty"` // Whether to recreate the collection
|
|
}
|
|
|
|
// RAGIngestOutput contains the result of a RAG ingest operation.
|
|
type RAGIngestOutput struct {
|
|
Success bool `json:"success"`
|
|
Path string `json:"path"`
|
|
Collection string `json:"collection"`
|
|
Chunks int `json:"chunks"`
|
|
Message string `json:"message,omitempty"`
|
|
}
|
|
|
|
// RAGCollectionsInput contains parameters for listing collections.
|
|
type RAGCollectionsInput struct {
|
|
ShowStats bool `json:"show_stats,omitempty"` // Include collection stats (point count, status)
|
|
}
|
|
|
|
// CollectionInfo contains information about a collection.
|
|
type CollectionInfo struct {
|
|
Name string `json:"name"`
|
|
PointsCount uint64 `json:"points_count"`
|
|
Status string `json:"status"`
|
|
}
|
|
|
|
// RAGCollectionsOutput contains the list of available collections.
|
|
type RAGCollectionsOutput struct {
|
|
Collections []CollectionInfo `json:"collections"`
|
|
}
|
|
|
|
// registerRAGTools adds RAG tools to the MCP server.
|
|
func (s *Service) registerRAGTools(server *mcp.Server) {
|
|
mcp.AddTool(server, &mcp.Tool{
|
|
Name: "rag_query",
|
|
Description: "Query the RAG vector database for relevant documentation. Returns semantically similar content based on the query.",
|
|
}, s.ragQuery)
|
|
|
|
mcp.AddTool(server, &mcp.Tool{
|
|
Name: "rag_ingest",
|
|
Description: "Ingest documents into the RAG vector database. Supports both single files and directories.",
|
|
}, s.ragIngest)
|
|
|
|
mcp.AddTool(server, &mcp.Tool{
|
|
Name: "rag_collections",
|
|
Description: "List all available collections in the RAG vector database.",
|
|
}, s.ragCollections)
|
|
}
|
|
|
|
// ragQuery handles the rag_query tool call.
|
|
func (s *Service) ragQuery(ctx context.Context, req *mcp.CallToolRequest, input RAGQueryInput) (*mcp.CallToolResult, RAGQueryOutput, error) {
|
|
// Apply defaults
|
|
collection := input.Collection
|
|
if collection == "" {
|
|
collection = DefaultRAGCollection
|
|
}
|
|
topK := input.TopK
|
|
if topK <= 0 {
|
|
topK = DefaultRAGTopK
|
|
}
|
|
|
|
s.logger.Info("MCP tool execution", "tool", "rag_query", "question", input.Question, "collection", collection, "topK", topK, "user", log.Username())
|
|
|
|
// Validate input
|
|
if input.Question == "" {
|
|
return nil, RAGQueryOutput{}, fmt.Errorf("question cannot be empty")
|
|
}
|
|
|
|
// Call the RAG query function
|
|
results, err := ragcmd.QueryDocs(ctx, input.Question, collection, topK)
|
|
if err != nil {
|
|
log.Error("mcp: rag query failed", "question", input.Question, "collection", collection, "err", err)
|
|
return nil, RAGQueryOutput{}, fmt.Errorf("failed to query RAG: %w", err)
|
|
}
|
|
|
|
// Convert results
|
|
output := RAGQueryOutput{
|
|
Results: make([]RAGQueryResult, len(results)),
|
|
Query: input.Question,
|
|
Collection: collection,
|
|
Context: rag.FormatResultsContext(results),
|
|
}
|
|
for i, r := range results {
|
|
output.Results[i] = RAGQueryResult{
|
|
Content: r.Text,
|
|
Source: r.Source,
|
|
Section: r.Section,
|
|
Category: r.Category,
|
|
ChunkIndex: r.ChunkIndex,
|
|
Score: r.Score,
|
|
}
|
|
}
|
|
|
|
return nil, output, nil
|
|
}
|
|
|
|
// ragIngest handles the rag_ingest tool call.
|
|
func (s *Service) ragIngest(ctx context.Context, req *mcp.CallToolRequest, input RAGIngestInput) (*mcp.CallToolResult, RAGIngestOutput, error) {
|
|
// Apply defaults
|
|
collection := input.Collection
|
|
if collection == "" {
|
|
collection = DefaultRAGCollection
|
|
}
|
|
|
|
s.logger.Security("MCP tool execution", "tool", "rag_ingest", "path", input.Path, "collection", collection, "recreate", input.Recreate, "user", log.Username())
|
|
|
|
// Validate input
|
|
if input.Path == "" {
|
|
return nil, RAGIngestOutput{}, fmt.Errorf("path cannot be empty")
|
|
}
|
|
|
|
// Check if path is a file or directory using the medium
|
|
info, err := s.medium.Stat(input.Path)
|
|
if err != nil {
|
|
log.Error("mcp: rag ingest stat failed", "path", input.Path, "err", err)
|
|
return nil, RAGIngestOutput{}, fmt.Errorf("failed to access path: %w", err)
|
|
}
|
|
|
|
var message string
|
|
var chunks int
|
|
if info.IsDir() {
|
|
// Ingest directory
|
|
err = ragcmd.IngestDirectory(ctx, input.Path, collection, input.Recreate)
|
|
if err != nil {
|
|
log.Error("mcp: rag ingest directory failed", "path", input.Path, "collection", collection, "err", err)
|
|
return nil, RAGIngestOutput{}, fmt.Errorf("failed to ingest directory: %w", err)
|
|
}
|
|
message = fmt.Sprintf("Successfully ingested directory %s into collection %s", input.Path, collection)
|
|
} else {
|
|
// Ingest single file
|
|
chunks, err = ragcmd.IngestFile(ctx, input.Path, collection)
|
|
if err != nil {
|
|
log.Error("mcp: rag ingest file failed", "path", input.Path, "collection", collection, "err", err)
|
|
return nil, RAGIngestOutput{}, fmt.Errorf("failed to ingest file: %w", err)
|
|
}
|
|
message = fmt.Sprintf("Successfully ingested file %s (%d chunks) into collection %s", input.Path, chunks, collection)
|
|
}
|
|
|
|
return nil, RAGIngestOutput{
|
|
Success: true,
|
|
Path: input.Path,
|
|
Collection: collection,
|
|
Chunks: chunks,
|
|
Message: message,
|
|
}, nil
|
|
}
|
|
|
|
// ragCollections handles the rag_collections tool call.
|
|
func (s *Service) ragCollections(ctx context.Context, req *mcp.CallToolRequest, input RAGCollectionsInput) (*mcp.CallToolResult, RAGCollectionsOutput, error) {
|
|
s.logger.Info("MCP tool execution", "tool", "rag_collections", "show_stats", input.ShowStats, "user", log.Username())
|
|
|
|
// Create Qdrant client with default config
|
|
qdrantClient, err := rag.NewQdrantClient(rag.DefaultQdrantConfig())
|
|
if err != nil {
|
|
log.Error("mcp: rag collections connect failed", "err", err)
|
|
return nil, RAGCollectionsOutput{}, fmt.Errorf("failed to connect to Qdrant: %w", err)
|
|
}
|
|
defer func() { _ = qdrantClient.Close() }()
|
|
|
|
// List collections
|
|
collectionNames, err := qdrantClient.ListCollections(ctx)
|
|
if err != nil {
|
|
log.Error("mcp: rag collections list failed", "err", err)
|
|
return nil, RAGCollectionsOutput{}, fmt.Errorf("failed to list collections: %w", err)
|
|
}
|
|
|
|
// Build collection info list
|
|
collections := make([]CollectionInfo, len(collectionNames))
|
|
for i, name := range collectionNames {
|
|
collections[i] = CollectionInfo{Name: name}
|
|
|
|
// Fetch stats if requested
|
|
if input.ShowStats {
|
|
info, err := qdrantClient.CollectionInfo(ctx, name)
|
|
if err != nil {
|
|
log.Error("mcp: rag collection info failed", "collection", name, "err", err)
|
|
// Continue with defaults on error
|
|
continue
|
|
}
|
|
if info.PointsCount != nil {
|
|
collections[i].PointsCount = *info.PointsCount
|
|
}
|
|
collections[i].Status = info.Status.String()
|
|
}
|
|
}
|
|
|
|
return nil, RAGCollectionsOutput{
|
|
Collections: collections,
|
|
}, nil
|
|
}
|