Consolidate comment status into save-comment tool

Remove standalone approve-comment and spam-comment tools. Status changes are now handled via the status param on save-comment, which accepts: approve, approved, hold, unapproved, spam, or trash.

Add normalize_comment_status() to map user-facing aliases to the values expected by wp_insert_comment and wp_set_comment_status. Update save_comment_tool to apply status via wp_set_comment_status when provided. Tool count updated from 55 to 53 in unit and integration tests.

Author: wpscholar

src/Tools/CommentManagementTools.php

@@ -48,7 +48,7 @@ private function add_comment_abilities() {
 				'content' => $this->string_prop( 'Comment content.' ),
 				'author_name' => $this->string_prop( 'Author name.' ),
 				'author_email' => $this->string_prop( 'Author email.' ),
-				'status' => $this->string_prop( 'Comment status.', 'hold' ),
+				'status' => $this->string_prop( 'Comment status: approve, approved, hold, unapproved, spam, or trash.', 'hold' ),
 			)
 		), function ( $params ) {
 			return $this->save_comment_tool( $params );
@@ -57,14 +57,6 @@ private function add_comment_abilities() {
 		$this->add_ability( self::INTERNAL_PREFIX . 'delete-comment', 'Delete Comment', 'Delete a WordPress comment by ID', $id_schema, function ( $params ) {
 			return $this->delete_comment_tool( (int) $params['id'] );
 		}, false, 'moderate_comments' );
-
-		$this->add_ability( self::INTERNAL_PREFIX . 'approve-comment', 'Approve Comment', 'Approve a WordPress comment by ID', $id_schema, function ( $params ) {
-			return $this->set_comment_status_tool( (int) $params['id'], 'approve' );
-		}, false, 'moderate_comments' );
-
-		$this->add_ability( self::INTERNAL_PREFIX . 'spam-comment', 'Spam Comment', 'Mark a WordPress comment as spam by ID', $id_schema, function ( $params ) {
-			return $this->set_comment_status_tool( (int) $params['id'], 'spam' );
-		}, false, 'moderate_comments' );
 	}
 
 	/**
@@ -138,12 +130,17 @@ private function add_comment_tool( $params ) {
 			return Response::error( 'This ability requires a WordPress runtime.', 500 );
 		}
 
+		$status = isset( $params['status'] ) ? $this->normalize_comment_status( $params['status'], 'insert' ) : '0';
+		if ( is_array( $status ) ) {
+			return $status;
+		}
+
 		return Response::unwrap_wp_error( wp_insert_comment( array(
 			'comment_post_ID'      => (int) $params['post_id'],
 			'comment_content'      => $params['content'],
 			'comment_author'       => isset( $params['author_name'] ) ? $params['author_name'] : '',
 			'comment_author_email' => isset( $params['author_email'] ) ? $params['author_email'] : '',
-			'comment_approved'     => isset( $params['status'] ) ? $params['status'] : 'hold',
+			'comment_approved'     => $status,
 		) ) );
 	}
 
@@ -162,11 +159,29 @@ private function update_comment_tool( $params ) {
 		if ( isset( $params['content'] ) ) {
 			$data['comment_content'] = $params['content'];
 		}
+
+		$result = true;
+		if ( count( $data ) > 1 ) {
+			$result = Response::unwrap_wp_error( wp_update_comment( $data, true ) );
+			if ( is_array( $result ) && isset( $result['status'] ) && 'error' === $result['status'] ) {
+				return $result;
+			}
+		}
+
 		if ( isset( $params['status'] ) ) {
-			$data['comment_approved'] = $params['status'];
+			if ( ! function_exists( 'wp_set_comment_status' ) ) {
+				return Response::error( 'This ability requires a WordPress runtime.', 500 );
+			}
+
+			$status = $this->normalize_comment_status( $params['status'], 'update' );
+			if ( is_array( $status ) ) {
+				return $status;
+			}
+
+			return Response::unwrap_wp_error( wp_set_comment_status( (int) $params['id'], $status, true ) );
 		}
 
-		return Response::unwrap_wp_error( wp_update_comment( $data, true ) );
+		return $result;
 	}
 
 	/**
@@ -186,21 +201,6 @@ private function delete_comment_tool( $id ) {
 		);
 	}
 
-	/**
-	 * Set comment status.
-	 *
-	 * @param int    $id Comment ID.
-	 * @param string $status Status.
-	 * @return mixed
-	 */
-	private function set_comment_status_tool( $id, $status ) {
-		if ( ! function_exists( 'wp_set_comment_status' ) ) {
-			return Response::error( 'This ability requires a WordPress runtime.', 500 );
-		}
-
-		return Response::unwrap_wp_error( wp_set_comment_status( $id, $status, true ) );
-	}
-
 	/**
 	 * Format comment.
 	 *
@@ -218,4 +218,59 @@ private function format_comment( $comment ) {
 			'date'         => $comment->comment_date,
 		);
 	}
+
+	/**
+	 * Normalize user-facing comment statuses for WordPress comment APIs.
+	 *
+	 * @param mixed  $status Status value.
+	 * @param string $context API context: insert or update.
+	 * @return string|array<string,mixed>
+	 */
+	private function normalize_comment_status( $status, $context ) {
+		$status = strtolower( trim( (string) $status ) );
+		$map    = array(
+			'1'          => array(
+				'insert' => '1',
+				'update' => 'approve',
+			),
+			'approve'    => array(
+				'insert' => '1',
+				'update' => 'approve',
+			),
+			'approved'   => array(
+				'insert' => '1',
+				'update' => 'approve',
+			),
+			'0'          => array(
+				'insert' => '0',
+				'update' => 'hold',
+			),
+			'hold'       => array(
+				'insert' => '0',
+				'update' => 'hold',
+			),
+			'pending'    => array(
+				'insert' => '0',
+				'update' => 'hold',
+			),
+			'unapproved' => array(
+				'insert' => '0',
+				'update' => 'hold',
+			),
+			'spam'       => array(
+				'insert' => 'spam',
+				'update' => 'spam',
+			),
+			'trash'      => array(
+				'insert' => 'trash',
+				'update' => 'trash',
+			),
+		);
+
+		if ( ! isset( $map[ $status ][ $context ] ) ) {
+			return Response::error( 'Unsupported comment status: ' . $status, 400 );
+		}
+
+		return $map[ $status ][ $context ];
+	}
 }

tests/integration/mcp-endpoint.mjs

@@ -214,8 +214,6 @@ const expectedTools = [
   'wp-forge-get-comment',
   'wp-forge-save-comment',
   'wp-forge-delete-comment',
-  'wp-forge-approve-comment',
-  'wp-forge-spam-comment',
   'wp-forge-get-site-health-info',
   'wp-forge-list-site-health-tests',
   'wp-forge-read-error-log',
@@ -397,8 +395,12 @@ await expectSuccess('wp-forge-list-comments', { post_id: postId, per_page: 5 });
 const comment = await expectSuccess('wp-forge-get-comment', { id: commentId });
 assert(comment.id === commentId, 'wp-forge-get-comment returned the wrong comment');
 await expectSuccess('wp-forge-save-comment', { id: commentId, content: `MCP comment updated ${suffix}` });
-await expectSuccess('wp-forge-approve-comment', { id: commentId });
-await expectSuccess('wp-forge-spam-comment', { id: commentId });
+await expectSuccess('wp-forge-save-comment', { id: commentId, status: 'approved' });
+const approvedComment = await expectSuccess('wp-forge-get-comment', { id: commentId });
+assert(approvedComment.status === 'approved', 'wp-forge-save-comment did not approve the comment');
+await expectSuccess('wp-forge-save-comment', { id: commentId, status: 'spam' });
+const spamComment = await expectSuccess('wp-forge-get-comment', { id: commentId });
+assert(spamComment.status === 'spam', 'wp-forge-save-comment did not mark the comment as spam');
 await expectSuccess('wp-forge-delete-comment', { id: commentId });
 
 const siteHealthInfo = await expectSuccess('wp-forge-get-site-health-info');

tests/run.php

@@ -171,7 +171,7 @@ function assert_same( $expected, $actual, $message ) {
 $all       = $abilities->list_abilities();
 $names     = array_column( $all, 'name' );
 
-assert_same( 55, count( $all ), 'Expected the WordPress ability catalog.' );
+assert_same( 53, count( $all ), 'Expected the WordPress ability catalog.' );
 assert_true( in_array( 'wp-forge-search-content', $names, true ), 'Expected content search ability.' );
 assert_true( in_array( 'wp-forge-get-site-info', $names, true ), 'Expected site info ability.' );
 assert_true( in_array( 'wp-forge-run-api-function', $names, true ), 'Expected REST runner ability.' );
@@ -219,8 +219,6 @@ function assert_same( $expected, $actual, $message ) {
 	'wp-forge-get-comment',
 	'wp-forge-save-comment',
 	'wp-forge-delete-comment',
-	'wp-forge-approve-comment',
-	'wp-forge-spam-comment',
 	'wp-forge-get-site-health-info',
 	'wp-forge-list-site-health-tests',
 	'wp-forge-read-error-log',
@@ -253,7 +251,7 @@ function assert_same( $expected, $actual, $message ) {
 
 $direct_tools = $abilities->list_tools();
 $direct_tool_names = array_column( $direct_tools, 'name' );
-assert_same( 55, count( $direct_tools ), 'Expected all abilities to be exposed as direct MCP tools.' );
+assert_same( 53, count( $direct_tools ), 'Expected all abilities to be exposed as direct MCP tools.' );
 assert_true( in_array( 'wp-forge-search-content', $direct_tool_names, true ), 'Direct tool list should include content search.' );
 assert_true( in_array( 'wp-forge-get-active-theme', $direct_tool_names, true ), 'Direct tool list should include active theme.' );
 assert_true( ! in_array( 'wp-forge-list-abilities', $direct_tool_names, true ), 'Gateway list tool should not be exposed.' );
@@ -295,11 +293,11 @@ function assert_same( $expected, $actual, $message ) {
 assert_same( array( 'page' ), array_column( $public_hierarchical_post_types['message']['post_types'], 'slug' ), 'Post type list should pass filters through to get_post_types().' );
 
 $wp_ability_names = $abilities->get_wordpress_ability_names();
-assert_same( 55, count( $wp_ability_names ), 'Expected all abilities to be available for the MCP adapter.' );
+assert_same( 53, count( $wp_ability_names ), 'Expected all abilities to be available for the MCP adapter.' );
 assert_true( in_array( 'wp-forge/search-content', $wp_ability_names, true ), 'Adapter ability list should use WordPress ability names.' );
 
 $abilities->register_wordpress_abilities();
-assert_same( 55, count( $registered_abilities ), 'Expected every ability to be registered with the WordPress Abilities API.' );
+assert_same( 53, count( $registered_abilities ), 'Expected every ability to be registered with the WordPress Abilities API.' );
 assert_true( isset( $registered_abilities['wp-forge/search-content'] ), 'Content search should be registered with the WordPress Abilities API.' );
 assert_same( 'Search and filter content for any registered post type', $registered_abilities['wp-forge/search-content']['description'], 'Registered ability should preserve descriptions.' );
 assert_same( true, $registered_abilities['wp-forge/search-content']['meta']['show_in_rest'], 'Registered abilities should be exposed through the Abilities REST API.' );
@@ -330,7 +328,7 @@ public function create_server() {
 assert_same( 'mcp', $adapter->args[1], 'Adapter server should keep the existing REST namespace.' );
 assert_same( 'wp-forge', $adapter->args[2], 'Adapter server should keep the existing REST route.' );
 assert_same( 'WordPress MCP', $adapter->args[3], 'Adapter server should preserve the server name.' );
-assert_same( 55, count( $adapter->args[9] ), 'Adapter server should expose every registered ability.' );
+assert_same( 53, count( $adapter->args[9] ), 'Adapter server should expose every registered ability.' );
 assert_true( in_array( 'wp-forge/search-content', $adapter->args[9], true ), 'Adapter server should expose content search.' );
 
 echo 'Tests passed: ' . $tests_run . PHP_EOL;