fix(gateway): honor restart continuation retry budget · o...

Recent Commits to openclaw:main

obviyus · 2026-05-09 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,26 @@ const mocks = vi.hoisted(() => {`
`89`	`89`	`if (!state.queuedSessionDelivery) {`
`90`	`90`	`return;`
`91`	`91`	`}`
`92`		`-const entry = {`
	`92`	`+const entry: Record<string, unknown> & {`
	`93`	`+id: string;`
	`94`	`+enqueuedAt: number;`
	`95`	`+retryCount: number;`
	`96`	`+} = {`
`93`	`97`	`id: "session-delivery-1",`
`94`	`98`	`enqueuedAt: 1,`
`95`	`99`	`retryCount: 0,`
`96`	`100`	`...state.queuedSessionDelivery,`
`97`	`101`	`};`
`98`		`-if (!params.selectEntry(entry, Date.now()).match) {`
	`102`	`+const decision = params.selectEntry(entry, Date.now());`
	`103`	`+if (!decision.match) {`
	`104`	`+return;`
	`105`	`+}`
	`106`	`+const maxRetries = typeof entry["maxRetries"] === "number" ? entry["maxRetries"] : 5;`
	`107`	`+if (entry.retryCount >= maxRetries) {`
	`108`	`+state.queuedSessionDelivery = null;`
	`109`	`+params.log.warn(`
	`110`	+`${params.logLabel}: entry ${entry.id} exceeded max retries and was moved to failed/`,
	`111`	`+);`
`99`	`112`	`return;`
`100`	`113`	`}`
`101`	`114`	`try {`

Original file line number	Diff line number	Diff line change
`@@ -432,13 +432,15 @@ function buildQueuedRestartContinuation(params: {`
`432`	`432`	`text: params.continuation.text,`
`433`	`433`	`...(params.deliveryContext ? { deliveryContext: params.deliveryContext } : {}),`
`434`	`434`	`idempotencyKey,`
	`435`	`+maxRetries: RESTART_CONTINUATION_BUSY_MAX_ATTEMPTS,`
`435`	`436`	`};`
`436`	`437`	`}`
`437`	`438`	`return {`
`438`	`439`	`kind: "agentTurn",`
`439`	`440`	`sessionKey: params.sessionKey,`
`440`	`441`	`message: params.continuation.message,`
`441`	`442`	`messageId: idempotencyKey,`
	`443`	`+maxRetries: RESTART_CONTINUATION_BUSY_MAX_ATTEMPTS,`
`442`	`444`	`...(params.route ? { route: params.route } : {}),`
`443`	`445`	`...(params.deliveryContext ? { deliveryContext: params.deliveryContext } : {}),`
`444`	`446`	`idempotencyKey,`
`@@ -613,7 +615,6 @@ async function loadRestartSentinelStartupTask(params: {`
`613`	`615`	`await removeRestartSentinelFile(sentinelPath);`
`614`	`616`	`const routedAgentTurnContinuation =`
`615`	`617`	`payload.continuation?.kind === "agentTurn" && continuationRoute !== undefined;`
`616`		`-// The routed continuation is the wake; a parallel heartbeat wake can steal the session.`
`617`	`618`	`if (!routedAgentTurnContinuation) {`
`618`	`619`	`enqueueRestartSentinelWake(message, sessionKey, wakeDeliveryContext);`
`619`	`620`	`}`

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@ function computeSessionDeliveryBackoffMs(retryCount: number): number {`
`68`	`68`	`return BACKOFF_MS[Math.min(retryCount - 1, BACKOFF_MS.length - 1)] ?? BACKOFF_MS.at(-1) ?? 0;`
`69`	`69`	`}`
`70`	`70`
	`71`	`+function resolveSessionDeliveryMaxRetries(entry: QueuedSessionDelivery): number {`
	`72`	`+return entry.maxRetries ?? MAX_SESSION_DELIVERY_RETRIES;`
	`73`	`+}`
	`74`	`+`
`71`	`75`	`export function isSessionDeliveryEligibleForRetry(`
`72`	`76`	`entry: QueuedSessionDelivery,`
`73`	`77`	`now: number,`
`@@ -153,7 +157,7 @@ export async function drainPendingSessionDeliveries(opts: {`
`153`	`157`	`if (!currentDecision.match) {`
`154`	`158`	`continue;`
`155`	`159`	`}`
`156`		`-if (currentEntry.retryCount >= MAX_SESSION_DELIVERY_RETRIES) {`
	`160`	`+if (currentEntry.retryCount >= resolveSessionDeliveryMaxRetries(currentEntry)) {`
`157`	`161`	`try {`
`158`	`162`	`await moveSessionDeliveryToFailed(currentEntry.id, opts.stateDir);`
`159`	`163`	`} catch (err) {`
`@@ -229,7 +233,7 @@ export async function recoverPendingSessionDeliveries(opts: {`
`229`	`233`	`if (opts.maxEnqueuedAt != null && currentEntry.enqueuedAt > opts.maxEnqueuedAt) {`
`230`	`234`	`continue;`
`231`	`235`	`}`
`232`		`-if (currentEntry.retryCount >= MAX_SESSION_DELIVERY_RETRIES) {`
	`236`	`+if (currentEntry.retryCount >= resolveSessionDeliveryMaxRetries(currentEntry)) {`
`233`	`237`	`summary.skippedMaxRetries += 1;`
`234`	`238`	`try {`
`235`	`239`	`await moveSessionDeliveryToFailed(currentEntry.id, opts.stateDir);`

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ type SessionDeliveryContext = {`
`27`	`27`	`threadId?: string \| number;`
`28`	`28`	`};`
`29`	`29`
	`30`	`+type SessionDeliveryRetryPolicy = {`
	`31`	`+maxRetries?: number;`
	`32`	`+};`
	`33`	`+`
`30`	`34`	`export type SessionDeliveryRoute = {`
`31`	`35`	`channel: string;`
`32`	`36`	`to: string;`
`@@ -37,22 +41,22 @@ export type SessionDeliveryRoute = {`
`37`	`41`	`};`
`38`	`42`
`39`	`43`	`export type QueuedSessionDeliveryPayload =`
`40`		`-\| {`
	`44`	`+\| ({`
`41`	`45`	`kind: "systemEvent";`
`42`	`46`	`sessionKey: string;`
`43`	`47`	`text: string;`
`44`	`48`	`deliveryContext?: SessionDeliveryContext;`
`45`	`49`	`idempotencyKey?: string;`
`46`		`-}`
`47`		`-\| {`
	`50`	`+} & SessionDeliveryRetryPolicy)`
	`51`	`+\| ({`
`48`	`52`	`kind: "agentTurn";`
`49`	`53`	`sessionKey: string;`
`50`	`54`	`message: string;`
`51`	`55`	`messageId: string;`
`52`	`56`	`route?: SessionDeliveryRoute;`
`53`	`57`	`deliveryContext?: SessionDeliveryContext;`
`54`	`58`	`idempotencyKey?: string;`
`55`		`-};`
	`59`	`+} & SessionDeliveryRetryPolicy);`
`56`	`60`
`57`	`61`	`export type QueuedSessionDelivery = QueuedSessionDeliveryPayload & {`
`58`	`62`	`id: string;`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import { describe, expect, it, vi } from "vitest";`
`2`	`2`	`import { withTempDir } from "../test-helpers/temp-dir.js";`
`3`	`3`	`import {`
	`4`	`+drainPendingSessionDeliveries,`
`4`	`5`	`enqueueSessionDelivery,`
`5`	`6`	`failSessionDelivery,`
`6`	`7`	`isSessionDeliveryEligibleForRetry,`
`@@ -68,6 +69,44 @@ describe("session-delivery queue recovery", () => {`
`68`	`69`	`});`
`69`	`70`	`});`
`70`	`71`
	`72`	`+it("uses the entry retry budget when draining entries", async () => {`
	`73`	`+await withTempDir({ prefix: "openclaw-session-delivery-" }, async (tempDir) => {`
	`74`	`+const id = await enqueueSessionDelivery(`
	`75`	`+{`
	`76`	`+kind: "agentTurn",`
	`77`	`+sessionKey: "agent:main:main",`
	`78`	`+message: "continue",`
	`79`	`+messageId: "restart-sentinel:agent:main:main:agentTurn:123",`
	`80`	`+maxRetries: 20,`
	`81`	`+},`
	`82`	`+tempDir,`
	`83`	`+);`
	`84`	`+for (let attempt = 0; attempt < 5; attempt += 1) {`
	`85`	`+await failSessionDelivery(id, "busy", tempDir);`
	`86`	`+}`
	`87`	`+`
	`88`	`+const deliver = vi.fn(async () => undefined);`
	`89`	`+await drainPendingSessionDeliveries({`
	`90`	`+drainKey: "test-restart-continuation",`
	`91`	`+logLabel: "test restart continuation",`
	`92`	`+ deliver,`
	`93`	`+stateDir: tempDir,`
	`94`	`+log: {`
	`95`	`+info: vi.fn(),`
	`96`	`+warn: vi.fn(),`
	`97`	`+error: vi.fn(),`
	`98`	`+},`
	`99`	`+selectEntry: (entry) => ({`
	`100`	`+match: entry.id === id,`
	`101`	`+bypassBackoff: true,`
	`102`	`+}),`
	`103`	`+});`
	`104`	`+`
	`105`	`+expect(deliver).toHaveBeenCalledTimes(1);`
	`106`	`+expect(await loadPendingSessionDeliveries(tempDir)).toEqual([]);`
	`107`	`+});`
	`108`	`+});`
	`109`	`+`
`71`	`110`	`it("skips entries queued after the startup recovery cutoff", async () => {`
`72`	`111`	`vi.useFakeTimers();`
`73`	`112`	`vi.setSystemTime(new Date("2026-04-23T00:00:00.000Z"));`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main