fix(codersdk/toolsdk): fix tool schemata

johnstcn · johnstcn · commit bc5d245f9157 · 2025-04-11T18:37:25.000+01:00
diff --git a/cli/exp_mcp.go b/cli/exp_mcp.go
@@ -689,6 +689,11 @@ 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]) 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 {
+		panic("developer error: schema properties cannot be nil")
+	}
 	return server.ServerTool{
 		Tool: mcp.Tool{
 			Name:        sdkTool.Tool.Name,
diff --git a/codersdk/toolsdk/toolsdk.go b/codersdk/toolsdk/toolsdk.go
@@ -259,6 +259,10 @@ is provisioned correctly and the agent can connect to the control plane.
 		Tool: aisdk.Tool{
 			Name:        "coder_list_templates",
 			Description: "Lists templates for the authenticated user.",
+			Schema: aisdk.Schema{
+				Properties: map[string]any{},
+				Required:   []string{},
+			},
 		},
 		Handler: func(ctx context.Context, _ map[string]any) ([]MinimalTemplate, error) {
 			client, err := clientFromContext(ctx)
@@ -318,6 +322,10 @@ is provisioned correctly and the agent can connect to the control plane.
 		Tool: aisdk.Tool{
 			Name:        "coder_get_authenticated_user",
 			Description: "Get the currently authenticated user, similar to the `whoami` command.",
+			Schema: aisdk.Schema{
+				Properties: map[string]any{},
+				Required:   []string{},
+			},
 		},
 		Handler: func(ctx context.Context, _ map[string]any) (codersdk.User, error) {
 			client, err := clientFromContext(ctx)
