nyrn
/
openclaw
mirror of https://github.com/openclaw/openclaw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: use session origin thread metadata in chat routing

This commit is contained in:
Tak Hoffman 2026-03-27 20:03:50 -05:00
parent a9e9c7cbfd
commit 59cd79d37f
No known key found for this signature in database
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/gateway/server-methods/chat.directive-tags.test.ts
View File

@ -894,6 +894,49 @@ describe("chat directive tag stripping for non-streaming final payloads", () =>
);
});
it("chat.send falls back to origin thread metadata for configured main CLI delivery inheritance", async () => {
createTranscriptFixture("openclaw-chat-send-config-main-origin-thread-routes-");
mockState.mainSessionKey = "work";
mockState.finalText = "ok";
mockState.sessionEntry = {
origin: {
provider: "telegram",
accountId: "default",
threadId: "42",
},
lastTo: "telegram:6812765697",
};
const respond = vi.fn();
const context = createChatContext();
await runNonStreamingChatSend({
context,
respond,
idempotencyKey: "idem-config-main-origin-thread-routes",
client: {
connect: {
client: {
mode: GATEWAY_CLIENT_MODES.CLI,
id: "cli",
},
},
} as unknown,
sessionKey: "agent:main:work",
deliver: true,
expectBroadcast: false,
});
expect(mockState.lastDispatchCtx).toEqual(
expect.objectContaining({
OriginatingChannel: "telegram",
OriginatingTo: "telegram:6812765697",
ExplicitDeliverRoute: true,
AccountId: "default",
MessageThreadId: "42",
}),
);
});
it("chat.send keeps configured main delivery inheritance when connect metadata omits client details", async () => {
createTranscriptFixture("openclaw-chat-send-config-main-connect-no-client-");
mockState.mainSessionKey = "work";

5
src/gateway/server-methods/chat.ts
View File

@ -124,6 +124,7 @@ type ChatSendDeliveryEntry = {
origin?: {
provider?: string;
accountId?: string;
threadId?: string | number;
};
lastChannel?: string;
lastTo?: string;
@ -177,7 +178,9 @@ function resolveChatSendOriginatingRoute(params: {
params.entry?.origin?.accountId ??
undefined;
const routeThreadIdCandidate =
params.entry?.deliveryContext?.threadId ?? params.entry?.lastThreadId;
params.entry?.deliveryContext?.threadId ??
params.entry?.lastThreadId ??
params.entry?.origin?.threadId;
if (params.sessionKey.length > CHAT_SEND_SESSION_KEY_MAX_LENGTH) {
return {
originatingChannel: INTERNAL_MESSAGE_CHANNEL,