fix(slack): offset presentation controls after native blo...

Recent Commits to openclaw:main

clawsweeper · 2026-04-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,10 @@ export function buildSlackInteractiveBlocks(`
`186`	`186`	`}).blocks;`
`187`	`187`	`}`
`188`	`188`
`189`		`-export function buildSlackPresentationBlocks(presentation?: MessagePresentation): SlackBlock[] {`
	`189`	`+export function buildSlackPresentationBlocks(`
	`190`	`+presentation?: MessagePresentation,`
	`191`	`+options: SlackInteractiveBlockRenderOptions = {},`
	`192`	`+): SlackBlock[] {`
`190`	`193`	`if (!presentation) {`
`191`	`194`	`return [];`
`192`	`195`	`}`
`@@ -229,6 +232,6 @@ export function buildSlackPresentationBlocks(presentation?: MessagePresentation)`
`229`	`232`	`(block) => block.type === "buttons" \|\| block.type === "select",`
`230`	`233`	`),`
`231`	`234`	`});`
`232`		`-blocks.push(...buildSlackInteractiveBlocks(interactive));`
	`235`	`+blocks.push(...buildSlackInteractiveBlocks(interactive, options));`
`233`	`236`	`return blocks;`
`234`	`237`	`}`

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,11 @@ function resolveSlackBlocks(payload: {`
`120`	`120`	`\| undefined;`
`121`	`121`	`const nativeBlocks = parseSlackBlocksInput(slackData?.blocks) as SlackBlock[] \| undefined;`
`122`	`122`	`const renderedPresentation =`
`123`		`-slackData?.presentationBlocks ?? buildSlackPresentationBlocks(payload.presentation);`
	`123`	`+slackData?.presentationBlocks ??`
	`124`	`+buildSlackPresentationBlocks(`
	`125`	`+payload.presentation,`
	`126`	`+resolveSlackInteractiveBlockOffsets(nativeBlocks),`
	`127`	`+);`
`124`	`128`	`const previousBlocks = [...(nativeBlocks ?? []), ...renderedPresentation];`
`125`	`129`	`const renderedInteractive = resolveRenderedInteractiveBlocks(payload.interactive, previousBlocks);`
`126`	`130`	`const mergedBlocks = [...previousBlocks, ...(renderedInteractive ?? [])];`
`@@ -147,16 +151,23 @@ export const slackOutbound: ChannelOutboundAdapter = {`
`147`	`151`	`context: true,`
`148`	`152`	`divider: true,`
`149`	`153`	`},`
`150`		`-renderPresentation: ({ payload, presentation }) => ({`
`151`		`- ...payload,`
`152`		`-channelData: {`
`153`		`- ...payload.channelData,`
`154`		`-slack: {`
`155`		`- ...(payload.channelData?.slack as Record<string, unknown> \| undefined),`
`156`		`-presentationBlocks: buildSlackPresentationBlocks(presentation),`
	`154`	`+renderPresentation: ({ payload, presentation }) => {`
	`155`	`+const slackData = payload.channelData?.slack as Record<string, unknown> \| undefined;`
	`156`	`+const nativeBlocks = parseSlackBlocksInput(slackData?.blocks) as SlackBlock[] \| undefined;`
	`157`	`+return {`
	`158`	`+ ...payload,`
	`159`	`+channelData: {`
	`160`	`+ ...payload.channelData,`
	`161`	`+slack: {`
	`162`	`+ ...slackData,`
	`163`	`+presentationBlocks: buildSlackPresentationBlocks(`
	`164`	`+presentation,`
	`165`	`+resolveSlackInteractiveBlockOffsets(nativeBlocks),`
	`166`	`+),`
	`167`	`+},`
`157`	`168`	`},`
`158`		`-},`
`159`		`-}),`
	`169`	`+};`
	`170`	`+},`
`160`	`171`	`sendPayload: async (ctx) => {`
`161`	`172`	`const payload = {`
`162`	`173`	`...ctx.payload,`

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,61 @@ describe("slackOutbound sendPayload", () => {`
`94`	`94`	`await expect(run()).rejects.toThrow(/Slack blocks cannot exceed 50 items/i);`
`95`	`95`	`expect(sendMock).not.toHaveBeenCalled();`
`96`	`96`	`});`
	`97`	`+`
	`98`	`+it("offsets presentation controls against native Slack blocks before standalone interactive controls", async () => {`
	`99`	`+const { run, sendMock, to } = createHarness({`
	`100`	`+payload: {`
	`101`	`+text: "Deploy?",`
	`102`	`+channelData: {`
	`103`	`+slack: {`
	`104`	`+blocks: [`
	`105`	`+{`
	`106`	`+type: "actions",`
	`107`	`+block_id: "openclaw_reply_buttons_1",`
	`108`	`+elements: [],`
	`109`	`+},`
	`110`	`+],`
	`111`	`+},`
	`112`	`+},`
	`113`	`+presentation: {`
	`114`	`+blocks: [`
	`115`	`+{`
	`116`	`+type: "buttons",`
	`117`	`+buttons: [{ label: "Stage", value: "stage" }],`
	`118`	`+},`
	`119`	`+],`
	`120`	`+},`
	`121`	`+interactive: {`
	`122`	`+blocks: [`
	`123`	`+{`
	`124`	`+type: "buttons",`
	`125`	`+buttons: [{ label: "Approve", value: "approve" }],`
	`126`	`+},`
	`127`	`+],`
	`128`	`+},`
	`129`	`+},`
	`130`	`+});`
	`131`	`+`
	`132`	`+await run();`
	`133`	`+`
	`134`	`+expect(sendMock).toHaveBeenCalledWith(`
	`135`	`+to,`
	`136`	`+"Deploy?",`
	`137`	`+expect.objectContaining({`
	`138`	`+blocks: [`
	`139`	`+expect.objectContaining({ block_id: "openclaw_reply_buttons_1" }),`
	`140`	`+expect.objectContaining({`
	`141`	`+block_id: "openclaw_reply_buttons_2",`
	`142`	`+elements: [expect.objectContaining({ action_id: "openclaw:reply_button:2:1" })],`
	`143`	`+}),`
	`144`	`+expect.objectContaining({`
	`145`	`+block_id: "openclaw_reply_buttons_3",`
	`146`	`+elements: [expect.objectContaining({ action_id: "openclaw:reply_button:3:1" })],`
	`147`	`+}),`
	`148`	`+],`
	`149`	`+}),`
	`150`	`+);`
	`151`	`+});`
`97`	`152`	`});`
`98`	`153`
`99`	`154`	`describe("Slack outbound payload contract", () => {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main