fix(discord): keep default account online when adding named accounts (openclaw#96401)

849261680 · steipete · web-flow · commit db0ebeed7707 · 2026-07-06T16:51:04.000+01:00
* fix(discord): keep default SecretRef active with named accounts

* fix(discord): align implicit default secret surfaces

---------

Co-authored-by: Peter Steinberger &lt;steipete@gmail.com&gt;
diff --git a/extensions/discord/src/secret-config-contract.ts b/extensions/discord/src/secret-config-contract.ts
@@ -3,6 +3,7 @@ import {
   collectNestedChannelFieldAssignments,
   collectSimpleChannelFieldAssignments,
   getChannelSurface,
+  hasConfiguredSecretInputValue,
   isBaseFieldActiveForChannelSurface,
   isEnabledFlag,
   isRecord,
@@ -93,6 +94,21 @@ export function collectRuntimeConfigAssignments(params: {
     return;
   }
   const { channel: discord, surface } = resolved;
+  const hasImplicitDefault =
+    surface.hasExplicitAccounts &&
+    !surface.accounts.some(({ accountId }) => accountId === "default") &&
+    [discord.token, params.context.env.DISCORD_BOT_TOKEN].some((value) =>
+      hasConfiguredSecretInputValue(value, params.defaults),
+    );
+  if (hasImplicitDefault) {
+    // Account discovery treats either token source as an implicit default. Keep it in
+    // secret collection so named accounts cannot orphan the default's inherited refs.
+    surface.accounts.push({
+      accountId: "default",
+      account: {},
+      enabled: surface.channelEnabled,
+    });
+  }
   collectSimpleChannelFieldAssignments({
     channelKey: "discord",
     field: "token",
diff --git a/src/secrets/runtime-discord-surface.test.ts b/src/secrets/runtime-discord-surface.test.ts
@@ -1,5 +1,8 @@
 /** Tests Discord secret surfaces in runtime preparation. */
+import fs from "node:fs/promises";
+import path from "node:path";
 import { describe, expect, it } from "vitest";
+import { withTempDir } from "../test-helpers/temp-dir.js";
 import "./runtime-discord.test-support.ts";
 import {
   asConfig,
@@ -71,6 +74,103 @@ describe("secrets runtime snapshot discord surface", () => {
     );
   });
 
+  it.skipIf(process.platform === "win32")(
+    "resolves the implicit default token when named Discord accounts are added",
+    async () => {
+      await withTempDir({ prefix: "openclaw-discord-secrets-" }, async (root) => {
+        const secretsPath = path.join(root, "secrets.json");
+        await fs.writeFile(
+          secretsPath,
+          JSON.stringify({
+            discord: {
+              defaultToken: "default-account-token",
+              secondToken: "second-account-token",
+            },
+          }),
+          "utf8",
+        );
+        await fs.chmod(secretsPath, 0o600);
+
+        const snapshot = await prepareSecretsRuntimeSnapshot({
+          config: asConfig({
+            secrets: {
+              providers: {
+                discord_file: {
+                  source: "file",
+                  path: secretsPath,
+                  mode: "json",
+                },
+              },
+            },
+            channels: {
+              discord: {
+                token: {
+                  source: "file",
+                  provider: "discord_file",
+                  id: "/discord/defaultToken",
+                },
+                accounts: {
+                  second: {
+                    enabled: true,
+                    token: {
+                      source: "file",
+                      provider: "discord_file",
+                      id: "/discord/secondToken",
+                    },
+                  },
+                },
+              },
+            },
+          }),
+          agentDirs: ["/tmp/openclaw-agent-main"],
+          loadAuthStore: () => loadAuthStoreWithProfiles({}),
+        });
+
+        expect(snapshot.config.channels?.discord?.token).toBe("default-account-token");
+        expect(snapshot.config.channels?.discord?.accounts?.second?.token).toBe(
+          "second-account-token",
+        );
+        expect(snapshot.warnings.map((warning) => warning.path)).not.toContain(
+          "channels.discord.token",
+        );
+      });
+    },
+  );
+
+  it("keeps inherited refs active for an env-backed implicit default", async () => {
+    const snapshot = await prepareSecretsRuntimeSnapshot({
+      config: asConfig({
+        channels: {
+          discord: {
+            pluralkit: {
+              token: { source: "env", provider: "default", id: "DISCORD_DEFAULT_PK_TOKEN" },
+            },
+            accounts: {
+              second: {
+                pluralkit: {
+                  token: { source: "env", provider: "default", id: "DISCORD_SECOND_PK_TOKEN" },
+                },
+              },
+            },
+          },
+        },
+      }),
+      env: {
+        DISCORD_BOT_TOKEN: "env-default-token",
+        DISCORD_DEFAULT_PK_TOKEN: "default-pk-token",
+        DISCORD_SECOND_PK_TOKEN: "second-pk-token",
+      },
+      agentDirs: ["/tmp/openclaw-agent-main"],
+      loadAuthStore: () => loadAuthStoreWithProfiles({}),
+    });
+
+    expect(snapshot.config.channels?.discord?.pluralkit?.token).toBe("default-pk-token");
+    expect(snapshot.config.channels?.discord?.accounts?.second?.pluralkit?.token).toBe(
+      "second-pk-token",
+    );
+    expect(snapshot.warnings).toStrictEqual([]);
+  });
+
   it("fails when non-default Discord account inherits an unresolved top-level token ref", async () => {
     await expect(
       prepareSecretsRuntimeSnapshot({
