fix: register code abilities during api hook replay (#439)

chubes4 · web-flow · commit 31dd20b493ed · 2026-05-19T23:17:24.000-04:00
diff --git a/data-machine-code.php b/data-machine-code.php
@@ -67,7 +67,16 @@ function datamachine_code_maybe_upgrade_schema(): void {
  * data-machine-code loads before data-machine).
  */
 function datamachine_code_bootstrap() {
+	static $bootstrapped = false;
+
+	if ( $bootstrapped ) {
+		return;
+	}
+
 	if ( ! class_exists( 'DataMachine\Abilities\PermissionHelper' ) ) {
+		add_action( 'init', 'datamachine_code_bootstrap', 1 );
+		add_action( 'wp_abilities_api_init', 'datamachine_code_bootstrap', 1 );
+
 		add_action( 'admin_notices', function () {
 			?>
 			<div class="notice notice-error">
@@ -78,6 +87,8 @@ function datamachine_code_bootstrap() {
 		return;
 	}
 
+	$bootstrapped = true;
+
 	// Load Abilities (they self-register).
 	new \DataMachineCode\Abilities\GitHubAbilities();
 	new \DataMachineCode\Abilities\WorkspaceAbilities();
diff --git a/inc/Abilities/CodeTaskAbilities.php b/inc/Abilities/CodeTaskAbilities.php
@@ -22,9 +22,9 @@ public function __construct() {
 			return;
 		}
 
-		if ( ! class_exists( 'WP_Ability' ) ) {
+		if ( ! function_exists( 'wp_register_ability' ) ) {
 			add_action( 'wp_abilities_api_init', function (): void {
-				if ( self::$registered || ! class_exists( 'WP_Ability' ) ) {
+				if ( self::$registered || ! function_exists( 'wp_register_ability' ) ) {
 					return;
 				}
 
@@ -34,7 +34,7 @@ public function __construct() {
 			return;
 		}
 
-		if ( function_exists( 'doing_action' ) && ( doing_action( 'wp_abilities_api_init' ) || did_action( 'wp_abilities_api_init' ) ) ) {
+		if ( function_exists( 'doing_action' ) && doing_action( 'wp_abilities_api_init' ) ) {
 			$this->register();
 		} else {
 			add_action( 'wp_abilities_api_init', array( $this, 'register' ) );
diff --git a/inc/Abilities/GitHubAbilities.php b/inc/Abilities/GitHubAbilities.php
@@ -86,9 +86,9 @@ public function __construct() {
 		if ( self::$registered ) {
 			return;
 		}
-		if ( ! class_exists( 'WP_Ability' ) ) {
+		if ( ! function_exists( 'wp_register_ability' ) ) {
 			add_action( 'wp_abilities_api_init', function (): void {
-				if ( self::$registered || ! class_exists( 'WP_Ability' ) ) {
+				if ( self::$registered || ! function_exists( 'wp_register_ability' ) ) {
 					return;
 				}
 
@@ -1332,7 +1332,7 @@ private function registerAbilities(): void {
 			);
 		};
 
-		if ( doing_action( 'wp_abilities_api_init' ) || did_action( 'wp_abilities_api_init' ) ) {
+		if ( doing_action( 'wp_abilities_api_init' ) ) {
 			$register_callback();
 		} else {
 			add_action( 'wp_abilities_api_init', $register_callback );
diff --git a/inc/Abilities/GitSyncAbilities.php b/inc/Abilities/GitSyncAbilities.php
@@ -30,9 +30,9 @@ public function __construct() {
 		if ( self::$registered ) {
 			return;
 		}
-		if ( ! class_exists( 'WP_Ability' ) ) {
+		if ( ! function_exists( 'wp_register_ability' ) ) {
 			add_action( 'wp_abilities_api_init', function (): void {
-				if ( self::$registered || ! class_exists( 'WP_Ability' ) ) {
+				if ( self::$registered || ! function_exists( 'wp_register_ability' ) ) {
 					return;
 				}
 
@@ -311,7 +311,7 @@ private function registerAbilities(): void {
 			);
 		};
 
-		if ( doing_action( 'wp_abilities_api_init' ) || did_action( 'wp_abilities_api_init' ) ) {
+		if ( doing_action( 'wp_abilities_api_init' ) ) {
 			$register_callback();
 		} else {
 			add_action( 'wp_abilities_api_init', $register_callback );
diff --git a/inc/Abilities/WordPressRuntimeAbilities.php b/inc/Abilities/WordPressRuntimeAbilities.php
@@ -21,9 +21,9 @@ public function __construct() {
 			return;
 		}
 
-		if ( ! class_exists( 'WP_Ability' ) ) {
+		if ( ! function_exists( 'wp_register_ability' ) ) {
 			add_action( 'wp_abilities_api_init', function (): void {
-				if ( self::$registered || ! class_exists( 'WP_Ability' ) ) {
+				if ( self::$registered || ! function_exists( 'wp_register_ability' ) ) {
 					return;
 				}
 
@@ -155,7 +155,7 @@ private function registerAbilities(): void {
 			);
 		};
 
-		if ( function_exists( 'doing_action' ) && ( doing_action( 'wp_abilities_api_init' ) || did_action( 'wp_abilities_api_init' ) ) ) {
+		if ( function_exists( 'doing_action' ) && doing_action( 'wp_abilities_api_init' ) ) {
 			$register_callback();
 			return;
 		}
diff --git a/inc/Abilities/WorkspaceAbilities.php b/inc/Abilities/WorkspaceAbilities.php
@@ -33,9 +33,9 @@ public function __construct() {
 			return;
 		}
 
-		if ( ! class_exists( 'WP_Ability' ) ) {
+		if ( ! function_exists( 'wp_register_ability' ) ) {
 			add_action( 'wp_abilities_api_init', function (): void {
-				if ( self::$registered || ! class_exists( 'WP_Ability' ) ) {
+				if ( self::$registered || ! function_exists( 'wp_register_ability' ) ) {
 					return;
 				}
 
@@ -2167,7 +2167,7 @@ private function registerAbilities(): void {
 			}
 		};
 
-		if ( doing_action( 'wp_abilities_api_init' ) || did_action( 'wp_abilities_api_init' ) ) {
+		if ( doing_action( 'wp_abilities_api_init' ) ) {
 			$register_callback();
 		} else {
 			add_action( 'wp_abilities_api_init', $register_callback );
diff --git a/inc/Abilities/WorkspaceDiffAbilities.php b/inc/Abilities/WorkspaceDiffAbilities.php
@@ -99,7 +99,7 @@ public function __construct() {
 			);
 		};
 
-		if ( did_action( 'wp_abilities_api_init' ) ) {
+		if ( doing_action( 'wp_abilities_api_init' ) ) {
 			$register_callback();
 			return;
 		}
diff --git a/tests/smoke-deferred-ability-registration.php b/tests/smoke-deferred-ability-registration.php
@@ -29,10 +29,6 @@ class Workspace {
 	$GLOBALS['datamachine_code_registered_abilities'] = array();
 	$GLOBALS['datamachine_code_added_actions']        = array();
 
-	function wp_register_ability( string $name, array $definition ): void {
-		$GLOBALS['datamachine_code_registered_abilities'][ $name ] = $definition;
-	}
-
 	function doing_action( string $hook ): bool {
 		return false;
 	}
@@ -67,7 +63,9 @@ function add_action( string $hook, callable $callback, int $priority = 10 ): voi
 	$assert( 'constructors defer when WP_Ability is unavailable', 2 === count( $GLOBALS['datamachine_code_added_actions'] ) );
 	$assert( 'constructors do not register before WP_Ability is available', array() === $GLOBALS['datamachine_code_registered_abilities'] );
 
-	class WP_Ability {}
+	function wp_register_ability( string $name, array $definition ): void {
+		$GLOBALS['datamachine_code_registered_abilities'][ $name ] = $definition;
+	}
 
 	foreach ( $GLOBALS['datamachine_code_added_actions'] as $action ) {
 		if ( 'wp_abilities_api_init' === $action['hook'] ) {
diff --git a/tests/smoke-late-ability-registration.php b/tests/smoke-late-ability-registration.php
@@ -38,7 +38,7 @@ function wp_register_ability( string $name, array $definition ): void {
 	}
 
 	function doing_action( string $hook ): bool {
-		return false;
+		return 'wp_abilities_api_init' === $hook;
 	}
 
 	function did_action( string $hook ): int {

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ public function __construct() {`
`22`	`22`	`return;`
`23`	`23`	`}`
`24`	`24`
`25`		`- if ( ! class_exists( 'WP_Ability' ) ) {`
	`25`	`+ if ( ! function_exists( 'wp_register_ability' ) ) {`
`26`	`26`	`add_action( 'wp_abilities_api_init', function (): void {`
`27`		`- if ( self::$registered \|\| ! class_exists( 'WP_Ability' ) ) {`
	`27`	`+ if ( self::$registered \|\| ! function_exists( 'wp_register_ability' ) ) {`
`28`	`28`	`return;`
`29`	`29`	`}`
`30`	`30`
`@@ -34,7 +34,7 @@ public function __construct() {`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
`37`		`- if ( function_exists( 'doing_action' ) && ( doing_action( 'wp_abilities_api_init' ) \|\| did_action( 'wp_abilities_api_init' ) ) ) {`
	`37`	`+ if ( function_exists( 'doing_action' ) && doing_action( 'wp_abilities_api_init' ) ) {`
`38`	`38`	`$this->register();`
`39`	`39`	`} else {`
`40`	`40`	`add_action( 'wp_abilities_api_init', array( $this, 'register' ) );`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ public function __construct() {`
`21`	`21`	`return;`
`22`	`22`	`}`
`23`	`23`
`24`		`- if ( ! class_exists( 'WP_Ability' ) ) {`
	`24`	`+ if ( ! function_exists( 'wp_register_ability' ) ) {`
`25`	`25`	`add_action( 'wp_abilities_api_init', function (): void {`
`26`		`- if ( self::$registered \|\| ! class_exists( 'WP_Ability' ) ) {`
	`26`	`+ if ( self::$registered \|\| ! function_exists( 'wp_register_ability' ) ) {`
`27`	`27`	`return;`
`28`	`28`	`}`
`29`	`29`
`@@ -155,7 +155,7 @@ private function registerAbilities(): void {`
`155`	`155`	`);`
`156`	`156`	`};`
`157`	`157`
`158`		`- if ( function_exists( 'doing_action' ) && ( doing_action( 'wp_abilities_api_init' ) \|\| did_action( 'wp_abilities_api_init' ) ) ) {`
	`158`	`+ if ( function_exists( 'doing_action' ) && doing_action( 'wp_abilities_api_init' ) ) {`
`159`	`159`	`$register_callback();`
`160`	`160`	`return;`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public function __construct() {`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`
`36`		`- if ( ! class_exists( 'WP_Ability' ) ) {`
	`36`	`+ if ( ! function_exists( 'wp_register_ability' ) ) {`
`37`	`37`	`add_action( 'wp_abilities_api_init', function (): void {`
`38`		`- if ( self::$registered \|\| ! class_exists( 'WP_Ability' ) ) {`
	`38`	`+ if ( self::$registered \|\| ! function_exists( 'wp_register_ability' ) ) {`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`
`@@ -2167,7 +2167,7 @@ private function registerAbilities(): void {`
`2167`	`2167`	`}`
`2168`	`2168`	`};`
`2169`	`2169`
`2170`		`- if ( doing_action( 'wp_abilities_api_init' ) \|\| did_action( 'wp_abilities_api_init' ) ) {`
	`2170`	`+ if ( doing_action( 'wp_abilities_api_init' ) ) {`
`2171`	`2171`	`$register_callback();`
`2172`	`2172`	`} else {`
`2173`	`2173`	`add_action( 'wp_abilities_api_init', $register_callback );`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function __construct() {`
`99`	`99`	`);`
`100`	`100`	`};`
`101`	`101`
`102`		`- if ( did_action( 'wp_abilities_api_init' ) ) {`
	`102`	`+ if ( doing_action( 'wp_abilities_api_init' ) ) {`
`103`	`103`	`$register_callback();`
`104`	`104`	`return;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ function wp_register_ability( string $name, array $definition ): void {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`function doing_action( string $hook ): bool {`
`41`		`- return false;`
	`41`	`+ return 'wp_abilities_api_init' === $hook;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`function did_action( string $hook ): int {`