lint

johnstcn · johnstcn · commit efc0cdb00673 · 2025-03-28T10:59:29.000Z
diff --git a/cli/exp_mcp.go b/cli/exp_mcp.go
@@ -113,4 +113,4 @@ func mcpHandler(inv *serpent.Invocation, client *codersdk.Client, instructions s
 		}
 	}
 	return nil
-}
+}
diff --git a/cli/exp_mcp_test.go b/cli/exp_mcp_test.go
@@ -133,4 +133,4 @@ func TestExpMcp(t *testing.T) {
 		err := inv.Run()
 		assert.ErrorContains(t, err, "your session has expired")
 	})
-}
+}
diff --git a/go.mod b/go.mod
@@ -320,7 +320,7 @@ require (
 	github.com/google/nftables v0.2.0 // indirect
 	github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
diff --git a/mcp/tools/command_validator_test.go b/mcp/tools/command_validator_test.go
@@ -9,6 +9,7 @@ import (
 )
 
 func TestIsCommandAllowed(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		name            string
 		command         string
@@ -65,6 +66,7 @@ func TestIsCommandAllowed(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got, err := mcptools.IsCommandAllowed(tt.command, tt.allowedCommands)
 			if tt.wantErr {
 				require.Error(t, err)
diff --git a/mcp/tools/tools_coder.go b/mcp/tools/tools_coder.go
@@ -50,7 +50,7 @@ func handleCoderReportTask(deps ToolDeps) mcpserver.ToolHandlerFunc {
 		}
 
 		// TODO: Waiting on support for tasks.
-		deps.Logger.Info(ctx, "reporting task", slog.F("summary", summary), slog.F("link", link), slog.F("done", done), slog.F("emoji", emoji))
+		deps.Logger.Info(ctx, "report task tool called", slog.F("summary", summary), slog.F("link", link), slog.F("done", done), slog.F("emoji", emoji))
 		/*
 			err := sdk.PostTask(ctx, agentsdk.PostTaskRequest{
 				Reporter:   "claude",
diff --git a/mcp/tools/tools_registry.go b/mcp/tools/tools_registry.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
-	mcpserver "github.com/mark3labs/mcp-go/server"
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/codersdk"
@@ -83,7 +82,7 @@ Good Summaries:
 
 // ToolAdder interface for adding tools to a server
 type ToolAdder interface {
-	AddTool(tool mcp.Tool, handler mcpserver.ToolHandlerFunc)
+	AddTool(tool mcp.Tool, handler server.ToolHandlerFunc)
 }
 
 // Ensure that MCPServer implements ToolAdder
@@ -99,7 +98,7 @@ type ToolDeps struct {
 // ToolHandler associates a tool with its handler creation function
 type ToolHandler struct {
 	Tool        mcp.Tool
-	MakeHandler func(ToolDeps) mcpserver.ToolHandlerFunc
+	MakeHandler func(ToolDeps) server.ToolHandlerFunc
 }
 
 // ToolRegistry is a map of available tools with their handler creation

Original file line number	Diff line number	Diff line change
`@@ -113,4 +113,4 @@ func mcpHandler(inv serpent.Invocation, client codersdk.Client, instructions s`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`return nil`
`116`		`-}`
	`116`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func handleCoderReportTask(deps ToolDeps) mcpserver.ToolHandlerFunc {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// TODO: Waiting on support for tasks.`
`53`		`- deps.Logger.Info(ctx, "reporting task", slog.F("summary", summary), slog.F("link", link), slog.F("done", done), slog.F("emoji", emoji))`
	`53`	`+ deps.Logger.Info(ctx, "report task tool called", slog.F("summary", summary), slog.F("link", link), slog.F("done", done), slog.F("emoji", emoji))`
`54`	`54`	`/*`
`55`	`55`	`err := sdk.PostTask(ctx, agentsdk.PostTaskRequest{`
`56`	`56`	`Reporter: "claude",`