From 04f651b7838fd4046c25a0c96cc8b53991a0f2dd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 29 Apr 2026 15:33:16 +0100
Subject: [PATCH] fix: preserve Slack DM access account lookup

---
 extensions/slack/src/accounts.test.ts | 22 ++++++++++++++++++++++
 extensions/slack/src/accounts.ts      | 12 ++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/extensions/slack/src/accounts.test.ts b/extensions/slack/src/accounts.test.ts
index fa52018e8ec..56360c610a3 100644
--- a/extensions/slack/src/accounts.test.ts
+++ b/extensions/slack/src/accounts.test.ts
@@ -167,6 +167,28 @@ describe("resolveSlackAccount allowFrom precedence", () => {
 
     expect(resolveSlackAccountDmPolicy({ cfg, accountId: "work" })).toBe("allowlist");
   });
+
+  it("resolves mixed-case account keys for DM access settings", () => {
+    const cfg = {
+      channels: {
+        slack: {
+          dmPolicy: "open",
+          allowFrom: ["root"],
+          accounts: {
+            Work: {
+              botToken: "xoxb-work",
+              appToken: "xapp-work",
+              dm: { policy: "allowlist" },
+              allowFrom: ["U123"],
+            },
+          },
+        },
+      },
+    } satisfies OpenClawConfig;
+
+    expect(resolveSlackAccountDmPolicy({ cfg, accountId: "work" })).toBe("allowlist");
+    expect(resolveSlackAccountAllowFrom({ cfg, accountId: "work" })).toEqual(["U123"]);
+  });
 });
 
 describe("resolveSlackAccount active secret surfaces", () => {
diff --git a/extensions/slack/src/accounts.ts b/extensions/slack/src/accounts.ts
index cf146a1ab43..56ed28884a8 100644
--- a/extensions/slack/src/accounts.ts
+++ b/extensions/slack/src/accounts.ts
@@ -12,6 +12,7 @@ import {
   resolveChannelDmPolicy,
   type ChannelDmPolicy,
 } from "openclaw/plugin-sdk/channel-config-helpers";
+import { resolveAccountEntry } from "openclaw/plugin-sdk/routing";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
 import type { SlackAccountSurfaceFields } from "./account-surface-fields.js";
 import type { SlackAccountConfig } from "./runtime-api.js";
@@ -38,6 +39,13 @@ const { listAccountIds, resolveDefaultAccountId } = createAccountListHelpers("sl
 export const listSlackAccountIds = listAccountIds;
 export const resolveDefaultSlackAccountId = resolveDefaultAccountId;
 
+export function resolveSlackAccountConfig(
+  cfg: OpenClawConfig,
+  accountId: string,
+): SlackAccountConfig | undefined {
+  return resolveAccountEntry(cfg.channels?.slack?.accounts, accountId);
+}
+
 export function mergeSlackAccountConfig(
   cfg: OpenClawConfig,
   accountId: string,
@@ -56,7 +64,7 @@ export function resolveSlackAccountAllowFrom(params: {
   const accountId = normalizeAccountId(
     params.accountId ?? resolveDefaultSlackAccountId(params.cfg),
   );
-  const accountConfig = params.cfg.channels?.slack?.accounts?.[accountId];
+  const accountConfig = resolveSlackAccountConfig(params.cfg, accountId);
   const rootConfig = params.cfg.channels?.slack as SlackAccountConfig | undefined;
   const allowFrom = resolveChannelDmAllowFrom({
     account: accountConfig as Record<string, unknown> | undefined,
@@ -72,7 +80,7 @@ export function resolveSlackAccountDmPolicy(params: {
   const accountId = normalizeAccountId(
     params.accountId ?? resolveDefaultSlackAccountId(params.cfg),
   );
-  const accountConfig = params.cfg.channels?.slack?.accounts?.[accountId];
+  const accountConfig = resolveSlackAccountConfig(params.cfg, accountId);
   const rootConfig = params.cfg.channels?.slack as SlackAccountConfig | undefined;
   const policy = resolveChannelDmPolicy({
     account: accountConfig as Record<string, unknown> | undefined,