惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

MyScale Blog
MyScale Blog
Jina AI
Jina AI
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
阮一峰的网络日志
阮一峰的网络日志
P
Proofpoint News Feed
Last Week in AI
Last Week in AI
博客园 - 司徒正美
Martin Fowler
Martin Fowler
T
Tailwind CSS Blog
B
Blog RSS Feed
Vercel News
Vercel News
博客园 - 聂微东
I
InfoQ
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
M
MIT News - Artificial intelligence
Recent Announcements
Recent Announcements
GbyAI
GbyAI
L
LangChain Blog
酷 壳 – CoolShell
酷 壳 – CoolShell
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
Microsoft Security Blog
Microsoft Security Blog
C
Check Point Blog
MongoDB | Blog
MongoDB | Blog
B
Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
refactor(delivery): share recovery primitives · openclaw/...
vincentkoc · 2026-06-23 · via Recent Commits to openclaw:main

@@ -9,6 +9,12 @@ import type {

99

ChannelMessageUnknownSendReconciliationResult,

1010

} from "../../channels/message/types.js";

1111

import type { OpenClawConfig } from "../../config/types.openclaw.js";

12+

import {

13+

claimRecoveryEntry as claimSharedRecoveryEntry,

14+

computeBackoffMs,

15+

getErrnoCode,

16+

releaseRecoveryEntry as releaseSharedRecoveryEntry,

17+

} from "../delivery-recovery.shared.js";

1218

import { formatErrorMessage } from "../errors.js";

1319

import { resolveOutboundChannelMessageAdapter } from "./channel-resolution.js";

1420

import type { OutboundDeliveryResult } from "./deliver-types.js";

@@ -26,6 +32,8 @@ import {

2632

type QueuedDeliveryPayload,

2733

} from "./delivery-queue-storage.js";

283435+

export { computeBackoffMs };

36+2937

export type RecoverySummary = {

3038

recovered: number;

3139

failed: number;

@@ -61,14 +69,6 @@ export type ActiveDeliveryClaimResult<T> =

61696270

const MAX_RETRIES = 5;

637164-

/** Backoff delays in milliseconds indexed by retry count (1-based). */

65-

const BACKOFF_MS: readonly number[] = [

66-

5_000, // retry 1: 5s

67-

25_000, // retry 2: 25s

68-

120_000, // retry 3: 2m

69-

600_000, // retry 4: 10m

70-

];

71-7272

const PERMANENT_ERROR_PATTERNS: readonly RegExp[] = [

7373

/no conversation reference found/i,

7474

/chat not found/i,

@@ -97,12 +97,6 @@ function resolveRecoveryDeadlineMs(maxRecoveryMs: number | undefined): number {

9797

return resolveExpiresAtMsFromDurationMs(durationMs) ?? resolveDateTimestampMs(Date.now());

9898

}

9999100-

function getErrnoCode(err: unknown): string | null {

101-

return err && typeof err === "object" && "code" in err

102-

? String((err as { code?: unknown }).code)

103-

: null;

104-

}

105-106100

function createEmptyRecoverySummary(): RecoverySummary {

107101

return {

108102

recovered: 0,

@@ -112,30 +106,18 @@ function createEmptyRecoverySummary(): RecoverySummary {

112106

};

113107

}

114108115-

function claimRecoveryEntry(entryId: string): boolean {

116-

if (entriesInProgress.has(entryId)) {

117-

return false;

118-

}

119-

entriesInProgress.add(entryId);

120-

return true;

121-

}

122-123-

function releaseRecoveryEntry(entryId: string): void {

124-

entriesInProgress.delete(entryId);

125-

}

126-127109

export async function withActiveDeliveryClaim<T>(

128110

entryId: string,

129111

fn: () => Promise<T>,

130112

): Promise<ActiveDeliveryClaimResult<T>> {

131-

if (!claimRecoveryEntry(entryId)) {

113+

if (!claimSharedRecoveryEntry(entriesInProgress, entryId)) {

132114

return { status: "claimed-by-other-owner" };

133115

}

134116135117

try {

136118

return { status: "claimed", value: await fn() };

137119

} finally {

138-

releaseRecoveryEntry(entryId);

120+

releaseSharedRecoveryEntry(entriesInProgress, entryId);

139121

}

140122

}

141123

@@ -326,14 +308,6 @@ async function moveEntryToFailedWithLogging(

326308

}

327309

}

328310329-

/** Compute the backoff delay in ms for a given retry count. */

330-

export function computeBackoffMs(retryCount: number): number {

331-

if (retryCount <= 0) {

332-

return 0;

333-

}

334-

return BACKOFF_MS[Math.min(retryCount - 1, BACKOFF_MS.length - 1)] ?? BACKOFF_MS.at(-1) ?? 0;

335-

}

336-337311

export function isEntryEligibleForRecoveryRetry(

338312

entry: QueuedDelivery,

339313

now: number,

@@ -513,7 +487,7 @@ export async function drainPendingDeliveries(opts: {

513487

);

514488515489

for (const entry of matchingEntries) {

516-

if (!claimRecoveryEntry(entry.id)) {

490+

if (!claimSharedRecoveryEntry(entriesInProgress, entry.id)) {

517491

opts.log.info(`${opts.logLabel}: entry ${entry.id} is already being recovered`);

518492

continue;

519493

}

@@ -582,7 +556,7 @@ export async function drainPendingDeliveries(opts: {

582556

);

583557

}

584558

} finally {

585-

releaseRecoveryEntry(entry.id);

559+

releaseSharedRecoveryEntry(entriesInProgress, entry.id);

586560

}

587561

}

588562

} finally {

@@ -622,7 +596,7 @@ export async function recoverPendingDeliveries(opts: {

622596

break;

623597

}

624598625-

if (!claimRecoveryEntry(entry.id)) {

599+

if (!claimSharedRecoveryEntry(entriesInProgress, entry.id)) {

626600

opts.log.info(`Recovery skipped for delivery ${entry.id}: already being processed`);

627601

continue;

628602

}

@@ -677,7 +651,7 @@ export async function recoverPendingDeliveries(opts: {

677651

continue;

678652

}

679653

} finally {

680-

releaseRecoveryEntry(entry.id);

654+

releaseSharedRecoveryEntry(entriesInProgress, entry.id);

681655

}

682656

}

683657