* 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>
133 lines
4.1 KiB
TypeScript
133 lines
4.1 KiB
TypeScript
import type { Client } from "@buape/carbon";
|
|
import type { GatewayPlugin } from "@buape/carbon/gateway";
|
|
import { danger } from "../../globals.js";
|
|
import type { RuntimeEnv } from "../../runtime.js";
|
|
import { attachDiscordGatewayLogging } from "../gateway-logging.js";
|
|
import { getDiscordGatewayEmitter, waitForDiscordGatewayStop } from "../monitor.gateway.js";
|
|
import type { DiscordVoiceManager } from "../voice/manager.js";
|
|
import { registerGateway, unregisterGateway } from "./gateway-registry.js";
|
|
|
|
type ExecApprovalsHandler = {
|
|
start: () => Promise<void>;
|
|
stop: () => Promise<void>;
|
|
};
|
|
|
|
export async function runDiscordGatewayLifecycle(params: {
|
|
accountId: string;
|
|
client: Client;
|
|
runtime: RuntimeEnv;
|
|
abortSignal?: AbortSignal;
|
|
isDisallowedIntentsError: (err: unknown) => boolean;
|
|
voiceManager: DiscordVoiceManager | null;
|
|
voiceManagerRef: { current: DiscordVoiceManager | null };
|
|
execApprovalsHandler: ExecApprovalsHandler | null;
|
|
threadBindings: { stop: () => void };
|
|
}) {
|
|
const gateway = params.client.getPlugin<GatewayPlugin>("gateway");
|
|
if (gateway) {
|
|
registerGateway(params.accountId, gateway);
|
|
}
|
|
const gatewayEmitter = getDiscordGatewayEmitter(gateway);
|
|
const stopGatewayLogging = attachDiscordGatewayLogging({
|
|
emitter: gatewayEmitter,
|
|
runtime: params.runtime,
|
|
});
|
|
|
|
const onAbort = () => {
|
|
if (!gateway) {
|
|
return;
|
|
}
|
|
gatewayEmitter?.once("error", () => {});
|
|
gateway.options.reconnect = { maxAttempts: 0 };
|
|
gateway.disconnect();
|
|
};
|
|
|
|
if (params.abortSignal?.aborted) {
|
|
onAbort();
|
|
} else {
|
|
params.abortSignal?.addEventListener("abort", onAbort, { once: true });
|
|
}
|
|
|
|
const HELLO_TIMEOUT_MS = 30000;
|
|
let helloTimeoutId: ReturnType<typeof setTimeout> | undefined;
|
|
const onGatewayDebug = (msg: unknown) => {
|
|
const message = String(msg);
|
|
if (!message.includes("WebSocket connection opened")) {
|
|
return;
|
|
}
|
|
if (helloTimeoutId) {
|
|
clearTimeout(helloTimeoutId);
|
|
}
|
|
helloTimeoutId = setTimeout(() => {
|
|
if (!gateway?.isConnected) {
|
|
params.runtime.log?.(
|
|
danger(
|
|
`connection stalled: no HELLO received within ${HELLO_TIMEOUT_MS}ms, forcing reconnect`,
|
|
),
|
|
);
|
|
gateway?.disconnect();
|
|
gateway?.connect(false);
|
|
}
|
|
helloTimeoutId = undefined;
|
|
}, HELLO_TIMEOUT_MS);
|
|
};
|
|
gatewayEmitter?.on("debug", onGatewayDebug);
|
|
|
|
let sawDisallowedIntents = false;
|
|
try {
|
|
if (params.execApprovalsHandler) {
|
|
await params.execApprovalsHandler.start();
|
|
}
|
|
|
|
await waitForDiscordGatewayStop({
|
|
gateway: gateway
|
|
? {
|
|
emitter: gatewayEmitter,
|
|
disconnect: () => gateway.disconnect(),
|
|
}
|
|
: undefined,
|
|
abortSignal: params.abortSignal,
|
|
onGatewayError: (err) => {
|
|
if (params.isDisallowedIntentsError(err)) {
|
|
sawDisallowedIntents = true;
|
|
params.runtime.error?.(
|
|
danger(
|
|
"discord: gateway closed with code 4014 (missing privileged gateway intents). Enable the required intents in the Discord Developer Portal or disable them in config.",
|
|
),
|
|
);
|
|
return;
|
|
}
|
|
params.runtime.error?.(danger(`discord gateway error: ${String(err)}`));
|
|
},
|
|
shouldStopOnError: (err) => {
|
|
const message = String(err);
|
|
return (
|
|
message.includes("Max reconnect attempts") ||
|
|
message.includes("Fatal Gateway error") ||
|
|
params.isDisallowedIntentsError(err)
|
|
);
|
|
},
|
|
});
|
|
} catch (err) {
|
|
if (!sawDisallowedIntents && !params.isDisallowedIntentsError(err)) {
|
|
throw err;
|
|
}
|
|
} finally {
|
|
unregisterGateway(params.accountId);
|
|
stopGatewayLogging();
|
|
if (helloTimeoutId) {
|
|
clearTimeout(helloTimeoutId);
|
|
}
|
|
gatewayEmitter?.removeListener("debug", onGatewayDebug);
|
|
params.abortSignal?.removeEventListener("abort", onAbort);
|
|
if (params.voiceManager) {
|
|
await params.voiceManager.destroy();
|
|
params.voiceManagerRef.current = null;
|
|
}
|
|
if (params.execApprovalsHandler) {
|
|
await params.execApprovalsHandler.stop();
|
|
}
|
|
params.threadBindings.stop();
|
|
}
|
|
}
|