Use workflow bridge filters for typed worker polling

Use workflow bridge filters for typed worker polling

Author: durable-workflow-ops

app/Support/WorkflowTaskPoller.php

@@ -430,6 +430,7 @@ private function claimReadyTask(
             limit: $limit,
             compatibility: null,
             namespace: $namespace,
+            workflowTypes: $supportedWorkflowTypes,
         );
 
         \Log::info('[WorkflowTaskPoller] claimReadyTask called', [
@@ -482,16 +483,6 @@ private function claimReadyTask(
                 continue;
             }
 
-            if (! $this->matchesWorkflowType($supportedWorkflowTypes, $readyTask['workflow_type'] ?? null)) {
-                \Log::debug('[WorkflowTaskPoller] Skipping task: workflow type not supported', [
-                    'taskId' => $readyTask['task_id'] ?? null,
-                    'taskWorkflowType' => $readyTask['workflow_type'] ?? null,
-                    'supportedWorkflowTypes' => $supportedWorkflowTypes,
-                ]);
-
-                continue;
-            }
-
             $taskId = is_string($readyTask['task_id'] ?? null)
                 ? $readyTask['task_id']
                 : null;
@@ -620,34 +611,6 @@ private function matchesCompatibility(?string $buildId, mixed $compatibility): b
         return $buildId !== null && $compatibility === $buildId;
     }
 
-    /**
-     * @param  list<string>  $supportedTypes
-     */
-    /**
-     * Check if a task's workflow type matches the worker's supported types.
-     *
-     * - If worker supports all types (empty list), match any task
-     * - If worker supports specific types, only match tasks with those types
-     * - Tasks with missing/empty workflow_type only match "all types" workers
-     *
-     * @param  list<string>  $supportedTypes
-     */
-    private function matchesWorkflowType(array $supportedTypes, mixed $workflowType): bool
-    {
-        // Worker supports all workflow types
-        if ($supportedTypes === []) {
-            return true;
-        }
-
-        // Task has no workflow type - only matches workers that accept all types
-        if (! is_string($workflowType) || trim($workflowType) === '') {
-            return false;
-        }
-
-        // Check if task's workflow type is in worker's supported list
-        return in_array($workflowType, $supportedTypes, true);
-    }
-
     private function nextVisibleReadyAt(string $namespace, string $taskQueue, ?string $buildId): ?\DateTimeInterface
     {
         $query = NamespaceWorkflowScope::taskQuery($namespace)

tests/Feature/WorkflowWorkerProtocolTest.php

@@ -578,7 +578,7 @@ public function test_it_uses_a_server_local_lease_counter_for_workflow_task_atte
         ): void {
             $mock->shouldReceive('poll')
                 ->times(2)
-                ->with(null, 'external-workflows', 10, null, 'default')
+                ->with(null, 'external-workflows', 10, null, 'default', [])
                 ->andReturn(
                     [[
                         'task_id' => $task->id,
@@ -1390,7 +1390,7 @@ public function test_it_drops_claimed_workflow_tasks_when_the_bridge_cannot_buil
         $this->mock(WorkflowTaskBridge::class, function (MockInterface $mock) use ($recordedAt): void {
             $mock->shouldReceive('poll')
                 ->once()
-                ->with(null, 'external-workflows', 10, null, 'default')
+                ->with(null, 'external-workflows', 10, null, 'default', [])
                 ->andReturn([
                     [
                         'task_id' => 'wf-task-missing-row',
@@ -1461,7 +1461,7 @@ public function test_it_does_not_fall_back_to_a_local_ready_scan_when_the_workfl
         $this->mock(WorkflowTaskBridge::class, function (MockInterface $mock): void {
             $mock->shouldReceive('poll')
                 ->once()
-                ->with(null, 'external-workflows', 10, null, 'default')
+                ->with(null, 'external-workflows', 10, null, 'default', [])
                 ->andReturn([]);
         });
 
@@ -1476,6 +1476,42 @@ public function test_it_does_not_fall_back_to_a_local_ready_scan_when_the_workfl
             ->assertJsonPath('task', null);
     }
 
+    public function test_it_passes_supported_workflow_types_to_the_workflow_bridge_poll(): void
+    {
+        Queue::fake();
+
+        $this->configureWorkflowTypes();
+        $this->createNamespace('default', 'Default namespace');
+
+        $this->mock(WorkflowTaskBridge::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('poll')
+                ->once()
+                ->with(
+                    null,
+                    'external-workflows',
+                    10,
+                    null,
+                    'default',
+                    ['tests.external-greeting-workflow'],
+                )
+                ->andReturn([]);
+        });
+
+        $this->registerWorker(
+            'php-worker-typed-bridge',
+            'external-workflows',
+            supportedWorkflowTypes: ['tests.external-greeting-workflow'],
+        );
+
+        $this->withHeaders($this->workerHeaders())
+            ->postJson('/api/worker/workflow-tasks/poll', [
+                'worker_id' => 'php-worker-typed-bridge',
+                'task_queue' => 'external-workflows',
+            ])
+            ->assertOk()
+            ->assertJsonPath('task', null);
+    }
+
     public function test_it_passes_the_next_visible_workflow_task_deadline_into_long_polling(): void
     {
         Queue::fake();