github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 05:52:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Channels: add thread-aware model overrides

Browse Source
This commit is contained in:
Shadow
2026-02-20 19:26:25 -06:00
committed by GitHub
parent ee8dd40509
commit f555835b09
53 changed files with 1379 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/discord/send.components.ts
View File

@@ -8,7 +8,6 @@ import type { APIChannel } from "discord-api-types/v10";
import { ChannelType, Routes } from "discord-api-types/v10";
import { loadConfig } from "../config/config.js";
import { recordChannelActivity } from "../infra/channel-activity.js";
import { buildAgentSessionKey } from "../routing/resolve-route.js";
import { loadWebMedia } from "../web/media.js";
import { resolveDiscordAccount } from "./accounts.js";
import { registerDiscordComponentEntries } from "./components-registry.js";
@@ -30,50 +29,6 @@ import type { DiscordSendResult } from "./send.types.js";
const DISCORD_FORUM_LIKE_TYPES = new Set<number>([ChannelType.GuildForum, ChannelType.GuildMedia]);
type DiscordRecipient = Awaited<ReturnType<typeof parseAndResolveRecipient>>;
function resolveDiscordDmRecipientId(channel?: APIChannel): string | undefined {
if (!channel || channel.type !== ChannelType.DM) {
return undefined;
}
const recipients = (channel as { recipients?: Array<{ id?: string }> }).recipients;
const recipientId = recipients?.[0]?.id;
if (typeof recipientId !== "string") {
return undefined;
}
const trimmed = recipientId.trim();
return trimmed ? trimmed : undefined;
}
function resolveDiscordComponentSessionKey(params: {
cfg: ReturnType<typeof loadConfig>;
accountId: string;
agentId?: string;
sessionKey?: string;
recipient: DiscordRecipient;
channel?: APIChannel;
}): string | undefined {
if (!params.sessionKey || !params.agentId) {
return params.sessionKey;
}
if (params.recipient.kind !== "channel") {
return params.sessionKey;
}
const recipientId = resolveDiscordDmRecipientId(params.channel);
if (!recipientId) {
return params.sessionKey;
}
// DM channel IDs should map back to the user session for component interactions.
return buildAgentSessionKey({
agentId: params.agentId,
channel: "discord",
accountId: params.accountId,
peer: { kind: "direct", id: recipientId },
dmScope: params.cfg.session?.dmScope,
identityLinks: params.cfg.session?.identityLinks,
});
}
function extractComponentAttachmentNames(spec: DiscordComponentMessageSpec): string[] {
const names: string[] = [];
for (const block of spec.blocks ?? []) {
@@ -108,10 +63,9 @@ export async function sendDiscordComponentMessage(
const recipient = await parseAndResolveRecipient(to, opts.accountId);
const { channelId } = await resolveChannelId(rest, recipient, request);
let channel: APIChannel | undefined;
let channelType: number | undefined;
try {
channel = (await rest.get(Routes.channel(channelId))) as APIChannel | undefined;
const channel = (await rest.get(Routes.channel(channelId))) as APIChannel | undefined;
channelType = channel?.type;
} catch {
channelType = undefined;
@@ -121,18 +75,9 @@ export async function sendDiscordComponentMessage(
throw new Error("Discord components are not supported in forum-style channels");
}
const componentSessionKey = resolveDiscordComponentSessionKey({
cfg,
accountId: accountInfo.accountId,
agentId: opts.agentId,
sessionKey: opts.sessionKey,
recipient,
channel,
});
const buildResult = buildDiscordComponentMessage({
spec,
sessionKey: componentSessionKey,
sessionKey: opts.sessionKey,
agentId: opts.agentId,
accountId: accountInfo.accountId,
});