vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 06:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(telegram): clear compaction replay after visible boundaries

Browse Source
This commit is contained in:
Ayaan Zaidi
2026-04-17 11:10:49 +05:30
parent 671579663b
commit 5aad79571e
2 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
extensions/telegram/src/bot-message-dispatch.test.ts
View File

@@ -1328,6 +1328,47 @@ describe("dispatchTelegramMessage draft streaming", () => {
);
});
it("rotates after a visible tool payload lands between compaction and the next assistant message", async () => {
const answerDraftStream = createSequencedDraftStream(1001);
const reasoningDraftStream = createDraftStream();
createTelegramDraftStream
.mockImplementationOnce(() => answerDraftStream)
.mockImplementationOnce(() => reasoningDraftStream);
dispatchReplyWithBufferedBlockDispatcher.mockImplementation(
async ({ dispatcherOptions, replyOptions }) => {
await replyOptions?.onPartialReply?.({ text: "Message A partial" });
await replyOptions?.onCompactionStart?.();
await replyOptions?.onCompactionEnd?.();
await dispatcherOptions.deliver(
{ mediaUrl: "file:///tmp/tool-result.png" },
{ kind: "tool" },
);
await replyOptions?.onAssistantMessageStart?.();
await replyOptions?.onPartialReply?.({ text: "Message B partial" });
await dispatcherOptions.deliver({ text: "Message B final" }, { kind: "final" });
return { queuedFinal: true };
},
);
deliverReplies.mockResolvedValue({ delivered: true });
editMessageTelegram.mockResolvedValue({ ok: true, chatId: "123", messageId: "1001" });
await dispatchWithContext({ context: createContext(), streamMode: "partial" });
expect(answerDraftStream.forceNewMessage).toHaveBeenCalledTimes(1);
expect(deliverReplies).toHaveBeenCalledWith(
expect.objectContaining({
replies: [expect.objectContaining({ mediaUrl: "file:///tmp/tool-result.png" })],
}),
);
expect(editMessageTelegram).toHaveBeenCalledTimes(1);
expect(editMessageTelegram).toHaveBeenCalledWith(
123,
expect.any(Number),
"Message B final",
expect.any(Object),
);
});
it("finalizes multi-message assistant stream to matching preview messages in order", async () => {
const answerDraftStream = createSequencedDraftStream(1001);
const reasoningDraftStream = createDraftStream();

18
extensions/telegram/src/bot-message-dispatch.ts
View File

@@ -10,7 +10,6 @@ import type {
OpenClawConfig,
ReplyToMode,
TelegramAccountConfig,
TelegramDirectConfig,
} from "openclaw/plugin-sdk/config-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { clearHistoryEntriesIfEnabled } from "openclaw/plugin-sdk/reply-history";
@@ -609,6 +608,11 @@ export const dispatchTelegramMessage = async ({
dispatcherOptions: {
...replyPipeline,
deliver: async (payload, info) => {
const clearPendingCompactionReplayBoundaryOnVisibleBoundary = (didDeliver: boolean) => {
if (didDeliver && info.kind !== "final") {
pendingCompactionReplayBoundary = false;
}
};
if (payload.isError === true) {
hadErrorReplyFailureOrSkip = true;
}
@@ -706,7 +710,9 @@ export const dispatchTelegramMessage = async ({
if (reply.hasMedia) {
const payloadWithoutSuppressedReasoning =
typeof payload.text === "string" ? { ...payload, text: "" } : payload;
await sendPayload(payloadWithoutSuppressedReasoning);
clearPendingCompactionReplayBoundaryOnVisibleBoundary(
await sendPayload(payloadWithoutSuppressedReasoning),
);
}
if (info.kind === "final") {
await flushBufferedFinalAnswer();
@@ -728,7 +734,7 @@ export const dispatchTelegramMessage = async ({
}
return;
}
await sendPayload(payload);
clearPendingCompactionReplayBoundaryOnVisibleBoundary(await sendPayload(payload));
if (info.kind === "final") {
await flushBufferedFinalAnswer();
pendingCompactionReplayBoundary = false;
@@ -960,8 +966,10 @@ export const dispatchTelegramMessage = async ({
const userMessage = (ctxPayload.RawBody ?? ctxPayload.Body ?? "").slice(0, 500);
if (userMessage.trim()) {
const agentDir = resolveAgentDir(cfg, route.agentId);
const directConfig = !isGroup ? (groupConfig as TelegramDirectConfig | undefined) : undefined;
const directAutoTopicLabel = directConfig?.autoTopicLabel;
const directAutoTopicLabel =
!isGroup && groupConfig && "autoTopicLabel" in groupConfig
? groupConfig.autoTopicLabel
: undefined;
const accountAutoTopicLabel = telegramCfg?.autoTopicLabel;
const autoTopicConfig = resolveAutoTopicLabelConfig(
directAutoTopicLabel,