Advertise split-role compose nodes with consistent topology identity

Align split-role compose topology identity

Author: durable-workflow-ops

README.md

@@ -679,10 +679,10 @@ configured process class, and the current execution mode. `execution_mode` is
 `local_queue_worker` when `DW_MODE=embedded` routes workflow and activity task
 execution through local Laravel queue workers. Set
 `DW_SERVER_TOPOLOGY_SHAPE` and `DW_SERVER_PROCESS_CLASS` when a deployment
-splits scheduler, matching, or execution work away from the default
-`server_http_node` so discovery reports the live node identity instead of a
-generic HTTP shape. The published Compose artifacts set these per service for
-the supported `server`, `worker`, and `scheduler` nodes, so `GET /api/cluster/info`
+splits control-plane, scheduler, matching, or execution work away from the
+default `server_http_node` so discovery reports the live node identity instead
+of a generic HTTP shape. The published Compose artifacts set these per service
+for the supported `server`, `worker`, and `scheduler` nodes, so `GET /api/cluster/info`
 and local diagnostics report the same node class the operator actually
 deployed. `topology.matching_role` adds the live matching-role
 deployment knobs for that node: `queue_wake_enabled`, the matching-role
@@ -1063,11 +1063,12 @@ service and adds a `matching` service running
 `php artisan workflow:v2:repair-pass --loop` so the broad sweep runs in a
 dedicated process operators can scale and supervise independently of API
 ingress and execution workers. It also pins
-`DW_SERVER_TOPOLOGY_SHAPE=split_control_execution` on the `worker`,
+`DW_SERVER_TOPOLOGY_SHAPE=split_control_execution` on the `server`, `worker`,
 `scheduler`, and `matching` services, with `DW_SERVER_PROCESS_CLASS`
-respectively set to `execution_node`, `scheduler_node`, and `matching_node`,
-so migration-shape diagnostics report the live background role instead of the
-standalone defaults while the HTTP server remains the `server_http_node`.
+respectively set to `control_plane_node`, `execution_node`,
+`scheduler_node`, and `matching_node`. That lets the public HTTP service
+advertise the split control-plane shape while execution, scheduler, and
+matching nodes each report their own independent role class.
 
 The daemon respects the watchdog loop throttle on every iteration so multiple
 cooperating matching-role processes coexist without duplicating broad-poll

app/Support/ServerTopology.php

@@ -279,6 +279,7 @@ private static function shapeAssignments(): array
                     [
                         'name' => 'control_plane_node',
                         'roles' => [
+                            'api_ingress',
                             'control_plane',
                             'history_projection',
                         ],
@@ -558,7 +559,7 @@ private static function supportedTopologies(): array
                         'roles' => ['api_ingress'],
                     ],
                     'control_plane_node' => [
-                        'roles' => ['control_plane', 'history_projection'],
+                        'roles' => ['api_ingress', 'control_plane', 'history_projection'],
                     ],
                     'scheduler_node' => [
                         'roles' => ['scheduler'],

docker-compose.dedicated-matching.yml

@@ -13,6 +13,9 @@ name: durable-workflow-server
 #     up
 #
 # This override:
+#   - promotes the public HTTP server into the split control-plane class so
+#     every long-running service in the deployment reports the same
+#     `split_control_execution` topology family
 #   - sets DW_V2_MATCHING_ROLE_QUEUE_WAKE=false on the `worker` service so
 #     execution-only workers no longer broad-poll the durable task table on
 #     every Looping event
@@ -50,6 +53,11 @@ x-server-environment: &server-environment
   DW_AUTH_BACKWARD_COMPATIBLE: ${DW_AUTH_BACKWARD_COMPATIBLE:-true}
 
 services:
+  server:
+    environment:
+      DW_SERVER_TOPOLOGY_SHAPE: split_control_execution
+      DW_SERVER_PROCESS_CLASS: control_plane_node
+
   worker:
     environment:
       DW_V2_MATCHING_ROLE_QUEUE_WAKE: "false"

tests/Feature/ClusterInfoTest.php

@@ -174,6 +174,10 @@ public function test_it_publishes_role_topology_for_the_current_server_node(): v
                 'topology.shape_assignments.standalone_server.process_classes.0.roles.3',
                 'history_projection',
             )
+            ->assertJsonPath(
+                'topology.shape_assignments.split_control_execution.process_classes.1.roles.0',
+                'api_ingress',
+            )
             ->assertJsonPath(
                 'topology.shape_assignments.split_control_execution.process_classes.4.roles.0',
                 'execution_plane',
@@ -277,6 +281,28 @@ public function test_it_can_publish_a_split_control_execution_process_class(): v
             ->assertJsonPath('topology.role_catalog.api_ingress.hosted_by_current_node', false);
     }
 
+    public function test_it_can_publish_a_split_control_execution_control_plane_node(): void
+    {
+        config([
+            'server.topology.shape' => 'split_control_execution',
+            'server.topology.process_class' => 'control_plane_node',
+        ]);
+
+        $response = $this->getJson('/api/cluster/info')->assertOk();
+
+        $response
+            ->assertJsonPath('topology.current_shape', 'split_control_execution')
+            ->assertJsonPath('topology.current_process_class', 'control_plane_node')
+            ->assertJsonPath('topology.current_roles.0', 'api_ingress')
+            ->assertJsonPath('topology.current_roles.1', 'control_plane')
+            ->assertJsonPath('topology.current_roles.2', 'history_projection')
+            ->assertJsonCount(3, 'topology.current_roles')
+            ->assertJsonPath('topology.role_catalog.api_ingress.hosted_by_current_node', true)
+            ->assertJsonPath('topology.role_catalog.control_plane.hosted_by_current_node', true)
+            ->assertJsonPath('topology.role_catalog.history_projection.hosted_by_current_node', true)
+            ->assertJsonPath('topology.role_catalog.matching.hosted_by_current_node', false);
+    }
+
     public function test_it_falls_back_to_the_default_process_class_when_the_configured_class_does_not_match_the_shape(): void
     {
         config([

tests/Unit/DedicatedMatchingComposeContractTest.php

@@ -18,6 +18,8 @@ public function test_override_swaps_worker_to_execution_only_and_adds_dedicated_
         $compose = $this->read('docker-compose.dedicated-matching.yml');
 
         foreach ([
+            'server:',
+            'DW_SERVER_PROCESS_CLASS: control_plane_node',
             'worker:',
             'DW_V2_MATCHING_ROLE_QUEUE_WAKE: "false"',
             'DW_SERVER_TOPOLOGY_SHAPE: split_control_execution',
@@ -81,12 +83,13 @@ public function test_published_compose_pins_topology_identity_for_supported_proc
         }
     }
 
-    public function test_override_promotes_background_services_to_split_role_identity(): void
+    public function test_override_promotes_all_long_running_services_to_split_role_identity(): void
     {
         $override = $this->read('docker-compose.dedicated-matching.yml');
 
         foreach ([
             'DW_SERVER_TOPOLOGY_SHAPE: split_control_execution',
+            'DW_SERVER_PROCESS_CLASS: control_plane_node',
             'DW_SERVER_PROCESS_CLASS: execution_node',
             'DW_SERVER_PROCESS_CLASS: scheduler_node',
             'DW_SERVER_PROCESS_CLASS: matching_node',
@@ -112,6 +115,7 @@ public function test_readme_documents_the_override_alongside_the_dedicated_daemo
             'DW_V2_MATCHING_ROLE_QUEUE_WAKE',
             'DW_SERVER_TOPOLOGY_SHAPE',
             'DW_SERVER_PROCESS_CLASS',
+            'control_plane_node',
         ] as $needle) {
             $this->assertStringContainsString(
                 $needle,