From c316dbfc4a5330364a9d518121516273f0846f1d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 30 Apr 2026 04:08:17 +0100
Subject: [PATCH] fix: keep slack message controls

---
 CHANGELOG.md                                  |  1 +
 .../slack/src/message-action-dispatch.test.ts | 39 +++++++++++++++++++
 .../slack/src/message-action-dispatch.ts      |  3 +-
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68206faf419..b7dc40dd72b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,6 +76,7 @@ Docs: https://docs.openclaw.ai
 - Slack/exec approvals: cap native approval metadata context to Slack's element and text limits, so large approval details no longer make Slack reject the approval card. Thanks @slackapi.
 - Slack/commands: cap native command argument-menu fallback rows to Slack's message block limit, so large plugin choice lists no longer make Slack reject the generated menu. Thanks @slackapi.
 - Slack/commands: drop fallback command argument buttons whose encoded values exceed Slack's button-value limit, so one oversized plugin choice no longer makes Slack reject the whole menu. Thanks @slackapi.
+- Slack/messages: merge message-tool presentation and interactive blocks on Slack sends, so buttons and selects are no longer dropped when a structured message body is also present. Thanks @slackapi.
 - Channels/WhatsApp: require Baileys outbound message ids before marking auto-replies delivered, so transcript text and ack reactions no longer make failed group replies look sent. Fixes #49225. Thanks @TinyTb.
 - CLI/update: scope packaged Node compile caches by OpenClaw version and install metadata, so global installs no longer reuse stale compiled chunks after package updates. Thanks @pashpashpash.
 - Channels/Voice call: keep pre-auth webhook in-flight limiting active when socket remote address metadata is missing, so slow-body requests from stripped-IP proxy paths still share the fallback bucket. (#74453) Thanks @davidangularme.
diff --git a/extensions/slack/src/message-action-dispatch.test.ts b/extensions/slack/src/message-action-dispatch.test.ts
index 9c372e77777..5de2854ff06 100644
--- a/extensions/slack/src/message-action-dispatch.test.ts
+++ b/extensions/slack/src/message-action-dispatch.test.ts
@@ -9,6 +9,45 @@ function createInvokeSpy() {
 }
 
 describe("handleSlackMessageAction", () => {
+  it("merges presentation and interactive blocks when sending", async () => {
+    const invoke = createInvokeSpy();
+
+    await handleSlackMessageAction({
+      providerId: "slack",
+      ctx: {
+        action: "send",
+        cfg: {},
+        params: {
+          to: "channel:C1",
+          message: "Deploy?",
+          presentation: {
+            blocks: [{ type: "text", text: "Deploy summary" }],
+          },
+          interactive: {
+            blocks: [
+              {
+                type: "buttons",
+                buttons: [{ label: "Approve", value: "approve" }],
+              },
+            ],
+          },
+        },
+      } as never,
+      invoke: invoke as never,
+    });
+
+    const action = invoke.mock.calls[0]?.[0] as {
+      blocks?: Array<{ type?: string; elements?: Array<{ value?: string }> }>;
+    };
+    expect(action.blocks).toEqual([
+      expect.objectContaining({ type: "section" }),
+      expect.objectContaining({
+        type: "actions",
+        elements: [expect.objectContaining({ value: "approve" })],
+      }),
+    ]);
+  });
+
   it("maps upload-file to the internal uploadFile action", async () => {
     const invoke = createInvokeSpy();
 
diff --git a/extensions/slack/src/message-action-dispatch.ts b/extensions/slack/src/message-action-dispatch.ts
index 232ccfaca3d..51bc9be8cb2 100644
--- a/extensions/slack/src/message-action-dispatch.ts
+++ b/extensions/slack/src/message-action-dispatch.ts
@@ -44,7 +44,8 @@ export async function handleSlackMessageAction(params: {
     const presentationBlocks = presentation
       ? buildSlackPresentationBlocks(presentation)
       : undefined;
-    const blocks = presentationBlocks?.length ? presentationBlocks : interactiveBlocks;
+    const mergedBlocks = [...(presentationBlocks ?? []), ...(interactiveBlocks ?? [])];
+    const blocks = mergedBlocks.length > 0 ? mergedBlocks : undefined;
     if (!content && !mediaUrl && !blocks) {
       throw new Error("Slack send requires message, blocks, or media.");
     }