diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37078f584..3ba0531f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - Control UI: flatten nav into a single horizontal scroll row on tablet/mobile (and always show collapsed group items). (#771) — thanks @carlulsoe.
 - macOS: start + await local gateway before onboarding wizard begins.
 - macOS: cancel onboarding wizard on close, recover if the gateway drops the session, and time out stalled gateway connects.
+- macOS: wizard debug CLI now surfaces error status instead of exiting as complete.
 - Models/Onboarding: configure MiniMax (minimax.io) via Anthropic-compatible `/anthropic` endpoint by default (keep `minimax-api` as a legacy alias).
 - Agents/Browser: cap Playwright AI snapshots for tool calls (maxChars); CLI snapshots remain full. (#763) — thanks @thesash.
 - Models: normalize Gemini 3 Pro/Flash IDs to preview names for live model lookups. (#769) — thanks @steipete.
diff --git a/apps/macos/Sources/ClawdbotWizardCLI/main.swift b/apps/macos/Sources/ClawdbotWizardCLI/main.swift
index 58a83681b..7fbcdb0c5 100644
--- a/apps/macos/Sources/ClawdbotWizardCLI/main.swift
+++ b/apps/macos/Sources/ClawdbotWizardCLI/main.swift
@@ -380,17 +380,17 @@ private func runWizard(client: GatewayWizardClient, opts: WizardCliOptions) asyn
     do {
         while true {
             let status = wizardStatusString(nextResult.status) ?? (nextResult.done ? "done" : "running")
-            if status == "done" || nextResult.done {
-                print("Wizard complete.")
-                return
-            }
             if status == "cancelled" {
                 print("Wizard cancelled.")
                 return
             }
-            if status == "error" {
+            if status == "error" || (nextResult.done && nextResult.error != nil) {
                 throw WizardCliError.gatewayError(nextResult.error ?? "wizard error")
             }
+            if status == "done" || nextResult.done {
+                print("Wizard complete.")
+                return
+            }
 
             if let step = decodeWizardStep(nextResult.step) {
                 let answer = try promptAnswer(for: step)