co-browser
diff --git a/‎go.mod
Copy file name to clipboard
+10-4Lines changed: 10 additions & 4 deletions b/‎go.mod
Copy file name to clipboard
+10-4Lines changed: 10 additions & 4 deletions
diff --git a/‎go.sum
Copy file name to clipboard
+37-11Lines changed: 37 additions & 11 deletions b/‎go.sum
Copy file name to clipboard
+37-11Lines changed: 37 additions & 11 deletions
diff --git a/‎internal/app/app.go
Copy file name to clipboard
+113-53Lines changed: 113 additions & 53 deletions b/‎internal/app/app.go
Copy file name to clipboard
+113-53Lines changed: 113 additions & 53 deletions
@@ -4,22 +4,28 @@ go 1.24.1
 
 require (
 	github.com/a-h/templ v0.3.857
+	github.com/jmoiron/sqlx v1.4.0
+	github.com/mark3labs/mcp-go v0.20.1
 	github.com/mattn/go-sqlite3 v1.14.27
-	github.com/mark3labs/mcp-go v0.18.0
+	github.com/prometheus/client_golang v1.22.0
 	github.com/rs/zerolog v1.34.0
 	go.uber.org/fx v1.23.0
 )
 
 require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	go.uber.org/dig v1.18.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/sys v0.32.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )
@@ -1,37 +1,63 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/a-h/templ v0.3.857 h1:6EqcJuGZW4OL+2iZ3MD+NnIcG7nGkaQeF2Zq5kf9ZGg=
 github.com/a-h/templ v0.3.857/go.mod h1:qhrhAkRFubE7khxLZHsBFHfX+gWwVNKbzKeF9GlPV4M=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/mark3labs/mcp-go v0.18.0 h1:YuhgIVjNlTG2ZOwmrkORWyPTp0dz1opPEqvsPtySXao=
-github.com/mark3labs/mcp-go v0.18.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mark3labs/mcp-go v0.20.1 h1:E1Bbx9K8d8kQmDZ1QHblM38c7UU2evQ2LlkANk1U/zw=
+github.com/mark3labs/mcp-go v0.20.1/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mattn/go-sqlite3 v1.14.27 h1:drZCnuvf37yPfs95E5jd9s3XhdVWLal+6BOK6qrv6IU=
 github.com/mattn/go-sqlite3 v1.14.27/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
 github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
 github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
-go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw=
-go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
+go.uber.org/dig v1.18.1 h1:rLww6NuajVjeQn+49u5NcezUJEGwd5uXmyoCKW2g5Es=
+go.uber.org/dig v1.18.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
 go.uber.org/fx v1.23.0 h1:lIr/gYWQGfTwGcSXWXu4vP5Ws6iqnNEIY+F/aFzCKTg=
 go.uber.org/fx v1.23.0/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -45,7 +71,7 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
 golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -4,45 +4,33 @@ package app
 import (
 	"context"
 	"net/http"
-	"time"
 
 	"github.com/co-browser/agent-browser/internal/backend"
 	"github.com/co-browser/agent-browser/internal/backend/database"
-	"github.com/co-browser/agent-browser/internal/config"
 	"github.com/co-browser/agent-browser/internal/events"
 	"github.com/co-browser/agent-browser/internal/log"
 	"github.com/co-browser/agent-browser/internal/mcp"
 	"github.com/co-browser/agent-browser/internal/web"
+	"github.com/co-browser/agent-browser/internal/web/client"
 	"github.com/co-browser/agent-browser/internal/web/handlers"
 
 	"go.uber.org/fx"
 )
 
-// CoreModules bundles the main application components for fx.
-var CoreModules = fx.Options(
-	LogModule,
-	DatabaseModule,
-	ConfigModule,
-	EventsModule,
-	BackendModule,
-	MCPClientModule,
-	UpdaterModule,
-	WebModule,
-	// TODO: Add MCP Server Frontend module
-	// TODO: Add Sync Daemon module
-)
+// --- Core Application Modules ---
 
-// LogModule provides common dependencies like logging.
+// LogModule provides common logging components.
 var LogModule = fx.Module("logger",
 	fx.Provide(
 		log.NewLogger,
 	),
 )
 
-// DatabaseModule provides the database dependency.
+// DatabaseModule provides the database dependency and manages its lifecycle.
 var DatabaseModule = fx.Module("database",
 	fx.Provide(
 		func(lc fx.Lifecycle, logger log.Logger) (database.DBInterface, error) {
+			// TODO: Make dbPath configurable
 			dbPath := "agent-browser.db"
 			db, err := database.New(dbPath)
 			if err != nil {
@@ -63,77 +51,149 @@ var DatabaseModule = fx.Module("database",
 )
 
 // ConfigModule provides configuration loading services.
+// Currently loads MCP configuration.
 var ConfigModule = fx.Module("config",
 	fx.Provide(
 		mcp.NewMCPConfig,
 	),
 )
 
-// EventsModule provides the event bus.
+// EventsModule provides the application-wide event bus.
 var EventsModule = fx.Module("events",
 	fx.Provide(events.NewBus),
 )
 
-// BackendModule provides the backend service.
+// BackendModule provides the core backend service logic, abstracting database interactions.
 var BackendModule = fx.Module("backend",
 	fx.Provide(
+		// Provide the backend service implementation, satisfying the backend.Service interface.
 		func(db database.DBInterface, bus events.Bus, logger log.Logger) backend.Service {
 			return backend.NewService(db, bus, logger)
 		},
 	),
 )
 
-// MCPClientModule provides the MCP client (distinct from server frontend).
+// MCPClientModule provides the components responsible for connecting *to* remote MCP servers.
+// This includes the ConnectionManager and the API client used by the ConnectionManager
+// to update this agent's status and sync tools via its own web API.
 var MCPClientModule = fx.Module("mcp_client",
 	fx.Provide(
+		// Provide the web API client used by MCP components
+		func(logger log.Logger) *client.Client {
+			// TODO: Make API client base URL configurable
+			config := client.DefaultConfig()
+			// DefaultConfig likely points to localhost, which is correct for the agent
+			// calling its own API.
+			return client.NewClient(config, logger)
+		},
+		// Provide MCP components (like ConnectionManager)
 		mcp.NewMCPComponents,
 	),
+	// Register lifecycle hooks for starting/stopping the MCP ConnectionManager
 	fx.Invoke(mcp.RegisterMCPServerHooks),
 )
 
-// UpdaterModule provides the tool and server updater service.
-var UpdaterModule = fx.Module("updater",
-	fx.Provide(
-		func(bs backend.Service, mc client.Client, bus events.Bus, logger log.Logger) updater.Service {
-			pollInterval := 5 * time.Minute
-			logger.Info().Dur("pollInterval", pollInterval).Msg("Creating Updater Service")
-			return updater.NewService(bs, mc, bus, logger, pollInterval)
-		},
-	),
-	fx.Invoke(func(lc fx.Lifecycle, us updater.Service, logger log.Logger) {
-		lc.Append(fx.Hook{
-			OnStart: func(_ctx context.Context) error {
-				logger.Info().Msg("Registering Updater Service start hook")
-				us.Start(_ctx)
-				return nil
-			},
-			OnStop: func(_ctx context.Context) error {
-				logger.Info().Msg("Registering Updater Service stop hook")
-				us.Stop()
-				return nil
-			},
-		})
-	}),
-)
-
-// WebModule provides the web server components
+// WebModule provides the HTTP server, API handlers, and UI handlers (if any).
+// It serves the API used internally by the MCPClient and potentially by external UIs.
 var WebModule = fx.Module("web",
 	fx.Provide(
-		// Provide UI handler
+		// Provide UI handler (if applicable)
 		handlers.NewUIHandler,
 		// Provide API handlers
-		func(bs backend.Service, us updater.Service, ce *config.Exporter, logger log.Logger) *handlers.APIHandlers {
-			return handlers.NewAPIHandlers(bs, us, ce, logger)
+		func(bs backend.Service, logger log.Logger) *handlers.APIHandlers {
+			return handlers.NewAPIHandlers(bs, logger)
 		},
-		// Provide HTTP mux using web package
+		// Provide the HTTP request router (ServeMux)
 		web.NewMux,
-		// Provide HTTP server using web package
+		// Provide the HTTP server itself
 		web.NewServer,
 	),
-	// Register API handlers with the router
+	// Register API handler routes with the router
 	fx.Invoke(func(router *http.ServeMux, apiHandlers *handlers.APIHandlers) {
 		apiHandlers.RegisterRoutes(router)
 	}),
-	// Register web server lifecycle hooks
+	// Register web server lifecycle hooks for starting/stopping the server
 	fx.Invoke(web.RegisterWebServerHooks),
 )
+
+// InitModule performs initial setup tasks, like seeding the database with default servers.
+// It runs once during application startup if needed.
+var InitModule = fx.Module("init",
+	fx.Invoke(func(bs backend.Service, logger log.Logger) {
+		// Check if any servers already exist in the database.
+		servers, err := bs.ListMCPServers()
+		if err != nil {
+			logger.Error().Err(err).Msg("Failed to check existing servers during initialization")
+			// Decide if this should be fatal. For now, we continue, but defaults won't be added.
+			return
+		}
+
+		// Only add default servers if the database is empty.
+		if len(servers) == 0 {
+			logger.Info().Msg("No MCP servers found in the database. Adding default servers...")
+
+			// Define the default servers to add.
+			// TODO: Consider moving these defaults to configuration.
+			defaultServers := []struct {
+				name        string
+				url         string
+				description string
+			}{
+				{
+					name:        "Local Test Server",
+					url:         "https://0.0.0.0:8001/sse", // Assumes local test server runs on 8001
+					description: "Local MCP test server",
+				},
+				{
+					name:        "API Gateway",
+					url:         "https://api-gateway.cobrowser.xyz/mcp/api/sse?api_key=REDACTED_API_KEY",
+					description: "API Gateway MCP server",
+				},
+			}
+
+			// Add each default server via the backend service.
+			for _, server := range defaultServers {
+				_, err := bs.AddMCPServer(server.name, server.url) // Description is not stored via AddMCPServer currently
+				if err != nil {
+					// Log error but continue trying to add others.
+					logger.Error().
+						Err(err).
+						Str("name", server.name).
+						Str("url", server.url).
+						// Str("description", server.description). // Not used by AddMCPServer
+						Msg("Failed to add default server")
+					continue // Skip logging success for this server
+				}
+				logger.Info().
+					Str("name", server.name).
+					Str("url", server.url).
+					// Str("description", server.description). // Not stored
+					Msg("Added default server")
+			}
+		} else {
+			logger.Info().Int("count", len(servers)).Msg("Servers already exist, skipping default server initialization")
+		}
+	}),
+)
+
+// --- Application Bootstrap ---
+
+// CoreModules bundles the main application components for fx.
+// The order generally doesn't matter for Fx, but grouping can improve readability.
+var CoreModules = fx.Options(
+	// Foundational Modules
+	LogModule,
+	ConfigModule, // Provides config values needed by others
+	EventsModule,
+	DatabaseModule,
+
+	// Core Service Logic
+	BackendModule, // Depends on DB, Events, Log
+
+	// Interface Layers & Clients
+	WebModule,       // Provides the API/UI server (depends on Backend)
+	MCPClientModule, // Connects *out* to other MCPs (depends on Backend, WebClient, Log, Config)
+
+	// Initialization Logic (runs after dependencies are ready)
+	InitModule,
+)