@nordbyte/nordrelay 0.8.1 → 0.8.3

package/dist/{discord-bot.js → channels/discord/discord-bot.js}

@@ -1,46 +1,48 @@
 import { randomUUID } from "node:crypto";
 import { Client, Events, GatewayIntentBits, Partials, REST, Routes, } from "discord.js";
-import { ADMIN_GROUP_ID } from "./access-control.js";
-import { agentLabel, agentReasoningLabel, agentReasoningOptions } from "./agent.js";
-import { getAgentActivityLog, getExternalSnapshotForSession } from "./agent-activity.js";
-import { listAgentAdapterDescriptors } from "./agent-adapter.js";
-import { AgentUpdateManager } from "./agent-updates.js";
-import { enabledAgents } from "./agent-factory.js";
-import { collectRecentWorkspaceArtifacts, ensureOutDir, formatArtifactSummary, persistWorkspaceArtifactReport } from "./artifacts.js";
-import { buildFileInstructions, outboxPath, stageFile } from "./attachments.js";
-import { AuditLogStore } from "./audit-log.js";
-import { BotPreferencesStore } from "./bot-preferences.js";
-import { capabilitiesOf, filterActivityEvents, formatLocalDateTime, parseActivityOptions, renderExternalMirrorEvent, renderExternalMirrorStatus, renderPromptFailure, trimLine } from "./bot-rendering.js";
-import { renderAgentUpdateJobAction, renderAgentUpdateJobsAction, renderAgentUpdateLogAction, renderAgentUpdatePickerAction, renderQueueListAction } from "./channel-actions.js";
-import { createSharedChannelCommandDispatcher } from "./channel-command-core.js";
-import { ChannelCommandService } from "./channel-command-service.js";
-import { discordHelpCommandList } from "./channel-command-catalog.js";
-import { createChannelPromptEngine } from "./channel-prompt-engine.js";
-import { runChannelPeerPrompt } from "./channel-peer-prompt.js";
-import { deliverChannelAction } from "./channel-runtime.js";
-import { checkAuthStatus, startLogin as startCodexLogin, startLogout as startCodexLogout } from "./codex-auth.js";
-import { checkClaudeCodeAuthStatus, startClaudeCodeLogin, startClaudeCodeLogout } from "./claude-code-auth.js";
-import { discordContextKey, isDiscordContextKey, parseDiscordContextKey } from "./context-key.js";
+import { ADMIN_GROUP_ID } from "../../access/access-control.js";
+import { agentLabel, agentReasoningLabel, agentReasoningOptions } from "../../agents/shared/agent.js";
+import { getAgentActivityLog, getExternalSnapshotForSession } from "../../agents/shared/agent-activity.js";
+import { hostAgentLoginCommand, hostAgentLogoutCommand } from "../../agents/shared/agent-auth-commands.js";
+import { listAgentAdapterDescriptors } from "../../agents/shared/agent-adapter.js";
+import { AgentUpdateManager } from "../../agents/shared/agent-updates.js";
+import { enabledAgents } from "../../agents/shared/agent-factory.js";
+import { ensureOutDir } from "../../artifacts/artifacts.js";
+import { buildFileInstructions, outboxPath, stageFile } from "../../artifacts/attachments.js";
+import { AuditLogStore } from "../../access/audit-log.js";
+import { BotPreferencesStore } from "../../state/bot-preferences.js";
+import { capabilitiesOf, filterActivityEvents, formatLocalDateTime, parseActivityOptions, renderPromptFailure, trimLine } from "../shared/bot-rendering.js";
+import { renderAgentUpdateJobAction, renderAgentUpdateJobsAction, renderAgentUpdateLogAction, renderAgentUpdatePickerAction, renderQueueListAction } from "../shared/channel-actions.js";
+import { createChannelActivityRecorder, createChannelAuditRecorder, createChannelBusyStore, createChannelPermissionChecker, createChannelQueueStatusController, } from "../shared/channel-bridge-controller.js";
+import { createSharedChannelCommandDispatcher } from "../shared/channel-command-core.js";
+import { ChannelCommandService } from "../shared/channel-command-service.js";
+import { discordHelpCommandList } from "../shared/channel-command-catalog.js";
+import { createChannelPromptEngine } from "../shared/channel-prompt-engine.js";
+import { queueChannelPromptIfBusy } from "../shared/channel-prompt-queue.js";
+import { runChannelPeerPrompt } from "../shared/channel-peer-prompt.js";
+import { deliverChannelAction } from "../shared/channel-runtime.js";
+import { deliverChannelCliArtifacts } from "../shared/channel-cli-artifacts.js";
+import { createChannelExternalMirrorController } from "../shared/channel-external-mirror-controller.js";
+import { monitorChannelExternalContexts } from "../shared/channel-external-monitor.js";
+import { discordContextKey, isDiscordContextKey, parseDiscordContextKey } from "../shared/context-key.js";
 import { DiscordBotChannelRuntime, actionFromDiscordCustomId, discordActionRows, splitDiscordMessage, trimDiscordMessage } from "./discord-channel-runtime.js";
 import { createDiscordArtifactCommandHandler, sendRecentDiscordArtifacts } from "./discord-artifacts.js";
 import { argumentFromDiscordInteraction, discordCommands, isUnauthenticatedDiscordCommandAllowed, parseDiscordMessageCommand, permissionForDiscordAction, requiredPermissionForDiscordCommand } from "./discord-command-surface.js";
 import { discordRateLimiter, getDiscordRateLimitMetrics } from "./discord-rate-limit.js";
-import { friendlyErrorText } from "./error-messages.js";
-import { checkHermesAuthStatus, startHermesLogin, startHermesLogout } from "./hermes-auth.js";
-import { spawnConnectorRestart, spawnSelfUpdate } from "./operations.js";
-import { checkOpenClawAuthStatus } from "./openclaw-auth.js";
-import { RemoteRelayClient } from "./peer-client.js";
-import { checkPiAuthStatus } from "./pi-auth.js";
-import { PromptStore, toPromptEnvelope } from "./prompt-store.js";
-import { RelayArtifactService } from "./relay-artifact-service.js";
-import { configureRedaction, redactText } from "./redaction.js";
-import { renderSessionInfoPlain } from "./session-format.js";
-import { canWriteWithLock, SessionLockStore } from "./session-locks.js";
-import { SessionRegistry } from "./session-registry.js";
-import { transcribeAudio } from "./voice.js";
-import { evaluateWorkspacePolicy, filterAllowedWorkspaces } from "./workspace-policy.js";
-import { UserStore } from "./user-management.js";
-import { WebActivityStore } from "./web-state.js";
+import { friendlyErrorText } from "../../core/error-messages.js";
+import { spawnConnectorRestart, spawnSelfUpdate } from "../../support/operations.js";
+import { RemoteRelayClient } from "../../peers/peer-client.js";
+import { PromptStore, toPromptEnvelope } from "../../state/prompt-store.js";
+import { RelayArtifactService } from "../../runtime/relay-artifact-service.js";
+import { RelayAuthService } from "../../runtime/relay-auth-service.js";
+import { configureRedaction, redactText } from "../../core/redaction.js";
+import { renderSessionInfoPlain } from "../shared/session-format.js";
+import { canWriteWithLock, SessionLockStore } from "../../access/session-locks.js";
+import { SessionRegistry } from "../../state/session-registry.js";
+import { transcribeAudio } from "../../artifacts/voice.js";
+import { evaluateWorkspacePolicy, filterAllowedWorkspaces } from "../../core/workspace-policy.js";
+import { UserStore } from "../../access/user-management.js";
+import { WebActivityStore } from "../../web/web-state.js";
 export { isUnauthenticatedDiscordCommandAllowed, permissionForDiscordAction, requiredPermissionForDiscordCommand } from "./discord-command-surface.js";
 const EDIT_DEBOUNCE_MS = 1500;
 const TYPING_INTERVAL_MS = 4500;
@@ -75,24 +77,23 @@ export function createDiscordBridge(config, registry) {
     const lockStore = new SessionLockStore(config.workspace, config.stateBackend);
     const userStore = new UserStore();
     const artifactService = new RelayArtifactService(config);
+    const authService = new RelayAuthService(config);
     const agentUpdates = new AgentUpdateManager();
     const commandService = new ChannelCommandService(config);
-    const busyStates = new Map();
+    const busyStates = createChannelBusyStore();
     const turnProgress = new Map();
     const draining = new Set();
     const picks = new Map();
     const responseOwners = new Map();
     const externalMirrors = new Map();
-    const queueStatusMessages = new Map();
+    const queueStatusMessages = createChannelQueueStatusController({
+        send: async (_contextKey, context, text) => (await runtime.sendMessage(context, { text, fallbackText: text })).messageId,
+        edit: async (_contextKey, context, messageId, text) => {
+            await runtime.editMessage(context, messageId, { text, fallbackText: text });
+        },
+    });
     let externalMonitor;
-    const getBusyState = (contextKey) => {
-        let state = busyStates.get(contextKey);
-        if (!state) {
-            state = { processing: false, switching: false };
-            busyStates.set(contextKey, state);
-        }
-        return state;
-    };
+    const getBusyState = (contextKey) => busyStates.get(contextKey);
     const actorFor = (request) => ({
         channel: "discord",
         id: request.authUser?.user.id ?? `discord:${request.user.id}`,
@@ -100,27 +101,19 @@ export function createDiscordBridge(config, registry) {
         username: request.authUser?.user.email ?? request.user.username,
         channelUserId: request.user.id,
     });
-    const appendActivity = (request, input) => {
-        activityStore.append({
-            source: "discord",
-            contextKey: request.contextKey,
-            actor: input.actor ?? actorFor(request),
-            workspace: input.workspace ?? config.workspace,
-            threadId: input.threadId ?? null,
-            ...input,
-        });
-    };
-    const audit = (request, input) => {
-        auditLog.append({
-            channelId: "discord",
-            contextKey: input.contextKey ?? request.contextKey,
-            actor: input.actor ?? actorFor(request),
-            actorId: request.authUser?.user.id ?? request.user.id,
-            actorRole: request.authUser?.groups.map((group) => group.name).join(", ") ?? "unauthenticated",
-            ...input,
-        });
-    };
-    const hasPermission = (request, permission) => userStore.hasPermission(request.authUser, permission);
+    const appendActivity = createChannelActivityRecorder({
+        source: "discord",
+        workspace: config.workspace,
+        activityStore,
+        actorFor,
+    });
+    const audit = createChannelAuditRecorder({
+        channelId: "discord",
+        auditLog,
+        actorFor,
+        actorIdFor: (request) => request.user.id,
+    });
+    const hasPermission = createChannelPermissionChecker(userStore);
     const reply = async (request, content, options = {}) => {
         const chunks = splitDiscordMessage(content);
         if (request.interaction) {
@@ -232,7 +225,7 @@ export function createDiscordBridge(config, registry) {
     };
     const commandArtifacts = createDiscordArtifactCommandHandler(artifactDeps);
     const getBusyReason = (contextKey) => {
-        const state = busyStates.get(contextKey);
+        const state = busyStates.peek(contextKey);
         const session = registry.get(contextKey);
         if (state?.processing || state?.switching || session?.isProcessing()) {
             return { busy: true, kind: "connector", state: state ?? getBusyState(contextKey) };
@@ -244,210 +237,7 @@ export function createDiscordBridge(config, registry) {
         return { busy: false, kind: "idle" };
     };
     const updateQueueStatusMessage = async (contextKey, context, text) => {
-        const state = queueStatusMessages.get(contextKey) ?? {};
-        if (state.lastText === text && state.messageId) {
-            return;
-        }
-        if (!state.messageId) {
-            const sent = await runtime.sendMessage(context, { text, fallbackText: text });
-            state.messageId = sent.messageId;
-            state.lastText = text;
-            queueStatusMessages.set(contextKey, state);
-            return;
-        }
-        await runtime.editMessage(context, state.messageId, { text, fallbackText: text });
-        state.lastText = text;
-        queueStatusMessages.set(contextKey, state);
-    };
-    const sendExternalMirrorTyping = async (context, state) => {
-        const now = Date.now();
-        if (state.lastTypingAt && now - state.lastTypingAt < TYPING_INTERVAL_MS) {
-            return;
-        }
-        state.lastTypingAt = now;
-        await runtime.sendTyping(context).catch(() => { });
-    };
-    const sendExternalWorkingNotice = async (context, state, snapshot) => {
-        const turnKey = snapshot.activity.turnId ?? snapshot.activity.startedAt?.toISOString() ?? "unknown";
-        if (state.workingNoticeTurnKey === turnKey) {
-            return;
-        }
-        const prompt = trimLine(snapshot.latestUserMessage ?? "", 250);
-        const text = prompt
-            ? `**Working on** ${prompt}`
-            : `**Working on** external ${snapshot.agentLabel} task...`;
-        await runtime.sendMessage(context, {
-            text,
-            fallbackText: prompt ? `Working on ${prompt}` : `Working on external ${snapshot.agentLabel} task...`,
-        });
-        state.workingNoticeTurnKey = turnKey;
-    };
-    const mirrorExternalSnapshot = async (contextKey, context, session, snapshot) => {
-        const previous = externalMirrors.get(contextKey);
-        let state = previous;
-        if (!state || state.threadId !== snapshot.threadId || state.rolloutPath !== snapshot.sourcePath) {
-            state = {
-                threadId: snapshot.threadId,
-                rolloutPath: snapshot.sourcePath,
-                lastLine: snapshot.lineCount,
-                turnId: snapshot.activity.turnId,
-                startedAt: snapshot.activity.startedAt,
-            };
-            externalMirrors.set(contextKey, state);
-        }
-        const mirrorMode = preferencesStore.get(contextKey).mirrorMode ?? config.discordMirrorMode;
-        if (snapshot.activity.active) {
-            state.turnId = snapshot.activity.turnId;
-            state.startedAt = snapshot.activity.startedAt;
-            const turnKey = snapshot.activity.turnId ?? snapshot.activity.startedAt?.toISOString() ?? "unknown";
-            if (state.activityStartedTurnKey !== turnKey) {
-                const info = session.getInfo();
-                activityStore.append({
-                    source: "cli",
-                    status: "running",
-                    type: "cli_turn_started",
-                    contextKey,
-                    threadId: snapshot.threadId,
-                    workspace: info.workspace,
-                    agentId: info.agentId,
-                    actor: { channel: "cli", label: `${snapshot.agentLabel} CLI` },
-                    prompt: snapshot.latestUserMessage ?? `${snapshot.agentLabel} CLI task`,
-                    detail: `${snapshot.sourceLabel}: ${snapshot.sourcePath}`,
-                });
-                state.activityStartedTurnKey = turnKey;
-                state.activityFinishedTurnKey = undefined;
-                state.activityToolStartLines = [];
-                state.activityToolEndLines = [];
-            }
-            if (mirrorMode !== "off") {
-                await sendExternalMirrorTyping(context, state);
-            }
-            if (mirrorMode === "final") {
-                await sendExternalWorkingNotice(context, state, snapshot);
-                state.lastLine = Math.max(state.lastLine, snapshot.lineCount);
-                return;
-            }
-            if (mirrorMode === "off") {
-                state.lastLine = Math.max(state.lastLine, snapshot.lineCount);
-                return;
-            }
-            const status = renderExternalMirrorStatus(snapshot, promptStore.list(contextKey).length);
-            const statusMessage = { text: status.html, fallbackText: status.plain, parseMode: "html" };
-            const now = Date.now();
-            const canUpdateStatus = !state.latestStatusAt || now - state.latestStatusAt >= config.discordMirrorMinUpdateMs;
-            if (!state.statusMessageId) {
-                const sent = await runtime.sendMessage(context, statusMessage);
-                state.statusMessageId = sent.messageId;
-                state.latestStatusAt = now;
-            }
-            else if (state.latestStatus !== status.plain && canUpdateStatus) {
-                await runtime.editMessage(context, state.statusMessageId, statusMessage);
-                state.latestStatusAt = now;
-            }
-            state.latestStatus = status.plain;
-            if (mirrorMode === "full") {
-                const newEvents = snapshot.events
-                    .filter((event) => event.lineNumber > (state.latestMirroredEventLine ?? state.lastLine))
-                    .filter((event) => event.kind === "tool" || event.kind === "task")
-                    .slice(-4);
-                for (const event of newEvents) {
-                    const rendered = renderExternalMirrorEvent(event);
-                    if (!rendered) {
-                        continue;
-                    }
-                    await deliverChannelAction(runtime, context, rendered);
-                    state.latestMirroredEventLine = event.lineNumber;
-                }
-            }
-            const info = session.getInfo();
-            const loggedStartLines = new Set(state.activityToolStartLines ?? []);
-            const loggedEndLines = new Set(state.activityToolEndLines ?? []);
-            for (const event of snapshot.events.filter((event) => event.lineNumber > state.lastLine && event.kind === "tool")) {
-                if (event.status === "started" && !loggedStartLines.has(event.lineNumber)) {
-                    activityStore.append({
-                        source: "cli",
-                        status: "running",
-                        type: "cli_tool_started",
-                        contextKey,
-                        threadId: snapshot.threadId,
-                        workspace: info.workspace,
-                        agentId: info.agentId,
-                        actor: { channel: "cli", label: `${snapshot.agentLabel} CLI` },
-                        prompt: snapshot.latestUserMessage ?? undefined,
-                        detail: event.toolName ?? "tool",
-                    });
-                    loggedStartLines.add(event.lineNumber);
-                }
-                if ((event.status === "finished" || event.status === "failed") && !loggedEndLines.has(event.lineNumber)) {
-                    activityStore.append({
-                        source: "cli",
-                        status: event.status === "failed" ? "failed" : "completed",
-                        type: event.status === "failed" ? "cli_tool_failed" : "cli_tool_completed",
-                        contextKey,
-                        threadId: snapshot.threadId,
-                        workspace: info.workspace,
-                        agentId: info.agentId,
-                        actor: { channel: "cli", label: `${snapshot.agentLabel} CLI` },
-                        prompt: snapshot.latestUserMessage ?? undefined,
-                        detail: event.toolName ?? "tool",
-                    });
-                    loggedEndLines.add(event.lineNumber);
-                }
-            }
-            state.activityToolStartLines = [...loggedStartLines].slice(-200);
-            state.activityToolEndLines = [...loggedEndLines].slice(-200);
-            state.lastLine = Math.max(state.lastLine, snapshot.lineCount);
-            return;
-        }
-        if (!previous) {
-            state.lastLine = Math.max(state.lastLine, snapshot.lineCount);
-            return;
-        }
-        const terminalEvent = [...snapshot.events].reverse().find((event) => event.kind === "task" && event.status && event.status !== "started");
-        if (terminalEvent) {
-            const turnKey = terminalEvent.turnId ?? snapshot.activity.turnId ?? state.startedAt?.toString() ?? "unknown";
-            if (state.activityFinishedTurnKey !== turnKey) {
-                const info = session.getInfo();
-                const startedAt = state.startedAt instanceof Date ? state.startedAt : state.startedAt ? new Date(state.startedAt) : snapshot.activity.startedAt;
-                activityStore.append({
-                    source: "cli",
-                    status: terminalEvent.status === "aborted" ? "aborted" : terminalEvent.status === "failed" ? "failed" : "completed",
-                    type: "cli_turn_finished",
-                    contextKey,
-                    threadId: snapshot.threadId,
-                    workspace: info.workspace,
-                    agentId: info.agentId,
-                    actor: { channel: "cli", label: `${snapshot.agentLabel} CLI` },
-                    prompt: snapshot.latestUserMessage ?? undefined,
-                    detail: `${snapshot.agentLabel} CLI task ${terminalEvent.status ?? "finished"}.`,
-                    durationMs: startedAt && terminalEvent.timestamp ? Math.max(0, terminalEvent.timestamp.getTime() - startedAt.getTime()) : undefined,
-                });
-                state.activityFinishedTurnKey = turnKey;
-            }
-            if (mirrorMode !== "off") {
-                const doneText = `${snapshot.agentLabel} CLI task ${terminalEvent.status}.`;
-                if (state.statusMessageId) {
-                    await runtime.editMessage(context, state.statusMessageId, { text: doneText, fallbackText: doneText });
-                }
-                else {
-                    await runtime.sendMessage(context, { text: doneText, fallbackText: doneText });
-                }
-            }
-            const finalAgent = snapshot.events.filter((event) => event.kind === "agent" && event.text).at(-1);
-            if (mirrorMode !== "off" && mirrorMode !== "status" && finalAgent?.text && finalAgent.lineNumber !== state.latestAgentLine) {
-                await runtime.sendMessage(context, {
-                    text: `**${snapshot.agentLabel} CLI final answer:**`,
-                    fallbackText: `${snapshot.agentLabel} CLI final answer:`,
-                });
-                for (const chunk of splitDiscordMessage(finalAgent.text)) {
-                    await runtime.sendMessage(context, { text: chunk, fallbackText: chunk });
-                }
-                state.latestAgentLine = finalAgent.lineNumber;
-            }
-            await deliverCliGeneratedArtifacts(contextKey, context, session, state.startedAt, terminalEvent.turnId);
-        }
-        state.workingNoticeTurnKey = undefined;
-        state.lastLine = Math.max(state.lastLine, snapshot.lineCount);
+        await queueStatusMessages.update(contextKey, context, text);
     };
     const ensureActiveThread = async (request, session) => {
         if (!session.hasActiveThread()) {
@@ -455,69 +245,15 @@ export function createDiscordBridge(config, registry) {
             updateSession(request, session);
         }
     };
-    const checkAgentAuthStatus = async (info) => {
-        if (info.agentId === "pi")
-            return checkPiAuthStatus(info.model);
-        if (info.agentId === "hermes")
-            return checkHermesAuthStatus({ baseUrl: config.hermesApiBaseUrl, apiKey: config.hermesApiKey });
-        if (info.agentId === "openclaw")
-            return checkOpenClawAuthStatus({ gatewayUrl: config.openClawGatewayUrl, token: config.openClawGatewayToken, password: config.openClawGatewayPassword });
-        if (info.agentId === "claude-code")
-            return checkClaudeCodeAuthStatus(config.claudeCodeCliPath);
-        return checkAuthStatus(config.codexApiKey);
-    };
-    const checkLoginAuthStatus = async (info) => {
-        if (info.agentId === "hermes")
-            return checkHermesAuthStatus({ baseUrl: config.hermesApiBaseUrl, apiKey: config.hermesApiKey });
-        if (info.agentId === "claude-code")
-            return checkClaudeCodeAuthStatus(config.claudeCodeCliPath);
-        return checkAuthStatus(config.codexApiKey);
-    };
-    const startAgentLogin = (info) => {
-        if (info.agentId === "hermes")
-            return startHermesLogin(config.hermesCliPath);
-        if (info.agentId === "claude-code")
-            return startClaudeCodeLogin(config.claudeCodeCliPath);
-        if (info.agentId === "codex")
-            return startCodexLogin();
-        return Promise.resolve({
-            success: false,
-            message: `${info.agentLabel} login is not managed by NordRelay. Run the agent login flow on the host.`,
-        });
-    };
-    const startAgentLogout = (info) => {
-        if (info.agentId === "hermes")
-            return startHermesLogout(config.hermesCliPath);
-        if (info.agentId === "claude-code")
-            return startClaudeCodeLogout(config.claudeCodeCliPath);
-        if (info.agentId === "codex")
-            return startCodexLogout();
-        return Promise.resolve({
-            success: false,
-            message: `${info.agentLabel} logout is not managed by NordRelay. Run the agent logout flow on the host.`,
-        });
-    };
+    const checkAgentAuthStatus = (info) => authService.check(info);
+    const checkLoginAuthStatus = (info) => authService.check(info);
+    const startAgentLogin = (info) => authService.startLogin(info);
+    const startAgentLogout = (info) => authService.startLogout(info);
     const hostLoginCommand = (info) => {
-        if (info.agentId === "hermes")
-            return `${config.hermesCliPath ?? "hermes"} login --no-browser`;
-        if (info.agentId === "claude-code")
-            return `${config.claudeCodeCliPath ?? "claude"} auth login`;
-        if (info.agentId === "pi")
-            return `${config.piCliPath ?? "pi"} auth login`;
-        if (info.agentId === "openclaw")
-            return `${config.openClawCliPath ?? "openclaw"} login`;
-        return "codex login --device-auth";
+        return hostAgentLoginCommand(config, info);
     };
     const hostLogoutCommand = (info) => {
-        if (info.agentId === "hermes")
-            return `${config.hermesCliPath ?? "hermes"} logout`;
-        if (info.agentId === "claude-code")
-            return `${config.claudeCodeCliPath ?? "claude"} auth logout`;
-        if (info.agentId === "pi")
-            return `${config.piCliPath ?? "pi"} auth logout`;
-        if (info.agentId === "openclaw")
-            return `${config.openClawCliPath ?? "openclaw"} logout`;
-        return "codex logout";
+        return hostAgentLogoutCommand(config, info);
     };
     const denyIfLocked = async (request) => {
         const lock = lockStore.get(request.contextKey);
@@ -569,30 +305,17 @@ export function createDiscordBridge(config, registry) {
         if (!options.fromQueue && await denyIfLocked(request)) {
             return;
         }
-        const busy = getBusyReason(request.contextKey);
-        if (busy.busy) {
-            const item = options.fromQueue && isQueuedPrompt(envelope)
-                ? envelope
-                : promptStore.enqueue(request.contextKey, envelope);
-            const position = promptStore.list(request.contextKey).findIndex((queued) => queued.id === item.id) + 1;
-            const text = busy.kind === "external"
-                ? `Queued prompt ${item.id} at position ${position}. The ${busy.agentLabel} session is still active and is processing a previous task.`
-                : `Queued prompt ${item.id} at position ${position}.`;
-            await reply(request, text, {
-                buttons: [[{ label: "Cancel queued message", action: `discord_queue_cancel:${request.contextKey}:${item.id}` }]],
-            });
-            appendActivity(request, {
-                status: "queued",
-                type: "prompt_queued",
-                prompt: item.description,
-                detail: text,
-            });
-            audit(request, {
-                action: "prompt_queued",
-                status: "ok",
-                promptId: item.id,
-                description: item.description,
-            });
+        if (await queueChannelPromptIfBusy({
+            request,
+            envelope,
+            fromQueue: options.fromQueue,
+            promptStore,
+            busy: getBusyReason(request.contextKey),
+            actionPrefix: "discord",
+            reply,
+            appendActivity,
+            audit,
+        })) {
             return;
         }
         const busyState = getBusyState(request.contextKey);
@@ -745,57 +468,73 @@ export function createDiscordBridge(config, registry) {
         }
     };
     const deliverCliGeneratedArtifacts = async (contextKey, context, session, startedAt, turnId) => {
-        if (!startedAt || !turnId) {
-            return;
-        }
-        const state = externalMirrors.get(contextKey);
-        if (state?.artifactsDeliveredForTurnId === turnId) {
-            return;
-        }
-        const workspace = session.getInfo().workspace;
-        const report = await collectRecentWorkspaceArtifacts(workspace, {
-            since: startedAt,
-            until: new Date(),
-            maxFileSize: config.maxFileSize,
-            limit: 5,
-            ignoreDirs: config.artifactIgnoreDirs,
-            ignoreGlobs: config.artifactIgnoreGlobs,
-        });
-        if (report.artifacts.length === 0 && report.skippedCount === 0 && !report.omittedCount) {
-            if (state)
-                state.artifactsDeliveredForTurnId = turnId;
-            return;
-        }
-        const persisted = await persistWorkspaceArtifactReport(workspace, turnId, report).catch((error) => {
-            console.error("Failed to persist Discord CLI artifact report:", error);
-            return null;
-        });
-        const summary = formatArtifactSummary(report.artifacts, report.skippedCount, report.omittedCount);
-        if (summary) {
-            await runtime.sendMessage(context, { text: summary, fallbackText: summary });
-        }
-        if (config.discordAutoSendArtifacts) {
-            for (const artifact of (persisted?.artifacts ?? report.artifacts).slice(0, 5)) {
-                await runtime.sendFile(context, { localPath: artifact.localPath, name: artifact.name }).catch((error) => {
-                    console.error(`Failed to send Discord CLI artifact ${artifact.name}:`, error);
-                });
-            }
-        }
-        const info = session.getInfo();
-        activityStore.append({
-            source: "cli",
-            status: "info",
-            type: config.discordAutoSendArtifacts ? "artifacts_sent" : "artifacts_detected",
+        await deliverChannelCliArtifacts({
+            config,
             contextKey,
-            threadId: info.threadId,
-            workspace: info.workspace,
-            agentId: info.agentId,
-            actor: { channel: "cli", label: `${info.agentLabel} CLI` },
-            detail: summary,
+            session,
+            startedAt,
+            turnId,
+            state: externalMirrors.get(contextKey),
+            autoSend: config.discordAutoSendArtifacts,
+            sendSummaryWhenAutoSendDisabled: true,
+            logPrefix: "Discord",
+            sendSummary: (summary) => runtime.sendMessage(context, { text: summary, fallbackText: summary }).then(() => { }),
+            sendArtifact: (artifact) => runtime.sendFile(context, { localPath: artifact.localPath, name: artifact.name }).then(() => { }).catch((error) => {
+                console.error(`Failed to send Discord CLI artifact ${artifact.name}:`, error);
+            }),
+            appendActivity: (input) => {
+                activityStore.append(input);
+            },
         });
-        if (state)
-            state.artifactsDeliveredForTurnId = turnId;
     };
+    const externalMirrorController = createChannelExternalMirrorController({
+        config,
+        states: externalMirrors,
+        typingIntervalMs: TYPING_INTERVAL_MS,
+        minUpdateMs: () => config.discordMirrorMinUpdateMs,
+        mirrorMode: (contextKey) => preferencesStore.get(contextKey).mirrorMode ?? config.discordMirrorMode,
+        queueLength: (contextKey) => promptStore.list(contextKey).length,
+        activityActor: (snapshot) => ({ channel: "cli", label: `${snapshot.agentLabel} CLI` }),
+        appendActivity: (input) => {
+            activityStore.append(input);
+        },
+        sendTyping: (_contextKey, context) => runtime.sendTyping(context).catch(() => { }),
+        sendWorkingNotice: async (_contextKey, context, state, snapshot, prompt) => {
+            const turnKey = snapshot.activity.turnId ?? snapshot.activity.startedAt?.toISOString() ?? "unknown";
+            if (state.workingNoticeTurnKey === turnKey) {
+                return;
+            }
+            const text = prompt ? `**Working on** ${prompt}` : `**Working on** external ${snapshot.agentLabel} task...`;
+            await runtime.sendMessage(context, {
+                text,
+                fallbackText: prompt ? `Working on ${prompt}` : `Working on external ${snapshot.agentLabel} task...`,
+            });
+            state.workingNoticeTurnKey = turnKey;
+        },
+        sendStatus: async (_contextKey, context, _state, rendered) => {
+            const sent = await runtime.sendMessage(context, { text: rendered.html, fallbackText: rendered.plain, parseMode: "html" });
+            return sent.messageId;
+        },
+        editStatus: (_contextKey, context, _state, messageId, rendered) => runtime.editMessage(context, messageId, { text: rendered.html, fallbackText: rendered.plain, parseMode: "html" }),
+        sendEvent: (_contextKey, context, _state, rendered) => deliverChannelAction(runtime, context, rendered).then(() => { }),
+        sendDone: (_contextKey, context, state, text) => {
+            if (state.statusMessageId) {
+                return runtime.editMessage(context, state.statusMessageId, { text, fallbackText: text });
+            }
+            return runtime.sendMessage(context, { text, fallbackText: text }).then(() => { });
+        },
+        sendFinalAnswer: async (_contextKey, context, _state, snapshot, text) => {
+            await runtime.sendMessage(context, {
+                text: `**${snapshot.agentLabel} CLI final answer:**`,
+                fallbackText: `${snapshot.agentLabel} CLI final answer:`,
+            });
+            for (const chunk of splitDiscordMessage(text)) {
+                await runtime.sendMessage(context, { text: chunk, fallbackText: chunk });
+            }
+        },
+        deliverArtifacts: (contextKey, context, session, state, turnId) => deliverCliGeneratedArtifacts(contextKey, context, session, state.startedAt, turnId),
+    });
+    const mirrorExternalSnapshot = externalMirrorController.mirror;
     const commandDispatcher = createSharedChannelCommandDispatcher({
         transport: "discord",
         bindings: [
@@ -1644,47 +1383,36 @@ export function createDiscordBridge(config, registry) {
         return id;
     };
     const monitorExternalContexts = async () => {
-        const keys = new Set([
-            ...registry.listContexts().map((context) => context.contextKey),
-            ...promptStore.listContextKeys(),
-        ].filter(isDiscordContextKey));
-        for (const contextKey of keys) {
-            const parsed = parseDiscordContextKey(contextKey);
-            if (!parsed)
-                continue;
-            if (!canSendSystemMessagesToDiscordContext(userStore, contextKey)) {
-                continue;
-            }
-            const guildId = parsed.guildId?.startsWith("dm-") ? undefined : parsed.guildId;
-            if (!isDiscordGuildAllowed(guildId) || !isDiscordChannelAllowedByEnv(parsed.channelId)) {
-                continue;
-            }
-            const session = await registry.getOrCreate(contextKey, { deferThreadStart: true }).catch(() => null);
-            if (!session)
-                continue;
-            const context = {
-                channelId: "discord",
-                chatId: parsed.threadId ?? parsed.channelId,
-                topicId: parsed.threadId,
-            };
-            const snapshot = getExternalSnapshotForSession(session, config, { maxEvents: 1 });
-            const previous = externalMirrors.get(contextKey);
-            const mirrorSnapshot = snapshot
-                ? getExternalSnapshotForSession(session, config, {
-                    afterLine: previous?.lastLine ?? Number.MAX_SAFE_INTEGER,
-                }) ?? snapshot
-                : null;
-            if (mirrorSnapshot && !session.isProcessing()) {
-                await mirrorExternalSnapshot(contextKey, context, session, mirrorSnapshot);
-            }
-            if (mirrorSnapshot?.activity.active) {
-                if (promptStore.list(contextKey).length > 0) {
-                    await updateQueueStatusMessage(contextKey, context, `Waiting for ${mirrorSnapshot.agentLabel} CLI task... ${promptStore.list(contextKey).length} queued${promptStore.isPaused(contextKey) ? " (paused)" : ""}.`).catch(() => { });
-                }
-                continue;
-            }
-            if (promptStore.list(contextKey).length > 0 && !promptStore.isPaused(contextKey) && !session.isProcessing()) {
-                await updateQueueStatusMessage(contextKey, context, `CLI task finished, running queued prompt 1/${promptStore.list(contextKey).length}.`).catch(() => { });
+        await monitorChannelExternalContexts({
+            config,
+            registry,
+            promptStore,
+            isContextKey: isDiscordContextKey,
+            canSendSystemMessages: (contextKey) => canSendSystemMessagesToDiscordContext(userStore, contextKey),
+            isAllowed: (contextKey) => {
+                const parsed = parseDiscordContextKey(contextKey);
+                if (!parsed)
+                    return false;
+                const guildId = parsed.guildId?.startsWith("dm-") ? undefined : parsed.guildId;
+                return isDiscordGuildAllowed(guildId) && isDiscordChannelAllowedByEnv(parsed.channelId);
+            },
+            contextForKey: (contextKey) => {
+                const parsed = parseDiscordContextKey(contextKey);
+                if (!parsed)
+                    return null;
+                return {
+                    channelId: "discord",
+                    chatId: parsed.threadId ?? parsed.channelId,
+                    ...(parsed.threadId ? { topicId: parsed.threadId } : {}),
+                };
+            },
+            previousLastLine: (contextKey) => externalMirrors.get(contextKey)?.lastLine,
+            mirrorSnapshot: mirrorExternalSnapshot,
+            updateQueueStatus: updateQueueStatusMessage,
+            drainQueue: async (contextKey, context) => {
+                const parsed = parseDiscordContextKey(contextKey);
+                if (!parsed)
+                    return;
                 const systemRequest = {
                     contextKey,
                     context,
@@ -1695,8 +1423,8 @@ export function createDiscordBridge(config, registry) {
                     source: "message",
                 };
                 await drainQueue(systemRequest);
-            }
-        }
+            },
+        });
     };
     const registerSlashCommands = async () => {
         if (!config.discordClientId || !config.discordAutoRegisterCommands || config.discordCommandMode === "message" || !config.discordBotToken) {
@@ -1840,6 +1568,3 @@ function inferMimeType(name) {
         return "audio/webm";
     return "application/octet-stream";
 }
-function isQueuedPrompt(value) {
-    return Boolean(value && typeof value === "object" && "id" in value && "contextKey" in value);
-}