github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-07 20:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(outbound): dedupe poll threading + tighten duration semantics

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-14 18:53:23 +01:00
parent f47584fec8
commit 4b9cb46c6e
7 changed files with 85 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/infra/outbound/message-action-runner.ts
View File

@@ -59,6 +59,33 @@ export type MessageActionRunnerGateway = {
mode: GatewayClientMode;
};
function resolveAndApplyOutboundThreadId(
params: Record<string, unknown>,
ctx: {
channel: ChannelId;
to: string;
toolContext?: ChannelThreadingToolContext;
allowSlackAutoThread: boolean;
},
): string | undefined {
const threadId = readStringParam(params, "threadId");
const slackAutoThreadId =
ctx.allowSlackAutoThread && ctx.channel === "slack" && !threadId
? resolveSlackAutoThreadId({ to: ctx.to, toolContext: ctx.toolContext })
: undefined;
const telegramAutoThreadId =
ctx.channel === "telegram" && !threadId
? resolveTelegramAutoThreadId({ to: ctx.to, toolContext: ctx.toolContext })
: undefined;
const resolved = threadId ?? slackAutoThreadId ?? telegramAutoThreadId;
// Write auto-resolved threadId back into params so downstream dispatch
// (plugin `readStringParam(params, "threadId")`) picks it up.
if (resolved && !params.threadId) {
params.threadId = resolved;
}
return resolved ?? undefined;
}
export type RunMessageActionParams = {
cfg: OpenClawConfig;
action: ChannelMessageActionName;
@@ -469,23 +496,12 @@ async function handleSendAction(ctx: ResolvedActionContext): Promise<MessageActi
const silent = readBooleanParam(params, "silent");
const replyToId = readStringParam(params, "replyTo");
const threadId = readStringParam(params, "threadId");
// Slack auto-threading can inject threadTs without explicit params; mirror to that session key.
const slackAutoThreadId =
channel === "slack" && !replyToId && !threadId
? resolveSlackAutoThreadId({ to, toolContext: input.toolContext })
: undefined;
// Telegram forum topic auto-threading: inject threadId so media/buttons land in the correct topic.
const telegramAutoThreadId =
channel === "telegram" && !threadId
? resolveTelegramAutoThreadId({ to, toolContext: input.toolContext })
: undefined;
const resolvedThreadId = threadId ?? slackAutoThreadId ?? telegramAutoThreadId;
// Write auto-resolved threadId back into params so downstream dispatch
// (plugin `readStringParam(params, "threadId")`) picks it up.
if (resolvedThreadId && !params.threadId) {
params.threadId = resolvedThreadId;
}
const resolvedThreadId = resolveAndApplyOutboundThreadId(params, {
channel,
to,
toolContext: input.toolContext,
allowSlackAutoThread: channel === "slack" && !replyToId,
});
const outboundRoute =
agentId && !dryRun
? await resolveOutboundSessionRoute({
@@ -584,19 +600,19 @@ async function handlePollAction(ctx: ResolvedActionContext): Promise<MessageActi
});
const maxSelections = allowMultiselect ? Math.max(2, options.length) : 1;
const threadId = readStringParam(params, "threadId");
const slackAutoThreadId =
channel === "slack" && !threadId
? resolveSlackAutoThreadId({ to, toolContext: input.toolContext })
: undefined;
const telegramAutoThreadId =
channel === "telegram" && !threadId
? resolveTelegramAutoThreadId({ to, toolContext: input.toolContext })
: undefined;
const resolvedThreadId = threadId ?? slackAutoThreadId ?? telegramAutoThreadId;
if (resolvedThreadId && !params.threadId) {
params.threadId = resolvedThreadId;
if (durationSeconds !== undefined && channel !== "telegram") {
throw new Error("pollDurationSeconds is only supported for Telegram polls");
}
if (isAnonymous !== undefined && channel !== "telegram") {
throw new Error("pollAnonymous/pollPublic are only supported for Telegram polls");
}
const resolvedThreadId = resolveAndApplyOutboundThreadId(params, {
channel,
to,
toolContext: input.toolContext,
allowSlackAutoThread: channel === "slack",
});
const base = typeof params.message === "string" ? params.message : "";
await maybeApplyCrossContextMarker({