fix: keep ci watchers off the chat queue

This commit is contained in:
Eyejoker
2026-03-23 05:40:31 +09:00
parent 25b1d702dd
commit 4df30a9b9b
2 changed files with 57 additions and 2 deletions

View File

@@ -152,6 +152,61 @@ describe('task scheduler', () => {
expect(enqueueTask.mock.calls[0][1]).toBe('task-group-context'); expect(enqueueTask.mock.calls[0][1]).toBe('task-group-context');
}); });
it('keeps watch_ci tasks on a dedicated queue even in group context', async () => {
const dueAt = new Date(Date.now() - 60_000).toISOString();
createTask({
id: 'task-watch-group',
group_folder: 'shared-group',
chat_jid: 'shared@g.us',
agent_type: 'codex',
prompt: `
[BACKGROUND CI WATCH]
Watch target:
GitHub Actions run 123456
Task ID:
task-watch-group
Check instructions:
Check the run.
`.trim(),
schedule_type: 'interval',
schedule_value: '60000',
context_mode: 'group',
next_run: dueAt,
status: 'active',
created_at: '2026-02-22T00:00:00.000Z',
});
const enqueueTask = vi.fn();
startSchedulerLoop({
serviceAgentType: 'codex',
registeredGroups: () => ({
'shared@g.us': {
name: 'Shared',
folder: 'shared-group',
trigger: '@Codex',
added_at: '2026-02-22T00:00:00.000Z',
agentType: 'codex',
},
}),
getSessions: () => ({}),
queue: { enqueueTask } as any,
onProcess: () => {},
sendMessage: async () => {},
});
await vi.advanceTimersByTimeAsync(10);
expect(enqueueTask).toHaveBeenCalledTimes(1);
expect(enqueueTask.mock.calls[0][0]).toBe(
'shared@g.us::task:task-watch-group',
);
expect(enqueueTask.mock.calls[0][1]).toBe('task-watch-group');
});
it('renders watcher heartbeat messages with target and timing', () => { it('renders watcher heartbeat messages with target and timing', () => {
const prompt = ` const prompt = `
[BACKGROUND CI WATCH] [BACKGROUND CI WATCH]

View File

@@ -203,9 +203,9 @@ export function renderWatchCiStatusMessage(args: {
} }
function getTaskQueueJid( function getTaskQueueJid(
task: Pick<ScheduledTask, 'chat_jid' | 'context_mode' | 'id'>, task: Pick<ScheduledTask, 'chat_jid' | 'context_mode' | 'id' | 'prompt'>,
): string { ): string {
return task.context_mode === 'isolated' return task.context_mode === 'isolated' || isWatchCiTask(task)
? `${task.chat_jid}::task:${task.id}` ? `${task.chat_jid}::task:${task.id}`
: task.chat_jid; : task.chat_jid;
} }