refactor: unify threading contexts

This commit is contained in:
Peter Steinberger
2026-01-21 20:01:12 +00:00
parent 76600e80ba
commit 45c1ccdfcf
15 changed files with 452 additions and 481 deletions

View File

@@ -3,137 +3,23 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { HISTORY_CONTEXT_MARKER } from "../auto-reply/reply/history.js";
import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
import { CURRENT_MESSAGE_MARKER } from "../auto-reply/reply/mentions.js";
import {
defaultSlackTestConfig,
flush,
getSlackTestState,
getSlackClient,
getSlackHandlers,
resetSlackTestState,
waitForSlackEvent,
} from "./monitor.test-helpers.js";
import { monitorSlackProvider } from "./monitor.js";
const sendMock = vi.fn();
const replyMock = vi.fn();
const updateLastRouteMock = vi.fn();
const reactMock = vi.fn();
let config: Record<string, unknown> = {};
const readAllowFromStoreMock = vi.fn();
const upsertPairingRequestMock = vi.fn();
const getSlackHandlers = () =>
(
globalThis as {
__slackHandlers?: Map<string, (args: unknown) => Promise<void>>;
}
).__slackHandlers;
const getSlackClient = () =>
(globalThis as { __slackClient?: Record<string, unknown> }).__slackClient;
vi.mock("../config/config.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../config/config.js")>();
return {
...actual,
loadConfig: () => config,
};
});
vi.mock("../auto-reply/reply.js", () => ({
getReplyFromConfig: (...args: unknown[]) => replyMock(...args),
}));
vi.mock("./resolve-channels.js", () => ({
resolveSlackChannelAllowlist: async ({ entries }: { entries: string[] }) =>
entries.map((input) => ({ input, resolved: false })),
}));
vi.mock("./resolve-users.js", () => ({
resolveSlackUserAllowlist: async ({ entries }: { entries: string[] }) =>
entries.map((input) => ({ input, resolved: false })),
}));
vi.mock("./send.js", () => ({
sendMessageSlack: (...args: unknown[]) => sendMock(...args),
}));
vi.mock("../pairing/pairing-store.js", () => ({
readChannelAllowFromStore: (...args: unknown[]) => readAllowFromStoreMock(...args),
upsertChannelPairingRequest: (...args: unknown[]) => upsertPairingRequestMock(...args),
}));
vi.mock("../config/sessions.js", () => ({
resolveStorePath: vi.fn(() => "/tmp/clawdbot-sessions.json"),
updateLastRoute: (...args: unknown[]) => updateLastRouteMock(...args),
resolveSessionKey: vi.fn(),
readSessionUpdatedAt: vi.fn(() => undefined),
recordSessionMetaFromInbound: vi.fn().mockResolvedValue(undefined),
}));
vi.mock("@slack/bolt", () => {
const handlers = new Map<string, (args: unknown) => Promise<void>>();
(globalThis as { __slackHandlers?: typeof handlers }).__slackHandlers = handlers;
const client = {
auth: { test: vi.fn().mockResolvedValue({ user_id: "bot-user" }) },
conversations: {
info: vi.fn().mockResolvedValue({
channel: { name: "dm", is_im: true },
}),
replies: vi.fn().mockResolvedValue({ messages: [] }),
},
users: {
info: vi.fn().mockResolvedValue({
user: { profile: { display_name: "Ada" } },
}),
},
assistant: {
threads: {
setStatus: vi.fn().mockResolvedValue({ ok: true }),
},
},
reactions: {
add: (...args: unknown[]) => reactMock(...args),
},
};
(globalThis as { __slackClient?: typeof client }).__slackClient = client;
class App {
client = client;
event(name: string, handler: (args: unknown) => Promise<void>) {
handlers.set(name, handler);
}
command() {
/* no-op */
}
start = vi.fn().mockResolvedValue(undefined);
stop = vi.fn().mockResolvedValue(undefined);
}
class HTTPReceiver {
requestListener = vi.fn();
}
return { App, HTTPReceiver, default: { App, HTTPReceiver } };
});
const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
async function waitForEvent(name: string) {
for (let i = 0; i < 10; i += 1) {
if (getSlackHandlers()?.has(name)) return;
await flush();
}
}
const slackTestState = getSlackTestState();
const { sendMock, replyMock } = slackTestState;
beforeEach(() => {
resetInboundDedupe();
getSlackHandlers()?.clear();
config = {
messages: {
responsePrefix: "PFX",
ackReaction: "👀",
ackReactionScope: "group-mentions",
},
channels: {
slack: {
dm: { enabled: true, policy: "open", allowFrom: ["*"] },
groupPolicy: "open",
},
},
};
sendMock.mockReset().mockResolvedValue(undefined);
replyMock.mockReset();
updateLastRouteMock.mockReset();
reactMock.mockReset();
readAllowFromStoreMock.mockReset().mockResolvedValue([]);
upsertPairingRequestMock.mockReset().mockResolvedValue({ code: "PAIRCODE", created: true });
resetSlackTestState(defaultSlackTestConfig());
});
describe("monitorSlackProvider tool results", () => {
@@ -150,7 +36,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -190,7 +76,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -215,7 +101,7 @@ describe("monitorSlackProvider tool results", () => {
});
it("does not derive responsePrefix from routed agent identity when unset", async () => {
config = {
slackTestState.config = {
agents: {
list: [
{
@@ -256,7 +142,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -281,7 +167,7 @@ describe("monitorSlackProvider tool results", () => {
});
it("preserves RawBody without injecting processed room history", async () => {
config = {
slackTestState.config = {
messages: { ackReactionScope: "group-mentions" },
channels: {
slack: {
@@ -305,7 +191,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -344,7 +230,7 @@ describe("monitorSlackProvider tool results", () => {
});
it("scopes thread history to the thread by default", async () => {
config = {
slackTestState.config = {
messages: { ackReactionScope: "group-mentions" },
channels: {
slack: {
@@ -368,7 +254,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -431,7 +317,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -470,7 +356,7 @@ describe("monitorSlackProvider tool results", () => {
});
it("accepts channel messages when mentionPatterns match", async () => {
config = {
slackTestState.config = {
messages: {
responsePrefix: "PFX",
groupChat: { mentionPatterns: ["\\bclawd\\b"] },
@@ -491,7 +377,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -515,7 +401,7 @@ describe("monitorSlackProvider tool results", () => {
});
it("treats replies to bot threads as implicit mentions", async () => {
config = {
slackTestState.config = {
channels: {
slack: {
dm: { enabled: true, policy: "open", allowFrom: ["*"] },
@@ -532,7 +418,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -558,7 +444,7 @@ describe("monitorSlackProvider tool results", () => {
});
it("accepts channel messages without mention when channels.slack.requireMention is false", async () => {
config = {
slackTestState.config = {
channels: {
slack: {
dm: { enabled: true, policy: "open", allowFrom: ["*"] },
@@ -576,7 +462,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -610,7 +496,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");
@@ -635,7 +521,7 @@ describe("monitorSlackProvider tool results", () => {
it("threads replies when incoming message is in a thread", async () => {
replyMock.mockResolvedValue({ text: "thread reply" });
config = {
slackTestState.config = {
messages: {
responsePrefix: "PFX",
ackReaction: "👀",
@@ -656,7 +542,7 @@ describe("monitorSlackProvider tool results", () => {
abortSignal: controller.signal,
});
await waitForEvent("message");
await waitForSlackEvent("message");
const handler = getSlackHandlers()?.get("message");
if (!handler) throw new Error("Slack message handler not registered");