coder
diff --git a/‎cli/exp_mcp.go
Lines changed: 8 additions & 8 deletions b/‎cli/exp_mcp.go
Lines changed: 8 additions & 8 deletions
@@ -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)
@@ -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
 	}()
 
@@ -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 {
@@ -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
 			}