Merge pull request #24 from kujtimiihoxha/cleanup-tools

Cleanup tools

Author: kujtimiihoxha

cmd/root.go

@@ -50,7 +50,7 @@ var rootCmd = &cobra.Command{
 
 go func() {
 // Set this up once
-agent.GetMcpTools(ctx)
+agent.GetMcpTools(ctx, app.Permissions)
 for msg := range ch {
 tui.Send(msg)
 }

internal/app/services.go

@@ -41,7 +41,7 @@ func New(ctx context.Context, conn *sql.DB) *App {
 Context: ctx,
 Sessions: sessions,
 Messages: messages,
-Permissions: permission.Default,
+Permissions: permission.NewPermissionService(),
 Logger: log,
 LSPClients: make(map[string]*lsp.Client),
 }

internal/llm/agent/coder.go

@@ -44,7 +44,7 @@ func NewCoderAgent(app *app.App) (Agent, error) {
 return nil, err
 }
 
-otherTools := GetMcpTools(app.Context)
+otherTools := GetMcpTools(app.Context, app.Permissions)
 if len(app.LSPClients) > 0 {
 otherTools = append(otherTools, tools.NewDiagnosticsTool(app.LSPClients))
 }
@@ -53,15 +53,15 @@ func NewCoderAgent(app *app.App) (Agent, error) {
 App: app,
 tools: append(
 []tools.BaseTool{
-tools.NewBashTool(),
-tools.NewEditTool(app.LSPClients),
-tools.NewFetchTool(),
+tools.NewBashTool(app.Permissions),
+tools.NewEditTool(app.LSPClients, app.Permissions),
+tools.NewFetchTool(app.Permissions),
 tools.NewGlobTool(),
 tools.NewGrepTool(),
 tools.NewLsTool(),
 tools.NewSourcegraphTool(),
 tools.NewViewTool(app.LSPClients),
-tools.NewWriteTool(app.LSPClients),
+tools.NewWriteTool(app.LSPClients, app.Permissions),
 }, otherTools...,
 ),
 model: model,

internal/llm/agent/mcp-tools.go

@@ -16,9 +16,10 @@ import (
 )
 
 type mcpTool struct {
-mcpName string
-tool mcp.Tool
-mcpConfig config.MCPServer
+mcpName string
+tool mcp.Tool
+mcpConfig config.MCPServer
+permissions permission.Service
 }
 
 type MCPClient interface {
@@ -80,7 +81,7 @@ func runTool(ctx context.Context, c MCPClient, toolName string, input string) (t
 
 func (b *mcpTool) Run(ctx context.Context, params tools.ToolCall) (tools.ToolResponse, error) {
 permissionDescription := fmt.Sprintf("execute %s with the following parameters: %s", b.Info().Name, params.Input)
-p := permission.Default.Request(
+p := b.permissions.Request(
 permission.CreatePermissionRequest{
 Path: config.WorkingDirectory(),
 ToolName: b.Info().Name,
@@ -118,17 +119,18 @@ func (b *mcpTool) Run(ctx context.Context, params tools.ToolCall) (tools.ToolRes
 return tools.NewTextErrorResponse("invalid mcp type"), nil
 }
 
-func NewMcpTool(name string, tool mcp.Tool, mcpConfig config.MCPServer) tools.BaseTool {
+func NewMcpTool(name string, tool mcp.Tool, permissions permission.Service, mcpConfig config.MCPServer) tools.BaseTool {
 return &mcpTool{
-mcpName: name,
-tool: tool,
-mcpConfig: mcpConfig,
+mcpName: name,
+tool: tool,
+mcpConfig: mcpConfig,
+permissions: permissions,
 }
 }
 
 var mcpTools []tools.BaseTool
 
-func getTools(ctx context.Context, name string, m config.MCPServer, c MCPClient) []tools.BaseTool {
+func getTools(ctx context.Context, name string, m config.MCPServer, permissions permission.Service, c MCPClient) []tools.BaseTool {
 var stdioTools []tools.BaseTool
 initRequest := mcp.InitializeRequest{}
 initRequest.Params.ProtocolVersion = mcp.LATEST_PROTOCOL_VERSION
@@ -149,13 +151,13 @@ func getTools(ctx context.Context, name string, m config.MCPServer, c MCPClient)
 return stdioTools
 }
 for _, t := range tools.Tools {
-stdioTools = append(stdioTools, NewMcpTool(name, t, m))
+stdioTools = append(stdioTools, NewMcpTool(name, t, permissions, m))
 }
 defer c.Close()
 return stdioTools
 }
 
-func GetMcpTools(ctx context.Context) []tools.BaseTool {
+func GetMcpTools(ctx context.Context, permissions permission.Service) []tools.BaseTool {
 if len(mcpTools) > 0 {
 return mcpTools
 }
@@ -172,7 +174,7 @@ func GetMcpTools(ctx context.Context) []tools.BaseTool {
 continue
 }
 
-mcpTools = append(mcpTools, getTools(ctx, name, m, c)...)
+mcpTools = append(mcpTools, getTools(ctx, name, m, permissions, c)...)
 case config.MCPSse:
 c, err := client.NewSSEMCPClient(
 m.URL,
@@ -182,7 +184,7 @@ func GetMcpTools(ctx context.Context) []tools.BaseTool {
 log.Printf("error creating mcp client: %s", err)
 continue
 }
-mcpTools = append(mcpTools, getTools(ctx, name, m, c)...)
+mcpTools = append(mcpTools, getTools(ctx, name, m, permissions, c)...)
 }
 }