* 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>
153 lines
4.7 KiB
TypeScript
153 lines
4.7 KiB
TypeScript
import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
|
|
import {
|
|
autoBindSpawnedDiscordSubagent,
|
|
listThreadBindingsBySessionKey,
|
|
resolveDiscordAccount,
|
|
unbindThreadBindingsBySessionKey,
|
|
} from "openclaw/plugin-sdk";
|
|
|
|
function summarizeError(err: unknown): string {
|
|
if (err instanceof Error) {
|
|
return err.message;
|
|
}
|
|
if (typeof err === "string") {
|
|
return err;
|
|
}
|
|
return "error";
|
|
}
|
|
|
|
export function registerDiscordSubagentHooks(api: OpenClawPluginApi) {
|
|
const resolveThreadBindingFlags = (accountId?: string) => {
|
|
const account = resolveDiscordAccount({
|
|
cfg: api.config,
|
|
accountId,
|
|
});
|
|
const baseThreadBindings = api.config.channels?.discord?.threadBindings;
|
|
const accountThreadBindings =
|
|
api.config.channels?.discord?.accounts?.[account.accountId]?.threadBindings;
|
|
return {
|
|
enabled:
|
|
accountThreadBindings?.enabled ??
|
|
baseThreadBindings?.enabled ??
|
|
api.config.session?.threadBindings?.enabled ??
|
|
true,
|
|
spawnSubagentSessions:
|
|
accountThreadBindings?.spawnSubagentSessions ??
|
|
baseThreadBindings?.spawnSubagentSessions ??
|
|
false,
|
|
};
|
|
};
|
|
|
|
api.on("subagent_spawning", async (event) => {
|
|
if (!event.threadRequested) {
|
|
return;
|
|
}
|
|
const channel = event.requester?.channel?.trim().toLowerCase();
|
|
if (channel !== "discord") {
|
|
// Ignore non-Discord channels so channel-specific plugins can handle
|
|
// their own thread/session provisioning without Discord blocking them.
|
|
return;
|
|
}
|
|
const threadBindingFlags = resolveThreadBindingFlags(event.requester?.accountId);
|
|
if (!threadBindingFlags.enabled) {
|
|
return {
|
|
status: "error" as const,
|
|
error:
|
|
"Discord thread bindings are disabled (set channels.discord.threadBindings.enabled=true to override for this account, or session.threadBindings.enabled=true globally).",
|
|
};
|
|
}
|
|
if (!threadBindingFlags.spawnSubagentSessions) {
|
|
return {
|
|
status: "error" as const,
|
|
error:
|
|
"Discord thread-bound subagent spawns are disabled for this account (set channels.discord.threadBindings.spawnSubagentSessions=true to enable).",
|
|
};
|
|
}
|
|
try {
|
|
const binding = await autoBindSpawnedDiscordSubagent({
|
|
accountId: event.requester?.accountId,
|
|
channel: event.requester?.channel,
|
|
to: event.requester?.to,
|
|
threadId: event.requester?.threadId,
|
|
childSessionKey: event.childSessionKey,
|
|
agentId: event.agentId,
|
|
label: event.label,
|
|
boundBy: "system",
|
|
});
|
|
if (!binding) {
|
|
return {
|
|
status: "error" as const,
|
|
error:
|
|
"Unable to create or bind a Discord thread for this subagent session. Session mode is unavailable for this target.",
|
|
};
|
|
}
|
|
return { status: "ok" as const, threadBindingReady: true };
|
|
} catch (err) {
|
|
return {
|
|
status: "error" as const,
|
|
error: `Discord thread bind failed: ${summarizeError(err)}`,
|
|
};
|
|
}
|
|
});
|
|
|
|
api.on("subagent_ended", (event) => {
|
|
unbindThreadBindingsBySessionKey({
|
|
targetSessionKey: event.targetSessionKey,
|
|
accountId: event.accountId,
|
|
targetKind: event.targetKind,
|
|
reason: event.reason,
|
|
sendFarewell: event.sendFarewell,
|
|
});
|
|
});
|
|
|
|
api.on("subagent_delivery_target", (event) => {
|
|
if (!event.expectsCompletionMessage) {
|
|
return;
|
|
}
|
|
const requesterChannel = event.requesterOrigin?.channel?.trim().toLowerCase();
|
|
if (requesterChannel !== "discord") {
|
|
return;
|
|
}
|
|
const requesterAccountId = event.requesterOrigin?.accountId?.trim();
|
|
const requesterThreadId =
|
|
event.requesterOrigin?.threadId != null && event.requesterOrigin.threadId !== ""
|
|
? String(event.requesterOrigin.threadId).trim()
|
|
: "";
|
|
const bindings = listThreadBindingsBySessionKey({
|
|
targetSessionKey: event.childSessionKey,
|
|
...(requesterAccountId ? { accountId: requesterAccountId } : {}),
|
|
targetKind: "subagent",
|
|
});
|
|
if (bindings.length === 0) {
|
|
return;
|
|
}
|
|
|
|
let binding: (typeof bindings)[number] | undefined;
|
|
if (requesterThreadId) {
|
|
binding = bindings.find((entry) => {
|
|
if (entry.threadId !== requesterThreadId) {
|
|
return false;
|
|
}
|
|
if (requesterAccountId && entry.accountId !== requesterAccountId) {
|
|
return false;
|
|
}
|
|
return true;
|
|
});
|
|
}
|
|
if (!binding && bindings.length === 1) {
|
|
binding = bindings[0];
|
|
}
|
|
if (!binding) {
|
|
return;
|
|
}
|
|
return {
|
|
origin: {
|
|
channel: "discord",
|
|
accountId: binding.accountId,
|
|
to: `channel:${binding.threadId}`,
|
|
threadId: binding.threadId,
|
|
},
|
|
};
|
|
});
|
|
}
|