co-browser
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/‎internal/backend/service.go
Copy file name to clipboard
+8-4Lines changed: 8 additions & 4 deletions b/‎internal/backend/service.go
Copy file name to clipboard
+8-4Lines changed: 8 additions & 4 deletions
diff --git a/‎internal/backend/service_test.go
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎internal/backend/service_test.go
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎internal/mcp/client/client_test.go
Copy file name to clipboard
-230Lines changed: 0 additions & 230 deletions b/‎internal/mcp/client/client_test.go
Copy file name to clipboard
-230Lines changed: 0 additions & 230 deletions
@@ -4,6 +4,7 @@ go 1.24.1
 
 require (
 	github.com/a-h/templ v0.3.857
+	github.com/google/go-cmp v0.7.0
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/mark3labs/mcp-go v0.20.1
 	github.com/mattn/go-sqlite3 v1.14.27
 
@@ -53,14 +53,18 @@ func (s *service) AddMCPServer(name, url string) (*models.MCPServer, error) {
 	if name == "" || url == "" {
 		return nil, fmt.Errorf("server name and URL cannot be empty")
 	}
-	existing, err := s.db.GetServerByURL(url)
+
+	// Check if server with the same URL already exists
+	existingByURL, err := s.db.GetServerByURL(url)
 	if err != nil {
 		s.logger.Error().Err(err).Str("url", url).Msg("Error checking for existing server URL")
-		return nil, fmt.Errorf("failed to check for existing server: %w", err)
+		return nil, fmt.Errorf("failed to check for existing server URL: %w", err)
 	}
-	if existing != nil {
-		return nil, fmt.Errorf("MCP server with URL '%s' already exists", url)
+	if existingByURL != nil {
+		// Make error message match the test expectation
+		return nil, fmt.Errorf("another MCP server with URL '%s' already exists (ID: %d)", url, existingByURL.ID)
 	}
+
 	id, err := s.db.AddServer(name, url)
 	if err != nil {
 		s.logger.Error().Err(err).Str("name", name).Str("url", url).Msg("Error adding server to DB")
 
@@ -155,7 +155,7 @@ func (m *mockDatabase) UpsertTool(tool models.Tool) (added bool, err error) {
 	if m.upsertToolError != nil {
 		return false, m.upsertToolError
 	}
-	serverTools, _ := m.tools[tool.SourceServerID]
+	serverTools := m.tools[tool.SourceServerID]
 	foundIdx := -1
 	now := time.Now().UTC()
 	for i := range serverTools {
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func (m *mockDatabase) UpsertTool(tool models.Tool) (added bool, err error) {`
`155`	`155`	`if m.upsertToolError != nil {`
`156`	`156`	`return false, m.upsertToolError`
`157`	`157`	`}`
`158`		`- serverTools, _ := m.tools[tool.SourceServerID]`
	`158`	`+ serverTools := m.tools[tool.SourceServerID]`
`159`	`159`	`foundIdx := -1`
`160`	`160`	`now := time.Now().UTC()`
`161`	`161`	`for i := range serverTools {`