* feat(discord): add exec approval forwarding to DMs Add support for forwarding exec approval requests to Discord DMs, allowing users to approve/deny command execution via interactive buttons. Features: - New DiscordExecApprovalHandler that connects to gateway and listens for exec.approval.requested/resolved events - Sends DMs with embeds showing command details and 3 buttons: Allow once, Always allow, Deny - Configurable via channels.discord.execApprovals with: - enabled: boolean - approvers: Discord user IDs to notify - agentFilter: only forward for specific agents - sessionFilter: only forward for matching session patterns - Updates message embed when approval is resolved or expires Also fixes exec completion routing: when async exec completes after approval, the heartbeat now uses a specialized prompt to ensure the model relays the result to the user instead of responding HEARTBEAT_OK. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat: generic exec approvals forwarding (#1621) (thanks @czekaj) --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: Peter Steinberger <steipete@gmail.com>
129 lines
4.4 KiB
TypeScript
129 lines
4.4 KiB
TypeScript
import { logVerbose } from "../../globals.js";
|
|
import { resolveSendPolicy } from "../../sessions/send-policy.js";
|
|
import { shouldHandleTextCommands } from "../commands-registry.js";
|
|
import { createInternalHookEvent, triggerInternalHook } from "../../hooks/internal-hooks.js";
|
|
import { routeReply } from "./route-reply.js";
|
|
import { handleBashCommand } from "./commands-bash.js";
|
|
import { handleCompactCommand } from "./commands-compact.js";
|
|
import { handleConfigCommand, handleDebugCommand } from "./commands-config.js";
|
|
import {
|
|
handleCommandsListCommand,
|
|
handleContextCommand,
|
|
handleHelpCommand,
|
|
handleStatusCommand,
|
|
handleWhoamiCommand,
|
|
} from "./commands-info.js";
|
|
import { handleAllowlistCommand } from "./commands-allowlist.js";
|
|
import { handleApproveCommand } from "./commands-approve.js";
|
|
import { handleSubagentsCommand } from "./commands-subagents.js";
|
|
import { handleModelsCommand } from "./commands-models.js";
|
|
import { handleTtsCommands } from "./commands-tts.js";
|
|
import {
|
|
handleAbortTrigger,
|
|
handleActivationCommand,
|
|
handleRestartCommand,
|
|
handleSendPolicyCommand,
|
|
handleStopCommand,
|
|
handleUsageCommand,
|
|
} from "./commands-session.js";
|
|
import { handlePluginCommand } from "./commands-plugin.js";
|
|
import type {
|
|
CommandHandler,
|
|
CommandHandlerResult,
|
|
HandleCommandsParams,
|
|
} from "./commands-types.js";
|
|
|
|
const HANDLERS: CommandHandler[] = [
|
|
// Plugin commands are processed first, before built-in commands
|
|
handlePluginCommand,
|
|
handleBashCommand,
|
|
handleActivationCommand,
|
|
handleSendPolicyCommand,
|
|
handleUsageCommand,
|
|
handleRestartCommand,
|
|
handleTtsCommands,
|
|
handleHelpCommand,
|
|
handleCommandsListCommand,
|
|
handleStatusCommand,
|
|
handleAllowlistCommand,
|
|
handleApproveCommand,
|
|
handleContextCommand,
|
|
handleWhoamiCommand,
|
|
handleSubagentsCommand,
|
|
handleConfigCommand,
|
|
handleDebugCommand,
|
|
handleModelsCommand,
|
|
handleStopCommand,
|
|
handleCompactCommand,
|
|
handleAbortTrigger,
|
|
];
|
|
|
|
export async function handleCommands(params: HandleCommandsParams): Promise<CommandHandlerResult> {
|
|
const resetMatch = params.command.commandBodyNormalized.match(/^\/(new|reset)(?:\s|$)/);
|
|
const resetRequested = Boolean(resetMatch);
|
|
if (resetRequested && !params.command.isAuthorizedSender) {
|
|
logVerbose(
|
|
`Ignoring /reset from unauthorized sender: ${params.command.senderId || "<unknown>"}`,
|
|
);
|
|
return { shouldContinue: false };
|
|
}
|
|
|
|
// Trigger internal hook for reset/new commands
|
|
if (resetRequested && params.command.isAuthorizedSender) {
|
|
const commandAction = resetMatch?.[1] ?? "new";
|
|
const hookEvent = createInternalHookEvent("command", commandAction, params.sessionKey ?? "", {
|
|
sessionEntry: params.sessionEntry,
|
|
previousSessionEntry: params.previousSessionEntry,
|
|
commandSource: params.command.surface,
|
|
senderId: params.command.senderId,
|
|
cfg: params.cfg, // Pass config for LLM slug generation
|
|
});
|
|
await triggerInternalHook(hookEvent);
|
|
|
|
// Send hook messages immediately if present
|
|
if (hookEvent.messages.length > 0) {
|
|
// Use OriginatingChannel/To if available, otherwise fall back to command channel/from
|
|
const channel = params.ctx.OriginatingChannel || (params.command.channel as any);
|
|
// For replies, use 'from' (the sender) not 'to' (which might be the bot itself)
|
|
const to = params.ctx.OriginatingTo || params.command.from || params.command.to;
|
|
|
|
if (channel && to) {
|
|
const hookReply = { text: hookEvent.messages.join("\n\n") };
|
|
await routeReply({
|
|
payload: hookReply,
|
|
channel: channel,
|
|
to: to,
|
|
sessionKey: params.sessionKey,
|
|
accountId: params.ctx.AccountId,
|
|
threadId: params.ctx.MessageThreadId,
|
|
cfg: params.cfg,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
const allowTextCommands = shouldHandleTextCommands({
|
|
cfg: params.cfg,
|
|
surface: params.command.surface,
|
|
commandSource: params.ctx.CommandSource,
|
|
});
|
|
|
|
for (const handler of HANDLERS) {
|
|
const result = await handler(params, allowTextCommands);
|
|
if (result) return result;
|
|
}
|
|
|
|
const sendPolicy = resolveSendPolicy({
|
|
cfg: params.cfg,
|
|
entry: params.sessionEntry,
|
|
sessionKey: params.sessionKey,
|
|
channel: params.sessionEntry?.channel ?? params.command.channel,
|
|
chatType: params.sessionEntry?.chatType,
|
|
});
|
|
if (sendPolicy === "deny") {
|
|
logVerbose(`Send blocked by policy for session ${params.sessionKey ?? "unknown"}`);
|
|
return { shouldContinue: false };
|
|
}
|
|
|
|
return { shouldContinue: true };
|
|
}
|