Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
11 changes: 6 additions & 5 deletions server/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ var (
ErrToolNotFound = errors.New("tool not found")

// Session-related errors
ErrSessionNotFound = errors.New("session not found")
ErrSessionExists = errors.New("session already exists")
ErrSessionNotInitialized = errors.New("session not properly initialized")
ErrSessionDoesNotSupportTools = errors.New("session does not support per-session tools")
ErrSessionDoesNotSupportLogging = errors.New("session does not support setting logging level")
ErrSessionNotFound = errors.New("session not found")
ErrSessionExists = errors.New("session already exists")
ErrSessionNotInitialized = errors.New("session not properly initialized")
ErrSessionDoesNotSupportTools = errors.New("session does not support per-session tools")
ErrSessionDoesNotSupportResources = errors.New("session does not support per-session resources")
ErrSessionDoesNotSupportLogging = errors.New("session does not support setting logging level")

// Notification-related errors
ErrNotificationNotInitialized = errors.New("notification channel not initialized")
Expand Down
132 changes: 132 additions & 0 deletions server/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -460,3 +460,135 @@ func (s *MCPServer) DeleteSessionTools(sessionID string, names ...string) error

return nil
}

// AddSessionResource adds a resource for a specific session
func (s *MCPServer) AddSessionResource(sessionID string, resource mcp.Resource, handler ResourceHandlerFunc) error {
return s.AddSessionResources(sessionID, ServerResource{Resource: resource, Handler: handler})
}

// AddSessionResources adds resources for a specific session
func (s *MCPServer) AddSessionResources(sessionID string, resources ...ServerResource) error {
sessionValue, ok := s.sessions.Load(sessionID)
if !ok {
return ErrSessionNotFound
}

session, ok := sessionValue.(SessionWithResources)
if !ok {
return ErrSessionDoesNotSupportResources
}

// For session resources, we want listChanged enabled by default
s.implicitlyRegisterCapabilities(
func() bool { return s.capabilities.resources != nil },
func() { s.capabilities.resources = &resourceCapabilities{listChanged: true} },
)

// Get existing resources (this should return a thread-safe copy)
sessionResources := session.GetSessionResources()

// Create a new map to avoid concurrent modification issues
newSessionResources := make(map[string]ServerResource, len(sessionResources)+len(resources))

// Copy existing resources
for k, v := range sessionResources {
newSessionResources[k] = v
}

// Add new resources
for _, resource := range resources {
newSessionResources[resource.Resource.URI] = resource
}

// Set the resources (this should be thread-safe)
session.SetSessionResources(newSessionResources)

// It only makes sense to send resource notifications to initialized sessions --
// if we're not initialized yet the client can't possibly have sent their
// initial resources/list message.
//
// For initialized sessions, honor resources.listChanged, which is specifically
// about whether notifications will be sent or not.
// see <https://modelcontextprotocol.io/specification/2025-03-26/server/resources#capabilities>
if session.Initialized() && s.capabilities.resources != nil && s.capabilities.resources.listChanged {
// Send notification only to this session
if err := s.SendNotificationToSpecificClient(sessionID, "notifications/resources/list_changed", nil); err != nil {
// Log the error but don't fail the operation
// The resources were successfully added, but notification failed
if s.hooks != nil && len(s.hooks.OnError) > 0 {
hooks := s.hooks
go func(sID string, hooks *Hooks) {
ctx := context.Background()
hooks.onError(ctx, nil, "notification", map[string]any{
"method": "notifications/resources/list_changed",
"sessionID": sID,
}, fmt.Errorf("failed to send notification after adding resources: %w", err))
}(sessionID, hooks)
}
}
}

return nil
}

// DeleteSessionResources removes resources from a specific session
func (s *MCPServer) DeleteSessionResources(sessionID string, uris ...string) error {
sessionValue, ok := s.sessions.Load(sessionID)
if !ok {
return ErrSessionNotFound
}

session, ok := sessionValue.(SessionWithResources)
if !ok {
return ErrSessionDoesNotSupportResources
}

// Get existing resources (this should return a thread-safe copy)
sessionResources := session.GetSessionResources()
if sessionResources == nil {
return nil
}

// Create a new map to avoid concurrent modification issues
newSessionResources := make(map[string]ServerResource, len(sessionResources))

// Copy existing resources except those being deleted
for k, v := range sessionResources {
newSessionResources[k] = v
}

// Remove specified resources
for _, uri := range uris {
delete(newSessionResources, uri)
}

// Set the resources (this should be thread-safe)
session.SetSessionResources(newSessionResources)

// It only makes sense to send resource notifications to initialized sessions --
// if we're not initialized yet the client can't possibly have sent their
// initial resources/list message.
//
// For initialized sessions, honor resources.listChanged, which is specifically
// about whether notifications will be sent or not.
// see <https://modelcontextprotocol.io/specification/2025-03-26/server/resources#capabilities>
if session.Initialized() && s.capabilities.resources != nil && s.capabilities.resources.listChanged {
// Send notification only to this session
if err := s.SendNotificationToSpecificClient(sessionID, "notifications/resources/list_changed", nil); err != nil {
// Log the error but don't fail the operation
// The resources were successfully deleted, but notification failed
if s.hooks != nil && len(s.hooks.OnError) > 0 {
hooks := s.hooks
go func(sID string, hooks *Hooks) {
ctx := context.Background()
hooks.onError(ctx, nil, "notification", map[string]any{
"method": "notifications/resources/list_changed",
"sessionID": sID,
}, fmt.Errorf("failed to send notification after deleting resources: %w", err))
}(sessionID, hooks)
}
}
}

return nil
}
Loading
Loading