romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(hooks): connect message_sending hook to outbound message pipeline

Browse Source 
- Add getGlobalHookRunner import to message handlers
- Call runMessageSending before onBlockReply in handleMessageEnd
- Support content modification and cancellation via hook result
- Fallback to original message on hook error

Closes #3945
This commit is contained in:
ramsbaby 2026-01-29 20:55:23 +09:00
parent 5f4715acfc
commit 90226c05e0
1 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/agents/pi-embedded-subscribe.handlers.messages.ts
View File

@ -18,6 +18,7 @@ import {
promoteThinkingTagsToBlocks,
} from "./pi-embedded-utils.js";
import { createInlineCodeState } from "../markdown/code-spans.js";
import { getGlobalHookRunner } from "../plugins/hook-runner-global.js";
export function handleMessageStart(
ctx: EmbeddedPiSubscribeContext,
@ -236,16 +237,72 @@ export function handleMessageEnd(
replyToTag,
replyToCurrent,
} = splitResult;
// Emit if there's content OR audioAsVoice flag (to propagate the flag).
if (cleanedText || (mediaUrls && mediaUrls.length > 0) || audioAsVoice) {
void onBlockReply({
text: cleanedText,
mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
audioAsVoice,
replyToId,
replyToTag,
replyToCurrent,
});
// Run message_sending hook before emitting
const hookRunner = getGlobalHookRunner();
const sessionKey = (ctx.params as { sessionKey?: string }).sessionKey;
const targetTo = sessionKey ?? "unknown";
if (hookRunner?.hasHooks("message_sending") && cleanedText) {
// Async hook execution with modification/cancellation support
void hookRunner
.runMessageSending(
{
to: targetTo,
content: cleanedText,
metadata: { mediaUrls, sessionKey },
},
{
channelId: (ctx.params as { channel?: string }).channel ?? "unknown",
accountId: (ctx.params as { accountId?: string }).accountId,
},
)
.then((hookResult) => {
const finalText = hookResult?.content ?? cleanedText;
const shouldCancel = hookResult?.cancel ?? false;
if (
!shouldCancel &&
(finalText || (mediaUrls && mediaUrls.length > 0) || audioAsVoice)
) {
void onBlockReply({
text: finalText,
mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
audioAsVoice,
replyToId,
replyToTag,
replyToCurrent,
});
} else if (shouldCancel) {
ctx.log.debug("Message cancelled by message_sending hook");
}
})
.catch((err) => {
ctx.log.warn(`message_sending hook failed: ${err}`);
// Fallback: send original message on hook error
if (cleanedText || (mediaUrls && mediaUrls.length > 0) || audioAsVoice) {
void onBlockReply({
text: cleanedText,
mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
audioAsVoice,
replyToId,
replyToTag,
replyToCurrent,
});
}
});
} else {
// No hooks registered, emit directly
if (cleanedText || (mediaUrls && mediaUrls.length > 0) || audioAsVoice) {
void onBlockReply({
text: cleanedText,
mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
audioAsVoice,
replyToId,
replyToTag,
replyToCurrent,
});
}
}
}
}