merge: external-system retry policy end-to-end (register row 27) — MaxRetries/RetryDelay now travel artifact→gRPC→site schema→S&F enqueue, CLI --max-retries/--retry-delay-seconds, ArtifactDiff compares them

src/ZB.MOM.WW.ScadaBridge.CLI/Commands/ExternalSystemCommands.cs

@@ -50,6 +50,9 @@ public static class ExternalSystemCommands
         var authTypeOption = new Option<string>("--auth-type") { Description = "Auth type", Required = true };
         var authConfigOption = new Option<string?>("--auth-config") { Description = "Auth configuration JSON" };
         var timeoutOption = new Option<int?>("--timeout-seconds") { Description = "Per-system HTTP timeout in seconds (0 = use gateway default); omit to preserve" };
+        var maxRetriesOption = new Option<int?>("--max-retries") { Description = "Store-and-forward retry budget for cached calls (0 = use engine default); omit to preserve" };
+        var retryDelayOption = new Option<int?>("--retry-delay-seconds") { Description = "Fixed interval between store-and-forward retries, in seconds (0 = use engine default); omit to preserve" };
+        retryDelayOption.Aliases.Add("--retry-delay");
 
         var cmd = new Command("update") { Description = "Update an external system" };
         cmd.Add(idOption);
@@ -58,6 +61,8 @@ public static class ExternalSystemCommands
         cmd.Add(authTypeOption);
         cmd.Add(authConfigOption);
         cmd.Add(timeoutOption);
+        cmd.Add(maxRetriesOption);
+        cmd.Add(retryDelayOption);
         cmd.SetAction(async (ParseResult result) =>
         {
             var id = result.GetValue(idOption);
@@ -66,9 +71,13 @@ public static class ExternalSystemCommands
             var authType = result.GetValue(authTypeOption)!;
             var authConfig = result.GetValue(authConfigOption);
             var timeoutSeconds = result.GetValue(timeoutOption);
+            var maxRetries = result.GetValue(maxRetriesOption);
+            var retryDelaySeconds = result.GetValue(retryDelayOption);
             return await CommandHelpers.ExecuteCommandAsync(
                 result, urlOption, formatOption, usernameOption, passwordOption,
-                new UpdateExternalSystemCommand(id, name, endpointUrl, authType, authConfig, timeoutSeconds));
+                new UpdateExternalSystemCommand(id, name, endpointUrl, authType, authConfig, timeoutSeconds,
+                    maxRetries,
+                    retryDelaySeconds is { } rd ? TimeSpan.FromSeconds(rd) : null));
         });
         return cmd;
     }
@@ -91,6 +100,9 @@ public static class ExternalSystemCommands
         var authTypeOption = new Option<string>("--auth-type") { Description = "Auth type (ApiKey, BasicAuth)", Required = true };
         var authConfigOption = new Option<string?>("--auth-config") { Description = "Auth configuration JSON" };
         var timeoutOption = new Option<int?>("--timeout-seconds") { Description = "Per-system HTTP timeout in seconds (0 = use gateway default)" };
+        var maxRetriesOption = new Option<int?>("--max-retries") { Description = "Store-and-forward retry budget for cached calls (0 = use engine default)" };
+        var retryDelayOption = new Option<int?>("--retry-delay-seconds") { Description = "Fixed interval between store-and-forward retries, in seconds (0 = use engine default)" };
+        retryDelayOption.Aliases.Add("--retry-delay");
 
         var cmd = new Command("create") { Description = "Create an external system" };
         cmd.Add(nameOption);
@@ -98,6 +110,8 @@ public static class ExternalSystemCommands
         cmd.Add(authTypeOption);
         cmd.Add(authConfigOption);
         cmd.Add(timeoutOption);
+        cmd.Add(maxRetriesOption);
+        cmd.Add(retryDelayOption);
         cmd.SetAction(async (ParseResult result) =>
         {
             var name = result.GetValue(nameOption)!;
@@ -105,9 +119,13 @@ public static class ExternalSystemCommands
             var authType = result.GetValue(authTypeOption)!;
             var authConfig = result.GetValue(authConfigOption);
             var timeoutSeconds = result.GetValue(timeoutOption);
+            var maxRetries = result.GetValue(maxRetriesOption);
+            var retryDelaySeconds = result.GetValue(retryDelayOption);
             return await CommandHelpers.ExecuteCommandAsync(
                 result, urlOption, formatOption, usernameOption, passwordOption,
-                new CreateExternalSystemCommand(name, endpointUrl, authType, authConfig, timeoutSeconds));
+                new CreateExternalSystemCommand(name, endpointUrl, authType, authConfig, timeoutSeconds,
+                    maxRetries,
+                    retryDelaySeconds is { } rd ? TimeSpan.FromSeconds(rd) : null));
         });
         return cmd;
     }

src/ZB.MOM.WW.ScadaBridge.CLI/README.md

@@ -1206,7 +1206,7 @@ scadabridge --url <url> external-system list
 Register an external HTTP system that scripts can call.
 
 ```sh
-scadabridge --url <url> external-system create --name <string> --endpoint-url <url> --auth-type <string> [--auth-config <json>]
+scadabridge --url <url> external-system create --name <string> --endpoint-url <url> --auth-type <string> [--auth-config <json>] [--timeout-seconds <int>] [--max-retries <int>] [--retry-delay-seconds <int>]
 ```
 
 | Option | Required | Description |
@@ -1215,6 +1215,13 @@ scadabridge --url <url> external-system create --name <string> --endpoint-url <u
 | `--endpoint-url` | yes | Base URL of the external system |
 | `--auth-type` | yes | Authentication type: `ApiKey` or `BasicAuth` |
 | `--auth-config` | no | Auth credentials as a JSON string |
+| `--timeout-seconds` | no | Per-system HTTP round-trip timeout. `0` (default) = use the gateway's `DefaultHttpTimeout` |
+| `--max-retries` | no | Store-and-forward retry budget for this system's `CachedCall`s. `0` (default) = use the engine's `DefaultMaxRetries` (50) |
+| `--retry-delay-seconds` | no | Fixed interval between store-and-forward retries. `0` (default) = use the engine's `DefaultRetryInterval` (30 s). Alias: `--retry-delay` |
+
+The retry options are deployed to sites with the rest of the definition, so they take
+effect on the next deployment — they govern how long a transient outage of this system is
+buffered before a cached call parks (`--max-retries` x `--retry-delay-seconds`).
 
 #### `external-system update`
 
@@ -1222,7 +1229,7 @@ Update an external system definition. An update **replaces** the whole entity
 required field below must be supplied, even if unchanged.
 
 ```sh
-scadabridge --url <url> external-system update --id <int> --name <string> --endpoint-url <url> --auth-type <string> [--auth-config <json>]
+scadabridge --url <url> external-system update --id <int> --name <string> --endpoint-url <url> --auth-type <string> [--auth-config <json>] [--timeout-seconds <int>] [--max-retries <int>] [--retry-delay-seconds <int>]
 ```
 
 | Option | Required | Description |
@@ -1231,7 +1238,14 @@ scadabridge --url <url> external-system update --id <int> --name <string> --endp
 | `--name` | yes | Display name |
 | `--endpoint-url` | yes | Base URL |
 | `--auth-type` | yes | Authentication type |
-| `--auth-config` | no | Updated auth credentials as a JSON string |
+| `--auth-config` | no | Updated auth credentials as a JSON string; omit to preserve the stored value |
+| `--timeout-seconds` | no | Per-system HTTP round-trip timeout; omit to preserve |
+| `--max-retries` | no | Store-and-forward retry budget for this system's `CachedCall`s; omit to preserve |
+| `--retry-delay-seconds` | no | Fixed interval between store-and-forward retries; omit to preserve. Alias: `--retry-delay` |
+
+Note the asymmetry with the required fields above: the four optional settings follow an
+**omit-to-preserve** rule, so a rename does not silently reset a system's auth config,
+timeout, or retry policy.
 
 #### `external-system delete`