mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-10 14:14:59 +00:00
fix: agent-only announce path, BB message IDs, sender identity, SSRF allowlist (#23970)
* fix(agents): defer announces until descendant cleanup settles * fix(bluebubbles): harden message metadata extraction * feat(contributors): rank by composite score (commits, PRs, LOC, tenure) * refactor(control-ui): move method guard after path checks to improve request handling * fix subagent completion announce when only current run is pending * fix(subagents): keep orchestrator runs active until descendants finish * fix: prepare PR feedback follow-ups (#23970) (thanks @tyler6204)
This commit is contained in:
@@ -35,20 +35,27 @@ export function resolveDeferredCleanupDecision(params: {
|
||||
now: number;
|
||||
activeDescendantRuns: number;
|
||||
announceExpiryMs: number;
|
||||
announceCompletionHardExpiryMs: number;
|
||||
maxAnnounceRetryCount: number;
|
||||
deferDescendantDelayMs: number;
|
||||
resolveAnnounceRetryDelayMs: (retryCount: number) => number;
|
||||
}): DeferredCleanupDecision {
|
||||
const endedAgo = resolveEndedAgoMs(params.entry, params.now);
|
||||
if (params.entry.expectsCompletionMessage === true && params.activeDescendantRuns > 0) {
|
||||
if (endedAgo > params.announceExpiryMs) {
|
||||
const isCompletionMessageFlow = params.entry.expectsCompletionMessage === true;
|
||||
const completionHardExpiryExceeded =
|
||||
isCompletionMessageFlow && endedAgo > params.announceCompletionHardExpiryMs;
|
||||
if (isCompletionMessageFlow && params.activeDescendantRuns > 0) {
|
||||
if (completionHardExpiryExceeded) {
|
||||
return { kind: "give-up", reason: "expiry" };
|
||||
}
|
||||
return { kind: "defer-descendants", delayMs: params.deferDescendantDelayMs };
|
||||
}
|
||||
|
||||
const retryCount = (params.entry.announceRetryCount ?? 0) + 1;
|
||||
if (retryCount >= params.maxAnnounceRetryCount || endedAgo > params.announceExpiryMs) {
|
||||
const expiryExceeded = isCompletionMessageFlow
|
||||
? completionHardExpiryExceeded
|
||||
: endedAgo > params.announceExpiryMs;
|
||||
if (retryCount >= params.maxAnnounceRetryCount || expiryExceeded) {
|
||||
return {
|
||||
kind: "give-up",
|
||||
reason: retryCount >= params.maxAnnounceRetryCount ? "retry-limit" : "expiry",
|
||||
|
||||
Reference in New Issue
Block a user