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

refactor(queue): share drain helpers across announce and reply

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-22 17:54:19 +00:00
parent 78220db2be
commit dacb3d1aa2
3 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/agents/subagent-announce-queue.ts
View File

@@ -8,9 +8,10 @@ import {
import {
applyQueueRuntimeSettings,
applyQueueDropPolicy,
beginQueueDrain,
buildCollectPrompt,
clearQueueSummaryState,
drainCollectItemIfNeeded,
drainCollectQueueStep,
drainNextQueueItem,
hasCrossChannelItems,
previewQueueSummaryPrompt,
@@ -97,33 +98,35 @@ function getAnnounceQueue(
return created;
}
function hasAnnounceCrossChannelItems(items: AnnounceQueueItem[]): boolean {
return hasCrossChannelItems(items, (item) => {
if (!item.origin) {
return {};
}
if (!item.originKey) {
return { cross: true };
}
return { key: item.originKey };
});
}
function scheduleAnnounceDrain(key: string) {
const queue = ANNOUNCE_QUEUES.get(key);
if (!queue || queue.draining) {
const queue = beginQueueDrain(ANNOUNCE_QUEUES, key);
if (!queue) {
return;
}
queue.draining = true;
void (async () => {
try {
let forceIndividualCollect = false;
while (queue.items.length > 0 || queue.droppedCount > 0) {
const collectState = { forceIndividualCollect: false };
for (;;) {
if (queue.items.length === 0 && queue.droppedCount === 0) {
break;
}
await waitForQueueDebounce(queue);
if (queue.mode === "collect") {
const isCrossChannel = hasCrossChannelItems(queue.items, (item) => {
if (!item.origin) {
return {};
}
if (!item.originKey) {
return { cross: true };
}
return { key: item.originKey };
});
const collectDrainResult = await drainCollectItemIfNeeded({
forceIndividualCollect,
isCrossChannel,
setForceIndividualCollect: (next) => {
forceIndividualCollect = next;
},
const collectDrainResult = await drainCollectQueueStep({
collectState,
isCrossChannel: hasAnnounceCrossChannelItems(queue.items),
items: queue.items,
run: async (item) => await queue.send(item),
});