nav/Dirigent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor #22

Merged
hzhang merged 33 commits from refactor into main 2026-04-10 07:49:57 +00:00
Conversation 0 Commits 33 Files Changed 69 +9 -5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 27c968fa69 - Show all commits

4
plugin/core/moderator-discord.ts
View File

@@ -2,7 +2,7 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
type Logger = { info: (m: string) => void; warn: (m: string) => void }; type Logger = { info: (m: string) => void; warn: (m: string) => void };
function userIdFromToken(token: string): string | undefined { export function userIdFromBotToken(token: string): string | undefined {
try { try {
const segment = token.split(".")[0]; const segment = token.split(".")[0];
const padded = segment + "=".repeat((4 - (segment.length % 4)) % 4); const padded = segment + "=".repeat((4 - (segment.length % 4)) % 4);
@@ -19,7 +19,7 @@ export function resolveDiscordUserId(api: OpenClawPluginApi, accountId: string):
const accounts = (discord.accounts as Record<string, Record<string, unknown>>) || {}; const accounts = (discord.accounts as Record<string, Record<string, unknown>>) || {};
const acct = accounts[accountId]; const acct = accounts[accountId];
if (!acct?.token || typeof acct.token !== "string") return undefined; if (!acct?.token || typeof acct.token !== "string") return undefined;
return userIdFromToken(acct.token); return userIdFromBotToken(acct.token);
} }
export type ModeratorMessageResult = export type ModeratorMessageResult =

10
plugin/hooks/message-received.ts
View File

@@ -3,7 +3,7 @@ import type { ChannelStore } from "../core/channel-store.js";
import type { IdentityRegistry } from "../core/identity-registry.js"; import type { IdentityRegistry } from "../core/identity-registry.js";
import { parseDiscordChannelId } from "./before-model-resolve.js"; import { parseDiscordChannelId } from "./before-model-resolve.js";
import { isDormant, wakeFromDormant, isCurrentSpeaker, hasSpeakers, setSpeakerList, getInitializingChannels, type SpeakerEntry } from "../turn-manager.js"; import { isDormant, wakeFromDormant, isCurrentSpeaker, hasSpeakers, setSpeakerList, getInitializingChannels, type SpeakerEntry } from "../turn-manager.js";
import { sendAndDelete, sendModeratorMessage } from "../core/moderator-discord.js"; import { sendAndDelete, sendModeratorMessage, userIdFromBotToken } from "../core/moderator-discord.js";
import { fetchVisibleChannelBotAccountIds } from "../core/channel-members.js"; import { fetchVisibleChannelBotAccountIds } from "../core/channel-members.js";
import type { InterruptFn } from "./agent-end.js"; import type { InterruptFn } from "./agent-end.js";
@@ -18,6 +18,9 @@ type Deps = {
export function registerMessageReceivedHook(deps: Deps): void { export function registerMessageReceivedHook(deps: Deps): void {
const { api, channelStore, identityRegistry, moderatorBotToken, scheduleIdentifier, interruptTailMatch } = deps; const { api, channelStore, identityRegistry, moderatorBotToken, scheduleIdentifier, interruptTailMatch } = deps;
// Derive the moderator bot's own Discord user ID so we can skip self-messages
// from waking dormant channels (idle reminders must not re-trigger the cycle).
const moderatorBotUserId = moderatorBotToken ? userIdFromBotToken(moderatorBotToken) : undefined;
api.on("message_received", async (event, ctx) => { api.on("message_received", async (event, ctx) => {
try { try {
@@ -125,8 +128,9 @@ export function registerMessageReceivedHook(deps: Deps): void {
interruptTailMatch(channelId); interruptTailMatch(channelId);
api.logger.info(`dirigent: message_received interrupt tail-match channel=${channelId} senderId=${senderId}`); api.logger.info(`dirigent: message_received interrupt tail-match channel=${channelId} senderId=${senderId}`);
// Wake from dormant if needed // Wake from dormant if needed — but ignore the moderator bot's own messages
if (isDormant(channelId) && moderatorBotToken) { // (e.g. idle reminder) to prevent it from immediately re-waking the channel.
if (isDormant(channelId) && moderatorBotToken && senderId !== moderatorBotUserId) {
const first = wakeFromDormant(channelId); const first = wakeFromDormant(channelId);
if (first) { if (first) {
const msg = `<@${first.discordUserId}>${scheduleIdentifier}`; const msg = `<@${first.discordUserId}>${scheduleIdentifier}`;