diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverResilienceSection.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverResilienceSection.razor
index 968af113..4a05503f 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverResilienceSection.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverResilienceSection.razor
@@ -1,16 +1,42 @@
-@* Resilience overrides — JSON textarea. Typed-form-ifying Polly is a follow-up; for now this
-   matches the legacy DriverEdit.razor behaviour exactly. *@
+@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers
 
 <section class="panel rise mt-3" style="animation-delay:.14s">
     <div class="panel-head">Resilience overrides (optional)</div>
     <div style="padding:1rem">
-        <InputTextArea Value="@ResilienceConfig"
-                       ValueExpression="() => ResilienceConfig"
-                       ValueChanged="OnChangedAsync"
-                       rows="6"
-                       class="form-control form-control-sm mono"
-                       placeholder="Leave blank to use tier defaults" />
-        <div class="form-text">Polly pipeline overrides per docs/v2/driver-stability.md — bulkhead, retry counts, breaker thresholds. Null = use the driver type's tier defaults.</div>
+        <p class="form-text mb-3">Blank fields use the driver type's stability-tier defaults
+            (see <span class="mono">docs/v2/driver-stability.md</span>). Set only what you need to override.</p>
+
+        <div class="row g-3">
+            <div class="col-md-4"><label class="form-label">Bulkhead max concurrent</label>
+                <input type="number" class="form-control form-control-sm" @bind="_m.BulkheadMaxConcurrent" @bind:after="EmitAsync" placeholder="tier default" /></div>
+            <div class="col-md-4"><label class="form-label">Bulkhead max queue</label>
+                <input type="number" class="form-control form-control-sm" @bind="_m.BulkheadMaxQueue" @bind:after="EmitAsync" placeholder="tier default" /></div>
+            <div class="col-md-4"><label class="form-label">Recycle interval (s, Tier C only)</label>
+                <input type="number" class="form-control form-control-sm" @bind="_m.RecycleIntervalSeconds" @bind:after="EmitAsync" placeholder="none" /></div>
+        </div>
+
+        <div class="table-wrap mt-3">
+            <table class="data-table">
+                <thead><tr><th>Capability</th><th>Timeout (s)</th><th>Retries</th><th>Breaker threshold</th></tr></thead>
+                <tbody>
+                    @foreach (var cap in ResilienceFormModel.Capabilities)
+                    {
+                        var row = _m.Policies[cap];
+                        <tr>
+                            <td class="mono">@cap</td>
+                            <td><input type="number" class="form-control form-control-sm" @bind="row.TimeoutSeconds" @bind:after="EmitAsync" placeholder="default" /></td>
+                            <td><input type="number" class="form-control form-control-sm" @bind="row.RetryCount" @bind:after="EmitAsync" placeholder="default" /></td>
+                            <td><input type="number" class="form-control form-control-sm" @bind="row.BreakerFailureThreshold" @bind:after="EmitAsync" placeholder="default" /></td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+
+        <details class="mt-3">
+            <summary class="small text-muted">Raw JSON (advanced)</summary>
+            <pre class="form-control form-control-sm mono mt-2" style="white-space:pre-wrap;min-height:3rem;">@(_m.ToJson() ?? "(null — all tier defaults)")</pre>
+        </details>
     </div>
 </section>
 
@@ -18,9 +44,24 @@
     [Parameter] public string? ResilienceConfig { get; set; }
     [Parameter] public EventCallback<string?> ResilienceConfigChanged { get; set; }
 
-    private async Task OnChangedAsync(string? newValue)
+    private ResilienceFormModel _m = new();
+    private string? _lastParsed;
+
+    protected override void OnParametersSet()
     {
-        ResilienceConfig = newValue;
-        await ResilienceConfigChanged.InvokeAsync(newValue);
+        // Re-parse only when the inbound value actually changed (avoid clobbering edits on re-render).
+        if (!string.Equals(_lastParsed, ResilienceConfig, StringComparison.Ordinal))
+        {
+            _m = ResilienceFormModel.FromJson(ResilienceConfig);
+            _lastParsed = ResilienceConfig;
+        }
+    }
+
+    private async Task EmitAsync()
+    {
+        var json = _m.ToJson();
+        _lastParsed = json;
+        ResilienceConfig = json;
+        await ResilienceConfigChanged.InvokeAsync(json);
     }
 }