Changeset 62101

Timestamp:

03/24/2026 12:39:00 PM (4 days ago)

Author:

flixos90

Message:

AI: Fix prompt lifecycle hooks not firing for wp_ai_client_prompt() flow.

This broke while porting over the relevant logic from the wp-ai-client package to Core.

With this changeset, the lifecycle hooks wp_ai_client_before_generate_result and wp_ai_client_after_generate_result fire as expected.

Props shadyvb, gziolo.
Fixes #64935.

Location:

trunk

Files:

• src/wp-includes/ai-client/class-wp-ai-client-prompt-builder.php (modified) (2 diffs)
• tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.php (modified) (1 diff)

trunk/src/wp-includes/ai-client/class-wp-ai-client-prompt-builder.php

@@ -8 +8 @@
  */
 
+use WordPress\AiClient\AiClient;
 use WordPress\AiClient\Builders\PromptBuilder;
 use WordPress\AiClient\Common\Exception\InvalidArgumentException;
@@ -184 +185 @@
     public function __construct( ProviderRegistry $registry, $prompt = null ) {
         try {
-            $this->builder = new PromptBuilder( $registry, $prompt );
+            $this->builder = new PromptBuilder( $registry, $prompt, AiClient::getEventDispatcher() );
         } catch ( Exception $e ) {
-            $this->builder = new PromptBuilder( $registry );
+            $this->builder = new PromptBuilder( $registry, null, AiClient::getEventDispatcher() );
             $this->error   = $this->exception_to_wp_error( $e );
         }

trunk/tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.php

@@ -1601 +1601 @@
 
     /**
+     * Tests that the wrapped PromptBuilder receives the same event dispatcher as AiClient.
+     *
+     * @ticket 64935
+     */
+    public function test_prompt_builder_passes_ai_client_event_dispatcher_to_wrapped_builder() {
+        $builder = new WP_AI_Client_Prompt_Builder( AiClient::defaultRegistry(), 'Test prompt' );
+
+        $wrapped_dispatcher = $this->get_wrapped_prompt_builder_property_value( $builder, 'eventDispatcher' );
+
+        $this->assertSame( AiClient::getEventDispatcher(), $wrapped_dispatcher );
+        $this->assertInstanceOf( WP_AI_Client_Event_Dispatcher::class, $wrapped_dispatcher );
+    }
+
+    /**
+     * Tests that generate_text_result fires wp_ai_client_before_generate_result and wp_ai_client_after_generate_result in order.
+     *
+     * @ticket 64935
+     */
+    public function test_generate_text_result_fires_lifecycle_action_hooks() {
+        $result = new GenerativeAiResult(
+            'test-result',
+            array( new Candidate( new ModelMessage( array( new MessagePart( 'Generated text' ) ) ), FinishReasonEnum::stop() ) ),
+            new TokenUsage( 100, 50, 150 ),
+            $this->create_test_provider_metadata(),
+            $this->create_test_text_model_metadata()
+        );
+
+        $metadata = $this->createMock( ModelMetadata::class );
+        $metadata->method( 'getId' )->willReturn( 'test-model' );
+
+        $model = $this->create_mock_text_generation_model( $result, $metadata );
+
+        $hook_order = array();
+
+        add_action(
+            'wp_ai_client_before_generate_result',
+            static function () use ( &$hook_order ) {
+                $hook_order[] = 'before';
+            }
+        );
+        add_action(
+            'wp_ai_client_after_generate_result',
+            static function () use ( &$hook_order ) {
+                $hook_order[] = 'after';
+            }
+        );
+
+        $builder = new WP_AI_Client_Prompt_Builder( $this->registry, 'Test prompt' );
+        $builder->using_model( $model );
+
+        $actual_result = $builder->generate_text_result();
+
+        $this->assertSame( $result, $actual_result );
+        $this->assertSame( array( 'before', 'after' ), $hook_order );
+    }
+
+    /**
      * Tests generateImageResult method.
      *