@@ -7,120 +7,39 @@ import (
77 "iter"
88 "strings"
99
10− "charm.land/fantasy"
11− "github.com/charmbracelet/crush/internal/agent/tools"
1210 "github.com/charmbracelet/crush/internal/csync"
13− "github.com/charmbracelet/crush/internal/permission"
1411 "github.com/modelcontextprotocol/go-sdk/mcp"
1512)
1613
14+type Tool = mcp.Tool
15+
1716var (
1817 allTools = csync.NewMap[string, *Tool]()
1918 client2Tools = csync.NewMap[string, []*Tool]()
2019)
2120
22−// GetMCPTools returns all available MCP tools.
23−func GetMCPTools() iter.Seq[*Tool] {
24− return allTools.Seq()
25−}
26−
27−type Tool struct {
28− mcpName string
29− tool *mcp.Tool
30− permissions permission.Service
31− workingDir string
32− providerOptions fantasy.ProviderOptions
33−}
34−
35−func (m *Tool) SetProviderOptions(opts fantasy.ProviderOptions) {
36− m.providerOptions = opts
37−}
38−
39−func (m *Tool) ProviderOptions() fantasy.ProviderOptions {
40− return m.providerOptions
21+// GetTools returns all available MCP tools.
22+func GetTools() iter.Seq2[string, *Tool] {
23+ return allTools.Seq2()
4124}
4225
43−func (m *Tool) Name() string {
44− return fmt.Sprintf("mcp_%s_%s", m.mcpName, m.tool.Name)
45−}
46−
47−func (m *Tool) MCP() string {
48− return m.mcpName
49−}
50−
51−func (m *Tool) MCPToolName() string {
52− return m.tool.Name
53−}
54−
55−func (m *Tool) Info() fantasy.ToolInfo {
56− parameters := make(map[string]any)
57− required := make([]string, 0)
58−
59− if input, ok := m.tool.InputSchema.(map[string]any); ok {
60− if props, ok := input["properties"].(map[string]any); ok {
61− parameters = props
62− }
63− if req, ok := input["required"].([]any); ok {
64− // Convert []any -> []string when elements are strings
65− for _, v := range req {
66− if s, ok := v.(string); ok {
67− required = append(required, s)
68− }
69− }
70− } else if reqStr, ok := input["required"].([]string); ok {
71− // Handle case where it's already []string
72− required = reqStr
73− }
74− }
75−
76− return fantasy.ToolInfo{
77− Name: fmt.Sprintf("mcp_%s_%s", m.mcpName, m.tool.Name),
78− Description: m.tool.Description,
79− Parameters: parameters,
80− Required: required,
81− }
82−}
83−
84−func (m *Tool) Run(ctx context.Context, params fantasy.ToolCall) (fantasy.ToolResponse, error) {
85− sessionID := tools.GetSessionFromContext(ctx)
86− if sessionID == "" {
87− return fantasy.ToolResponse{}, fmt.Errorf("session ID is required for creating a new file")
88− }
89− permissionDescription := fmt.Sprintf("execute %s with the following parameters:", m.Info().Name)
90− p := m.permissions.Request(
91− permission.CreatePermissionRequest{
92− SessionID: sessionID,
93− ToolCallID: params.ID,
94− Path: m.workingDir,
95− ToolName: m.Info().Name,
96− Action: "execute",
97− Description: permissionDescription,
98− Params: params.Input,
99− },
100− )
101− if !p {
102− return fantasy.ToolResponse{}, permission.ErrorPermissionDenied
103− }
104−
105− return runTool(ctx, m.mcpName, m.tool.Name, params.Input)
106−}
107−
108−func runTool(ctx context.Context, name, toolName string, input string) (fantasy.ToolResponse, error) {
26+// RunTool runs an MCP tool with the given input parameters.
27+func RunTool(ctx context.Context, name, toolName string, input string) (string, error) {
10928 var args map[string]any
11029 if err := json.Unmarshal([]byte(input), &args); err != nil {
111− return fantasy.NewTextErrorResponse(fmt.Sprintf("error parsing parameters: %s", err)), nil
30+ return "", fmt.Errorf("error parsing parameters: %s", err)
11231 }
11332
11433 c, err := getOrRenewClient(ctx, name)
11534 if err != nil {
116− return fantasy.NewTextErrorResponse(err.Error()), nil
35+ return "", err
11736 }
11837 result, err := c.CallTool(ctx, &mcp.CallToolParams{
11938 Name: toolName,
12039 Arguments: args,
12140 })
12241 if err != nil {
123− return fantasy.NewTextErrorResponse(err.Error()), nil
42+ return "", err
12443 }
12544
12645 output := make([]string, 0, len(result.Content))
@@ -131,27 +50,18 @@ func runTool(ctx context.Context, name, toolName string, input string) (fantasy.
13150 output = append(output, fmt.Sprintf("%v", v))
13251 }
13352 }
134− return fantasy.NewTextResponse(strings.Join(output, "\n")), nil
53+ return strings.Join(output, "\n"), nil
13554}
13655
137−func getTools(ctx context.Context, name string, permissions permission.Service, c *mcp.ClientSession, workingDir string) ([]*Tool, error) {
138− if c.InitializeResult().Capabilities.Tools == nil {
56+func getTools(ctx context.Context, session *mcp.ClientSession) ([]*Tool, error) {
57+ if session.InitializeResult().Capabilities.Tools == nil {
13958 return nil, nil
14059 }
141− result, err := c.ListTools(ctx, &mcp.ListToolsParams{})
60+ result, err := session.ListTools(ctx, &mcp.ListToolsParams{})
14261 if err != nil {
14362 return nil, err
14463 }
145− mcpTools := make([]*Tool, 0, len(result.Tools))
146− for _, tool := range result.Tools {
147− mcpTools = append(mcpTools, &Tool{
148− mcpName: name,
149− tool: tool,
150− permissions: permissions,
151− workingDir: workingDir,
152− })
153− }
154− return mcpTools, nil
64+ return result.Tools, nil
15565}
15666
15767// updateTools updates the global mcpTools and mcpClient2Tools maps
@@ -161,9 +71,9 @@ func updateTools(mcpName string, tools []*Tool) {
16171 } else {
16272 client2Tools.Set(mcpName, tools)
16373 }
164− for _, tools := range client2Tools.Seq2() {
74+ for name, tools := range client2Tools.Seq2() {
16575 for _, t := range tools {
166− allTools.Set(t.Name(), t)
76+ allTools.Set(name, t)
16777 }
16878 }
16979}