Add scope MCP server config and close method to loader

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

pkg/loader/loader.go

@@ -417,6 +417,7 @@ type Options struct {
 
 type MCPLoader interface {
 	Load(ctx context.Context, tool types.Tool) ([]types.Tool, error)
+	Close() error
 }
 
 func complete(opts ...Options) (result Options) {

pkg/loader/openapi_test.go

@@ -131,3 +131,7 @@ type fakeMCPLoader struct{}
 func (fakeMCPLoader) Load(context.Context, types.Tool) ([]types.Tool, error) {
 	return nil, nil
 }
+
+func (fakeMCPLoader) Close() error {
+	return nil
+}

pkg/mcp/loader.go

@@ -3,6 +3,7 @@ package mcp
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"maps"
 	"slices"
@@ -49,6 +50,7 @@ type ServerConfig struct {
 	URL                string   `json:"url"`
 	BaseURL            string   `json:"baseURL,omitempty"`
 	Headers            []string `json:"headers"`
+	Scope              string   `json:"scope"`
 }
 
 func (s *ServerConfig) GetBaseURL() string {
@@ -104,6 +106,24 @@ func (l *Local) Load(ctx context.Context, tool types.Tool) (result []types.Tool,
 	return nil, fmt.Errorf("no MCP server configuration found in tool instructions: %s", configData)
 }
 
+func (l *Local) Close() error {
+	if l == nil {
+		return nil
+	}
+
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	var errs []error
+	for id, session := range l.sessions {
+		if err := session.Client.Close(); err != nil {
+			errs = append(errs, fmt.Errorf("failed to close MCP client %s: %w", id, err))
+		}
+	}
+
+	return errors.Join(errs...)
+}
+
 func (l *Local) sessionToTools(ctx context.Context, session *Session, toolName string) ([]types.Tool, error) {
 	tools, err := session.Client.ListTools(ctx, mcp.ListToolsRequest{})
 	if err != nil {