co-browser
diff --git a/‎.gitignore
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎.gitignore
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎cmd/agent-browser/main.go
Copy file name to clipboard
+1-3Lines changed: 1 addition & 3 deletions b/‎cmd/agent-browser/main.go
Copy file name to clipboard
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/‎go.mod
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎go.mod
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎go.sum
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎go.sum
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎internal/app/app.go
Copy file name to clipboard
+87-19Lines changed: 87 additions & 19 deletions b/‎internal/app/app.go
Copy file name to clipboard
+87-19Lines changed: 87 additions & 19 deletions
@@ -4,7 +4,7 @@
 *.dll
 *.so
 *.dylib
-agent-browser
+*.db
 
 # Test binary, built with `go test -c`
 *.test
 
@@ -5,7 +5,6 @@ import (
 	"github.com/co-browser/agent-browser/internal/log"
 	"go.uber.org/fx"
 	"go.uber.org/fx/fxevent"
-	// No longer need context, errors, net/http, or log imports directly here
 )
 
 func main() {
@@ -14,12 +13,11 @@ func main() {
 	fxApp := fx.New(
 		app.CoreModules,
 
-		// Configure Fx to use our custom zerolog logger
+		// Configure Fx to use our custom log.Logger via the adapter
 		fx.WithLogger(func(logger log.Logger) fxevent.Logger {
 			// Use the adapter we created
 			return log.NewFxZerologAdapter(logger)
 		}),
-		// Remove old comment: // Add fx.NopLogger() here for quiet startup, or fx.WithLogger(...) for custom fx logging
 	)
 
 	// Run the application.
 
@@ -11,6 +11,7 @@ require (
 require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-sqlite3 v1.14.27 // indirect
 	go.uber.org/dig v1.18.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 
@@ -12,6 +12,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 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.27 h1:drZCnuvf37yPfs95E5jd9s3XhdVWLal+6BOK6qrv6IU=
+github.com/mattn/go-sqlite3 v1.14.27/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 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=
 
@@ -2,70 +2,138 @@
 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/client"
+	"github.com/co-browser/agent-browser/internal/updater"
 	"github.com/co-browser/agent-browser/internal/web"
 	"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(
-	CommonModule,
+	LogModule,
+	DatabaseModule,
 	ConfigModule,
+	EventsModule,
 	BackendModule,
-	MCPModule,
+	MCPClientModule,
 	UpdaterModule,
 	WebModule,
-	// Add other core modules like SyncModule if needed
+	// TODO: Add MCP Server Frontend module
+	// TODO: Add Sync Daemon module
 )
 
-// CommonModule provides common dependencies like logging.
-var CommonModule = fx.Module("common",
+// LogModule provides common dependencies like logging.
+var LogModule = fx.Module("logger",
 	fx.Provide(
 		log.NewLogger,
 	),
 )
 
+// DatabaseModule provides the database dependency.
+var DatabaseModule = fx.Module("database",
+	fx.Provide(
+		func(lc fx.Lifecycle, logger log.Logger) (database.DBInterface, error) {
+			dbPath := "agent-browser.db"
+			db, err := database.New(dbPath)
+			if err != nil {
+				logger.Error().Err(err).Str("dbPath", dbPath).Msg("Failed to initialize database")
+				return nil, err
+			}
+
+			lc.Append(fx.Hook{
+				OnStop: func(ctx context.Context) error {
+					logger.Info().Msg("Closing database connection...")
+					return db.Close()
+				},
+			})
+			logger.Info().Str("dbPath", dbPath).Msg("Database initialized")
+			return db, nil
+		},
+	),
+)
+
 // ConfigModule provides configuration loading services.
 var ConfigModule = fx.Module("config",
 	fx.Provide(
-	// config.NewConfigLoader, // Example placeholder
+		config.NewExporter,
 	),
 )
 
-// BackendModule provides the backend service and its dependencies (like DB).
+// EventsModule provides the event bus.
+var EventsModule = fx.Module("events",
+	fx.Provide(events.NewBus),
+)
+
+// BackendModule provides the backend service.
 var BackendModule = fx.Module("backend",
 	fx.Provide(
-	// backend.NewDB,          // Example placeholder
-	// backend.NewService,     // Example placeholder
+		func(db database.DBInterface, bus events.Bus, logger log.Logger) backend.Service {
+			return backend.NewService(db, bus, logger)
+		},
 	),
 )
 
-// MCPModule provides the MCP server frontend and its dependencies.
-var MCPModule = fx.Module("mcp",
+// MCPClientModule provides the MCP client (distinct from server frontend).
+var MCPClientModule = fx.Module("mcp_client",
 	fx.Provide(
-	// mcp.NewClient,    // Example placeholder
-	// mcp.NewServer,    // Example placeholder
+		client.NewHTTPClient,
 	),
 )
 
 // UpdaterModule provides the tool and server updater service.
 var UpdaterModule = fx.Module("updater",
 	fx.Provide(
-	// updater.NewService, // Example placeholder
+		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, UI handlers, and API handlers.
+// WebModule provides the web server components
 var WebModule = fx.Module("web",
 	fx.Provide(
+		// Provide UI handler
 		handlers.NewUIHandler,
-		// handlers.NewAPIHandler,
+		// 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)
+		},
+		// Provide HTTP mux using web package
 		web.NewMux,
+		// Provide HTTP server using web package
 		web.NewServer,
 	),
+	// Register API handlers with the router
+	fx.Invoke(func(router *http.ServeMux, apiHandlers *handlers.APIHandlers) {
+		apiHandlers.RegisterRoutes(router)
+	}),
+	// Register web server lifecycle hooks
 	fx.Invoke(web.RegisterWebServerHooks),
 )
-
-// --- Placeholders for other modules like Sync ---
-// var SyncModule = fx.Module("sync", ...)