Skip to content

Fix null parameter handling in Prompts and Resources handlers #77

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 3 commits into from
Oct 30, 2025
Merged

Fix null parameter handling in Prompts and Resources handlers #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1133901
Fix null parameter handling in Prompts and Resources handlers
galatanovidiu Oct 21, 2025
1ced301
Fix resource ability parameter handling for abilities without input
galatanovidiu Oct 21, 2025
df2f71b
Merge branch 'trunk' into fix/parameter-handling-prompts-resources
JasonTheAdams Oct 30, 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
9 changes: 8 additions & 1 deletion includes/Handlers/Prompts/PromptsHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,14 @@ public function get_prompt( array $params, int $request_id = 0 ): array {
*
* @var \WP_Ability $ability
*/
$ability = $prompt->get_ability();
$ability = $prompt->get_ability();

// If ability has no input schema and arguments is empty, pass null
// This is required by WP_Ability::validate_input() which expects null when no schema
$ability_input_schema = $ability->get_input_schema();
if ( empty( $ability_input_schema ) && empty( $arguments ) ) {
$arguments = null;
}
$has_permission = $ability->check_permissions( $arguments );
if ( true !== $has_permission ) {
// Extract detailed error message and code if WP_Error was returned
Expand Down
4 changes: 2 additions & 2 deletions includes/Handlers/Resources/ResourcesHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function read_resource( array $params, int $request_id = 0 ): array {
$ability = $resource->get_ability();

try {
$has_permission = $ability->check_permissions( $request_params );
$has_permission = $ability->check_permissions();
if ( true !== $has_permission ) {
// Extract detailed error message and code if WP_Error was returned
$error_message = 'Access denied for resource: ' . $resource->get_name();
Expand All @@ -128,7 +128,7 @@ public function read_resource( array $params, int $request_id = 0 ): array {
);
}

$contents = $ability->execute( $request_params );
$contents = $ability->execute();

// Handle WP_Error objects that weren't converted by the ability.
if ( is_wp_error( $contents ) ) {
Expand Down
5 changes: 2 additions & 3 deletions tests/Fixtures/DummyAbility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,10 @@ public static function register_abilities(): void {
'label' => 'Resource',
'description' => 'A text resource',
'category' => 'test',
'input_schema' => array( 'type' => 'object' ),
'execute_callback' => static function ( array $input ) {
'execute_callback' => static function () {
return 'content';
},
'permission_callback' => static function ( array $input ) {
'permission_callback' => static function () {
return true;
},
'meta' => array(
Expand Down
Loading