* 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>
290 lines
8.1 KiB
TypeScript
290 lines
8.1 KiB
TypeScript
import { ChannelType, Routes } from "discord-api-types/v10";
|
|
import { logVerbose } from "../../globals.js";
|
|
import { createDiscordRestClient } from "../client.js";
|
|
import { sendMessageDiscord, sendWebhookMessageDiscord } from "../send.js";
|
|
import { createThreadDiscord } from "../send.messages.js";
|
|
import { summarizeBindingPersona } from "./thread-bindings.messages.js";
|
|
import {
|
|
BINDINGS_BY_THREAD_ID,
|
|
REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL,
|
|
rememberReusableWebhook,
|
|
toReusableWebhookKey,
|
|
} from "./thread-bindings.state.js";
|
|
import {
|
|
DISCORD_UNKNOWN_CHANNEL_ERROR_CODE,
|
|
type ThreadBindingRecord,
|
|
} from "./thread-bindings.types.js";
|
|
|
|
function buildThreadTarget(threadId: string): string {
|
|
return `channel:${threadId}`;
|
|
}
|
|
|
|
export function isThreadArchived(raw: unknown): boolean {
|
|
if (!raw || typeof raw !== "object") {
|
|
return false;
|
|
}
|
|
const asRecord = raw as {
|
|
archived?: unknown;
|
|
thread_metadata?: { archived?: unknown };
|
|
threadMetadata?: { archived?: unknown };
|
|
};
|
|
if (asRecord.archived === true) {
|
|
return true;
|
|
}
|
|
if (asRecord.thread_metadata?.archived === true) {
|
|
return true;
|
|
}
|
|
if (asRecord.threadMetadata?.archived === true) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function isThreadChannelType(type: unknown): boolean {
|
|
return (
|
|
type === ChannelType.PublicThread ||
|
|
type === ChannelType.PrivateThread ||
|
|
type === ChannelType.AnnouncementThread
|
|
);
|
|
}
|
|
|
|
export function summarizeDiscordError(err: unknown): string {
|
|
if (err instanceof Error) {
|
|
return err.message;
|
|
}
|
|
if (typeof err === "string") {
|
|
return err;
|
|
}
|
|
if (
|
|
typeof err === "number" ||
|
|
typeof err === "boolean" ||
|
|
typeof err === "bigint" ||
|
|
typeof err === "symbol"
|
|
) {
|
|
return String(err);
|
|
}
|
|
return "error";
|
|
}
|
|
|
|
function extractNumericDiscordErrorValue(value: unknown): number | undefined {
|
|
if (typeof value === "number" && Number.isFinite(value)) {
|
|
return Math.trunc(value);
|
|
}
|
|
if (typeof value === "string" && /^\d+$/.test(value.trim())) {
|
|
return Number(value);
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
function extractDiscordErrorStatus(err: unknown): number | undefined {
|
|
if (!err || typeof err !== "object") {
|
|
return undefined;
|
|
}
|
|
const candidate = err as {
|
|
status?: unknown;
|
|
statusCode?: unknown;
|
|
response?: { status?: unknown };
|
|
};
|
|
return (
|
|
extractNumericDiscordErrorValue(candidate.status) ??
|
|
extractNumericDiscordErrorValue(candidate.statusCode) ??
|
|
extractNumericDiscordErrorValue(candidate.response?.status)
|
|
);
|
|
}
|
|
|
|
function extractDiscordErrorCode(err: unknown): number | undefined {
|
|
if (!err || typeof err !== "object") {
|
|
return undefined;
|
|
}
|
|
const candidate = err as {
|
|
code?: unknown;
|
|
rawError?: { code?: unknown };
|
|
body?: { code?: unknown };
|
|
response?: { body?: { code?: unknown }; data?: { code?: unknown } };
|
|
};
|
|
return (
|
|
extractNumericDiscordErrorValue(candidate.code) ??
|
|
extractNumericDiscordErrorValue(candidate.rawError?.code) ??
|
|
extractNumericDiscordErrorValue(candidate.body?.code) ??
|
|
extractNumericDiscordErrorValue(candidate.response?.body?.code) ??
|
|
extractNumericDiscordErrorValue(candidate.response?.data?.code)
|
|
);
|
|
}
|
|
|
|
export function isDiscordThreadGoneError(err: unknown): boolean {
|
|
const code = extractDiscordErrorCode(err);
|
|
if (code === DISCORD_UNKNOWN_CHANNEL_ERROR_CODE) {
|
|
return true;
|
|
}
|
|
const status = extractDiscordErrorStatus(err);
|
|
// 404: deleted/unknown channel. 403: bot no longer has access.
|
|
return status === 404 || status === 403;
|
|
}
|
|
|
|
export async function maybeSendBindingMessage(params: {
|
|
record: ThreadBindingRecord;
|
|
text: string;
|
|
preferWebhook?: boolean;
|
|
}) {
|
|
const text = params.text.trim();
|
|
if (!text) {
|
|
return;
|
|
}
|
|
const record = params.record;
|
|
if (params.preferWebhook !== false && record.webhookId && record.webhookToken) {
|
|
try {
|
|
await sendWebhookMessageDiscord(text, {
|
|
webhookId: record.webhookId,
|
|
webhookToken: record.webhookToken,
|
|
accountId: record.accountId,
|
|
threadId: record.threadId,
|
|
username: summarizeBindingPersona(record),
|
|
});
|
|
return;
|
|
} catch (err) {
|
|
logVerbose(`discord thread binding webhook send failed: ${summarizeDiscordError(err)}`);
|
|
}
|
|
}
|
|
try {
|
|
await sendMessageDiscord(buildThreadTarget(record.threadId), text, {
|
|
accountId: record.accountId,
|
|
});
|
|
} catch (err) {
|
|
logVerbose(`discord thread binding fallback send failed: ${summarizeDiscordError(err)}`);
|
|
}
|
|
}
|
|
|
|
export async function createWebhookForChannel(params: {
|
|
accountId: string;
|
|
token?: string;
|
|
channelId: string;
|
|
}): Promise<{ webhookId?: string; webhookToken?: string }> {
|
|
try {
|
|
const rest = createDiscordRestClient({
|
|
accountId: params.accountId,
|
|
token: params.token,
|
|
}).rest;
|
|
const created = (await rest.post(Routes.channelWebhooks(params.channelId), {
|
|
body: {
|
|
name: "OpenClaw Agents",
|
|
},
|
|
})) as { id?: string; token?: string };
|
|
const webhookId = typeof created?.id === "string" ? created.id.trim() : "";
|
|
const webhookToken = typeof created?.token === "string" ? created.token.trim() : "";
|
|
if (!webhookId || !webhookToken) {
|
|
return {};
|
|
}
|
|
return { webhookId, webhookToken };
|
|
} catch (err) {
|
|
logVerbose(
|
|
`discord thread binding webhook create failed for ${params.channelId}: ${summarizeDiscordError(err)}`,
|
|
);
|
|
return {};
|
|
}
|
|
}
|
|
|
|
export function findReusableWebhook(params: { accountId: string; channelId: string }): {
|
|
webhookId?: string;
|
|
webhookToken?: string;
|
|
} {
|
|
const reusableKey = toReusableWebhookKey({
|
|
accountId: params.accountId,
|
|
channelId: params.channelId,
|
|
});
|
|
const cached = REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL.get(reusableKey);
|
|
if (cached) {
|
|
return {
|
|
webhookId: cached.webhookId,
|
|
webhookToken: cached.webhookToken,
|
|
};
|
|
}
|
|
for (const record of BINDINGS_BY_THREAD_ID.values()) {
|
|
if (record.accountId !== params.accountId) {
|
|
continue;
|
|
}
|
|
if (record.channelId !== params.channelId) {
|
|
continue;
|
|
}
|
|
if (!record.webhookId || !record.webhookToken) {
|
|
continue;
|
|
}
|
|
rememberReusableWebhook(record);
|
|
return {
|
|
webhookId: record.webhookId,
|
|
webhookToken: record.webhookToken,
|
|
};
|
|
}
|
|
return {};
|
|
}
|
|
|
|
export async function resolveChannelIdForBinding(params: {
|
|
accountId: string;
|
|
token?: string;
|
|
threadId: string;
|
|
channelId?: string;
|
|
}): Promise<string | null> {
|
|
const explicit = params.channelId?.trim();
|
|
if (explicit) {
|
|
return explicit;
|
|
}
|
|
try {
|
|
const rest = createDiscordRestClient({
|
|
accountId: params.accountId,
|
|
token: params.token,
|
|
}).rest;
|
|
const channel = (await rest.get(Routes.channel(params.threadId))) as {
|
|
id?: string;
|
|
type?: number;
|
|
parent_id?: string;
|
|
parentId?: string;
|
|
};
|
|
const channelId = typeof channel?.id === "string" ? channel.id.trim() : "";
|
|
const type = channel?.type;
|
|
const parentId =
|
|
typeof channel?.parent_id === "string"
|
|
? channel.parent_id.trim()
|
|
: typeof channel?.parentId === "string"
|
|
? channel.parentId.trim()
|
|
: "";
|
|
// Only thread channels should resolve to their parent channel.
|
|
// Non-thread channels (text/forum/media) must keep their own ID.
|
|
if (parentId && isThreadChannelType(type)) {
|
|
return parentId;
|
|
}
|
|
return channelId || null;
|
|
} catch (err) {
|
|
logVerbose(
|
|
`discord thread binding channel resolve failed for ${params.threadId}: ${summarizeDiscordError(err)}`,
|
|
);
|
|
return null;
|
|
}
|
|
}
|
|
|
|
export async function createThreadForBinding(params: {
|
|
accountId: string;
|
|
token?: string;
|
|
channelId: string;
|
|
threadName: string;
|
|
}): Promise<string | null> {
|
|
try {
|
|
const created = await createThreadDiscord(
|
|
params.channelId,
|
|
{
|
|
name: params.threadName,
|
|
autoArchiveMinutes: 60,
|
|
},
|
|
{
|
|
accountId: params.accountId,
|
|
token: params.token,
|
|
},
|
|
);
|
|
const createdId = typeof created?.id === "string" ? created.id.trim() : "";
|
|
return createdId || null;
|
|
} catch (err) {
|
|
logVerbose(
|
|
`discord thread binding auto-thread create failed for ${params.channelId}: ${summarizeDiscordError(err)}`,
|
|
);
|
|
return null;
|
|
}
|
|
}
|