mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 17:38:27 +00:00
feat: thread-bound subagents on Discord (#21805)
* docs: thread-bound subagents plan * docs: add exact thread-bound subagent implementation touchpoints * Docs: prioritize auto thread-bound subagent flow * Docs: add ACP harness thread-binding extensions * Discord: add thread-bound session routing and auto-bind spawn flow * Subagents: add focus commands and ACP/session binding lifecycle hooks * Tests: cover thread bindings, focus commands, and ACP unbind hooks * Docs: add plugin-hook appendix for thread-bound subagents * Plugins: add subagent lifecycle hook events * Core: emit subagent lifecycle hooks and decouple Discord bindings * Discord: handle subagent bind lifecycle via plugin hooks * Subagents: unify completion finalizer and split registry modules * Add subagent lifecycle events module * Hooks: fix subagent ended context key * Discord: share thread bindings across ESM and Jiti * Subagents: add persistent sessions_spawn mode for thread-bound sessions * Subagents: clarify thread intro and persistent completion copy * test(subagents): stabilize sessions_spawn lifecycle cleanup assertions * Discord: add thread-bound session TTL with auto-unfocus * Subagents: fail session spawns when thread bind fails * Subagents: cover thread session failure cleanup paths * Session: add thread binding TTL config and /session ttl controls * Tests: align discord reaction expectations * Agent: persist sessionFile for keyed subagent sessions * Discord: normalize imports after conflict resolution * Sessions: centralize sessionFile resolve/persist helper * Discord: harden thread-bound subagent session routing * Rebase: resolve upstream/main conflicts * Subagents: move thread binding into hooks and split bindings modules * Docs: add channel-agnostic subagent routing hook plan * Agents: decouple subagent routing from Discord * Discord: refactor thread-bound subagent flows * Subagents: prevent duplicate end hooks and orphaned failed sessions * Refactor: split subagent command and provider phases * Subagents: honor hook delivery target overrides * Discord: add thread binding kill switches and refresh plan doc * Discord: fix thread bind channel resolution * Routing: centralize account id normalization * Discord: clean up thread bindings on startup failures * Discord: add startup cleanup regression tests * Docs: add long-term thread-bound subagent architecture * Docs: split session binding plan and dedupe thread-bound doc * Subagents: add channel-agnostic session binding routing * Subagents: stabilize announce completion routing tests * Subagents: cover multi-bound completion routing * Subagents: suppress lifecycle hooks on failed thread bind * tests: fix discord provider mock typing regressions * docs/protocol: sync slash command aliases and delete param models * fix: add changelog entry for Discord thread-bound subagents (#21805) (thanks @onutc) --------- Co-authored-by: Shadow <hi@shadowing.dev>
This commit is contained in:
@@ -295,6 +295,100 @@ export async function sendMessageDiscord(
|
||||
return toDiscordSendResult(result, channelId);
|
||||
}
|
||||
|
||||
type DiscordWebhookSendOpts = {
|
||||
webhookId: string;
|
||||
webhookToken: string;
|
||||
accountId?: string;
|
||||
threadId?: string | number;
|
||||
replyTo?: string;
|
||||
username?: string;
|
||||
avatarUrl?: string;
|
||||
wait?: boolean;
|
||||
};
|
||||
|
||||
function resolveWebhookExecutionUrl(params: {
|
||||
webhookId: string;
|
||||
webhookToken: string;
|
||||
threadId?: string | number;
|
||||
wait?: boolean;
|
||||
}) {
|
||||
const baseUrl = new URL(
|
||||
`https://discord.com/api/v10/webhooks/${encodeURIComponent(params.webhookId)}/${encodeURIComponent(params.webhookToken)}`,
|
||||
);
|
||||
baseUrl.searchParams.set("wait", params.wait === false ? "false" : "true");
|
||||
if (params.threadId !== undefined && params.threadId !== null && params.threadId !== "") {
|
||||
baseUrl.searchParams.set("thread_id", String(params.threadId));
|
||||
}
|
||||
return baseUrl.toString();
|
||||
}
|
||||
|
||||
export async function sendWebhookMessageDiscord(
|
||||
text: string,
|
||||
opts: DiscordWebhookSendOpts,
|
||||
): Promise<DiscordSendResult> {
|
||||
const webhookId = opts.webhookId.trim();
|
||||
const webhookToken = opts.webhookToken.trim();
|
||||
if (!webhookId || !webhookToken) {
|
||||
throw new Error("Discord webhook id/token are required");
|
||||
}
|
||||
|
||||
const replyTo = typeof opts.replyTo === "string" ? opts.replyTo.trim() : "";
|
||||
const messageReference = replyTo ? { message_id: replyTo, fail_if_not_exists: false } : undefined;
|
||||
|
||||
const response = await fetch(
|
||||
resolveWebhookExecutionUrl({
|
||||
webhookId,
|
||||
webhookToken,
|
||||
threadId: opts.threadId,
|
||||
wait: opts.wait,
|
||||
}),
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"content-type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
content: text,
|
||||
username: opts.username?.trim() || undefined,
|
||||
avatar_url: opts.avatarUrl?.trim() || undefined,
|
||||
...(messageReference ? { message_reference: messageReference } : {}),
|
||||
}),
|
||||
},
|
||||
);
|
||||
if (!response.ok) {
|
||||
const raw = await response.text().catch(() => "");
|
||||
throw new Error(
|
||||
`Discord webhook send failed (${response.status}${raw ? `: ${raw.slice(0, 200)}` : ""})`,
|
||||
);
|
||||
}
|
||||
|
||||
const payload = (await response.json().catch(() => ({}))) as {
|
||||
id?: string;
|
||||
channel_id?: string;
|
||||
};
|
||||
try {
|
||||
const account = resolveDiscordAccount({
|
||||
cfg: loadConfig(),
|
||||
accountId: opts.accountId,
|
||||
});
|
||||
recordChannelActivity({
|
||||
channel: "discord",
|
||||
accountId: account.accountId,
|
||||
direction: "outbound",
|
||||
});
|
||||
} catch {
|
||||
// Best-effort telemetry only.
|
||||
}
|
||||
return {
|
||||
messageId: payload.id ? String(payload.id) : "unknown",
|
||||
channelId: payload.channel_id
|
||||
? String(payload.channel_id)
|
||||
: opts.threadId
|
||||
? String(opts.threadId)
|
||||
: "",
|
||||
};
|
||||
}
|
||||
|
||||
export async function sendStickerDiscord(
|
||||
to: string,
|
||||
stickerIds: string[],
|
||||
|
||||
Reference in New Issue
Block a user