Harden wizard progress polling budget

Allow a single long-running gateway progress step to use the full bounded progress budget instead of failing after the previous shorter per-step cap. Share the progress constants between the setup runner and UI and cover the intended budget in tests.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: shanselman

src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml.cs

@@ -17,9 +17,6 @@ public sealed partial class WizardPage : Page
     private const int MaxSameStepVisits = 3;
 
     // Bound progress polling separately from interactive wizard steps.
-    private const int MaxProgressPolls = 360;
-    private const int MaxTotalProgressPolls = 1200;
-    private static readonly TimeSpan ProgressPollDelay = TimeSpan.FromSeconds(1);
 
     private SetupConfig? _config;
     private OpenClawGatewayClient? _client;
@@ -252,19 +249,19 @@ private async Task ApplyPayloadAsync(JsonElement payload)
 
                 _progressPolls++;
                 _totalProgressPolls++;
-                if (_progressPolls > MaxProgressPolls)
+                if (_progressPolls > WizardTimeouts.MaxProgressPollsPerStep)
                 {
-                    ShowError($"Gateway wizard progress step '{_stepId}' did not complete after {MaxProgressPolls} updates.");
+                    ShowError($"Gateway wizard progress step '{_stepId}' did not complete after {WizardTimeouts.MaxProgressPollsPerStep} updates.");
                     return;
                 }
-                if (_totalProgressPolls > MaxTotalProgressPolls)
+                if (_totalProgressPolls > WizardTimeouts.MaxTotalProgressPolls)
                 {
-                    ShowError($"Gateway wizard did not finish after {MaxTotalProgressPolls} progress updates.");
+                    ShowError($"Gateway wizard did not finish after {WizardTimeouts.MaxTotalProgressPolls} progress updates.");
                     return;
                 }
 
                 RenderProgressStep(title, message);
-                await Task.Delay(ProgressPollDelay);
+                await Task.Delay(WizardTimeouts.ProgressPollDelay);
                 if (generation != _operationGeneration || _errorState || _client == null)
                     return;
 

src/OpenClaw.SetupEngine/SetupWizardRunner.cs

@@ -11,11 +11,8 @@ public sealed class SetupWizardRunner
     private const int MaxSameStepVisits = 3;
     private static readonly Regex s_normalizeKeyRegex = new("[^a-z0-9]+", RegexOptions.Compiled);
 
-    // Progress steps can repeat while background work runs; keep per-step and
-    // aggregate caps so setup fails with a diagnostic instead of hanging.
-    private const int MaxProgressPolls = 360;
-    private const int MaxTotalProgressPolls = 1200;
-    private static readonly TimeSpan ProgressPollDelay = TimeSpan.FromSeconds(1);
+    // Progress steps can repeat while background work runs; keep bounded caps
+    // so setup fails with a diagnostic instead of hanging.
 
     private readonly SetupContext _ctx;
 
@@ -182,17 +179,17 @@ async Task<JsonElement> SendWizardNextAsync(object parameters, int timeoutMs)
 
                     progressPolls++;
                     totalProgressPolls++;
-                    if (progressPolls > MaxProgressPolls)
-                        return StepResult.Fail($"Gateway wizard progress step '{parsed.StepId}' did not complete after {MaxProgressPolls} polls.");
-                    if (totalProgressPolls > MaxTotalProgressPolls)
-                        return StepResult.Fail($"Gateway wizard did not finish after {MaxTotalProgressPolls} progress updates.");
+                    if (progressPolls > WizardTimeouts.MaxProgressPollsPerStep)
+                        return StepResult.Fail($"Gateway wizard progress step '{parsed.StepId}' did not complete after {WizardTimeouts.MaxProgressPollsPerStep} polls.");
+                    if (totalProgressPolls > WizardTimeouts.MaxTotalProgressPolls)
+                        return StepResult.Fail($"Gateway wizard did not finish after {WizardTimeouts.MaxTotalProgressPolls} progress updates.");
 
                     var progressText = $"{parsed.Title} {parsed.Message}".Trim();
                     _ctx.Logger.Info(string.IsNullOrWhiteSpace(progressText)
                         ? $"Wizard progress step '{parsed.StepId}' — polling for next step"
                         : $"Wizard progress: {progressText}");
 
-                    await Task.Delay(ProgressPollDelay, ct);
+                    await Task.Delay(WizardTimeouts.ProgressPollDelay, ct);
                     payload = await SendWizardNextAsync(WizardNextPayload.Acknowledge(sessionId, parsed.StepId), TimeoutFor(parsed));
                     continue;
                 }

src/OpenClaw.SetupEngine/WizardTimeouts.cs

@@ -9,6 +9,15 @@ public static class WizardTimeouts
     /// <summary>Extended timeout for steps that wait on external auth.</summary>
     public const int AuthTimeoutMs = 300_000;
 
+    /// <summary>Polling delay for gateway progress/status wizard steps.</summary>
+    public static readonly TimeSpan ProgressPollDelay = TimeSpan.FromSeconds(1);
+
+    /// <summary>Total progress/status updates before setup fails as stalled.</summary>
+    public const int MaxTotalProgressPolls = 1200;
+
+    /// <summary>Per-step progress/status budget; allow a single long install to consume the total budget.</summary>
+    public const int MaxProgressPollsPerStep = MaxTotalProgressPolls;
+
     private static readonly string[] s_authHints =
     {
         "device", "authorize", "login", "sign in", "oauth",

tests/OpenClaw.SetupEngine.Tests/WizardTimeoutsTests.cs

@@ -29,4 +29,14 @@ public void OrdinarySteps_GetDefaultTimeout(string text)
     {
         Assert.Equal(WizardTimeouts.DefaultTimeoutMs, WizardTimeouts.ForStep(text, string.Empty));
     }
+
+    [Fact]
+    public void ProgressPollBudget_AllowsSingleLongSetupStepToUseTotalBudget()
+    {
+        Assert.Equal(WizardTimeouts.MaxTotalProgressPolls, WizardTimeouts.MaxProgressPollsPerStep);
+        var totalBudget = TimeSpan.FromTicks(
+            WizardTimeouts.ProgressPollDelay.Ticks * WizardTimeouts.MaxTotalProgressPolls);
+        Assert.True(
+            totalBudget >= TimeSpan.FromMinutes(20));
+    }
 }