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

refactor(queue): reuse collect-mode item drain flow

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-19 07:00:44 +00:00
parent 2f6b8663ff
commit b22deada9e
3 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import {
applyQueueDropPolicy,
buildCollectPrompt,
clearQueueSummaryState,
drainCollectItemIfNeeded,
drainNextQueueItem,
hasCrossChannelItems,
previewQueueSummaryPrompt,
@@ -108,12 +109,6 @@ function scheduleAnnounceDrain(key: string) {
while (queue.items.length > 0 || queue.droppedCount > 0) {
await waitForQueueDebounce(queue);
if (queue.mode === "collect") {
if (forceIndividualCollect) {
if (!(await drainNextQueueItem(queue.items, async (item) => await queue.send(item)))) {
break;
}
continue;
}
const isCrossChannel = hasCrossChannelItems(queue.items, (item) => {
if (!item.origin) {
return {};
@@ -123,11 +118,19 @@ function scheduleAnnounceDrain(key: string) {
}
return { key: item.originKey };
});
if (isCrossChannel) {
forceIndividualCollect = true;
if (!(await drainNextQueueItem(queue.items, async (item) => await queue.send(item)))) {
break;
}
const collectDrainResult = await drainCollectItemIfNeeded({
forceIndividualCollect,
isCrossChannel,
setForceIndividualCollect: (next) => {
forceIndividualCollect = next;
},
items: queue.items,
run: async (item) => await queue.send(item),
});
if (collectDrainResult === "empty") {
break;
}
if (collectDrainResult === "drained") {
continue;
}
const items = queue.items.slice();