mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-10 01:03:29 +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:
81
src/agents/subagent-registry-cleanup.test.ts
Normal file
81
src/agents/subagent-registry-cleanup.test.ts
Normal file
@@ -0,0 +1,81 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { resolveDeferredCleanupDecision } from "./subagent-registry-cleanup.js";
|
||||
import type { SubagentRunRecord } from "./subagent-registry.types.js";
|
||||
|
||||
function makeEntry(overrides: Partial<SubagentRunRecord> = {}): SubagentRunRecord {
|
||||
return {
|
||||
runId: "run-1",
|
||||
childSessionKey: "agent:main:subagent:child",
|
||||
requesterSessionKey: "agent:main:main",
|
||||
requesterDisplayKey: "main",
|
||||
task: "test",
|
||||
cleanup: "keep",
|
||||
createdAt: 0,
|
||||
endedAt: 1_000,
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
describe("resolveDeferredCleanupDecision", () => {
|
||||
const now = 2_000;
|
||||
|
||||
it("defers completion-message cleanup while descendants are still pending", () => {
|
||||
const decision = resolveDeferredCleanupDecision({
|
||||
entry: makeEntry({ expectsCompletionMessage: true }),
|
||||
now,
|
||||
activeDescendantRuns: 2,
|
||||
announceExpiryMs: 5 * 60_000,
|
||||
announceCompletionHardExpiryMs: 30 * 60_000,
|
||||
maxAnnounceRetryCount: 3,
|
||||
deferDescendantDelayMs: 1_000,
|
||||
resolveAnnounceRetryDelayMs: () => 2_000,
|
||||
});
|
||||
|
||||
expect(decision).toEqual({ kind: "defer-descendants", delayMs: 1_000 });
|
||||
});
|
||||
|
||||
it("hard-expires completion-message cleanup when descendants never settle", () => {
|
||||
const decision = resolveDeferredCleanupDecision({
|
||||
entry: makeEntry({ expectsCompletionMessage: true, endedAt: now - (30 * 60_000 + 1) }),
|
||||
now,
|
||||
activeDescendantRuns: 1,
|
||||
announceExpiryMs: 5 * 60_000,
|
||||
announceCompletionHardExpiryMs: 30 * 60_000,
|
||||
maxAnnounceRetryCount: 3,
|
||||
deferDescendantDelayMs: 1_000,
|
||||
resolveAnnounceRetryDelayMs: () => 2_000,
|
||||
});
|
||||
|
||||
expect(decision).toEqual({ kind: "give-up", reason: "expiry" });
|
||||
});
|
||||
|
||||
it("keeps regular expiry behavior for non-completion flows", () => {
|
||||
const decision = resolveDeferredCleanupDecision({
|
||||
entry: makeEntry({ expectsCompletionMessage: false, endedAt: now - (5 * 60_000 + 1) }),
|
||||
now,
|
||||
activeDescendantRuns: 0,
|
||||
announceExpiryMs: 5 * 60_000,
|
||||
announceCompletionHardExpiryMs: 30 * 60_000,
|
||||
maxAnnounceRetryCount: 3,
|
||||
deferDescendantDelayMs: 1_000,
|
||||
resolveAnnounceRetryDelayMs: () => 2_000,
|
||||
});
|
||||
|
||||
expect(decision).toEqual({ kind: "give-up", reason: "expiry", retryCount: 1 });
|
||||
});
|
||||
|
||||
it("uses retry backoff for completion-message flows once descendants are settled", () => {
|
||||
const decision = resolveDeferredCleanupDecision({
|
||||
entry: makeEntry({ expectsCompletionMessage: true, announceRetryCount: 1 }),
|
||||
now,
|
||||
activeDescendantRuns: 0,
|
||||
announceExpiryMs: 5 * 60_000,
|
||||
announceCompletionHardExpiryMs: 30 * 60_000,
|
||||
maxAnnounceRetryCount: 3,
|
||||
deferDescendantDelayMs: 1_000,
|
||||
resolveAnnounceRetryDelayMs: (retryCount) => retryCount * 1_000,
|
||||
});
|
||||
|
||||
expect(decision).toEqual({ kind: "retry", retryCount: 2, resumeDelayMs: 2_000 });
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user