Skip to content

Commit d4fb881

Browse files
committed
add --no-resources for opencode/crush
some MCP clients such as opencode do not support MCP resource capabilities, so this flag converts resources into tool calls. see anomalyco/opencode#806.
1 parent c3eeab7 commit d4fb881

2 files changed

Lines changed: 91 additions & 36 deletions

File tree

‎cmd/buttplug-mcp/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func main() {
4343
pflag.BoolVarP(&config.LogJSON, "log-json", "j", false, "Log in JSON (default is plaintext)")
4444
pflag.StringVarP(&config.MCPConfig.SSEHostPort, "sse-host", "", "", "host:port to listen to SSE connections")
4545
pflag.BoolVarP(&config.MCPConfig.UseSSE, "sse", "", false, "Use SSE Transport (default is stdio transport)")
46+
pflag.BoolVarP(&config.MCPConfig.NoResourcesMode, "no-resources", "", false, "Disable resource capabilities in favor of tools (for MCP clients that don't support them)")
4647
pflag.StringVarP(&config.BPConfig.WebsocketHost, "ws-host", "", "localhost", "host to connect to the Buttplug Websocket server")
4748
pflag.IntVarP(&config.BPConfig.WebsocketPort, "ws-port", "", 12345, "port to connect to the Buttplug Websocket server")
4849
pflag.BoolVarP(&config.Verbose, "verbose", "v", false, "Verbose logging")

‎internal/mcp/mcp.go‎

Lines changed: 90 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ const (
2222

2323
// Config is configuration for our MCP server.
2424
type Config struct {
25-
Name string // Service Name
26-
Version string // Service Version
27-
UseSSE bool // Use SSE Transport instead of STDIO
28-
SSEHostPort string // HostPort to use for SSE
25+
Name string // Service Name
26+
Version string // Service Version
27+
UseSSE bool // Use SSE Transport instead of STDIO
28+
SSEHostPort string // HostPort to use for SSE
29+
NoResourcesMode bool
2930

3031
// ButtplugWebsocketAddress is the address of the Buttplug Websocket server
3132
// to connect to.
@@ -43,7 +44,12 @@ type Server struct {
4344
// New creates a new MCP server with the given configuration.
4445
func New(config Config, bpm *bp.Manager, logger *slog.Logger) *Server {
4546
// Create the MCP Server
46-
mcp := mcpserver.NewMCPServer(config.Name, config.Version)
47+
mcp := mcpserver.NewMCPServer(
48+
config.Name, config.Version,
49+
mcpserver.WithToolCapabilities(true), // Enable tools
50+
mcpserver.WithResourceCapabilities(true, true), // Enable resources
51+
mcpserver.WithInstructions("Control the user's sex toys (vibrators, buttplugs, etc.) via Buttplug.io over MCP."),
52+
)
4753

4854
s := &Server{
4955
mcp: mcp,
@@ -69,21 +75,38 @@ func (s *Server) Start() error {
6975

7076
// registerTools registers tools+metadata with the passed MCPServer
7177
func (s *Server) registerTools() {
72-
// /devices
73-
s.mcp.AddResource(mcp.NewResource("/devices", "List Device IDs",
74-
mcp.WithResourceDescription("List of buttplug.io connected devices as an array of each device's ID number."),
75-
mcp.WithMIMEType("application/json"),
76-
), s.handleDeviceList)
77-
78-
// /devices/{id}
79-
s.mcp.AddResourceTemplate(mcp.NewResourceTemplate("/devices/{id}", "Get Device by ID",
80-
mcp.WithTemplateDescription("Get buttplug.io device information by device ID, where `id` is a key from `/devices`"),
81-
mcp.WithTemplateMIMEType("application/json"),
82-
), s.handleDeviceOne)
78+
if !s.config.NoResourcesMode {
79+
// /devices
80+
s.mcp.AddResource(mcp.NewResource("buttplug://devices", "List Device IDs",
81+
mcp.WithResourceDescription("List of buttplug.io connected devices as an array of each device's ID number."),
82+
mcp.WithMIMEType("application/json"),
83+
), s.handleDeviceList)
84+
85+
// /devices/{id}
86+
s.mcp.AddResource(mcp.NewResource("buttplug://devices/{id}", "Get Device by ID",
87+
mcp.WithResourceDescription("Get buttplug.io device information by device ID, where `id` is a key from `/devices`"),
88+
mcp.WithMIMEType("application/json"),
89+
), s.handleDeviceOne)
90+
} else {
91+
// get_device_ids
92+
s.mcp.AddTool(mcp.NewTool("get_device_ids",
93+
mcp.WithDescription("List connected buttplug.io devices as an array of device IDs."),
94+
), s.handleDeviceListTool)
95+
96+
// get_device_by_id
97+
s.mcp.AddTool(mcp.NewTool("get_device_by_id",
98+
mcp.WithDescription("Get buttplug.io device information by device ID, where `id` is a key from `get_device_ids`."),
99+
mcp.WithNumber("id",
100+
mcp.Required(),
101+
mcp.Description("Device index to query, sourced from `get_device_ids`."),
102+
mcp.Pattern(regexInt),
103+
),
104+
), s.handleDeviceOneTool)
105+
}
83106

84107
// device_vibrate
85108
s.mcp.AddTool(mcp.NewTool("device_vibrate",
86-
mcp.WithDescription("Vibrates device with `id`, selecting `strength`"),
109+
mcp.WithDescription("Vibrates device with `id` (from `/devices`) at `strength` (0.0 to 1.0) for `duration_sec` seconds, optionally stopping after duration."),
87110
mcp.WithNumber("id",
88111
mcp.Required(),
89112
mcp.Description("Device index to vibrate, sourced from `/devices`."),
@@ -98,7 +121,7 @@ func (s *Server) registerTools() {
98121
),
99122
mcp.WithNumber("duration_sec",
100123
mcp.Required(),
101-
mcp.Description("Duration in seconds to wait for until returning. If zero, vibrate indefinitely until another command is sent."),
124+
mcp.Description("Duration in seconds to wait for until returning. If zero, vibrate indefinitely until another command is sent. Avoid setting this to zero unless you definitely plan to stop the device later."),
102125
mcp.DefaultNumber(0.0),
103126
mcp.Min(0.0),
104127
mcp.Max(3600.0),
@@ -111,7 +134,7 @@ func (s *Server) registerTools() {
111134

112135
// device_stop
113136
s.mcp.AddTool(mcp.NewTool("device_stop",
114-
mcp.WithDescription("Stop vibrating device with `id`"),
137+
mcp.WithDescription("Stop vibrating device with `id`. Use in emergency situations or to halt vibration early."),
115138
mcp.WithNumber("id",
116139
mcp.Required(),
117140
mcp.Description("Device index to stop, sourced from `/devices`."),
@@ -121,22 +144,35 @@ func (s *Server) registerTools() {
121144
}
122145

123146
func (s *Server) handleDeviceList(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
124-
jbytes, err := json.Marshal(map[string]any{
125-
"device_ids": s.bpm.DeviceIndexes(),
126-
})
147+
jbytes, err := s.handleDeviceListRaw()
127148
if err != nil {
128-
return nil, fmt.Errorf("failed to json.Marshal devices: %w", err)
149+
return nil, err
129150
}
130151

131152
return []mcp.ResourceContents{
132-
mcp.TextResourceContents{
133-
URI: "/devices",
153+
&mcp.TextResourceContents{
154+
URI: request.Params.URI,
134155
MIMEType: "application/json",
135156
Text: string(jbytes),
136157
},
137158
}, nil
138159
}
139160

161+
func (s *Server) handleDeviceListTool(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
162+
jbytes, err := s.handleDeviceListRaw()
163+
if err != nil {
164+
return nil, err
165+
}
166+
167+
return mcp.NewToolResultText(string(jbytes)), nil
168+
}
169+
170+
func (s *Server) handleDeviceListRaw() (json.RawMessage, error) {
171+
return json.Marshal(map[string]any{
172+
"device_ids": s.bpm.DeviceIndexes(),
173+
})
174+
}
175+
140176
var reDeviceID = regexp.MustCompile(`/device/(\d+)`)
141177

142178
func (s *Server) handleDeviceOne(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
@@ -150,28 +186,46 @@ func (s *Server) handleDeviceOne(ctx context.Context, request mcp.ReadResourceRe
150186
return nil, fmt.Errorf("invalid device ID: %w", err)
151187
}
152188

153-
device, err := s.bpm.Device(ctx, deviceID)
154-
if err != nil {
155-
return nil, fmt.Errorf("failed to query device %d: %w", deviceID, err)
156-
}
157-
158-
jbytes, err := json.Marshal(map[string]any{
159-
"device_id": deviceID,
160-
"device": device,
161-
})
189+
jbytes, err := s.handleDeviceOneRaw(ctx, deviceID)
162190
if err != nil {
163-
return nil, fmt.Errorf("failed to json.Marshal battery: %w", err)
191+
return nil, err
164192
}
165193

166194
return []mcp.ResourceContents{
167-
mcp.TextResourceContents{
195+
&mcp.TextResourceContents{
168196
URI: request.Params.URI,
169197
MIMEType: "application/json",
170198
Text: string(jbytes),
171199
},
172200
}, nil
173201
}
174202

203+
func (s *Server) handleDeviceOneTool(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
204+
deviceID, err := request.RequireInt("id")
205+
if err != nil {
206+
return nil, fmt.Errorf("id must be set %w", err)
207+
}
208+
209+
jbytes, err := s.handleDeviceOneRaw(ctx, deviceID)
210+
if err != nil {
211+
return nil, err
212+
}
213+
214+
return mcp.NewToolResultText(string(jbytes)), nil
215+
}
216+
217+
func (s *Server) handleDeviceOneRaw(ctx context.Context, deviceID int) (json.RawMessage, error) {
218+
device, err := s.bpm.Device(ctx, deviceID)
219+
if err != nil {
220+
return nil, fmt.Errorf("failed to query device %d: %w", deviceID, err)
221+
}
222+
223+
return json.Marshal(map[string]any{
224+
"device_id": deviceID,
225+
"device": device,
226+
})
227+
}
228+
175229
func (s *Server) handleDeviceVibrate(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
176230
deviceID, err := request.RequireInt("id")
177231
if err != nil {

0 commit comments

Comments
 (0)