@xopcai/xopc 0.0.29 → 0.0.31

package/dist/src/gateway/service.d.ts

@@ -3,20 +3,15 @@ import { ExtensionLoader } from '../extensions/index.js';
 import { SessionManager } from '../session/index.js';
 import type { Config } from '../config/schema.js';
 import type { SessionListQuery, ExportFormat } from '../session/types.js';
+import type { SessionPatchBody } from '../session/patch-metadata.js';
+import type { CompactionResult } from '../agent/memory/compaction.js';
 import { AgentRunRelay } from './agent-run-relay.js';
-import { type MarketplacePackageDetail, type SkillsStoreListParams, type SkillsStoreListResponse } from '../agent/skills/skills-store-client.js';
+import { type MarketplaceCategoryOption, type SkillsStoreListParams, type UnifiedMarketplaceListResponse, type UnifiedMarketplacePackageDetail } from '../agent/skills/skills-marketplace.js';
 import type { SkillCatalogEntry } from '../agent/agent-manager.js';
+import type { SkillMarkdownPreviewPayload } from '../agent/skills/types.js';
 import type { ManagedSkillListItem } from '../agent/skills/managed-store.js';
-export interface ServiceEvent {
-    id: string;
-    type: string;
-    payload: unknown;
-}
-type EventListener = (event: ServiceEvent) => Promise<void> | void;
-export interface GatewayServiceConfig {
-    configPath?: string;
-    enableHotReload?: boolean;
-}
+import type { GatewayServiceConfig, ServiceEvent } from './service/types.js';
+export type { GatewayServiceConfig, ServiceEvent } from './service/types.js';
 export declare class GatewayService {
     private serviceConfig;
     private bus;
@@ -33,9 +28,7 @@ export declare class GatewayService {
     private startTime;
     private workspacePath;
     private auth;
-    private eventCounter;
-    private subscribers;
-    private eventBuffers;
+    private readonly sse;
     readonly runRelay: AgentRunRelay;
     /** Per-run abort for webchat (POST /api/agent/abort or client disconnect). */
     private runAbortControllers;
@@ -146,10 +139,8 @@ export declare class GatewayService {
         error?: string;
     }>;
     /**
-     * Run agent with a message and stream events
-     */
-    /**
-     * @param runOptions.signal — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.
+     * Run agent with a message and stream events.
+     * `runOptions.signal` — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.
      */
     runAgent(message: string, channel: string, chatId: string, attachments?: Array<{
         type: string;
@@ -159,6 +150,7 @@ export declare class GatewayService {
         size?: number;
     }>, thinking?: string, runOptions?: {
         signal?: AbortSignal;
+        clientCreatedAtMs?: number;
     }): AsyncGenerator<{
         type: string;
         content?: string;
@@ -254,14 +246,11 @@ export declare class GatewayService {
     invokeGatewayMethod(method: string, params: Record<string, unknown>): Promise<unknown>;
     get currentConfig(): Config;
     get cronServiceInstance(): CronService;
-    getSkillsApi(): {
+    getSkillsApi(lang?: string): {
         catalog: SkillCatalogEntry[];
         managed: ManagedSkillListItem[];
     };
-    getSkillMarkdownSource(skillName: string): {
-        name: string;
-        markdown: string;
-    } | null;
+    getSkillMarkdownSource(skillName: string, lang?: string): SkillMarkdownPreviewPayload | null;
     deleteManagedSkill(skillId: string): void;
     installManagedSkillZip(buffer: Buffer, opts: {
         skillId?: string;
@@ -270,8 +259,11 @@ export declare class GatewayService {
         skillId: string;
         path: string;
     };
-    fetchSkillsMarketplaceCatalog(params: SkillsStoreListParams): Promise<SkillsStoreListResponse>;
-    fetchSkillsMarketplacePackageDetail(packageName: string): Promise<MarketplacePackageDetail>;
+    fetchSkillsMarketplaceCatalog(params: SkillsStoreListParams): Promise<UnifiedMarketplaceListResponse>;
+    fetchSkillsMarketplaceCategories(): Promise<{
+        items: MarketplaceCategoryOption[];
+    }>;
+    fetchSkillsMarketplacePackageDetail(packageName: string): Promise<UnifiedMarketplacePackageDetail>;
     installSkillFromMarketplace(opts: {
         name: string;
         version?: string;
@@ -280,6 +272,10 @@ export declare class GatewayService {
         skillId: string;
         path: string;
     }>;
+    getSkillsMarketplaceProvider(): {
+        provider: string;
+        displayName: string;
+    };
     reloadSkillsFromDisk(): void;
     patchSkillEnabled(skillName: string, enabled: boolean): void;
     get sessionManagerInstance(): SessionManager;
@@ -309,7 +305,7 @@ export declare class GatewayService {
      * Subscribe to server-pushed events.
      * Returns a cleanup function to unsubscribe.
      */
-    subscribe(sessionId: string, listener: EventListener): () => void;
+    subscribe(sessionId: string, listener: (event: ServiceEvent) => Promise<void> | void): () => void;
     /**
      * Emit an event to all subscribers.
      */
@@ -318,11 +314,6 @@ export declare class GatewayService {
      * Get events since a given event id (for Last-Event-ID reconnection).
      */
     getEventsSince(sessionId: string, lastEventId: string): ServiceEvent[];
-    /**
-     * Save user message to session for webchat (fire-and-forget).
-     * Called at the start of runAgent to ensure message survives page refresh.
-     */
-    private _saveUserMessage;
     /**
      * List sessions with query filters
      */
@@ -335,7 +326,26 @@ export declare class GatewayService {
     /**
      * Get a single session by key
      */
-    getSession(key: string): Promise<import("../session/types.js").SessionDetail>;
+    getSession(key: string, options?: {
+        includeTranscriptSummary?: boolean;
+        includeTranscriptRows?: boolean;
+    }): Promise<import("../session/types.js").SessionDetail>;
+    /**
+     * Partial session metadata update (OpenClaw-style sessions.patch subset).
+     */
+    patchSession(key: string, body: SessionPatchBody): Promise<{
+        ok: true;
+    } | {
+        ok: false;
+        error: string;
+    }>;
+    listSessionCompactionCheckpoints(key: string): Promise<import("../session/types.js").CompactionCheckpointSummary[]>;
+    getSessionCompactionCheckpoint(key: string, checkpointId: string): Promise<import("../session/types.js").CompactionCheckpointDetail>;
+    restoreSessionCompactionCheckpoint(key: string, checkpointId: string): Promise<void>;
+    runSessionCompaction(key: string, options?: {
+        instructions?: string;
+        force?: boolean;
+    }): Promise<CompactionResult>;
     /**
      * Delete a session
      */
@@ -443,4 +453,3 @@ export declare class GatewayService {
      */
     refreshAuthToken(): Promise<string>;
 }
-export {};

package/dist/src/gateway/service.js

@@ -6,7 +6,6 @@ import { buildSessionKey, init_session_key, parseSessionKey } from "../routing/s
 import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 import { getLogDir } from "../utils/logger/config.js";
 import { getLogStats } from "../utils/logger/stats.js";
-import { inboundCorrelationMetadataFromAsyncLogContext } from "../utils/logger/context.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_paths, resolveAgentDir, resolveConfigPath, resolveCronJobsPath, resolveWorkspaceExtensionsDir } from "../config/paths.js";
@@ -18,7 +17,6 @@ import { removeSkillsLockEntry } from "../agent/skills/hub-lock.js";
 import { deleteManagedSkill, installSkillFromZip, listManagedSkillDirs } from "../agent/skills/managed-store.js";
 import { MessageBus, MessageBusShutdownError } from "../infra/bus/queue.js";
 import "../infra/bus/index.js";
-import { prependEnvelopeTimestamp } from "../channels/envelope-timestamp.js";
 import { SessionManager } from "../session/manager.js";
 import "../session/index.js";
 import { registerClarifyBridge } from "./clarify-runtime.js";
@@ -39,10 +37,13 @@ import { assertGatewayAuthNotKnownWeak } from "./security/known-weak-secrets.js"
 import { auditGatewayConfig } from "./security/audit.js";
 import { AgentRunRelay } from "./agent-run-relay.js";
 import { ClarifyBridge } from "./clarify-bridge.js";
-import { downloadSkillZipBuffer, fetchMarketplacePackageDetail, listSkillPackages, resolveSkillZipDownloadUrl, resolveSkillsStoreBaseUrl, skillIdForMarketplaceInstall } from "../agent/skills/skills-store-client.js";
+import { getMarketplaceProviderDisplayName, resolveSkillsMarketplaceProvider } from "../agent/skills/marketplace/resolve-adapter.js";
+import { downloadFromMarketplace, getMarketplacePackageDetail, listMarketplaceCategories, listMarketplacePackages } from "../agent/skills/skills-marketplace.js";
 import { scheduleGatewayUpdateCheck } from "../infra/update-startup.js";
 import { restartGatewayProcessWithFreshPid } from "./respawn.js";
-import "./chat-limits.js";
+import { getDistinctSessionChatIds } from "./service/session-chat-ids.js";
+import { runGatewayAgent } from "./service/run-gateway-agent.js";
+import { GatewaySseHub } from "./service/sse-hub.js";
 import crypto from "crypto";
 //#region src/gateway/service.ts
 init_schema();
@@ -53,7 +54,6 @@ init_package_version();
 init_session_key();
 init_resolve_route();
 const log = createLogger("GatewayService");
-const EVENT_BUFFER_SIZE = 200;
 var GatewayService = class {
 	bus;
 	config;
@@ -69,9 +69,7 @@ var GatewayService = class {
 	startTime = Date.now();
 	workspacePath;
 	auth;
-	eventCounter = 0;
-	subscribers = /* @__PURE__ */ new Map();
-	eventBuffers = /* @__PURE__ */ new Map();
+	sse = new GatewaySseHub();
 	runRelay = new AgentRunRelay();
 	/** Per-run abort for webchat (POST /api/agent/abort or client disconnect). */
 	runAbortControllers = /* @__PURE__ */ new Map();
@@ -583,150 +581,48 @@ var GatewayService = class {
 		}
 	}
 	/**
-	* Run agent with a message and stream events
-	*/
-	/**
-	* @param runOptions.signal — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.
+	* Run agent with a message and stream events.
+	* `runOptions.signal` — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.
 	*/
 	async *runAgent(message, channel, chatId, attachments, thinking, runOptions) {
-		const cappedAttachments = attachments && attachments.length > 10 ? attachments.slice(0, 10) : attachments;
-		if (attachments && cappedAttachments && attachments.length > cappedAttachments.length) log.debug({
-			dropped: attachments.length - cappedAttachments.length,
-			max: 10
-		}, "Attachments capped for webchat");
-		const runId = crypto.randomUUID();
-		if (channel === "webchat") {
-			const sessionKey = parseSessionKey(chatId) ? chatId : buildSessionKey({
-				agentId: getDefaultAgentId(this.config),
-				source: "webchat",
-				accountId: "default",
-				peerKind: "direct",
-				peerId: chatId
-			});
-			this.runRelay.ensureRun(runId, sessionKey);
-			this.runAbortControllers.set(runId, new AbortController());
-		}
-		const statusEvent = {
-			type: "status",
-			status: "accepted",
-			runId
-		};
-		if (channel === "webchat") this.runRelay.publish(runId, statusEvent);
-		yield statusEvent;
-		try {
-			if (channel === "webchat") {
-				const sessionKey = parseSessionKey(chatId) ? chatId : buildSessionKey({
-					agentId: getDefaultAgentId(this.config),
-					source: "webchat",
-					accountId: "default",
-					peerKind: "direct",
-					peerId: chatId
-				});
-				const timezone = this.agentService.resolveUserTimezoneForSession(sessionKey);
-				const stampedMessage = message.trimStart().startsWith("/") ? message : prependEnvelopeTimestamp(message, timezone);
-				const prepared = await this.agentService.prepareInboundAttachments(sessionKey, cappedAttachments);
-				try {
-					await this._saveUserMessage(sessionKey, message, prepared);
-				} catch (err) {
-					log.error({
-						err,
-						sessionKey
-					}, "Failed to save user message");
-				}
-				const runAbort = this.runAbortControllers.get(runId);
-				if (!runAbort) throw new Error("run abort controller missing for webchat");
-				const mergedSignal = runOptions?.signal ? AbortSignal.any([runOptions.signal, runAbort.signal]) : runAbort.signal;
-				this.activeWebchatRunBySession.set(sessionKey, runId);
-				let streamError;
-				try {
-					this.emit("agent.stream", {
-						sessionKey,
-						event: statusEvent
-					});
-					const eventStream = this.agentService.processDirectStreaming(stampedMessage, sessionKey, prepared, thinking, { signal: mergedSignal });
-					for await (const event of eventStream) {
-						this.runRelay.publish(runId, event);
-						this.emit("agent.stream", {
-							sessionKey,
-							event
-						});
-						yield event;
-					}
-					this.runRelay.complete(runId);
-					try {
-						const metaAfter = await this.sessionManager.getSessionMetadata(sessionKey);
-						if (metaAfter?.name) this.emit("session.updated", {
-							key: sessionKey,
-							name: metaAfter.name
-						});
-					} catch {}
-					return {
-						status: mergedSignal.aborted ? "aborted" : "ok",
-						summary: mergedSignal.aborted ? "Interrupted" : "Message processed successfully"
-					};
-				} catch (error) {
-					log.error({ error }, "Agent processing failed");
-					streamError = error instanceof Error ? error.message : "Unknown error";
-					const errorEvent = {
-						type: "error",
-						content: `Error: ${streamError}`
-					};
-					this.runRelay.publish(runId, errorEvent);
-					this.emit("agent.stream", {
-						sessionKey,
-						event: errorEvent
-					});
-					this.runRelay.complete(runId);
-					yield errorEvent;
-					return {
-						status: "error",
-						summary: streamError
-					};
-				} finally {
-					this.activeWebchatRunBySession.delete(sessionKey);
-					this.runAbortControllers.delete(runId);
-					const assistantPlainText = this.agentService.getLastAssistantPlainText(sessionKey);
-					await this.agentService.emitWebchatTurnComplete({
-						sessionKey,
-						inboundUserText: message,
-						assistantPlainText,
-						aborted: mergedSignal.aborted,
-						...streamError !== void 0 ? { streamError } : {}
-					});
-				}
-			}
-			const correlationMeta = inboundCorrelationMetadataFromAsyncLogContext();
-			await this.bus.publishInbound({
-				channel,
-				sender_id: "gateway",
-				chat_id: chatId,
-				content: message,
-				...correlationMeta ? { metadata: correlationMeta } : {}
-			});
-			yield {
-				type: "token",
-				content: "Processing...\n"
-			};
-			await new Promise((resolve) => setTimeout(resolve, 1e3));
-			yield {
-				type: "token",
-				content: "Done\n"
-			};
-			return {
-				status: "ok",
-				summary: "Message processed"
-			};
-		} catch (error) {
-			log.error({ error }, "Agent run failed");
-			throw error;
+		const iter = runGatewayAgent({
+			config: this.config,
+			agentService: this.agentService,
+			bus: this.bus,
+			runRelay: this.runRelay,
+			runAbortControllers: this.runAbortControllers,
+			activeWebchatRunBySession: this.activeWebchatRunBySession,
+			sessionManager: this.sessionManager,
+			emit: (type, payload) => this.sse.emit(type, payload)
+		}, message, channel, chatId, attachments, thinking, runOptions);
+		let step = await iter.next();
+		while (!step.done) {
+			yield step.value;
+			step = await iter.next();
 		}
+		return step.value;
 	}
 	/** Abort an in-flight webchat agent run (matches `runId` from SSE `status`). */
 	abortAgentRun(runId) {
 		this.clarifyBridge.cancelForRun(runId);
-		for (const [sk, id] of this.activeWebchatRunBySession) if (id === runId) this.activeWebchatRunBySession.delete(sk);
+		const keysToMark = [];
+		for (const [sk, id] of this.activeWebchatRunBySession) if (id === runId) keysToMark.push(sk);
+		for (const sk of keysToMark) this.activeWebchatRunBySession.delete(sk);
+		const relaySk = this.runRelay.getSessionKey(runId);
+		if (relaySk && !keysToMark.includes(relaySk)) keysToMark.push(relaySk);
 		const c = this.runAbortControllers.get(runId);
 		if (!c) return false;
+		const cutoffTs = Date.now();
+		for (const sk of keysToMark) {
+			this.sessionManager.updateSessionMetadata(sk, { abortCutoffTimestamp: cutoffTs }).catch(() => {});
+			this.sessionManager.appendTranscriptContextEntry(sk, {
+				text: "Webchat agent run aborted",
+				data: {
+					runId,
+					abortCutoffTimestamp: cutoffTs
+				}
+			}).catch(() => {});
+		}
 		c.abort();
 		return true;
 	}
@@ -953,14 +849,14 @@ var GatewayService = class {
 	get cronServiceInstance() {
 		return this.cronService;
 	}
-	getSkillsApi() {
+	getSkillsApi(lang) {
 		return {
-			catalog: this.agentService.getSkillCatalog(),
+			catalog: this.agentService.getSkillCatalog(lang),
 			managed: listManagedSkillDirs()
 		};
 	}
-	getSkillMarkdownSource(skillName) {
-		return this.agentService.getSkillMarkdownSource(skillName);
+	getSkillMarkdownSource(skillName, lang) {
+		return this.agentService.getSkillMarkdownSource(skillName, lang);
 	}
 	deleteManagedSkill(skillId) {
 		removeSkillsLockEntry(skillId);
@@ -974,21 +870,28 @@ var GatewayService = class {
 		return result;
 	}
 	async fetchSkillsMarketplaceCatalog(params) {
-		return listSkillPackages(resolveSkillsStoreBaseUrl(this.config), params);
+		return listMarketplacePackages(this.config, params);
+	}
+	async fetchSkillsMarketplaceCategories() {
+		return listMarketplaceCategories(this.config);
 	}
 	async fetchSkillsMarketplacePackageDetail(packageName) {
-		return fetchMarketplacePackageDetail(resolveSkillsStoreBaseUrl(this.config), packageName);
+		return getMarketplacePackageDetail(this.config, packageName);
 	}
 	async installSkillFromMarketplace(opts) {
-		const base = resolveSkillsStoreBaseUrl(this.config);
-		const { downloadUrl } = await resolveSkillZipDownloadUrl(base, opts.name, opts.version);
-		const buf = await downloadSkillZipBuffer(base, downloadUrl);
-		const skillId = skillIdForMarketplaceInstall(opts.name);
-		return this.installManagedSkillZip(buf, {
+		const { buffer, skillId } = await downloadFromMarketplace(this.config, opts.name, opts.version);
+		return this.installManagedSkillZip(buffer, {
 			skillId,
 			overwrite: opts.overwrite ?? false
 		});
 	}
+	getSkillsMarketplaceProvider() {
+		const provider = resolveSkillsMarketplaceProvider(this.config);
+		return {
+			provider,
+			displayName: getMarketplaceProviderDisplayName(provider)
+		};
+	}
 	reloadSkillsFromDisk() {
 		this.agentService.refreshSkillsAfterDiskChange();
 	}
@@ -1020,80 +923,19 @@ var GatewayService = class {
 	* Returns a cleanup function to unsubscribe.
 	*/
 	subscribe(sessionId, listener) {
-		this.subscribers.set(sessionId, listener);
-		if (!this.eventBuffers.has(sessionId)) this.eventBuffers.set(sessionId, []);
-		log.debug({ sessionId }, "Event subscriber added");
-		return () => {
-			this.subscribers.delete(sessionId);
-			setTimeout(() => {
-				if (!this.subscribers.has(sessionId)) this.eventBuffers.delete(sessionId);
-			}, 5 * 6e4);
-			log.debug({ sessionId }, "Event subscriber removed");
-		};
+		return this.sse.subscribe(sessionId, listener);
 	}
 	/**
 	* Emit an event to all subscribers.
 	*/
 	emit(type, payload) {
-		const event = {
-			id: String(++this.eventCounter),
-			type,
-			payload
-		};
-		for (const [sessionId, listener] of this.subscribers) {
-			const buf = this.eventBuffers.get(sessionId) || [];
-			buf.push(event);
-			if (buf.length > EVENT_BUFFER_SIZE) buf.shift();
-			this.eventBuffers.set(sessionId, buf);
-			try {
-				listener(event);
-			} catch (err) {
-				log.warn({
-					sessionId,
-					err
-				}, "Failed to deliver event to subscriber");
-			}
-		}
+		this.sse.emit(type, payload);
 	}
 	/**
 	* Get events since a given event id (for Last-Event-ID reconnection).
 	*/
 	getEventsSince(sessionId, lastEventId) {
-		const buf = this.eventBuffers.get(sessionId);
-		if (!buf) return [];
-		const idx = buf.findIndex((e) => e.id === lastEventId);
-		if (idx === -1) return buf;
-		return buf.slice(idx + 1);
-	}
-	/**
-	* Save user message to session for webchat (fire-and-forget).
-	* Called at the start of runAgent to ensure message survives page refresh.
-	*/
-	async _saveUserMessage(sessionKey, message, attachments) {
-		const existingMessages = await this.sessionManager.loadMessages(sessionKey);
-		const userMessage = {
-			role: "user",
-			content: [{
-				type: "text",
-				text: message
-			}],
-			attachments: attachments?.map((a) => ({
-				type: a.type,
-				mimeType: a.mimeType,
-				name: a.name,
-				size: a.size,
-				workspaceRelativePath: a.workspaceRelativePath
-			})),
-			timestamp: Date.now(),
-			/** Dropped before `agent.prompt` so we don't duplicate the turn; not exposed via GET session */
-			webchatEarlySave: true
-		};
-		const updatedMessages = [...existingMessages, userMessage];
-		await this.sessionManager.saveMessages(sessionKey, updatedMessages);
-		log.debug({
-			sessionKey,
-			messageCount: updatedMessages.length
-		}, "User message saved");
+		return this.sse.getEventsSince(sessionId, lastEventId);
 	}
 	/**
 	* List sessions with query filters
@@ -1111,8 +953,37 @@ var GatewayService = class {
 	/**
 	* Get a single session by key
 	*/
-	async getSession(key) {
-		return this.sessionManager.getSession(key);
+	async getSession(key, options) {
+		return this.sessionManager.getSession(key, options);
+	}
+	/**
+	* Partial session metadata update (OpenClaw-style sessions.patch subset).
+	*/
+	async patchSession(key, body) {
+		return this.sessionManager.patchSession(key, body);
+	}
+	async listSessionCompactionCheckpoints(key) {
+		return this.sessionManager.listCompactionCheckpoints(key);
+	}
+	async getSessionCompactionCheckpoint(key, checkpointId) {
+		return this.sessionManager.getCompactionCheckpointDetail(key, checkpointId);
+	}
+	async restoreSessionCompactionCheckpoint(key, checkpointId) {
+		await this.sessionManager.restoreCompactionCheckpoint(key, checkpointId);
+		this.agentService.evictSessionAgent(key);
+	}
+	async runSessionCompaction(key, options) {
+		const result = await this.agentService.compactSession(key, options);
+		if (result.compacted) this.sessionManager.appendTranscriptContextEntry(key, {
+			text: "Session transcript compacted",
+			data: {
+				firstKeptIndex: result.firstKeptIndex,
+				tokensBefore: result.tokensBefore,
+				tokensAfter: result.tokensAfter,
+				summaryPreview: result.summary.slice(0, 500)
+			}
+		}).catch(() => {});
+		return result;
 	}
 	/**
 	* Delete a session
@@ -1206,32 +1077,7 @@ var GatewayService = class {
 	* When `routing` exists, `peerId` is the platform id (e.g. Telegram numeric chat id).
 	*/
 	async getSessionChatIds(channel) {
-		const result = await this.sessionManager.listSessions({
-			limit: 1e3,
-			sortBy: "lastAccessedAt",
-			sortOrder: "desc",
-			...channel ? { channel } : {}
-		});
-		const seen = /* @__PURE__ */ new Set();
-		const chatIds = [];
-		for (const session of result.items) {
-			const key = `${session.sourceChannel}:${session.sourceChatId}`;
-			if (!seen.has(key) && session.sourceChannel && session.sourceChatId) {
-				seen.add(key);
-				const r = session.routing;
-				chatIds.push({
-					channel: session.sourceChannel,
-					chatId: session.sourceChatId,
-					lastActive: session.lastAccessedAt,
-					...r ? {
-						accountId: r.accountId,
-						peerKind: r.peerKind,
-						peerId: r.peerId
-					} : {}
-				});
-			}
-		}
-		return chatIds;
+		return getDistinctSessionChatIds(this.sessionManager, channel);
 	}
 	/**
 	* Validate authentication token from request headers.