refactor: centralize PR label handling (#768)

Co-authored-by: homeboy-ci[bot] <266378653+homeboy-ci[bot]@users.noreply.github.com>

Author: chubes4

inc/Abilities/GitHubAbilities.php

@@ -1606,27 +1606,7 @@ public static function createPullRequest( array $input ): array|\WP_Error {
 
 		if ( null !== $existing_pull ) {
 			$pull     = self::normalizePull($existing_pull);
-			$labels   = self::mergeProvenanceLabels(isset($input['labels']) && is_array($input['labels']) ? $input['labels'] : array());
-			$labeling = null;
-
-			if ( ! empty($labels) && ! empty($pull['number']) ) {
-				$label_response = self::applyLabelsToNumber($repo, (int) $pull['number'], $labels, $pat);
-				if ( is_wp_error($label_response) ) {
-					$labeling = array(
-						'success'    => false,
-						'labels'     => $labels,
-						'error_code' => $label_response->get_error_code(),
-						'error'      => $label_response->get_error_message(),
-						'status'     => is_array($label_response->get_error_data()) ? ( $label_response->get_error_data()['status'] ?? null ) : null,
-					);
-				} else {
-					$labeling = array(
-						'success'        => true,
-						'labels'         => $labels,
-						'applied_labels' => $label_response['applied_labels'] ?? array(),
-					);
-				}
-			}
+			$labeling = self::labelPullRequest($repo, (int) ( $pull['number'] ?? 0 ), $input, $pat);
 
 			$result = array(
 				'success'      => true,
@@ -1674,27 +1654,7 @@ public static function createPullRequest( array $input ): array|\WP_Error {
 		}
 
 		$pull     = self::normalizePull($response['data']);
-		$labels   = self::mergeProvenanceLabels(isset($input['labels']) && is_array($input['labels']) ? $input['labels'] : array());
-		$labeling = null;
-
-		if ( ! empty($labels) && ! empty($pull['number']) ) {
-			$label_response = self::applyLabelsToNumber($repo, (int) $pull['number'], $labels, $pat);
-			if ( is_wp_error($label_response) ) {
-				$labeling = array(
-					'success'    => false,
-					'labels'     => $labels,
-					'error_code' => $label_response->get_error_code(),
-					'error'      => $label_response->get_error_message(),
-					'status'     => is_array($label_response->get_error_data()) ? ( $label_response->get_error_data()['status'] ?? null ) : null,
-				);
-			} else {
-				$labeling = array(
-					'success'        => true,
-					'labels'         => $labels,
-					'applied_labels' => $label_response['applied_labels'] ?? array(),
-				);
-			}
-		}
+		$labeling = self::labelPullRequest($repo, (int) ( $pull['number'] ?? 0 ), $input, $pat);
 
 		$result = array(
 			'success'      => true,
@@ -1931,6 +1891,41 @@ private static function mergeProvenanceLabels( array $labels ): array {
 		return $merged;
 	}
 
+	/**
+	 * Apply PR labels and normalize the result for every PR creation path.
+	 *
+	 * @param  string $repo   Repository owner/name.
+	 * @param  int    $number Pull request number.
+	 * @param  array  $input  Pull request input.
+	 * @param  string $pat    GitHub token.
+	 * @return array<string,mixed>|null
+	 */
+	private static function labelPullRequest( string $repo, int $number, array $input, string $pat ): ?array {
+		$labels = self::mergeProvenanceLabels(isset($input['labels']) && is_array($input['labels']) ? $input['labels'] : array());
+		if ( empty($labels) || $number <= 0 ) {
+			return null;
+		}
+
+		$label_response = self::applyLabelsToNumber($repo, $number, $labels, $pat);
+		if ( is_wp_error($label_response) ) {
+			$error_data = $label_response->get_error_data();
+
+			return array(
+				'success'    => false,
+				'labels'     => $labels,
+				'error_code' => $label_response->get_error_code(),
+				'error'      => $label_response->get_error_message(),
+				'status'     => is_array($error_data) ? ( $error_data['status'] ?? null ) : null,
+			);
+		}
+
+		return array(
+			'success'        => true,
+			'labels'         => $labels,
+			'applied_labels' => $label_response['applied_labels'] ?? array(),
+		);
+	}
+
 	/**
 	 * Resolve the current Data Machine agent slug when running in agent context.
 	 */

inc/Handlers/GitHub/GitHubPullRequestPublish.php

@@ -220,33 +220,21 @@ protected function executePublish( array $parameters, array $handler_config ): a
 		$pull_number = (int) ( $result['pull_number'] ?? 0 );
 
 		$labels         = $this->resolveListParameter($parameters['labels'] ?? null, $handler_config['labels'] ?? '');
-		$applied_labels = array();
-		$label_error    = null;
+		$labeling       = is_array($result['labeling'] ?? null) ? $result['labeling'] : null;
+		$applied_labels = is_array($labeling['applied_labels'] ?? null) ? $labeling['applied_labels'] : array();
+		$label_error    = is_array($labeling) && false === ( $labeling['success'] ?? true ) ? (string) ( $labeling['error'] ?? '' ) : null;
 
-		if ( ! empty($labels) && $pull_number > 0 ) {
-			$label_result = GitHubAbilities::addLabels(
+		if ( null !== $label_error ) {
+			$this->log(
+				'warning',
+				'GitHub Pull Request opened but failed to apply labels: ' . $label_error,
 				array(
+					'job_id'      => $parameters['job_id'] ?? null,
 					'repo'        => $repo,
 					'pull_number' => $pull_number,
-					'labels'      => $labels,
+					'labels'      => $labeling['labels'] ?? $labels,
 				)
 			);
-
-			if ( is_wp_error($label_result) ) {
-				$label_error = $label_result->get_error_message();
-				$this->log(
-					'warning',
-					'GitHub Pull Request opened but failed to apply labels: ' . $label_error,
-					array(
-						'job_id'      => $parameters['job_id'] ?? null,
-						'repo'        => $repo,
-						'pull_number' => $pull_number,
-						'labels'      => $labels,
-					)
-				);
-			} else {
-				$applied_labels = $label_result['applied_labels'] ?? array();
-			}
 		}
 
 		$response_data = array(