Skip to content

fix: don't gc component servers when the parent catalog entry is deleted #4966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 10, 2025
Merged

fix: don't gc component servers when the parent catalog entry is deleted #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02e2bad
fix: don't gc component servers when the parent catalog entry is deleted
njhale Nov 8, 2025
3aea2ed
fix: validate composite catalog entry before committing upgrade
njhale Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/api/handlers/mcpcatalogs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,6 +1251,11 @@ func (h *MCPCatalogHandler) RefreshCompositeComponents(req api.Context) error {
}
}

// Validate the refreshed manifest to ensure it's still valid
if err := validation.ValidateCatalogEntryManifest(entry.Spec.Manifest); err != nil {
return types.NewErrBadRequest("failed to validate entry manifest: %v", err)
}

// Update the entry
if err := req.Update(&entry); err != nil {
return fmt.Errorf("failed to update entry: %w", err)
Expand Down
9 changes: 7 additions & 2 deletions pkg/storage/apis/obot.obot.ai/v1/mcpserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,18 @@ func (in *MCPServer) FieldNames() []string {
}

func (in *MCPServer) DeleteRefs() []Ref {
return []Ref{
refs := []Ref{
{ObjType: &Thread{}, Name: in.Spec.ThreadName},
{ObjType: &MCPServerCatalogEntry{}, Name: in.Spec.MCPServerCatalogEntryName},
{ObjType: &MCPCatalog{}, Name: in.Spec.MCPCatalogID},
{ObjType: &PowerUserWorkspace{}, Name: in.Spec.PowerUserWorkspaceID},
{ObjType: &MCPServer{}, Name: in.Spec.CompositeName},
}
if in.Spec.CompositeName == "" {
// Only garbage collect an MCP server when the catalog entry is deleted if it's not a component of a composite MCP server.
// Component MCP servers get their manifest from the composite catalog entry instead.
refs = append(refs, Ref{ObjType: &MCPServerCatalogEntry{}, Name: in.Spec.MCPServerCatalogEntryName})
}
return refs
}

type MCPServerSpec struct {
Expand Down
Loading