Skip to content

chore(codersdk/toolsdk): improve static analyzability of toolsdk.Tools #17562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 29, 2025
Merged

chore(codersdk/toolsdk): improve static analyzability of toolsdk.Tools #17562

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d2dbf0
chore(codersdk/toolsdk): add typed argument to toolsdk.Tool
johnstcn Apr 24, 2025
a7784ea
chore(codersdk/toolsdk): add tool deps in toolbox struct instead of c…
johnstcn Apr 24, 2025
5b30ea0
chore(codersdk/toolsdk): add panic recovery tool middleware
johnstcn Apr 24, 2025
def3fcb
chore(coderd): improve tests for patchWorkspaceAgentAppStatus
johnstcn Apr 24, 2025
5647b8b
simplify toolbox impl, rename to deps
johnstcn Apr 24, 2025
c1057d9
add WithCleanContext middleware func
johnstcn Apr 25, 2025
9edd5f7
fix(codersdk/toolsdk): address type incompatibility issues
johnstcn Apr 25, 2025
0f1d4ac
fix tests
johnstcn Apr 25, 2025
2462f76
address PR feedback
johnstcn Apr 29, 2025
233f9da
address more PR comments
johnstcn Apr 29, 2025
40b2fdc
unexport deps fields
johnstcn Apr 29, 2025
6d7561f
Merge branch 'main' into cj/toolsdk-refactor
johnstcn Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore(codersdk/toolsdk): add tool deps in toolbox struct instead of c… 
…ontext
  • Loading branch information
@johnstcn
johnstcn committed Apr 29, 2025
commit a7784ea2340183a52db02632bdf34b9f106a57bc
16 changes: 8 additions & 8 deletions cli/exp_mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,21 +400,21 @@ func mcpServerHandler(inv *serpent.Invocation, client *codersdk.Client, instruct
)

// Create a new context for the tools with all relevant information.
clientCtx := toolsdk.WithClient(ctx, client)
tb := toolsdk.NewToolbox(client)
// Get the workspace agent token from the environment.
var hasAgentClient bool
if agentToken, err := getAgentToken(fs); err == nil && agentToken != "" {
hasAgentClient = true
agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
clientCtx = toolsdk.WithAgentClient(clientCtx, agentClient)
tb = tb.WithAgentClient(agentClient)
} else {
cliui.Warnf(inv.Stderr, "CODER_AGENT_TOKEN is not set, task reporting will not be available")
}
if appStatusSlug == "" {
cliui.Warnf(inv.Stderr, "CODER_MCP_APP_STATUS_SLUG is not set, task reporting will not be available.")
} else {
clientCtx = toolsdk.WithWorkspaceAppStatusSlug(clientCtx, appStatusSlug)
tb = tb.WithAppStatusSlug(appStatusSlug)
}

// Register tools based on the allowlist (if specified)
Expand All @@ -427,15 +427,15 @@ func mcpServerHandler(inv *serpent.Invocation, client *codersdk.Client, instruct
if len(allowedTools) == 0 || slices.ContainsFunc(allowedTools, func(t string) bool {
return t == tool.Tool.Name
}) {
mcpSrv.AddTools(mcpFromSDK(tool))
mcpSrv.AddTools(mcpFromSDK(tool, tb))
}
}

srv := server.NewStdioServer(mcpSrv)
done := make(chan error)
go func() {
defer close(done)
srvErr := srv.Listen(clientCtx, invStdin, invStdout)
srvErr := srv.Listen(ctx, invStdin, invStdout)
done <- srvErr
}()

Expand Down Expand Up @@ -695,7 +695,7 @@ func getAgentToken(fs afero.Fs) (string, error) {

// mcpFromSDK adapts a toolsdk.Tool to go-mcp's server.ServerTool.
// It assumes that the tool responds with a valid JSON object.
func mcpFromSDK(sdkTool toolsdk.Tool[any, any]) server.ServerTool {
func mcpFromSDK(sdkTool toolsdk.Tool[any, any], tb toolsdk.Toolbox) server.ServerTool {
// NOTE: some clients will silently refuse to use tools if there is an issue
// with the tool's schema or configuration.
if sdkTool.Schema.Properties == nil {
Expand All @@ -711,8 +711,8 @@ func mcpFromSDK(sdkTool toolsdk.Tool[any, any]) server.ServerTool {
Required: sdkTool.Schema.Required,
},
},
Handler: func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
result, err := sdkTool.Handler(ctx, request.Params.Arguments)
Handler: func(_ context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
result, err := sdkTool.Handler(tb, request.Params.Arguments)
if err != nil {
return nil, err
}
Expand Down
Loading