@xopcai/xopc 0.0.284 → 0.0.286

package/dist/browser-ext/manifest.json

@@ -3,7 +3,7 @@
   "minimum_chrome_version": "120",
   "default_locale": "en",
   "name": "__MSG_appName__",
-  "version": "0.0.284",
+  "version": "0.0.286",
   "description": "__MSG_appDescription__",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqnpr4vpLC/nmvy+wiOWk3SWlp2nEZkFijfk8ivGw7StNZgCK90nOMvwhdEtlkk3GOWDvdVnq8HxCsM3UNQ8FnGUyerpH1FJXqXuradxeHf8ZxFjiQU/mIWfnKbUuONWQORon3/pigyoXoK/VUXgg0Wbm/rbVwsS0bv+25R6m+mZgBspOLeKuoH7ivhL+48WV6POtMBsFPZweY26477EM7ukh+56Ff5ENevB8ymxBBn7qK5ZoeZd2a23U8ioX5TsHfe6fnrjitPWjIxD8G0NoKQxcaa/Mo+xs+T6UiLKxP0wjz5bm7jB5H+CXtkRJqzBWUB0h+RSLJckzZfA8BAJrRwIDAQAB",
   "permissions": [

package/dist/extensions/feishu/src/adapters/gateway-setup.js

@@ -3,10 +3,10 @@ import { beginAppRegistration, initAppRegistration, pollAppRegistration } from "
 //#region extensions/feishu/src/adapters/gateway-setup.ts
 const activeSessions = /* @__PURE__ */ new Map();
 const completedSessions = /* @__PURE__ */ new Map();
-function rememberCompleted(sessionKey, state) {
-	activeSessions.delete(sessionKey);
-	completedSessions.set(sessionKey, state);
-	setTimeout(() => completedSessions.delete(sessionKey), 10 * 6e4);
+function rememberCompleted(conversationId, state) {
+	activeSessions.delete(conversationId);
+	completedSessions.set(conversationId, state);
+	setTimeout(() => completedSessions.delete(conversationId), 10 * 6e4);
 }
 function readInput(input) {
 	return input && typeof input === "object" && !Array.isArray(input) ? input : {};
@@ -131,8 +131,8 @@ const feishuGatewaySetupActions = { async runAction({ cfg, actionId, input, loca
 			}
 		};
 		const begin = await beginAppRegistration(domain);
-		const sessionKey = begin.deviceCode;
-		activeSessions.set(sessionKey, {
+		const conversationId = begin.deviceCode;
+		activeSessions.set(conversationId, {
 			startedAt: Date.now(),
 			qrPayload: begin.qrUrl
 		});
@@ -144,14 +144,14 @@ const feishuGatewaySetupActions = { async runAction({ cfg, actionId, input, loca
 				initialDomain: domain
 			});
 			if (outcome.status !== "success") {
-				rememberCompleted(sessionKey, {
+				rememberCompleted(conversationId, {
 					phase: "done",
 					ok: false,
 					message: outcome.status === "access_denied" ? zh ? "用户拒绝授权。" : "User denied authorization." : outcome.status === "expired" ? zh ? "配置会话已过期。" : "Setup session expired." : outcome.status === "timeout" ? zh ? "配置超时。" : "Setup timed out." : outcome.message ?? (zh ? "飞书配置失败。" : "Feishu setup failed.")
 				});
 				return;
 			}
-			rememberCompleted(sessionKey, {
+			rememberCompleted(conversationId, {
 				phase: "done",
 				ok: true,
 				accountId: "default",
@@ -164,7 +164,7 @@ const feishuGatewaySetupActions = { async runAction({ cfg, actionId, input, loca
 			ok: true,
 			payload: {
 				type: "qr",
-				sessionKey,
+				conversationId,
 				qrPayload: begin.qrUrl,
 				statusAction: "setup.status",
 				pollIntervalMs: Math.max(1e3, begin.intervalSec * 1e3),
@@ -175,15 +175,15 @@ const feishuGatewaySetupActions = { async runAction({ cfg, actionId, input, loca
 	}
 	if (actionId === "setup.status") {
 		const raw = readInput(input);
-		const sessionKey = typeof raw.sessionKey === "string" ? raw.sessionKey : "";
-		if (!sessionKey) return {
+		const conversationId = typeof raw.conversationId === "string" ? raw.conversationId : "";
+		if (!conversationId) return {
 			ok: false,
-			message: zh ? "缺少配置 sessionKey" : "Missing setup sessionKey"
+			message: zh ? "缺少配置 conversationId" : "Missing setup conversationId"
 		};
-		const completed = completedSessions.get(sessionKey);
+		const completed = completedSessions.get(conversationId);
 		return {
 			ok: true,
-			payload: statusPayload(completed, activeSessions.get(sessionKey), locale),
+			payload: statusPayload(completed, activeSessions.get(conversationId), locale),
 			nextConfig: completedNextConfig(cfg, completed)
 		};
 	}

package/dist/extensions/feishu/src/state/message-bindings.d.ts

@@ -1,6 +1,6 @@
 export type FeishuMessageBinding = {
     messageId: string;
-    sessionKey: string;
+    conversationId: string;
     accountId: string;
     chatId: string;
     senderId: string;

package/dist/extensions/feishu/src/state/thread-bindings.d.ts

@@ -2,7 +2,7 @@ type BindingRecord = {
     accountId: string;
     conversationId: string;
     parentConversationId?: string;
-    targetSessionKey: string;
+    targetConversationId: string;
     boundAt: number;
     lastActivityAt: number;
     metadata?: Record<string, unknown>;
@@ -11,9 +11,9 @@ export declare function bindFeishuConversation(params: {
     accountId: string;
     conversationId: string;
     parentConversationId?: string;
-    targetSessionKey: string;
+    targetConversationId: string;
     metadata?: Record<string, unknown>;
 }): BindingRecord;
-export declare function listBindingsBySessionKey(accountId: string, targetSessionKey: string): BindingRecord[];
-export declare function unbindBySessionKey(accountId: string, targetSessionKey: string): BindingRecord[];
+export declare function listBindingsByConversationId(accountId: string, targetConversationId: string): BindingRecord[];
+export declare function unbindByConversationId(accountId: string, targetConversationId: string): BindingRecord[];
 export {};

package/dist/extensions/feishu/src/state/thread-bindings.js

@@ -18,7 +18,7 @@ function bindFeishuConversation(params) {
 		accountId: params.accountId,
 		conversationId: params.conversationId,
 		parentConversationId: params.parentConversationId,
-		targetSessionKey: params.targetSessionKey,
+		targetConversationId: params.targetConversationId,
 		boundAt: now,
 		lastActivityAt: now,
 		metadata: params.metadata
@@ -26,19 +26,19 @@ function bindFeishuConversation(params) {
 	getState().byAccountConversation.set(key(rec.accountId, rec.conversationId), rec);
 	return rec;
 }
-function listBindingsBySessionKey(accountId, targetSessionKey) {
+function listBindingsByConversationId(accountId, targetConversationId) {
 	const out = [];
-	for (const rec of getState().byAccountConversation.values()) if (rec.accountId === accountId && rec.targetSessionKey === targetSessionKey) out.push(rec);
+	for (const rec of getState().byAccountConversation.values()) if (rec.accountId === accountId && rec.targetConversationId === targetConversationId) out.push(rec);
 	return out;
 }
-function unbindBySessionKey(accountId, targetSessionKey) {
+function unbindByConversationId(accountId, targetConversationId) {
 	const removed = [];
 	for (const rec of getState().byAccountConversation.values()) {
-		if (rec.accountId !== accountId || rec.targetSessionKey !== targetSessionKey) continue;
+		if (rec.accountId !== accountId || rec.targetConversationId !== targetConversationId) continue;
 		getState().byAccountConversation.delete(key(rec.accountId, rec.conversationId));
 		removed.push(rec);
 	}
 	return removed;
 }
 //#endregion
-export { bindFeishuConversation, listBindingsBySessionKey, unbindBySessionKey };
+export { bindFeishuConversation, listBindingsByConversationId, unbindByConversationId };

package/dist/extensions/feishu/src/subagent-hooks.d.ts

@@ -1,5 +1,5 @@
 export declare function handleFeishuSubagentSpawning(event: any, ctx?: {
-    requesterSessionKey?: string;
+    requesterConversationId?: string;
 }): Promise<{
     status: "error";
     error: string;

package/dist/extensions/feishu/src/subagent-hooks.js

@@ -1,4 +1,4 @@
-import { bindFeishuConversation, unbindBySessionKey } from "./state/thread-bindings.js";
+import { bindFeishuConversation, unbindByConversationId } from "./state/thread-bindings.js";
 //#region extensions/feishu/src/subagent-hooks.ts
 function normLower(v) {
 	return typeof v === "string" ? v.trim().toLowerCase() : "";
@@ -26,9 +26,9 @@ async function handleFeishuSubagentSpawning(event, ctx = {}) {
 		accountId,
 		conversationId: isChatTarget ? `${withoutProvider}|topic:${threadId}` : withoutProvider,
 		parentConversationId: isChatTarget ? withoutProvider : void 0,
-		targetSessionKey: String(event.childSessionKey),
+		targetConversationId: String(event.childConversationId),
 		metadata: {
-			requesterSessionKey: ctx.requesterSessionKey,
+			requesterConversationId: ctx.requesterConversationId,
 			deliveryTo: to,
 			deliveryThreadId: threadId || void 0,
 			agentId: event?.agentId,
@@ -42,9 +42,9 @@ async function handleFeishuSubagentSpawning(event, ctx = {}) {
 }
 function handleFeishuSubagentEnded(event) {
 	const accountId = String(event?.accountId ?? "").trim() || "default";
-	const sk = String(event?.targetSessionKey ?? "").trim();
+	const sk = String(event?.targetConversationId ?? "").trim();
 	if (!sk) return;
-	unbindBySessionKey(accountId, sk);
+	unbindByConversationId(accountId, sk);
 }
 //#endregion
 export { handleFeishuSubagentEnded, handleFeishuSubagentSpawning };

package/dist/extensions/feishu/src/transport/socket-mode/monitor.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../../../../../src/utils/logger/index.js";
 import { init_logger } from "../../../../../src/utils/logger.js";
-import { generateSessionKey } from "../../../../../src/chat-commands/session-key.js";
+import { generateConversationId } from "../../../../../src/chat-commands/session-key.js";
 import { getFeishuBindingByMessageId, recordFeishuMessageBinding } from "../../state/message-bindings.js";
 import { createFeishuClient } from "../client/client.js";
 import { sendFeishuPairingPromptIfNeeded } from "../../pairing/feishu-pairing-prompt.js";
@@ -51,7 +51,7 @@ function createFeishuSocketModeMonitor(deps) {
 			chat_id: binding.chatId,
 			content: kind === "deleted" ? `撤回了一个表情（${emojiType}）${preview ? `，对应消息：「${preview}」` : ""}` : `对一条消息添加了表情（${emojiType}）${preview ? `：「${preview}」` : ""}`,
 			metadata: {
-				sessionKey: binding.sessionKey,
+				conversationId: binding.conversationId,
 				accountId: binding.accountId,
 				isGroup: binding.isGroup,
 				threadId: binding.threadId,
@@ -72,7 +72,7 @@ function createFeishuSocketModeMonitor(deps) {
 		const openMessageId = (ctx?.open_message_id ?? "").trim();
 		const binding = openMessageId ? getFeishuBindingByMessageId(openMessageId) : null;
 		const isGroup = chatId.startsWith("oc_");
-		const sessionKey = binding?.sessionKey ?? generateSessionKey({
+		const conversationId = binding?.conversationId ?? generateConversationId({
 			source: "feishu",
 			chatId: chatId || senderId,
 			senderId: senderId || "unknown",
@@ -87,7 +87,7 @@ function createFeishuSocketModeMonitor(deps) {
 			chat_id: chatId || senderId || "unknown",
 			content,
 			metadata: {
-				sessionKey,
+				conversationId,
 				accountId: account.accountId,
 				isGroup: Boolean(chatId) && isGroup,
 				feishuEventType: "card.action.trigger",
@@ -106,7 +106,7 @@ function createFeishuSocketModeMonitor(deps) {
 		const binding = getFeishuBindingByMessageId(recalledMessageId);
 		if (!binding && !chatId) return;
 		const isGroup = (binding?.isGroup ?? chatId.startsWith("oc_")) === true;
-		const sessionKey = binding?.sessionKey ?? generateSessionKey({
+		const conversationId = binding?.conversationId ?? generateConversationId({
 			source: "feishu",
 			chatId: chatId || "unknown",
 			senderId: binding?.senderId ?? "unknown",
@@ -119,7 +119,7 @@ function createFeishuSocketModeMonitor(deps) {
 			chat_id: chatId || binding?.chatId || "unknown",
 			content: `撤回了一条消息（${recalledMessageId}）`,
 			metadata: {
-				sessionKey,
+				conversationId,
 				accountId: account.accountId,
 				isGroup,
 				threadId: binding?.threadId,
@@ -150,7 +150,7 @@ function createFeishuSocketModeMonitor(deps) {
 		const normalizedText = stripFeishuMentions(text ?? "").trim();
 		if (!normalizedText) return;
 		const threadId = msg?.thread_id ?? msg?.threadId ?? void 0;
-		const sessionKey = generateSessionKey({
+		const conversationId = generateConversationId({
 			source: "feishu",
 			chatId,
 			senderId,
@@ -160,7 +160,7 @@ function createFeishuSocketModeMonitor(deps) {
 		});
 		recordFeishuMessageBinding({
 			messageId,
-			sessionKey,
+			conversationId,
 			accountId: account.accountId,
 			chatId,
 			senderId,
@@ -203,7 +203,7 @@ function createFeishuSocketModeMonitor(deps) {
 			chat_id: chatId,
 			content: normalizedText,
 			metadata: {
-				sessionKey,
+				conversationId,
 				accountId: account.accountId,
 				messageId,
 				threadId,

package/dist/extensions/feishu/src/transport/webhook/monitor.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../../../../../src/utils/logger/index.js";
 import { init_logger } from "../../../../../src/utils/logger.js";
-import { generateSessionKey } from "../../../../../src/chat-commands/session-key.js";
+import { generateConversationId } from "../../../../../src/chat-commands/session-key.js";
 import { recordFeishuMessageBinding } from "../../state/message-bindings.js";
 import { loadFeishuLarkSdk } from "../client/lark-sdk.js";
 import { createFeishuLarkSdkPinoLogger } from "../client/lark-sdk-logger.js";
@@ -163,7 +163,7 @@ function createFeishuWebhookMonitor(deps) {
 		const normalizedText = stripFeishuMentions((msg?.content && typeof msg.content === "string" ? safeJsonText(msg.content) : safeJsonText(msg?.body?.content)) ?? "").trim();
 		if (!normalizedText) return;
 		const threadId = msg?.thread_id ?? msg?.threadId ?? void 0;
-		const sessionKey = generateSessionKey({
+		const conversationId = generateConversationId({
 			source: "feishu",
 			chatId,
 			senderId,
@@ -173,7 +173,7 @@ function createFeishuWebhookMonitor(deps) {
 		});
 		recordFeishuMessageBinding({
 			messageId,
-			sessionKey,
+			conversationId,
 			accountId: account.accountId,
 			chatId,
 			senderId,
@@ -205,7 +205,7 @@ function createFeishuWebhookMonitor(deps) {
 			chat_id: chatId,
 			content: normalizedText,
 			metadata: {
-				sessionKey,
+				conversationId,
 				accountId: account.accountId,
 				messageId,
 				threadId,

package/dist/extensions/feishu/src/workflow-progress.d.ts

@@ -10,7 +10,7 @@
  * default throttle leaves comfortable headroom even when several workflows
  * run concurrently.
  *
- * Routing: sessionKey `main:feishu:<accountId>:<dm|group|channel>:<peerId>`.
+ * Routing: conversationId `main:feishu:<accountId>:<dm|group|channel>:<peerId>`.
  * - DM peerId is an `open_id` (starts with `ou_`) → use `receive_id_type=open_id`.
  * - Group / channel peerId is a `chat_id` → use `receive_id_type=chat_id`.
  *

package/dist/extensions/feishu/src/workflow-progress.js

@@ -1,6 +1,7 @@
 import { createLogger } from "../../../src/utils/logger/index.js";
 import { init_logger } from "../../../src/utils/logger.js";
-import { init_session_key, parseSessionKey } from "../../../src/routing/session-key.js";
+import { getConversationRouting } from "../../../src/storage/sqlite/conversation-repository.js";
+import { init_session_key } from "../../../src/routing/session-key.js";
 import { resolveFeishuAccount } from "./state/accounts.js";
 //#region extensions/feishu/src/workflow-progress.ts
 init_session_key();
@@ -17,10 +18,10 @@ function createFeishuWorkflowProgressCapability(opts) {
 		async postProgress(input) {
 			const cfg = opts.getConfig();
 			if (!cfg) throw new Error("feishu workflow progress: no config loaded");
-			const target = resolveTarget(input.sessionKey);
-			if (!target) throw new Error(`feishu workflow progress: cannot route sessionKey "${input.sessionKey}"`);
+			const target = resolveTarget(input.conversationId);
+			if (!target) throw new Error(`feishu workflow progress: cannot route conversationId "${input.conversationId}"`);
 			const account = resolveFeishuAccount(cfg, target.accountId);
-			if (!account.configured) throw new Error(`feishu workflow progress: account "${target.accountId}" not configured (sessionKey "${input.sessionKey}")`);
+			if (!account.configured) throw new Error(`feishu workflow progress: account "${target.accountId}" not configured (conversationId "${input.conversationId}")`);
 			const text = clampForFeishu(input.text);
 			if (input.previousMessageId && !input.isFinal) try {
 				const { editMessageFeishu } = await import("./outbound/actions.js");
@@ -34,7 +35,7 @@ function createFeishuWorkflowProgressCapability(opts) {
 			} catch (err) {
 				if (isMessageNotModified(err)) return { messageId: input.previousMessageId };
 				if (isEditTargetGone(err)) log.debug({
-					sessionKey: input.sessionKey,
+					conversationId: input.conversationId,
 					previousMessageId: input.previousMessageId
 				}, "edit target gone; falling back to fresh send");
 				else throw err;
@@ -55,8 +56,8 @@ function createFeishuWorkflowProgressCapability(opts) {
 		}
 	};
 }
-function resolveTarget(sessionKey) {
-	const parsed = parseSessionKey(sessionKey);
+function resolveTarget(conversationId) {
+	const parsed = getConversationRouting(conversationId);
 	if (!parsed) return null;
 	if (parsed.source !== "feishu") return null;
 	if (!parsed.peerId) return null;

package/dist/extensions/telegram/src/approval-store.d.ts

@@ -2,7 +2,7 @@ export type TelegramApprovalStatus = 'pending' | 'approved' | 'denied' | 'expire
 export interface TelegramPendingApproval {
     id: string;
     accountId: string;
-    sessionKey: string;
+    conversationId: string;
     chatId: string;
     toolName: string;
     summary: string;
@@ -13,7 +13,7 @@ export interface TelegramPendingApproval {
 }
 export declare function createTelegramPendingApproval(params: {
     accountId: string;
-    sessionKey: string;
+    conversationId: string;
     chatId: string;
     toolName: string;
     summary: string;

package/dist/extensions/telegram/src/approval-store.js

@@ -8,7 +8,7 @@ function createTelegramPendingApproval(params) {
 	const entry = {
 		id,
 		accountId: params.accountId,
-		sessionKey: params.sessionKey,
+		conversationId: params.conversationId,
 		chatId: params.chatId,
 		toolName: params.toolName,
 		summary: params.summary,

package/dist/extensions/telegram/src/command-handler.d.ts

@@ -12,8 +12,8 @@ export interface TelegramCommandHandlerDeps {
     bus: any;
     config: Config;
     accountManager: TelegramAccountManager;
-    getSessionModel: (sessionKey: string) => string | undefined;
-    setSessionModel: (sessionKey: string, modelId: string) => void | Promise<void>;
+    getSessionModel: (conversationId: string) => string | undefined;
+    setSessionModel: (conversationId: string, modelId: string) => void | Promise<void>;
     showProviderModels?: (ctx: Context, providerId: string) => Promise<void>;
     showProvidersAgain?: (ctx: Context) => Promise<void>;
     handleCleanupConfirm?: (ctx: Context) => Promise<void>;

package/dist/extensions/telegram/src/command-handler.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../../../src/utils/logger/index.js";
 import { init_logger } from "../../../src/utils/logger.js";
-import { generateSessionKey } from "../../../src/chat-commands/session-key.js";
+import { generateConversationId } from "../../../src/chat-commands/session-key.js";
 import { TelegramInlineKeyboards } from "./inline-keyboards.js";
 //#region extensions/telegram/src/command-handler.ts
 init_logger();
@@ -35,13 +35,13 @@ function createTelegramCommandHandler(deps) {
 			provider: m.provider
 		}));
 	};
-	const getSessionKeyFromCtx = (ctx) => {
+	const getConversationIdFromCtx = (ctx) => {
 		const chatId = String(ctx.chat?.id);
 		const senderId = String(ctx.from?.id);
 		const isGroup = ctx.chat?.type === "group" || ctx.chat?.type === "supergroup";
 		const threadId = ctx.message?.message_thread_id ?? (ctx.callbackQuery?.message)?.message_thread_id;
 		const accountId = accountManager.resolveAccountIdFromContext(ctx);
-		return generateSessionKey({
+		return generateConversationId({
 			source: "telegram",
 			chatId,
 			senderId,
@@ -96,10 +96,10 @@ function createTelegramCommandHandler(deps) {
 	};
 	const handleProviderSelect = async (ctx, providerId) => {
 		try {
-			const sessionKey = getSessionKeyFromCtx(ctx);
+			const conversationId = getConversationIdFromCtx(ctx);
 			const { getDefaultModelSync, getProviderDisplayName } = await import("../../../src/providers/index.js");
 			const defaultModel = getDefaultModelSync(config);
-			const currentModel = getSessionModel(sessionKey) || defaultModel;
+			const currentModel = getSessionModel(conversationId) || defaultModel;
 			const models = await getModelsForProvider(providerId);
 			if (models.length === 0) {
 				await ctx.editMessageText("❌ No models available for this provider.");
@@ -123,13 +123,13 @@ function createTelegramCommandHandler(deps) {
 	};
 	const handleModelSelect = async (ctx, modelId) => {
 		try {
-			const sessionKey = getSessionKeyFromCtx(ctx);
-			await Promise.resolve(setSessionModel(sessionKey, modelId));
+			const conversationId = getConversationIdFromCtx(ctx);
+			await Promise.resolve(setSessionModel(conversationId, modelId));
 			const modelName = modelId.split("/").pop() || modelId;
 			await ctx.editMessageText(`✅ Model switched to *${modelName}*\n\nThis model will be used for your next message.`, { parse_mode: "Markdown" });
 			await ctx.answerCallbackQuery(`Switched to ${modelName}`);
 			log.info({
-				sessionKey,
+				conversationId,
 				modelId
 			}, "Model switched via Telegram");
 		} catch (err) {

package/dist/extensions/telegram/src/delivery-chat-id.d.ts

@@ -1,6 +1,6 @@
 /**
  * Resolves Telegram Bot API `chat_id` from config/UI `to` / `targetChatId`.
- * Accepts numeric ids, full session keys (`agent:main:telegram:...`), or
+ * Accepts numeric ids, conversation UUIDs, or
  * routing suffixes (`account:dm:peerId` / `account:group:peerId`).
  */
 export declare function normalizeTelegramDeliveryChatId(to: string): string;

package/dist/extensions/telegram/src/delivery-chat-id.js

@@ -1,15 +1,19 @@
-import { init_session_key, parseSessionKey } from "../../../src/routing/session-key.js";
+import { conversationIdSchema } from "../../../packages/gateway-contract/src/conversation-identity.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
+import { getConversationRouting } from "../../../src/storage/sqlite/conversation-repository.js";
+import { init_session_key } from "../../../src/routing/session-key.js";
 //#region extensions/telegram/src/delivery-chat-id.ts
+init_src();
 init_session_key();
 /**
 * Resolves Telegram Bot API `chat_id` from config/UI `to` / `targetChatId`.
-* Accepts numeric ids, full session keys (`agent:main:telegram:...`), or
+* Accepts numeric ids, conversation UUIDs, or
 * routing suffixes (`account:dm:peerId` / `account:group:peerId`).
 */
 function normalizeTelegramDeliveryChatId(to) {
 	const trimmed = to.trim();
 	if (!trimmed) return trimmed;
-	const parsed = parseSessionKey(trimmed);
+	const parsed = conversationIdSchema.safeParse(trimmed).success ? getConversationRouting(trimmed) : null;
 	if (parsed?.source === "telegram") return parsed.peerId;
 	const parts = trimmed.split(":");
 	if (parts.length === 3 && (parts[1] === "dm" || parts[1] === "group") && parts[2] !== "") return parts[2];

package/dist/extensions/telegram/src/exec-approval-handler.js

@@ -15,7 +15,7 @@ function createTelegramExecApprovalHandler(deps) {
 			if (!bot) return false;
 			const approval = createTelegramPendingApproval({
 				accountId,
-				sessionKey: payload.sessionKey,
+				conversationId: payload.conversationId,
 				chatId: payload.chatId,
 				toolName: payload.toolName,
 				summary: payload.summary

package/dist/extensions/telegram/src/focus-handler.d.ts

@@ -5,8 +5,8 @@ export declare function handleTelegramFocusCommand(params: {
     accountId: string;
     config: Config;
 }): Promise<void>;
-export declare function resolveTelegramFocusedSessionKey(params: {
+export declare function resolveTelegramFocusedConversationId(params: {
     chatId: string;
     threadId?: string;
-    defaultSessionKey: string;
+    defaultConversationId: string;
 }): string;

package/dist/extensions/telegram/src/focus-handler.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../../../src/utils/logger/index.js";
 import { init_logger } from "../../../src/utils/logger.js";
-import { generateSessionKey } from "../../../src/chat-commands/session-key.js";
+import { generateConversationId } from "../../../src/chat-commands/session-key.js";
 import { clearTelegramThreadBinding, getTelegramThreadBinding, setTelegramThreadBinding } from "./thread-bindings.js";
 import { buildTelegramConversationId } from "./conversation-id.js";
 //#region extensions/telegram/src/focus-handler.ts
@@ -19,7 +19,7 @@ async function handleTelegramFocusCommand(params) {
 		await ctx.reply("Thread focus cleared.");
 		return;
 	}
-	const sessionKey = parts.length > 1 && parts[1] && !parts[1].startsWith("/") ? parts.slice(1).join(" ").trim() : generateSessionKey({
+	const conversationId = parts.length > 1 && parts[1] && !parts[1].startsWith("/") ? parts.slice(1).join(" ").trim() : generateConversationId({
 		source: "telegram",
 		chatId,
 		senderId,
@@ -28,7 +28,7 @@ async function handleTelegramFocusCommand(params) {
 		accountId
 	});
 	setTelegramThreadBinding({
-		sessionKey,
+		conversationId,
 		chatId,
 		threadId: threadId != null ? String(threadId) : void 0,
 		createdAtMs: Date.now(),
@@ -38,16 +38,16 @@ async function handleTelegramFocusCommand(params) {
 		accountId,
 		chatId,
 		threadId,
-		sessionKey,
-		conversationId: buildTelegramConversationId(chatId, threadId)
+		conversationId,
+		externalConversationId: buildTelegramConversationId(chatId, threadId)
 	}, "Telegram thread focus set");
-	await ctx.reply(`Focused on session:\n${sessionKey}`);
+	await ctx.reply(`Focused on session:\n${conversationId}`);
 }
-function resolveTelegramFocusedSessionKey(params) {
+function resolveTelegramFocusedConversationId(params) {
 	const binding = getTelegramThreadBinding(params.chatId, params.threadId);
-	if (!binding) return params.defaultSessionKey;
+	if (!binding) return params.defaultConversationId;
 	binding.lastActivityMs = Date.now();
-	return binding.sessionKey;
+	return binding.conversationId;
 }
 //#endregion
-export { handleTelegramFocusCommand, resolveTelegramFocusedSessionKey };
+export { handleTelegramFocusCommand, resolveTelegramFocusedConversationId };

package/dist/extensions/telegram/src/inbound-processor.d.ts

@@ -41,8 +41,8 @@ export interface AccessControlService {
     }): boolean;
     removeBotMention(text: string, botUsername: string): string;
 }
-export interface SessionKeyService {
-    generateSessionKey(options: {
+export interface ConversationIdService {
+    generateConversationId(options: {
         source: string;
         chatId: string;
         senderId: string;
@@ -68,7 +68,7 @@ export interface InboundProcessorDeps {
     config: Config;
     accountManager: TelegramAccountManager;
     accessControl: AccessControlService;
-    sessionKeyService: SessionKeyService;
+    conversationIdService: ConversationIdService;
     sttService: STTService;
     mediaUtils: MediaUtils;
 }