modelcontextprotocol/go-sdk
Watch
1
0
Fork
You've already forked go-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mcp: add return type to subscriptions/listen (#1088)

Browse source 
This PR adds the expected return type to `subscriptions/listen` rpc
This commit is contained in:
Guglielmo Colombo 2026-07-15 14:37:19 +02:00 • committed by GitHub
commit 8baa4ccebe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mcp/client.go
View file

@ -1443,7 +1443,7 @@ func (cs *ClientSession) cancelAllResourceSubscriptions() {
// usual handlers registered in [ClientOptions]. // usual handlers registered in [ClientOptions].
func (cs *ClientSession) subscriptionsListen(ctx context.Context, params *SubscriptionsListenParams) error { func (cs *ClientSession) subscriptionsListen(ctx context.Context, params *SubscriptionsListenParams) error {
params = injectRequestMeta(cs, params) params = injectRequestMeta(cs, params)
_, err := handleSend[*emptyResult](ctx, methodSubscriptionsListen, newClientRequest(cs, orZero[Params](params))) _, err := handleSend[*SubscriptionsListenResult](ctx, methodSubscriptionsListen, newClientRequest(cs, orZero[Params](params)))
return err return err
} }

12
mcp/protocol.go
View file

@ -2109,6 +2109,18 @@ type SubscriptionsAcknowledgedParams struct {
func (x *SubscriptionsAcknowledgedParams) isParams() {} func (x *SubscriptionsAcknowledgedParams) isParams() {}
func (x *SubscriptionsAcknowledgedParams) isNil() bool { return x == nil } func (x *SubscriptionsAcknowledgedParams) isNil() bool { return x == nil }
// SubscriptionsListenResult is the response to a "subscriptions/listen"
// request, signalling that the subscription has ended gracefully (for example,
// during server shutdown). Because the listen stream is long-lived, this
// result is sent only when the server tears the subscription down; an abrupt
// transport close carries no response.
type SubscriptionsListenResult struct {
completeResultWithType
Meta `json:"_meta"`
}
func (*SubscriptionsListenResult) isResult() {}
// TODO(jba): add CompleteRequest and related types. // TODO(jba): add CompleteRequest and related types.
// A request from the server to elicit additional information from the user via the client. // A request from the server to elicit additional information from the user via the client.

6
mcp/server.go
View file

@ -1180,7 +1180,7 @@ func (s *Server) unsubscribe(ctx context.Context, req *UnsubscribeRequest) (*emp
return &emptyResult{}, nil return &emptyResult{}, nil
} }
func (s *Server) subscriptionsListen(ctx context.Context, req *SubscriptionsListenRequest) (*emptyResult, error) { func (s *Server) subscriptionsListen(ctx context.Context, req *SubscriptionsListenRequest) (*SubscriptionsListenResult, error) {
requestID, ok := ctx.Value(idContextKey{}).(jsonrpc.ID) requestID, ok := ctx.Value(idContextKey{}).(jsonrpc.ID)
if !ok || !requestID.IsValid() { if !ok || !requestID.IsValid() {
return nil, fmt.Errorf("%w: subscriptions/listen requires a request ID", jsonrpc2.ErrInvalidRequest) return nil, fmt.Errorf("%w: subscriptions/listen requires a request ID", jsonrpc2.ErrInvalidRequest)
@ -1242,7 +1242,9 @@ func (s *Server) subscriptionsListen(ctx context.Context, req *SubscriptionsList
if len(allowed.ResourceSubscriptions) > 0 || allowed.ToolsListChanged || allowed.PromptsListChanged || allowed.ResourcesListChanged { if len(allowed.ResourceSubscriptions) > 0 || allowed.ToolsListChanged || allowed.PromptsListChanged || allowed.ResourcesListChanged {
<-ctx.Done() <-ctx.Done()
} }
return &emptyResult{}, nil return &SubscriptionsListenResult{
Meta: Meta{MetaKeySubscriptionID: requestID.Raw()},
}, nil
} }
func (s *Server) allowedSubscriptions(want *NotificationSubscriptions) NotificationSubscriptions { func (s *Server) allowedSubscriptions(want *NotificationSubscriptions) NotificationSubscriptions {