github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 17:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(sessions): share session thread/topic parsing

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-18 17:55:01 +00:00
parent 1aa4d3a6f0
commit 0dc004fd21
3 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/config/sessions/delivery-info.test.ts
View File

@@ -17,7 +17,7 @@ vi.mock("./store.js", () => ({
loadSessionStore: () => storeState.store,
}));
import { extractDeliveryInfo } from "./delivery-info.js";
import { extractDeliveryInfo, parseSessionThreadInfo } from "./delivery-info.js";
const buildEntry = (deliveryContext: SessionEntry["deliveryContext"]): SessionEntry => ({
sessionId: "session-1",
@@ -30,6 +30,25 @@ beforeEach(() => {
});
describe("extractDeliveryInfo", () => {
it("parses base session and thread/topic ids", () => {
expect(parseSessionThreadInfo("agent:main:telegram:group:1:topic:55")).toEqual({
baseSessionKey: "agent:main:telegram:group:1",
threadId: "55",
});
expect(parseSessionThreadInfo("agent:main:slack:channel:C1:thread:123.456")).toEqual({
baseSessionKey: "agent:main:slack:channel:C1",
threadId: "123.456",
});
expect(parseSessionThreadInfo("agent:main:telegram:dm:user-1")).toEqual({
baseSessionKey: "agent:main:telegram:dm:user-1",
threadId: undefined,
});
expect(parseSessionThreadInfo(undefined)).toEqual({
baseSessionKey: undefined,
threadId: undefined,
});
});
it("returns deliveryContext for direct session keys", () => {
const sessionKey = "agent:main:webchat:dm:user-123";
storeState.store[sessionKey] = buildEntry({

19
src/config/sessions/delivery-info.ts
View File

@@ -6,12 +6,12 @@ import { loadSessionStore } from "./store.js";
* Extract deliveryContext and threadId from a sessionKey.
* Supports both :thread: (most channels) and :topic: (Telegram).
*/
export function extractDeliveryInfo(sessionKey: string | undefined): {
deliveryContext: { channel?: string; to?: string; accountId?: string } | undefined;
export function parseSessionThreadInfo(sessionKey: string | undefined): {
baseSessionKey: string | undefined;
threadId: string | undefined;
} {
if (!sessionKey) {
return { deliveryContext: undefined, threadId: undefined };
return { baseSessionKey: undefined, threadId: undefined };
}
const topicIndex = sessionKey.lastIndexOf(":topic:");
const threadIndex = sessionKey.lastIndexOf(":thread:");
@@ -22,6 +22,17 @@ export function extractDeliveryInfo(sessionKey: string | undefined): {
const threadIdRaw =
markerIndex === -1 ? undefined : sessionKey.slice(markerIndex + marker.length);
const threadId = threadIdRaw?.trim() || undefined;
return { baseSessionKey, threadId };
}
export function extractDeliveryInfo(sessionKey: string | undefined): {
deliveryContext: { channel?: string; to?: string; accountId?: string } | undefined;
threadId: string | undefined;
} {
const { baseSessionKey, threadId } = parseSessionThreadInfo(sessionKey);
if (!sessionKey || !baseSessionKey) {
return { deliveryContext: undefined, threadId };
}
let deliveryContext: { channel?: string; to?: string; accountId?: string } | undefined;
try {
@@ -29,7 +40,7 @@ export function extractDeliveryInfo(sessionKey: string | undefined): {
const storePath = resolveStorePath(cfg.session?.store);
const store = loadSessionStore(storePath);
let entry = store[sessionKey];
if (!entry?.deliveryContext && markerIndex !== -1 && baseSessionKey) {
if (!entry?.deliveryContext && baseSessionKey !== sessionKey) {
entry = store[baseSessionKey];
}
if (entry?.deliveryContext) {