Complete paired-room SSOT cleanup and logger singleton

This commit is contained in:
ejclaw
2026-04-07 05:12:22 +09:00
parent ae12b157be
commit 10e10b499c
18 changed files with 648 additions and 473 deletions

View File

@@ -1827,124 +1827,6 @@ describe('createMessageRuntime', () => {
expect(sendMessage).not.toHaveBeenCalled();
});
it('requeues owner follow-ups from reviewer bot-only messages even when paired turn output storage is stale', async () => {
const chatJid = 'group@test';
const group = makeGroup('codex');
const ownerChannel = makeChannel(chatJid);
const reviewerChannel = {
...makeChannel(chatJid, 'discord-review', false),
isOwnMessage: vi.fn((message) => message.sender === 'reviewer-bot@test'),
};
const enqueueMessageCheck = vi.fn();
const closeStdin = vi.fn();
const sendMessage = vi.fn(() => false);
const setLastTimestamp = vi.fn();
const saveState = vi.fn();
const lastAgentTimestamps: Record<string, string> = {};
const stopLoop = new Error('stop-message-loop');
vi.mocked(serviceRouting.hasReviewerLease).mockReturnValue(true);
vi.mocked(db.getLatestOpenPairedTaskForChat).mockReturnValue({
id: 'task-active-owner-follow-up-stale-output',
chat_jid: chatJid,
group_folder: group.folder,
owner_service_id: 'codex-main',
reviewer_service_id: 'claude',
title: null,
source_ref: 'HEAD',
plan_notes: null,
review_requested_at: '2026-03-30T00:00:00.000Z',
round_trip_count: 1,
status: 'active',
arbiter_verdict: null,
arbiter_requested_at: null,
completion_reason: null,
created_at: '2026-03-30T00:00:00.000Z',
updated_at: '2026-03-30T00:00:00.000Z',
});
vi.mocked(db.getPairedTurnOutputs).mockReturnValue([
{
id: 1,
task_id: 'task-active-owner-follow-up-stale-output',
turn_number: 1,
role: 'owner',
output_text: 'owner 초안',
created_at: '2026-03-30T00:00:01.000Z',
},
]);
vi.mocked(db.getNewMessages).mockReturnValue({
messages: [
{
id: 'reviewer-bot-message-owner-follow-up-stale-output',
chat_jid: chatJid,
sender: 'reviewer-bot@test',
sender_name: '리뷰어',
content: 'DONE_WITH_CONCERNS\n\nreviewer direct message',
timestamp: '2026-03-30T00:00:04.000Z',
seq: 42,
is_bot_message: true,
} as any,
],
newTimestamp: '42',
});
const runtime = createMessageRuntime({
assistantName: 'Andy',
idleTimeout: 60_000,
pollInterval: 123,
timezone: 'UTC',
triggerPattern: /^@Andy\b/i,
channels: [ownerChannel, reviewerChannel],
queue: {
registerProcess: vi.fn(),
closeStdin,
enqueueMessageCheck,
notifyIdle: vi.fn(),
sendMessage,
} as any,
getRegisteredGroups: () => ({ [chatJid]: group }),
getSessions: () => ({}),
getLastTimestamp: () => '',
setLastTimestamp,
getLastAgentTimestamps: () => lastAgentTimestamps,
saveState,
persistSession: vi.fn(),
clearSession: vi.fn(),
});
const originalSetTimeout = global.setTimeout;
const setTimeoutSpy = vi.spyOn(global, 'setTimeout').mockImplementation(((
handler: any,
timeout?: number,
...args: any[]
) => {
if (timeout === 123) {
throw stopLoop;
}
return (originalSetTimeout as any)(handler, timeout, ...args);
}) as typeof setTimeout);
try {
await expect(runtime.startMessageLoop()).rejects.toThrow(
stopLoop.message,
);
} finally {
setTimeoutSpy.mockRestore();
}
expect(setLastTimestamp).toHaveBeenCalledWith('42');
expect(agentRunner.runAgentProcess).not.toHaveBeenCalled();
expect(closeStdin).toHaveBeenCalledWith(
chatJid,
expect.objectContaining({ reason: 'paired-pending-turn-follow-up' }),
);
expect(enqueueMessageCheck).toHaveBeenCalledWith(
chatJid,
resolveGroupIpcPath(group.folder),
);
expect(sendMessage).not.toHaveBeenCalled();
});
it('auto-runs an owner follow-up when a task returns to active after reviewer feedback', async () => {
const chatJid = 'group@test';
const group = makeGroup('codex');