github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 15:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(subagents): restore configurable announce timeout

Browse Source 
Co-authored-by: Valadon <20071960+Valadon@users.noreply.github.com>
This commit is contained in:
Peter Steinberger
2026-02-22 21:36:43 +01:00
parent 3820ad77ba
commit 320cf8eb3e
5 changed files with 184 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/agents/subagent-announce.ts
View File

@@ -41,6 +41,8 @@ import { sanitizeTextContent, extractAssistantText } from "./tools/sessions-help
const FAST_TEST_MODE = process.env.OPENCLAW_TEST_FAST === "1";
const FAST_TEST_RETRY_INTERVAL_MS = 8;
const FAST_TEST_REPLY_CHANGE_WAIT_MS = 20;
const DEFAULT_SUBAGENT_ANNOUNCE_TIMEOUT_MS = 60_000;
const MAX_TIMER_SAFE_TIMEOUT_MS = 2_147_000_000;
type ToolResultMessage = {
role?: unknown;
@@ -55,6 +57,14 @@ type SubagentAnnounceDeliveryResult = {
error?: string;
};
function resolveSubagentAnnounceTimeoutMs(cfg: ReturnType<typeof loadConfig>): number {
const configured = cfg.agents?.defaults?.subagents?.announceTimeoutMs;
if (typeof configured !== "number" || !Number.isFinite(configured)) {
return DEFAULT_SUBAGENT_ANNOUNCE_TIMEOUT_MS;
}
return Math.min(Math.max(1, Math.floor(configured)), MAX_TIMER_SAFE_TIMEOUT_MS);
}
function buildCompletionDeliveryMessage(params: {
findings: string;
subagentName: string;
@@ -468,6 +478,8 @@ async function resolveSubagentCompletionOrigin(params: {
}
async function sendAnnounce(item: AnnounceQueueItem) {
const cfg = loadConfig();
const announceTimeoutMs = resolveSubagentAnnounceTimeoutMs(cfg);
const requesterDepth = getSubagentDepthFromSessionStore(item.sessionKey);
const requesterIsSubagent = requesterDepth >= 1;
const origin = item.origin;
@@ -494,7 +506,7 @@ async function sendAnnounce(item: AnnounceQueueItem) {
deliver: !requesterIsSubagent,
idempotencyKey,
},
timeoutMs: 15_000,
timeoutMs: announceTimeoutMs,
});
}
@@ -627,6 +639,7 @@ async function sendSubagentAnnounceDirectly(params: {
requesterIsSubagent: boolean;
}): Promise<SubagentAnnounceDeliveryResult> {
const cfg = loadConfig();
const announceTimeoutMs = resolveSubagentAnnounceTimeoutMs(cfg);
const canonicalRequesterSessionKey = resolveRequesterStoreKey(
cfg,
params.targetRequesterSessionKey,
@@ -689,7 +702,7 @@ async function sendSubagentAnnounceDirectly(params: {
message: params.completionMessage,
idempotencyKey: params.directIdempotencyKey,
},
timeoutMs: 15_000,
timeoutMs: announceTimeoutMs,
});
return {
@@ -717,7 +730,7 @@ async function sendSubagentAnnounceDirectly(params: {
idempotencyKey: params.directIdempotencyKey,
},
expectFinal: true,
timeoutMs: 15_000,
timeoutMs: announceTimeoutMs,
});
return {