From e82f00e798fd190ccaf8e6377a177a7545e6301c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 05:47:19 +0000
Subject: [PATCH 1/4] Initial plan


From fdfce2ac561ec588355e22eaa1cfafe2c049bfea Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 05:56:35 +0000
Subject: [PATCH 2/4] Add FLAGD_SYNC_PORT support for in-process providers with
 backwards compatibility

Co-authored-by: aepfli <9987394+aepfli@users.noreply.github.com>
---
 gherkin/config.feature | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/gherkin/config.feature b/gherkin/config.feature
index 227e4b6..3c7a7a0 100644
--- a/gherkin/config.feature
+++ b/gherkin/config.feature
@@ -6,6 +6,7 @@ Feature: Configuration Test
   | resolver              | FLAGD_RESOLVER                 | mode of operation                                                               | String - `rpc`, `in-process` | rpc                           | rpc & in-process    |
   | host                  | FLAGD_HOST                     | remote host                                                                     | String                       | localhost                     | rpc & in-process    |
   | port                  | FLAGD_PORT                     | remote port                                                                     | int                          | 8013 (rpc), 8015 (in-process) | rpc & in-process    |
+  | syncPort              | FLAGD_SYNC_PORT                | sync service port (in-process only)                                             | int                          | 8015                          | in-process          |
   | targetUri             | FLAGD_TARGET_URI               | alternative to host/port, supporting custom name resolution                     | string                       | null                          | rpc & in-process    |
   | tls                   | FLAGD_TLS                      | connection encryption                                                           | boolean                      | false                         | rpc & in-process    |
   | socketPath            | FLAGD_SOCKET_PATH              | alternative to host port, unix socket                                           | String                       | null                          | rpc & in-process    |
@@ -102,8 +103,9 @@ Feature: Configuration Test
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<default>"
     Scenarios:
-      | option | type    | default |
-      | port   | Integer | 8015    |
+      | option   | type    | default |
+      | port     | Integer | 8015    |
+      | syncPort | Integer | 8015    |
 
   @file
   Scenario Outline: File Backwards compatibility
@@ -141,6 +143,11 @@ Feature: Configuration Test
       | tls    | Boolean | True  |
       | port   | Integer | 1234  |
 
+    @in-process
+    Scenarios: In-Process Sync Port
+      | option   | type    | value |
+      | syncPort | Integer | 1234  |
+
     @rpc @in-process @targetURI
     Scenarios: Target URI
       | option    | type   | value |
@@ -208,6 +215,16 @@ Feature: Configuration Test
       | tls    | FLAGD_TLS  | Boolean | True  |
       | port   | FLAGD_PORT | Integer | 1234  |
 
+    @in-process
+    Scenarios: In-Process Sync Port
+      | option   | env             | type    | value |
+      | syncPort | FLAGD_SYNC_PORT | Integer | 1234  |
+
+    @in-process @legacy-sync-port
+    Scenarios: In-Process Legacy Port (backwards compatibility)
+      | option | env        | type    | value |
+      | port   | FLAGD_PORT | Integer | 1234  |
+
     @rpc @in-process @targetURI
     Scenarios: Target URI
       | option    | env              | type   | value |
@@ -284,6 +301,16 @@ Feature: Configuration Test
       | tls    | FLAGD_TLS  | Boolean | True  | False     |
       | port   | FLAGD_PORT | Integer | 1234  | 3456      |
 
+    @in-process
+    Scenarios: In-Process Sync Port
+      | option   | env             | type    | value | env-value |
+      | syncPort | FLAGD_SYNC_PORT | Integer | 1234  | 3456      |
+
+    @in-process @legacy-sync-port
+    Scenarios: In-Process Legacy Port (backwards compatibility)
+      | option | env        | type    | value | env-value |
+      | port   | FLAGD_PORT | Integer | 1234  | 3456      |
+
     @rpc @in-process @targetURI
     Scenarios: Target URI
       | option    | env              | type   | value | env-value |

From 0bf3813b8873de8d309604f103d00b5dfa8b56c4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 06:10:03 +0000
Subject: [PATCH 3/4] Use port option with FLAGD_SYNC_PORT env var instead of
 creating syncPort option

Co-authored-by: aepfli <9987394+aepfli@users.noreply.github.com>
---
 gherkin/config.feature | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/gherkin/config.feature b/gherkin/config.feature
index 3c7a7a0..16e6f29 100644
--- a/gherkin/config.feature
+++ b/gherkin/config.feature
@@ -5,8 +5,7 @@ Feature: Configuration Test
   | --------------------- | ------------------------------ | ------------------------------------------------------------------------------- | ---------------------------- | ----------------------------- | ------------------- |
   | resolver              | FLAGD_RESOLVER                 | mode of operation                                                               | String - `rpc`, `in-process` | rpc                           | rpc & in-process    |
   | host                  | FLAGD_HOST                     | remote host                                                                     | String                       | localhost                     | rpc & in-process    |
-  | port                  | FLAGD_PORT                     | remote port                                                                     | int                          | 8013 (rpc), 8015 (in-process) | rpc & in-process    |
-  | syncPort              | FLAGD_SYNC_PORT                | sync service port (in-process only)                                             | int                          | 8015                          | in-process          |
+  | port                  | FLAGD_PORT (rpc), FLAGD_SYNC_PORT (in-process, FLAGD_PORT as fallback) | remote port                                                                     | int                          | 8013 (rpc), 8015 (in-process) | rpc & in-process    |
   | targetUri             | FLAGD_TARGET_URI               | alternative to host/port, supporting custom name resolution                     | string                       | null                          | rpc & in-process    |
   | tls                   | FLAGD_TLS                      | connection encryption                                                           | boolean                      | false                         | rpc & in-process    |
   | socketPath            | FLAGD_SOCKET_PATH              | alternative to host port, unix socket                                           | String                       | null                          | rpc & in-process    |
@@ -103,9 +102,8 @@ Feature: Configuration Test
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<default>"
     Scenarios:
-      | option   | type    | default |
-      | port     | Integer | 8015    |
-      | syncPort | Integer | 8015    |
+      | option | type    | default |
+      | port   | Integer | 8015    |
 
   @file
   Scenario Outline: File Backwards compatibility
@@ -143,11 +141,6 @@ Feature: Configuration Test
       | tls    | Boolean | True  |
       | port   | Integer | 1234  |
 
-    @in-process
-    Scenarios: In-Process Sync Port
-      | option   | type    | value |
-      | syncPort | Integer | 1234  |
-
     @rpc @in-process @targetURI
     Scenarios: Target URI
       | option    | type   | value |
@@ -217,8 +210,8 @@ Feature: Configuration Test
 
     @in-process
     Scenarios: In-Process Sync Port
-      | option   | env             | type    | value |
-      | syncPort | FLAGD_SYNC_PORT | Integer | 1234  |
+      | option | env             | type    | value |
+      | port   | FLAGD_SYNC_PORT | Integer | 1234  |
 
     @in-process @legacy-sync-port
     Scenarios: In-Process Legacy Port (backwards compatibility)
@@ -303,8 +296,8 @@ Feature: Configuration Test
 
     @in-process
     Scenarios: In-Process Sync Port
-      | option   | env             | type    | value | env-value |
-      | syncPort | FLAGD_SYNC_PORT | Integer | 1234  | 3456      |
+      | option | env             | type    | value | env-value |
+      | port   | FLAGD_SYNC_PORT | Integer | 1234  | 3456      |
 
     @in-process @legacy-sync-port
     Scenarios: In-Process Legacy Port (backwards compatibility)

From be7a31800c35953fcdae4ff6e983958e9f0ab787 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 06:15:40 +0000
Subject: [PATCH 4/4] Add test to verify FLAGD_SYNC_PORT takes priority over
 FLAGD_PORT

Co-authored-by: aepfli <9987394+aepfli@users.noreply.github.com>
---
 gherkin/config.feature | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gherkin/config.feature b/gherkin/config.feature
index 16e6f29..b54b5da 100644
--- a/gherkin/config.feature
+++ b/gherkin/config.feature
@@ -349,3 +349,10 @@ Feature: Configuration Test
     Scenarios: providerId
       | option     | env               | type   | value      | env-value  |
       | providerId | FLAGD_PROVIDER_ID | String | providerId | env-prov |
+
+  @in-process
+  Scenario: FLAGD_SYNC_PORT takes priority over FLAGD_PORT
+    Given an environment variable "FLAGD_SYNC_PORT" with value "9999"
+    And an environment variable "FLAGD_PORT" with value "8888"
+    When a config was initialized
+    Then the option "port" of type "Integer" should have the value "9999"