Skip to content

Commit 92734be

Browse files
only21milclaude
andcommitted
fix(server): bound oversized coalesced webhook failure history
A coalesced window whose rendered prompt is too long moves its logged delivery into the suppression bucket when it fails, but only insertion pruned a bucket, so these rows were never trimmed. Prune the row's bucket after a failure update too. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 2517b93 commit 92734be

1 file changed

Lines changed: 45 additions & 29 deletions

File tree

‎apps/server/src/scheduledTasks/ScheduledTaskService.ts‎

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,35 @@ export const layer = Layer.effect(
14121412
WHERE delivery_id = ${deliveryId}`.pipe(Effect.asVoid, Effect.mapError(dedupeError));
14131413
};
14141414

1415+
// Each suppression bucket retains its own rows, never real run history.
1416+
const deliveryBucket = (outcome: string, error: string | undefined) =>
1417+
outcome === "filtered"
1418+
? "filtered"
1419+
: outcome === "duplicate" ||
1420+
outcome === "coalesced" ||
1421+
outcome === "rate_limited" ||
1422+
error === PROMPT_TOO_LONG
1423+
? "dedupe"
1424+
: "main";
1425+
const pruneDeliveries = (
1426+
taskId: string,
1427+
retentionBucket: ReturnType<typeof deliveryBucket>,
1428+
) => {
1429+
const rowBucket = sql.literal(`CASE WHEN outcome = 'filtered' THEN 'filtered'
1430+
WHEN outcome IN ('duplicate', 'coalesced', 'rate_limited') OR error = 'The filled-in prompt is too long.' THEN 'dedupe'
1431+
ELSE 'main' END`);
1432+
return sql`
1433+
DELETE FROM scheduled_task_webhook_deliveries
1434+
WHERE task_id = ${taskId} AND ${rowBucket} = ${retentionBucket}
1435+
AND delivery_id NOT IN (
1436+
SELECT delivery_id FROM scheduled_task_webhook_deliveries
1437+
WHERE task_id = ${taskId} AND ${rowBucket} = ${retentionBucket}
1438+
ORDER BY received_at DESC, rowid DESC
1439+
LIMIT ${retentionBucket === "main" ? WEBHOOK_DELIVERY_RETENTION : retentionBucket === "filtered" ? WEBHOOK_FILTERED_DELIVERY_RETENTION : WEBHOOK_DEDUPE_DELIVERY_RETENTION}
1440+
)
1441+
`;
1442+
};
1443+
14151444
const recordDelivery = (input: {
14161445
readonly id: string;
14171446
readonly taskId: ScheduledTaskId;
@@ -1454,30 +1483,7 @@ export const layer = Layer.effect(
14541483
rendered_prompt = excluded.rendered_prompt,
14551484
error = excluded.error
14561485
`;
1457-
// Each suppression bucket retains its own rows, never real run history.
1458-
const bucket = (outcome: string, error: string | undefined) =>
1459-
outcome === "filtered"
1460-
? "filtered"
1461-
: outcome === "duplicate" ||
1462-
outcome === "coalesced" ||
1463-
outcome === "rate_limited" ||
1464-
error === PROMPT_TOO_LONG
1465-
? "dedupe"
1466-
: "main";
1467-
const retentionBucket = bucket(input.outcome, input.error);
1468-
const rowBucket = sql.literal(`CASE WHEN outcome = 'filtered' THEN 'filtered'
1469-
WHEN outcome IN ('duplicate', 'coalesced', 'rate_limited') OR error = 'The filled-in prompt is too long.' THEN 'dedupe'
1470-
ELSE 'main' END`);
1471-
yield* sql`
1472-
DELETE FROM scheduled_task_webhook_deliveries
1473-
WHERE task_id = ${input.taskId} AND ${rowBucket} = ${retentionBucket}
1474-
AND delivery_id NOT IN (
1475-
SELECT delivery_id FROM scheduled_task_webhook_deliveries
1476-
WHERE task_id = ${input.taskId} AND ${rowBucket} = ${retentionBucket}
1477-
ORDER BY received_at DESC, rowid DESC
1478-
LIMIT ${retentionBucket === "main" ? WEBHOOK_DELIVERY_RETENTION : retentionBucket === "filtered" ? WEBHOOK_FILTERED_DELIVERY_RETENTION : WEBHOOK_DEDUPE_DELIVERY_RETENTION}
1479-
)
1480-
`;
1486+
yield* pruneDeliveries(input.taskId, deliveryBucket(input.outcome, input.error));
14811487
}),
14821488
)
14831489
.pipe(
@@ -1488,11 +1494,21 @@ export const layer = Layer.effect(
14881494
};
14891495

14901496
const markDeliveryFailed = (deliveryId: string, message: string) =>
1491-
sql`
1492-
UPDATE scheduled_task_webhook_deliveries
1493-
SET outcome = 'dispatch_failed', error = ${message}
1494-
WHERE delivery_id = ${deliveryId}
1495-
`.pipe(Effect.ignore);
1497+
sql
1498+
.withTransaction(
1499+
Effect.gen(function* () {
1500+
const [updated] = yield* sql<{ task_id: string }>`
1501+
UPDATE scheduled_task_webhook_deliveries
1502+
SET outcome = 'dispatch_failed', error = ${message}
1503+
WHERE delivery_id = ${deliveryId}
1504+
RETURNING task_id
1505+
`;
1506+
// An oversized prompt moves the row into the suppression bucket.
1507+
if (updated !== undefined)
1508+
yield* pruneDeliveries(updated.task_id, deliveryBucket("dispatch_failed", message));
1509+
}),
1510+
)
1511+
.pipe(Effect.ignore);
14961512

14971513
/** Sliding one-minute window for deliveries that can start work. */
14981514
const takeRateSlot = (

0 commit comments

Comments
 (0)