fix(telegram): cron and heartbeat messages land in wrong chat instead of target topic (#19367)
Merged via /review-pr -> /prepare-pr -> /merge-pr. Prepared head SHA: bf02bbf9cec2aacbc909905fad90450cc7d921ec Co-authored-by: Lukavyi <1013690+Lukavyi@users.noreply.github.com> Co-authored-by: obviyus <22031114+obviyus@users.noreply.github.com> Reviewed-by: @obviyusfeature/PAZ-358-fe-credit-error-display
parent
114736ed1a
commit
d833dcd731
@ -0,0 +1,131 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import type { OpenClawConfig } from "../config/config.js";
|
||||
|
||||
// Mock session store so we can control what entries exist.
|
||||
const mockStore: Record<string, Record<string, unknown>> = {};
|
||||
vi.mock("../config/sessions.js", () => ({
|
||||
loadSessionStore: vi.fn((storePath: string) => mockStore[storePath] ?? {}),
|
||||
resolveAgentMainSessionKey: vi.fn(({ agentId }: { agentId: string }) => `agent:${agentId}:main`),
|
||||
resolveStorePath: vi.fn((_store: unknown, _opts: unknown) => "/mock/store.json"),
|
||||
}));
|
||||
|
||||
// Mock channel-selection to avoid real config resolution.
|
||||
vi.mock("../infra/outbound/channel-selection.js", () => ({
|
||||
resolveMessageChannelSelection: vi.fn(async () => ({ channel: "telegram" })),
|
||||
}));
|
||||
|
||||
// Minimal mock for channel plugins (Telegram resolveTarget is an identity).
|
||||
vi.mock("../channels/plugins/index.js", () => ({
|
||||
getChannelPlugin: vi.fn(() => ({
|
||||
meta: { label: "Telegram" },
|
||||
config: {},
|
||||
outbound: {
|
||||
resolveTarget: ({ to }: { to?: string }) =>
|
||||
to ? { ok: true, to } : { ok: false, error: new Error("missing") },
|
||||
},
|
||||
})),
|
||||
normalizeChannelId: vi.fn((id: string) => id),
|
||||
}));
|
||||
|
||||
const { resolveDeliveryTarget } = await import("./isolated-agent/delivery-target.js");
|
||||
|
||||
describe("resolveDeliveryTarget thread session lookup", () => {
|
||||
const cfg: OpenClawConfig = {};
|
||||
|
||||
it("uses thread session entry when sessionKey is provided and entry exists", async () => {
|
||||
mockStore["/mock/store.json"] = {
|
||||
"agent:main:main": {
|
||||
sessionId: "s1",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "-100111",
|
||||
},
|
||||
"agent:main:main:thread:9999": {
|
||||
sessionId: "s2",
|
||||
updatedAt: 2,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "-100111",
|
||||
lastThreadId: 9999,
|
||||
},
|
||||
};
|
||||
|
||||
const result = await resolveDeliveryTarget(cfg, "main", {
|
||||
channel: "last",
|
||||
sessionKey: "agent:main:main:thread:9999",
|
||||
});
|
||||
|
||||
expect(result.to).toBe("-100111");
|
||||
expect(result.threadId).toBe(9999);
|
||||
expect(result.channel).toBe("telegram");
|
||||
});
|
||||
|
||||
it("falls back to main session when sessionKey entry does not exist", async () => {
|
||||
mockStore["/mock/store.json"] = {
|
||||
"agent:main:main": {
|
||||
sessionId: "s1",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "-100222",
|
||||
},
|
||||
};
|
||||
|
||||
const result = await resolveDeliveryTarget(cfg, "main", {
|
||||
channel: "last",
|
||||
sessionKey: "agent:main:main:thread:nonexistent",
|
||||
});
|
||||
|
||||
expect(result.to).toBe("-100222");
|
||||
expect(result.threadId).toBeUndefined();
|
||||
expect(result.channel).toBe("telegram");
|
||||
});
|
||||
|
||||
it("falls back to main session when no sessionKey is provided", async () => {
|
||||
mockStore["/mock/store.json"] = {
|
||||
"agent:main:main": {
|
||||
sessionId: "s1",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "-100333",
|
||||
},
|
||||
};
|
||||
|
||||
const result = await resolveDeliveryTarget(cfg, "main", {
|
||||
channel: "last",
|
||||
});
|
||||
|
||||
expect(result.to).toBe("-100333");
|
||||
expect(result.threadId).toBeUndefined();
|
||||
});
|
||||
|
||||
it("preserves threadId from :topic: in delivery.to on first run (no session history)", async () => {
|
||||
mockStore["/mock/store.json"] = {};
|
||||
|
||||
const result = await resolveDeliveryTarget(cfg, "main", {
|
||||
channel: "telegram",
|
||||
to: "63448508:topic:1008013",
|
||||
});
|
||||
|
||||
expect(result.to).toBe("63448508");
|
||||
expect(result.threadId).toBe(1008013);
|
||||
expect(result.channel).toBe("telegram");
|
||||
});
|
||||
|
||||
it("preserves threadId from :topic: when lastTo differs", async () => {
|
||||
mockStore["/mock/store.json"] = {
|
||||
"agent:main:main": {
|
||||
sessionId: "s1",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "-100999",
|
||||
},
|
||||
};
|
||||
|
||||
const result = await resolveDeliveryTarget(cfg, "main", {
|
||||
channel: "telegram",
|
||||
to: "63448508:topic:1008013",
|
||||
});
|
||||
|
||||
expect(result.to).toBe("63448508");
|
||||
expect(result.threadId).toBe(1008013);
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,220 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { resolveSessionDeliveryTarget } from "./targets.js";
|
||||
|
||||
describe("resolveSessionDeliveryTarget", () => {
|
||||
it("derives implicit delivery from the last route", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-1",
|
||||
updatedAt: 1,
|
||||
lastChannel: " whatsapp ",
|
||||
lastTo: " +1555 ",
|
||||
lastAccountId: " acct-1 ",
|
||||
},
|
||||
requestedChannel: "last",
|
||||
});
|
||||
|
||||
expect(resolved).toEqual({
|
||||
channel: "whatsapp",
|
||||
to: "+1555",
|
||||
accountId: "acct-1",
|
||||
threadId: undefined,
|
||||
threadIdExplicit: false,
|
||||
mode: "implicit",
|
||||
lastChannel: "whatsapp",
|
||||
lastTo: "+1555",
|
||||
lastAccountId: "acct-1",
|
||||
lastThreadId: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it("prefers explicit targets without reusing lastTo", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-2",
|
||||
updatedAt: 1,
|
||||
lastChannel: "whatsapp",
|
||||
lastTo: "+1555",
|
||||
},
|
||||
requestedChannel: "telegram",
|
||||
});
|
||||
|
||||
expect(resolved).toEqual({
|
||||
channel: "telegram",
|
||||
to: undefined,
|
||||
accountId: undefined,
|
||||
threadId: undefined,
|
||||
threadIdExplicit: false,
|
||||
mode: "implicit",
|
||||
lastChannel: "whatsapp",
|
||||
lastTo: "+1555",
|
||||
lastAccountId: undefined,
|
||||
lastThreadId: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it("allows mismatched lastTo when configured", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-3",
|
||||
updatedAt: 1,
|
||||
lastChannel: "whatsapp",
|
||||
lastTo: "+1555",
|
||||
},
|
||||
requestedChannel: "telegram",
|
||||
allowMismatchedLastTo: true,
|
||||
});
|
||||
|
||||
expect(resolved).toEqual({
|
||||
channel: "telegram",
|
||||
to: "+1555",
|
||||
accountId: undefined,
|
||||
threadId: undefined,
|
||||
threadIdExplicit: false,
|
||||
mode: "implicit",
|
||||
lastChannel: "whatsapp",
|
||||
lastTo: "+1555",
|
||||
lastAccountId: undefined,
|
||||
lastThreadId: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it("passes through explicitThreadId when provided", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-thread",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "-100123",
|
||||
lastThreadId: 999,
|
||||
},
|
||||
requestedChannel: "last",
|
||||
explicitThreadId: 42,
|
||||
});
|
||||
|
||||
expect(resolved.threadId).toBe(42);
|
||||
expect(resolved.channel).toBe("telegram");
|
||||
expect(resolved.to).toBe("-100123");
|
||||
});
|
||||
|
||||
it("uses session lastThreadId when no explicitThreadId", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-thread-2",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "-100123",
|
||||
lastThreadId: 999,
|
||||
},
|
||||
requestedChannel: "last",
|
||||
});
|
||||
|
||||
expect(resolved.threadId).toBe(999);
|
||||
});
|
||||
|
||||
it("falls back to a provided channel when requested is unsupported", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-4",
|
||||
updatedAt: 1,
|
||||
lastChannel: "whatsapp",
|
||||
lastTo: "+1555",
|
||||
},
|
||||
requestedChannel: "webchat",
|
||||
fallbackChannel: "slack",
|
||||
});
|
||||
|
||||
expect(resolved).toEqual({
|
||||
channel: "slack",
|
||||
to: undefined,
|
||||
accountId: undefined,
|
||||
threadId: undefined,
|
||||
threadIdExplicit: false,
|
||||
mode: "implicit",
|
||||
lastChannel: "whatsapp",
|
||||
lastTo: "+1555",
|
||||
lastAccountId: undefined,
|
||||
lastThreadId: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it("parses :topic:NNN from explicitTo into threadId", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-topic",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "63448508",
|
||||
},
|
||||
requestedChannel: "last",
|
||||
explicitTo: "63448508:topic:1008013",
|
||||
});
|
||||
|
||||
expect(resolved.to).toBe("63448508");
|
||||
expect(resolved.threadId).toBe(1008013);
|
||||
});
|
||||
|
||||
it("parses :topic:NNN even when lastTo is absent", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-no-last",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
},
|
||||
requestedChannel: "last",
|
||||
explicitTo: "63448508:topic:1008013",
|
||||
});
|
||||
|
||||
expect(resolved.to).toBe("63448508");
|
||||
expect(resolved.threadId).toBe(1008013);
|
||||
});
|
||||
|
||||
it("skips :topic: parsing for non-telegram channels", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-slack",
|
||||
updatedAt: 1,
|
||||
lastChannel: "slack",
|
||||
lastTo: "C12345",
|
||||
},
|
||||
requestedChannel: "last",
|
||||
explicitTo: "C12345:topic:999",
|
||||
});
|
||||
|
||||
expect(resolved.to).toBe("C12345:topic:999");
|
||||
expect(resolved.threadId).toBeUndefined();
|
||||
});
|
||||
|
||||
it("skips :topic: parsing when channel is explicitly non-telegram even if lastChannel was telegram", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-cross",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "63448508",
|
||||
},
|
||||
requestedChannel: "slack",
|
||||
explicitTo: "C12345:topic:999",
|
||||
});
|
||||
|
||||
expect(resolved.to).toBe("C12345:topic:999");
|
||||
expect(resolved.threadId).toBeUndefined();
|
||||
});
|
||||
|
||||
it("explicitThreadId takes priority over :topic: parsed value", () => {
|
||||
const resolved = resolveSessionDeliveryTarget({
|
||||
entry: {
|
||||
sessionId: "sess-priority",
|
||||
updatedAt: 1,
|
||||
lastChannel: "telegram",
|
||||
lastTo: "63448508",
|
||||
},
|
||||
requestedChannel: "last",
|
||||
explicitTo: "63448508:topic:1008013",
|
||||
explicitThreadId: 42,
|
||||
});
|
||||
|
||||
expect(resolved.threadId).toBe(42);
|
||||
expect(resolved.to).toBe("63448508");
|
||||
});
|
||||
});
|
||||
Loading…
Reference in New Issue