From 06e3d82b04ab326a36694264ffb4b9dd94ec5661 Mon Sep 17 00:00:00 2001
From: Taksh Kothari <takshkothari09@gmail.com>
Date: Thu, 23 Jul 2026 21:04:39 +0530
Subject: [PATCH] fix(desktop): allow skipping harness setup onboarding (#2360)

Signed-off-by: Taksh <takshkothari09@gmail.com>
---
 .../features/onboarding/ui/MachineOnboardingFlow.tsx   |  9 ++++++++-
 desktop/src/features/onboarding/ui/SetupStep.tsx       | 10 ++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
index 89c284f23..e400d07a9 100644
--- a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
+++ b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
@@ -215,7 +215,14 @@ export function MachineOnboardingFlow({
                 back: () =>
                   setPage(identityWasImported ? "key-import" : "backup"),
                 next: (runtimeIds) => {
-                  setReadyRuntimeIds(Array.from(runtimeIds));
+                  const ids = Array.from(runtimeIds);
+                  setReadyRuntimeIds(ids);
+                  // Harness install can fail (Windows/PATH/network). Don't soft-lock
+                  // onboarding — users can finish setup later in Settings → Agents.
+                  if (ids.length === 0) {
+                    complete(selectedPubkey ?? undefined);
+                    return;
+                  }
                   setPage("config");
                 },
               }}
diff --git a/desktop/src/features/onboarding/ui/SetupStep.tsx b/desktop/src/features/onboarding/ui/SetupStep.tsx
index 6111589ce..96e7322d1 100644
--- a/desktop/src/features/onboarding/ui/SetupStep.tsx
+++ b/desktop/src/features/onboarding/ui/SetupStep.tsx
@@ -687,6 +687,16 @@ function SetupStepContent({
           Next
         </Button>
 
+        <Button
+          className="h-9 rounded-full bg-foreground/10 px-6 text-sm hover:bg-foreground/15"
+          data-testid="onboarding-setup-skip"
+          onClick={() => actions.next([])}
+          type="button"
+          variant="ghost"
+        >
+          Skip for now
+        </Button>
+
         <Button
           className="h-9 rounded-full bg-foreground/10 px-6 text-sm hover:bg-foreground/15"
           data-testid="onboarding-back"