From a97e1e1611aa3dd6e4307198da4f6691b108f5d1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 15 Mar 2026 19:47:49 -0700
Subject: [PATCH] fix(plugins): tighten lazy setup typing

---
 extensions/slack/src/channel.setup.ts |  4 ++--
 src/commands/onboard-channels.ts      |  2 +-
 src/commands/onboarding/registry.ts   | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/extensions/slack/src/channel.setup.ts b/extensions/slack/src/channel.setup.ts
index 2f7b888ca18..83cd1625059 100644
--- a/extensions/slack/src/channel.setup.ts
+++ b/extensions/slack/src/channel.setup.ts
@@ -7,6 +7,7 @@ import {
   buildChannelConfigSchema,
   getChatChannelMeta,
   inspectSlackAccount,
+  isSlackInteractiveRepliesEnabled,
   listSlackAccountIds,
   resolveDefaultSlackAccountId,
   resolveSlackAccount,
@@ -68,8 +69,7 @@ export const slackSetupPlugin: ChannelPlugin<ResolvedSlackAccount> = {
   },
   agentPrompt: {
     messageToolHints: ({ cfg, accountId }) =>
-      cfg.channels?.slack?.accounts?.[accountId ?? "default"]?.capabilities?.interactiveReplies ===
-        true || cfg.channels?.slack?.capabilities?.interactiveReplies === true
+      isSlackInteractiveRepliesEnabled({ cfg, accountId })
         ? [
             "- Slack interactive replies: use `[[slack_buttons: Label:value, Other:other]]` to add action buttons that route clicks back as Slack interaction system events.",
             "- Slack selects: use `[[slack_select: Placeholder | Label:value, Other:other]]` to add a static select menu that routes the chosen value back as a Slack interaction system event.",
diff --git a/src/commands/onboard-channels.ts b/src/commands/onboard-channels.ts
index cd269ac2cf9..c70fbde04ab 100644
--- a/src/commands/onboard-channels.ts
+++ b/src/commands/onboard-channels.ts
@@ -280,7 +280,7 @@ async function maybeConfigureDmPolicies(params: {
   resolveAdapter?: (channel: ChannelChoice) => ChannelOnboardingAdapter | undefined;
 }): Promise<OpenClawConfig> {
   const { selection, prompter, accountIdsByChannel } = params;
-  const resolve = params.resolveAdapter;
+  const resolve = params.resolveAdapter ?? (() => undefined);
   const dmPolicies = selection
     .map((channel) => resolve(channel)?.dmPolicy)
     .filter(Boolean) as ChannelOnboardingDmPolicy[];
diff --git a/src/commands/onboarding/registry.ts b/src/commands/onboarding/registry.ts
index 01bc0deeb7a..9d7711e3092 100644
--- a/src/commands/onboarding/registry.ts
+++ b/src/commands/onboarding/registry.ts
@@ -51,17 +51,23 @@ export async function loadBundledChannelOnboardingPlugin(
 ): Promise<ChannelPlugin | undefined> {
   switch (channel) {
     case "discord":
-      return (await import("../../../extensions/discord/setup-entry.js")).default.plugin;
+      return (await import("../../../extensions/discord/setup-entry.js")).default
+        .plugin as ChannelPlugin;
     case "imessage":
-      return (await import("../../../extensions/imessage/setup-entry.js")).default.plugin;
+      return (await import("../../../extensions/imessage/setup-entry.js")).default
+        .plugin as ChannelPlugin;
     case "signal":
-      return (await import("../../../extensions/signal/setup-entry.js")).default.plugin;
+      return (await import("../../../extensions/signal/setup-entry.js")).default
+        .plugin as ChannelPlugin;
     case "slack":
-      return (await import("../../../extensions/slack/setup-entry.js")).default.plugin;
+      return (await import("../../../extensions/slack/setup-entry.js")).default
+        .plugin as ChannelPlugin;
     case "telegram":
-      return (await import("../../../extensions/telegram/setup-entry.js")).default.plugin;
+      return (await import("../../../extensions/telegram/setup-entry.js")).default
+        .plugin as ChannelPlugin;
     case "whatsapp":
-      return (await import("../../../extensions/whatsapp/setup-entry.js")).default.plugin;
+      return (await import("../../../extensions/whatsapp/setup-entry.js")).default
+        .plugin as ChannelPlugin;
     default:
       return undefined;
   }