fix: harden paired runtime turn coordination

This commit is contained in:
ejclaw
2026-04-09 13:52:42 +09:00
parent e7a7b538b2
commit 0f994ab2ce
27 changed files with 2108 additions and 295 deletions

View File

@@ -1,4 +1,13 @@
import type { PairedTask, PairedTaskStatus } from './types.js';
import {
_clearPairedTurnReservationsForTests,
claimPairedTurnReservation,
reservePairedTurnReservation,
} from './db.js';
import type {
PairedTask,
PairedTaskStatus,
PairedTurnReservationIntentKind,
} from './types.js';
export type ScheduledPairedFollowUpIntentKind =
| 'reviewer-turn'
@@ -11,17 +20,6 @@ type ScheduledPairedFollowUpTask = Pick<
'id' | 'status' | 'round_trip_count' | 'updated_at'
>;
export const SCHEDULED_PAIRED_FOLLOW_UP_TTL_MS = 10 * 60 * 1000;
const scheduledPairedFollowUps = new Map<string, number>();
function pruneExpiredScheduledPairedFollowUps(now: number): void {
for (const [key, scheduledAt] of scheduledPairedFollowUps) {
if (now - scheduledAt > SCHEDULED_PAIRED_FOLLOW_UP_TTL_MS) {
scheduledPairedFollowUps.delete(key);
}
}
}
export function buildPairedFollowUpKey(args: {
taskId: string;
taskStatus: PairedTaskStatus | null;
@@ -45,29 +43,45 @@ export function schedulePairedFollowUpOnce(args: {
intentKind: ScheduledPairedFollowUpIntentKind;
enqueue: () => void;
}): boolean {
const now = Date.now();
pruneExpiredScheduledPairedFollowUps(now);
const reserved = reservePairedTurnReservation({
chatJid: args.chatJid,
taskId: args.task.id,
taskStatus: args.task.status,
roundTripCount: args.task.round_trip_count,
taskUpdatedAt: args.task.updated_at,
intentKind: args.intentKind,
runId: args.runId,
});
const key = [
args.chatJid,
buildPairedFollowUpKey({
taskId: args.task.id,
taskStatus: args.task.status,
roundTripCount: args.task.round_trip_count,
taskUpdatedAt: args.task.updated_at,
intentKind: args.intentKind,
}),
].join(':');
if (scheduledPairedFollowUps.has(key)) {
if (!reserved) {
return false;
}
scheduledPairedFollowUps.set(key, now);
args.enqueue();
return true;
}
export function resetPairedFollowUpScheduleState(): void {
scheduledPairedFollowUps.clear();
export function claimPairedTurnExecution(args: {
chatJid: string;
runId: string;
task: ScheduledPairedFollowUpTask;
intentKind: PairedTurnReservationIntentKind;
}): string | null {
const nextTaskUpdatedAt = new Date().toISOString();
const claimed = claimPairedTurnReservation({
chatJid: args.chatJid,
taskId: args.task.id,
taskStatus: args.task.status,
roundTripCount: args.task.round_trip_count,
taskUpdatedAt: args.task.updated_at,
nextTaskUpdatedAt,
intentKind: args.intentKind,
runId: args.runId,
});
return claimed ? nextTaskUpdatedAt : null;
}
export function resetPairedFollowUpScheduleState(): void {
_clearPairedTurnReservationsForTests();
}