From 6317fce9cb18d4bae6ef91c52992068b4bc68707 Mon Sep 17 00:00:00 2001
From: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
Date: Fri, 3 Apr 2026 15:22:40 -0500
Subject: [PATCH] fix: honor discord default setup status

---
 extensions/discord/src/setup-core.ts         |  5 +---
 extensions/discord/src/setup-surface.test.ts | 25 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/extensions/discord/src/setup-core.ts b/extensions/discord/src/setup-core.ts
index e111758ad1a..29aefe6635d 100644
--- a/extensions/discord/src/setup-core.ts
+++ b/extensions/discord/src/setup-core.ts
@@ -109,10 +109,7 @@ export function createDiscordSetupWizardBase(handlers: {
       configuredScore: 2,
       unconfiguredScore: 1,
       resolveConfigured: ({ cfg, accountId }) =>
-        (accountId ? [accountId] : listDiscordSetupAccountIds(cfg)).some((resolvedAccountId) => {
-          const account = inspectDiscordSetupAccount({ cfg, accountId: resolvedAccountId });
-          return account.configured;
-        }),
+        inspectDiscordSetupAccount({ cfg, accountId }).configured,
     }),
     credentials: [
       {
diff --git a/extensions/discord/src/setup-surface.test.ts b/extensions/discord/src/setup-surface.test.ts
index b5b9e507730..95b42142f22 100644
--- a/extensions/discord/src/setup-surface.test.ts
+++ b/extensions/discord/src/setup-surface.test.ts
@@ -54,3 +54,28 @@ describe("discordSetupWizard.dmPolicy", () => {
     expect(next?.channels?.discord?.accounts?.alerts?.allowFrom).toEqual(["123", "*"]);
   });
 });
+
+describe("discordSetupWizard.status", () => {
+  it("uses configured defaultAccount for omitted setup configured state", async () => {
+    const configured = await discordSetupWizard.status.resolveConfigured({
+      cfg: {
+        channels: {
+          discord: {
+            defaultAccount: "work",
+            token: "discord-root-token",
+            accounts: {
+              alerts: {
+                token: "discord-alerts-token",
+              },
+              work: {
+                token: "",
+              },
+            },
+          },
+        },
+      } as OpenClawConfig,
+    });
+
+    expect(configured).toBe(false);
+  });
+});