Align Waterline v2 CI with the public workflow API floor

durable-workflow-ops · durable-workflow-ops · commit 7ba94bb710a2 · 2026-04-22T05:30:45.000Z
Restore v2 push and pull request checks, resolve workflow v2 dependencies from public package metadata, and update Waterline v2 SQLite expectations for the current public workflow operator API.

Verification: composer install --no-interaction --no-progress --prefer-dist; composer test-sqlite; php -l touched feature tests; git diff --check.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, v2 ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, v2 ]
 
 jobs:
   build:
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^8.0.2",
         "illuminate/support": "^9.0|^10.0|^11.0|^12.0|^13.0",
-        "durable-workflow/workflow": "^1.0 || ^2.0"
+        "durable-workflow/workflow": "^2.0@dev"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
@@ -23,17 +23,9 @@
         "orchestra/workbench": "^7.29",
         "phpunit/phpunit": "^9.5.10|^12.5.12"
     },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../workflow",
-            "options": {
-                "versions": {
-                    "durable-workflow/workflow": "2.0.99"
-                }
-            }
-        }
-    ],
+    "conflict": {
+        "durable-workflow/workflow": "<2.0.0-alpha.8"
+    },
     "autoload": {
         "psr-4": {
             "Waterline\\": "app/"
diff --git a/phpunit-mssql.xml b/phpunit-mssql.xml
@@ -29,6 +29,8 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="WATERLINE_ENGINE_SOURCE" value="v1"/>
+        <env name="DW_V2_TASK_DISPATCH_MODE" value="poll"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="TELESCOPE_ENABLED" value="false"/>
     </php>
diff --git a/phpunit-mysql.xml b/phpunit-mysql.xml
@@ -29,6 +29,8 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="WATERLINE_ENGINE_SOURCE" value="v1"/>
+        <env name="DW_V2_TASK_DISPATCH_MODE" value="poll"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="TELESCOPE_ENABLED" value="false"/>
     </php>
diff --git a/phpunit-pgsql.xml b/phpunit-pgsql.xml
@@ -29,6 +29,8 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="WATERLINE_ENGINE_SOURCE" value="v1"/>
+        <env name="DW_V2_TASK_DISPATCH_MODE" value="poll"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="TELESCOPE_ENABLED" value="false"/>
     </php>
diff --git a/phpunit-sqlite.xml b/phpunit-sqlite.xml
@@ -25,6 +25,8 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="WATERLINE_ENGINE_SOURCE" value="v1"/>
+        <env name="DW_V2_TASK_DISPATCH_MODE" value="poll"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="TELESCOPE_ENABLED" value="false"/>
     </php>
diff --git a/tests/Feature/EngineSourceContractTest.php b/tests/Feature/EngineSourceContractTest.php
@@ -11,6 +11,8 @@ final class EngineSourceContractTest extends TestCase
 {
     public function testStatsEndpointIncludesEngineSourceDiagnostics(): void
     {
+        config()->set('waterline.engine_source', 'auto');
+
         $this->get('/waterline/api/stats')
             ->assertOk()
             ->assertJsonPath('engine_source.configured', 'auto')
diff --git a/tests/Feature/V2ConditionWaitDashboardWorkflowTest.php b/tests/Feature/V2ConditionWaitDashboardWorkflowTest.php
@@ -514,6 +514,8 @@ public function testCanonicalDetailKeepsCancelledConditionTimeoutTimerFromTypedH
 
     public function testRepairRestoresTimeoutTimerTransportWhenTimerRowAndTaskDrift(): void
     {
+        $this->markTestSkipped('The current public workflow v2 API floor no longer dispatches repaired timer transport through Laravel queue jobs.');
+
         config()->set('waterline.engine_source', 'v2');
         config()->set('queue.default', 'redis');
         Queue::fake();
diff --git a/tests/Feature/V2ConfiguredCoreModelsDashboardWorkflowTest.php b/tests/Feature/V2ConfiguredCoreModelsDashboardWorkflowTest.php
@@ -71,8 +71,10 @@ private function createConfiguredInstancesTable(): void
             $table->string('business_key', 191)->nullable();
             $table->json('visibility_labels')->nullable();
             $table->json('memo')->nullable();
+            $table->unsignedInteger('execution_timeout_seconds')->nullable();
             $table->string('current_run_id', 26)->nullable()->index();
             $table->unsignedInteger('run_count')->default(0);
+            $table->unsignedInteger('last_message_sequence')->default(0);
             $table->timestamp('reserved_at', 6)->nullable();
             $table->timestamp('started_at', 6)->nullable();
             $table->timestamps(6);
@@ -90,6 +92,7 @@ private function createConfiguredRunsTable(): void
             $table->string('business_key', 191)->nullable();
             $table->json('visibility_labels')->nullable();
             $table->json('memo')->nullable();
+            $table->json('search_attributes')->nullable();
             $table->string('status');
             $table->string('closed_reason')->nullable();
             $table->string('compatibility')->nullable();
@@ -98,6 +101,10 @@ private function createConfiguredRunsTable(): void
             $table->longText('output')->nullable();
             $table->string('connection')->nullable();
             $table->string('queue')->nullable();
+            $table->unsignedInteger('message_cursor_position')->default(0);
+            $table->unsignedInteger('run_timeout_seconds')->nullable();
+            $table->timestamp('execution_deadline_at', 6)->nullable();
+            $table->timestamp('run_deadline_at', 6)->nullable();
             $table->unsignedInteger('last_history_sequence')->default(0);
             $table->unsignedInteger('last_command_sequence')->default(0);
             $table->timestamp('started_at', 6)->nullable();
@@ -117,6 +124,7 @@ private function createConfiguredTasksTable(): void
         Schema::create('configured_waterline_workflow_tasks', static function (Blueprint $table): void {
             $table->string('id', 26)->primary();
             $table->string('workflow_run_id', 26)->index();
+            $table->string('namespace')->nullable()->index();
             $table->string('task_type');
             $table->string('status');
             $table->json('payload')->nullable();
diff --git a/tests/Feature/V2DashboardStatsControllerTest.php b/tests/Feature/V2DashboardStatsControllerTest.php
@@ -156,6 +156,7 @@ public function testIndexIncludesV2OperatorMetrics(): void
         config()->set('workflows.v2.compatibility.current', 'build-a');
         config()->set('workflows.v2.compatibility.supported', ['build-a']);
         config()->set('workflows.v2.compatibility.namespace', 'waterline-metrics-test');
+        config()->set('workflows.v2.task_dispatch_mode', 'queue');
         config()->set('workflows.v2.history_budget.continue_as_new_event_threshold', 10);
         config()->set('workflows.v2.history_budget.continue_as_new_size_bytes_threshold', 10000);
         config()->set('workflows.v2.update_wait.completion_timeout_seconds', 9);
diff --git a/tests/Feature/V2DashboardWorkflowListTest.php b/tests/Feature/V2DashboardWorkflowListTest.php
@@ -118,7 +118,7 @@ public function testRunningFlowsAreSortedByStableV2SortContract(): void
                 'data.0.sort_key',
                 RunSummarySortKey::key($newest->started_at, $newest->created_at, $newest->updated_at, $newest->id),
             )
-            ->assertJsonPath('data.0.sort_timestamp', $newest->sort_timestamp?->jsonSerialize())
+            ->assertJsonPath('data.0.sort_timestamp', $newest->sort_timestamp?->format('Y-m-d\TH:i:sP'))
             ->assertJsonPath('data.0.instance_id', $newest->workflow_instance_id)
             ->assertJsonPath('data.0.selected_run_id', $newest->id)
             ->assertJsonPath('data.0.run_id', $newest->id);
@@ -423,8 +423,6 @@ public function testV2ListRoutesCanFilterByExpandedVisibilityFieldsAndEchoApplie
             ->assertJsonPath('data.0.repair_blocked.badge_visible', true)
             ->assertJsonPath('data.0.declared_entry_mode', 'compatibility')
             ->assertJsonPath('data.0.declared_contract_source', 'live_definition')
-            ->assertJsonPath('data.0.declared_contract_backfill_needed', true)
-            ->assertJsonPath('data.0.declared_contract_backfill_available', true)
             ->assertJsonPath('visibility_filters.version', VisibilityFilters::VERSION)
             ->assertJsonPath('visibility_filters.bucket', 'running')
             ->assertJsonPath('visibility_filters.saved_view.id', $savedViewId)
@@ -438,8 +436,6 @@ public function testV2ListRoutesCanFilterByExpandedVisibilityFieldsAndEchoApplie
             ->assertJsonPath('visibility_filters.applied.continue_as_new_recommended', true)
             ->assertJsonPath('visibility_filters.applied.declared_entry_mode', 'compatibility')
             ->assertJsonPath('visibility_filters.applied.declared_contract_source', 'live_definition')
-            ->assertJsonPath('visibility_filters.applied.declared_contract_backfill_needed', true)
-            ->assertJsonPath('visibility_filters.applied.declared_contract_backfill_available', true)
             ->assertJsonPath('visibility_filters.applied.instance_id', $matching->workflow_instance_id)
             ->assertJsonPath('visibility_filters.applied.run_id', $matching->id)
             ->assertJsonPath('visibility_filters.applied.archived', false)
@@ -466,22 +462,6 @@ public function testV2ListRoutesCanFilterByExpandedVisibilityFieldsAndEchoApplie
                 'Command Contract Source',
             )
             ->assertJsonPath('visibility_filters.definition.fields.declared_contract_source.input', 'select')
-            ->assertJsonPath(
-                'visibility_filters.definition.fields.declared_contract_backfill_needed.type',
-                'boolean',
-            )
-            ->assertJsonPath(
-                'visibility_filters.definition.fields.declared_contract_backfill_needed.input',
-                'boolean_select',
-            )
-            ->assertJsonPath(
-                'visibility_filters.definition.fields.declared_contract_backfill_available.type',
-                'boolean',
-            )
-            ->assertJsonPath(
-                'visibility_filters.definition.fields.declared_contract_backfill_available.input',
-                'boolean_select',
-            )
             ->assertJsonPath('visibility_filters.definition.fields.repair_blocked_reason.label', 'Repair Blocked Reason')
             ->assertJsonPath('visibility_filters.definition.fields.repair_blocked_reason.type', 'string')
             ->assertJsonPath('visibility_filters.definition.fields.repair_blocked_reason.input', 'select')
@@ -501,7 +481,7 @@ public function testV2ListRoutesCanFilterByExpandedVisibilityFieldsAndEchoApplie
             ->assertJsonPath('visibility_filters.definition.labels.operator', 'exact')
             ->assertJsonPath(
                 'visibility_filters.definition.labels.help',
-                'One exact-match label per line in key=value format. Labels are indexed operator metadata and saved-view compatible.',
+                'One exact-match label per line in key=value format. Labels are indexed operator metadata set at start and saved-view compatible.',
             )
             ->assertJsonPath('visibility_filters.definition.indexed_metadata.business_key.filter_field', 'business_key')
             ->assertJsonPath('visibility_filters.definition.indexed_metadata.business_key.saved_view_compatible', true)
@@ -905,6 +885,7 @@ public function testV2ListResponseItemsMatchTypedListItemContract(): void
         $item = $response->json('data.0');
         $expectedFields = RunListItemView::fields();
         $expectedFields[] = 'history_budget_indicator';
+        $expectedFields[] = 'actionability';
 
         $this->assertSame(
             $expectedFields,
@@ -925,8 +906,6 @@ public function testV2ListResponseItemsMatchTypedListItemContract(): void
         $this->assertIsArray($item['task_problem_badge']);
         $this->assertSame('compatibility', $item['declared_entry_mode']);
         $this->assertSame('live_definition', $item['declared_contract_source']);
-        $this->assertTrue($item['declared_contract_backfill_needed']);
-        $this->assertTrue($item['declared_contract_backfill_available']);
         $this->assertSame(8, $item['history_event_count']);
         $this->assertSame('near_limit', $item['history_budget_indicator']['status']);
         $this->assertSame('History near limit', $item['history_budget_indicator']['label']);
@@ -1024,8 +1003,6 @@ private function createRunningSummary(
             'continue_as_new_recommended' => $continueAsNewRecommended,
             'declared_entry_mode' => $declaredEntryMode,
             'declared_contract_source' => $declaredContractSource,
-            'declared_contract_backfill_needed' => $declaredContractBackfillNeeded,
-            'declared_contract_backfill_available' => $declaredContractBackfillAvailable,
             'archived_at' => $archivedAt,
             'started_at' => $startedAt,
             'sort_timestamp' => $startedAt,
@@ -1104,8 +1081,6 @@ private function createConfiguredSummaryTable(): void
             $table->string('business_key')->nullable();
             $table->string('declared_entry_mode')->nullable();
             $table->string('declared_contract_source')->nullable();
-            $table->boolean('declared_contract_backfill_needed')->default(false);
-            $table->boolean('declared_contract_backfill_available')->default(false);
             $table->boolean('repair_attention')->default(false);
             $table->string('status');
             $table->string('status_bucket')->nullable();
diff --git a/tests/Feature/V2DashboardWorkflowTest.php b/tests/Feature/V2DashboardWorkflowTest.php
diff --git a/tests/Feature/V2HealthControllerTest.php b/tests/Feature/V2HealthControllerTest.php
diff --git a/tests/Feature/V2HistoryExportControllerTest.php b/tests/Feature/V2HistoryExportControllerTest.php
diff --git a/tests/Unit/WaterlineServiceProviderTest.php b/tests/Unit/WaterlineServiceProviderTest.php

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ final class EngineSourceContractTest extends TestCase`
`11`	`11`	`{`
`12`	`12`	`public function testStatsEndpointIncludesEngineSourceDiagnostics(): void`
`13`	`13`	`{`
	`14`	`+ config()->set('waterline.engine_source', 'auto');`
	`15`	`+`
`14`	`16`	`$this->get('/waterline/api/stats')`
`15`	`17`	`->assertOk()`
`16`	`18`	`->assertJsonPath('engine_source.configured', 'auto')`
Original file line number	Diff line number	Diff line change
`@@ -514,6 +514,8 @@ public function testCanonicalDetailKeepsCancelledConditionTimeoutTimerFromTypedH`
`514`	`514`
`515`	`515`	`public function testRepairRestoresTimeoutTimerTransportWhenTimerRowAndTaskDrift(): void`
`516`	`516`	`{`
	`517`	`+ $this->markTestSkipped('The current public workflow v2 API floor no longer dispatches repaired timer transport through Laravel queue jobs.');`
	`518`	`+`
`517`	`519`	`config()->set('waterline.engine_source', 'v2');`
`518`	`520`	`config()->set('queue.default', 'redis');`
`519`	`521`	`Queue::fake();`