@openclaw/matrix 2026.7.2-beta.7 → 2026.7.34

package/dist/{channel-vj788dNZ.js → .setup/channel-an4umty1.mjs}

@@ -1,21 +1,22 @@
-import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.js";
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-DfngqebB.js";
-import { a as normalizeMatrixUserId, n as DEFAULT_ACCOUNT_ID$2, r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-Djxw3C6b.js";
-import { t as normalizeMatrixApproverId } from "./approval-ids-BdJGPAJT.js";
-import { a as resolveMatrixTargetIdentity, i as resolveMatrixDirectUserId, n as normalizeMatrixMessagingTarget, r as normalizeMatrixResolvableTarget, t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
-import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-BMSJkkAE.js";
-import { d as setMatrixThreadBindingIdleTimeoutBySessionKey, p as setMatrixThreadBindingMaxAgeBySessionKey } from "./thread-bindings-shared-CKnY4LSd.js";
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-M3hRmGO-.js";
-import { d as namedAccountPromotionKeys, f as resolveSingleAccountPromotionTarget, n as matrixSetupAdapter, p as singleAccountKeysToMove, r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-BVfBv2ai.js";
-import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-DRbBZlhS.js";
+import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-BOQeTqax.mjs";
+import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.mjs";
+import { d as resolveSingleAccountPromotionTarget, f as singleAccountKeysToMove, g as resolveMatrixAccount, h as resolveDefaultMatrixAccountId, n as matrixSetupAdapter, p as listMatrixAccountIds, t as createMatrixSetupWizardProxy, u as namedAccountPromotionKeys } from "./setup-core-bhdcEo7v.mjs";
+import { a as normalizeMatrixUserId, n as DEFAULT_ACCOUNT_ID$2, r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-D9J_vUF6.mjs";
+import { t as normalizeMatrixApproverId } from "./approval-ids-DdFnDB3h.mjs";
+import { a as resolveMatrixTargetIdentity, i as resolveMatrixDirectUserId, n as normalizeMatrixMessagingTarget, r as normalizeMatrixResolvableTarget, t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.mjs";
+import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.mjs";
+import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-DNJw0fdq.mjs";
+import { d as setMatrixThreadBindingIdleTimeoutBySessionKey, p as setMatrixThreadBindingMaxAgeBySessionKey } from "./thread-bindings-shared-CKnY4LSd.mjs";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-phPvlNfV.mjs";
+import { i as autoPrepareLegacyMatrixCrypto, o as autoMigrateLegacyMatrixState, r as resolveMatrixMigrationStatus } from "./matrix-migration.runtime-BDH5c3fN.mjs";
+import { t as maybeCreateMatrixMigrationSnapshot } from "./migration-snapshot-backup-CpgYhiUp.mjs";
+import { n as resolveMatrixInboundConversation } from "./thread-binding-api-B7UaOoKv.mjs";
 import { createLazyRuntimeModule, createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { adaptScopedAccountAccessor, createScopedDmSecurityResolver } from "openclaw/plugin-sdk/channel-config-helpers";
 import { buildChannelOutboundSessionRoute, buildThreadAwareOutboundSessionRoute, createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { createChannelMessageAdapterFromOutbound, createReplyPrefixOptions, createRuntimeOutboundDelegates, createTypingCallbacks, logTypingFailure } from "openclaw/plugin-sdk/channel-outbound";
-import { createAllowlistProviderOpenWarningCollector, projectAccountConfigWarningCollector, resolveScopeRequireMention, resolveScopeToolsPolicy } from "openclaw/plugin-sdk/channel-policy";
+import { createAllowlistProviderOpenWarningCollector, projectAccountConfigWarningCollector } from "openclaw/plugin-sdk/channel-policy";
 import { createScopedAccountReplyToModeResolver } from "openclaw/plugin-sdk/conversation-runtime";
 import { createChannelDirectoryAdapter, createResolvedDirectoryEntriesLister, createRuntimeDirectoryLiveAdapter } from "openclaw/plugin-sdk/directory-runtime";
 import { buildProbeChannelStatusSummary, collectStatusIssuesFromLastError, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
@@ -28,16 +29,16 @@ import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { createApproverRestrictedNativeApprovalCapability, createChannelApprovalCapability, splitChannelApprovalCapability } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
 import { createChannelNativeOriginTargetResolver, resolveApprovalRequestChannelAccountId, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
-import { createChannelApprovalAuth, resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
+import { createResolvedApproverActionAuthAdapter, resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
 import { addAllowlistUserEntriesFromConfigEntry, buildAllowlistResolutionSummary, canonicalizeAllowlistWithResolvedIds, patchAllowlistUsersInConfigEntries, summarizeMapping } from "openclaw/plugin-sdk/allow-from";
 import { createChannelExecApprovalProfile, getExecApprovalReplyMetadata, isChannelExecApprovalClientEnabledFromConfig, isChannelExecApprovalTargetRecipient, matchesApprovalRequestFilters } from "openclaw/plugin-sdk/approval-client-runtime";
 import { normalizeAccountId as normalizeAccountId$1, parseThreadSessionSuffix } from "openclaw/plugin-sdk/routing";
 import { createPairingPrefixStripper } from "openclaw/plugin-sdk/channel-pairing";
 import { PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk/channel-status";
 import { formatLocationText, logInboundDrop, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
-import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-local-roots";
-import { buildChannelKeyCandidates } from "openclaw/plugin-sdk/channel-targets";
-import { deliveryContextFromSession, getSessionEntry, resolveStorePath, sessionDeliveryOrigin } from "openclaw/plugin-sdk/session-store-runtime";
+import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/agent-media-payload";
+import { buildChannelKeyCandidates, resolveChannelEntryMatch } from "openclaw/plugin-sdk/channel-targets";
+import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 //#region extensions/matrix/src/actions.ts
 const MATRIX_PLUGIN_HANDLED_ACTIONS = /* @__PURE__ */ new Set([
 	"send",
@@ -118,7 +119,7 @@ const matrixMessageActions = {
 		const listedActions = Array.from(actions);
 		return {
 			actions: listedActions,
-			capabilities: ["presentation"],
+			capabilities: [],
 			schema: listedActions.includes("set-profile") ? buildMatrixProfileToolSchema() : null,
 			mediaSourceParams: listedActions.includes("set-profile") ? { "set-profile": MATRIX_PROFILE_MEDIA_SOURCE_PARAMS } : null
 		};
@@ -128,22 +129,12 @@ const matrixMessageActions = {
 		return extractToolSend(args, "sendMessage");
 	},
 	handleAction: async (ctx) => {
-		const { handleMatrixAction } = await import("./tool-actions.runtime-uu9blSqO.js");
+		const { handleMatrixAction } = await import("./tool-actions.runtime-CXDLk2jg.mjs");
 		const { action, params, cfg, accountId, mediaLocalRoots } = ctx;
 		const dispatch = async (actionParams) => await handleMatrixAction({
 			...actionParams,
 			...accountId ? { accountId } : {}
-		}, cfg, {
-			mediaLocalRoots,
-			readContext: {
-				accountId,
-				requesterAccountId: ctx.requesterAccountId,
-				currentChannelId: ctx.toolContext?.currentChannelId,
-				currentChannelProvider: ctx.toolContext?.currentChannelProvider,
-				currentChatType: ctx.toolContext?.currentChatType,
-				conversationReadOrigin: ctx.conversationReadOrigin
-			}
-		});
+		}, cfg, { mediaLocalRoots });
 		const resolveRoomId = () => readStringParam(params, "roomId") ?? readStringParam(params, "channelId") ?? readStringParam(params, "to", { required: true });
 		if (action === "send") {
 			const to = readStringParam(params, "to", { required: true });
@@ -241,7 +232,7 @@ const matrixMessageActions = {
 		if (action === "member-info") return await dispatch({
 			action: "memberInfo",
 			userId: readStringParam(params, "userId", { required: true }),
-			roomId: resolveRoomId()
+			roomId: readStringParam(params, "roomId") ?? readStringParam(params, "channelId")
 		});
 		if (action === "channel-info") return await dispatch({
 			action: "channelInfo",
@@ -280,18 +271,21 @@ const matrixMessageActions = {
 };
 //#endregion
 //#region extensions/matrix/src/approval-auth.ts
-const matrixApproval = createChannelApprovalAuth({
+function getMatrixApprovalAuthApprovers(params) {
+	const account = resolveMatrixAccount(params);
+	return resolveApprovalApprovers({
+		allowFrom: account.config.dm?.allowFrom,
+		normalizeApprover: normalizeMatrixApproverId
+	});
+}
+const matrixApprovalAuth = createResolvedApproverActionAuthAdapter({
 	channelLabel: "Matrix",
-	resolveInputs: ({ cfg, accountId }) => {
-		return { allowFrom: resolveMatrixAccount({
-			cfg,
-			accountId
-		}).config.dm?.allowFrom };
-	},
-	normalizeApprover: normalizeMatrixApproverId
+	resolveApprovers: ({ cfg, accountId }) => getMatrixApprovalAuthApprovers({
+		cfg,
+		accountId
+	}),
+	normalizeSenderId: (value) => normalizeMatrixApproverId(value)
 });
-const getMatrixApprovalAuthApprovers = matrixApproval.resolveApprovers;
-const matrixApprovalAuth = matrixApproval.approvalAuth;
 //#endregion
 //#region extensions/matrix/src/exec-approvals.ts
 function normalizeMatrixExecApproverId(value) {
@@ -361,6 +355,9 @@ function getMatrixExecApprovalApprovers(params) {
 		normalizeApprover: normalizeMatrixExecApproverId
 	});
 }
+function resolveMatrixApprovalKind(request) {
+	return request.id.startsWith("plugin:") ? "plugin" : "exec";
+}
 function getMatrixApprovalApprovers(params) {
 	if (params.approvalKind === "plugin") return getMatrixApprovalAuthApprovers({
 		cfg: params.cfg,
@@ -387,12 +384,15 @@ const matrixExecApprovalProfile = createChannelExecApprovalProfile({
 	})
 });
 const isMatrixExecApprovalClientEnabled = matrixExecApprovalProfile.isClientEnabled;
+matrixExecApprovalProfile.isApprover;
 const isMatrixExecApprovalAuthorizedSender = matrixExecApprovalProfile.isAuthorizedSender;
 const resolveMatrixExecApprovalTarget = matrixExecApprovalProfile.resolveTarget;
+matrixExecApprovalProfile.shouldHandleRequest;
 function isMatrixApprovalClientEnabled(params) {
 	if (params.approvalKind === "exec") return isMatrixExecApprovalClientEnabled(params);
+	const config = resolveMatrixExecApprovalConfig(params);
 	return isChannelExecApprovalClientEnabledFromConfig({
-		enabled: resolveMatrixExecApprovalConfig(params)?.enabled,
+		enabled: config?.enabled,
 		approverCount: getMatrixApprovalApprovers(params).length
 	});
 }
@@ -406,17 +406,17 @@ function isMatrixAnyApprovalClientEnabled(params) {
 	});
 }
 function shouldHandleMatrixApprovalRequest(params) {
-	if (params.approvalKind !== "exec" && params.approvalKind !== "plugin") return false;
+	const approvalKind = resolveMatrixApprovalKind(params.request);
 	if (!matchesMatrixRequestAccount({
 		...params,
-		approvalKind: params.approvalKind
+		approvalKind
 	})) return false;
 	const config = resolveMatrixExecApprovalConfig(params);
 	if (!isChannelExecApprovalClientEnabledFromConfig({
 		enabled: config?.enabled,
 		approverCount: getMatrixApprovalApprovers({
 			...params,
-			approvalKind: params.approvalKind
+			approvalKind
 		}).length
 	})) return false;
 	return matchesApprovalRequestFilters({
@@ -456,7 +456,6 @@ function shouldSuppressLocalMatrixExecApprovalPrompt(params) {
 	return shouldHandleMatrixApprovalRequest({
 		cfg: params.cfg,
 		accountId: params.accountId,
-		approvalKind: metadata.approvalKind,
 		request
 	});
 }
@@ -522,15 +521,11 @@ function resolveSuppressionAccountId(params) {
 }
 const resolveMatrixOriginTarget = createChannelNativeOriginTargetResolver({
 	channel: "matrix",
-	shouldHandleRequest: ({ cfg, accountId, approvalKind, request }) => {
-		if (approvalKind !== "exec" && approvalKind !== "plugin") return false;
-		return shouldHandleMatrixApprovalRequest({
-			cfg,
-			accountId,
-			approvalKind,
-			request
-		});
-	},
+	shouldHandleRequest: ({ cfg, accountId, request }) => shouldHandleMatrixApprovalRequest({
+		cfg,
+		accountId,
+		request
+	}),
 	resolveTurnSourceTarget: resolveTurnSourceMatrixOriginTarget,
 	resolveSessionTarget: resolveSessionMatrixOriginTarget,
 	normalizeTargetForMatch: normalizeMatrixOriginTarget,
@@ -596,13 +591,12 @@ const matrixNativeApprovalCapability = createApproverRestrictedNativeApprovalCap
 			cfg,
 			accountId
 		}),
-		shouldHandle: ({ cfg, accountId, approvalKind, request }) => shouldHandleMatrixApprovalRequest({
+		shouldHandle: ({ cfg, accountId, request }) => shouldHandleMatrixApprovalRequest({
 			cfg,
 			accountId,
-			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-DSeaIsGa.js")).matrixApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-CEXm9_-p.mjs")).matrixApprovalNativeRuntime
 	})
 });
 const splitMatrixApprovalCapability = splitChannelApprovalCapability(matrixNativeApprovalCapability);
@@ -617,16 +611,6 @@ const matrixDeliveryAdapter = matrixBaseDeliveryAdapter && {
 			accountId,
 			approvalKind: params.approvalKind
 		})) return false;
-		if (params.approvalKind === "plugin") {
-			const targetChannel = normalizeLowercaseStringOrEmpty(params.target.channel);
-			const turnSourceChannel = normalizeLowercaseStringOrEmpty(params.request.request.turnSourceChannel);
-			return targetChannel === "matrix" && turnSourceChannel === "matrix" && shouldHandleMatrixApprovalRequest({
-				cfg: params.cfg,
-				accountId,
-				approvalKind: "plugin",
-				request: params.request
-			});
-		}
 		return matrixBaseDeliveryAdapter.shouldSuppressForwardingFallback?.(params) ?? false;
 	}
 };
@@ -645,7 +629,7 @@ const matrixNativeAdapter = matrixBaseNativeApprovalAdapter && {
 		});
 		return {
 			...capabilities,
-			enabled: hasApprovers && clientEnabled
+			enabled: capabilities.enabled && hasApprovers && clientEnabled
 		};
 	},
 	resolveOriginTarget: matrixBaseNativeApprovalAdapter.resolveOriginTarget,
@@ -725,63 +709,57 @@ function readLegacyRoomAllowAlias(room) {
 	const rawRoom = room;
 	return typeof rawRoom?.allow === "boolean" ? rawRoom.allow : void 0;
 }
-function buildMatrixRoomScopeTree(rooms) {
-	const scopes = {};
-	for (const [key, room] of Object.entries(rooms ?? {})) scopes[key] = {
-		requireMention: typeof room.autoReply === "boolean" ? !room.autoReply : room.requireMention,
-		tools: room.tools
-	};
-	return { scopes };
-}
-function resolveMatrixRoomScopePath(params) {
-	const key = buildChannelKeyCandidates(params.roomId, `room:${params.roomId}`, ...params.aliases).find((candidate) => Object.hasOwn(params.tree.scopes, candidate)) ?? (Object.hasOwn(params.tree.scopes, "*") ? "*" : void 0);
-	return key ? [key] : [];
-}
 function resolveMatrixRoomConfig(params) {
 	const rooms = params.rooms ?? {};
-	const tree = { scopes: rooms };
-	const [matchKey] = resolveMatrixRoomScopePath({
-		...params,
-		tree
+	const allowlistConfigured = Object.keys(rooms).length > 0;
+	const candidates = buildChannelKeyCandidates(params.roomId, `room:${params.roomId}`, ...params.aliases);
+	const { entry: matched, key: matchedKey, wildcardEntry, wildcardKey } = resolveChannelEntryMatch({
+		entries: rooms,
+		keys: candidates,
+		wildcardKey: "*"
 	});
-	const resolved = matchKey ? rooms[matchKey] : void 0;
+	const resolved = matched ?? wildcardEntry;
 	const legacyAllow = readLegacyRoomAllowAlias(resolved);
 	return {
 		allowed: resolved ? resolved.enabled !== false && legacyAllow !== false : false,
-		allowlistConfigured: Object.keys(rooms).length > 0,
+		allowlistConfigured,
 		config: resolved,
-		matchKey,
-		matchSource: resolved ? matchKey === "*" ? "wildcard" : "direct" : void 0
+		matchKey: matchedKey ?? wildcardKey,
+		matchSource: matched ? "direct" : wildcardEntry ? "wildcard" : void 0
 	};
 }
 //#endregion
 //#region extensions/matrix/src/group-mentions.ts
-function resolveMatrixGroupScope(params) {
+function resolveMatrixRoomConfigForGroup(params) {
+	const roomId = normalizeMatrixResolvableTarget(params.groupId?.trim() ?? "");
+	const groupChannel = params.groupChannel?.trim() ?? "";
+	const aliases = groupChannel ? [normalizeMatrixResolvableTarget(groupChannel)] : [];
+	const cfg = params.cfg;
 	const matrixConfig = resolveMatrixAccountConfig({
-		cfg: params.cfg,
+		cfg,
 		accountId: params.accountId
 	});
-	const tree = buildMatrixRoomScopeTree(matrixConfig.groups ?? matrixConfig.rooms);
-	const roomId = normalizeMatrixResolvableTarget(params.groupId?.trim() ?? "");
-	const groupChannel = normalizeMatrixResolvableTarget(params.groupChannel?.trim() ?? "");
-	return {
-		tree,
-		path: resolveMatrixRoomScopePath({
-			tree,
-			roomId,
-			aliases: groupChannel ? [groupChannel] : []
-		})
-	};
+	return resolveMatrixRoomConfig({
+		rooms: matrixConfig.groups ?? matrixConfig.rooms,
+		roomId,
+		aliases
+	}).config;
 }
 function resolveMatrixGroupRequireMention(params) {
-	return resolveScopeRequireMention(resolveMatrixGroupScope(params));
+	const resolved = resolveMatrixRoomConfigForGroup(params);
+	if (resolved) {
+		if (resolved.autoReply === true) return false;
+		if (resolved.autoReply === false) return true;
+		if (typeof resolved.requireMention === "boolean") return resolved.requireMention;
+	}
+	return true;
 }
 function resolveMatrixGroupToolPolicy(params) {
-	return resolveScopeToolsPolicy(resolveMatrixGroupScope(params));
+	return resolveMatrixRoomConfigForGroup(params)?.tools;
 }
 //#endregion
 //#region extensions/matrix/src/resolver.ts
-const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-DS6uPaEe.js"), "matrixResolverRuntime");
+const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-CeBHR9-T.mjs"), "matrixResolverRuntime");
 const matrixResolverAdapter = { resolveTargets: async ({ cfg, accountId, inputs, kind, runtime }) => (await loadMatrixChannelRuntime$1()).resolveMatrixTargets({
 	cfg,
 	accountId,
@@ -791,34 +769,38 @@ const matrixResolverAdapter = { resolveTargets: async ({ cfg, accountId, inputs,
 }) };
 //#endregion
 //#region extensions/matrix/src/matrix/session-store-metadata.ts
+function trimMaybeString(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : void 0;
+}
 function resolveMatrixRoomTargetId(value) {
-	const trimmed = normalizeOptionalString(value);
+	const trimmed = trimMaybeString(value);
 	if (!trimmed) return;
 	const target = resolveMatrixTargetIdentity(trimmed);
 	return target?.kind === "room" && target.id.startsWith("!") ? target.id : void 0;
 }
 function resolveMatrixSessionAccountId(value) {
-	const trimmed = normalizeOptionalString(value);
+	const trimmed = trimMaybeString(value);
 	return trimmed ? normalizeAccountId(trimmed) : void 0;
 }
 function resolveMatrixStoredRoomId(params) {
-	return resolveMatrixRoomTargetId(params.deliveryTo) ?? resolveMatrixRoomTargetId(params.originNativeChannelId) ?? resolveMatrixRoomTargetId(params.originTo);
+	return resolveMatrixRoomTargetId(params.deliveryTo) ?? resolveMatrixRoomTargetId(params.lastTo) ?? resolveMatrixRoomTargetId(params.originNativeChannelId) ?? resolveMatrixRoomTargetId(params.originTo);
 }
 function resolveMatrixStoredSessionMeta(entry) {
 	if (!entry) return null;
-	const deliveryContext = deliveryContextFromSession(entry);
-	const origin = sessionDeliveryOrigin(entry);
-	const channel = normalizeOptionalString(deliveryContext?.channel) ?? normalizeOptionalString(origin?.provider);
-	const accountId = resolveMatrixSessionAccountId(deliveryContext?.accountId ?? origin?.accountId) ?? void 0;
+	const channel = trimMaybeString(entry.deliveryContext?.channel) ?? trimMaybeString(entry.lastChannel) ?? trimMaybeString(entry.origin?.provider);
+	const accountId = resolveMatrixSessionAccountId(entry.deliveryContext?.accountId ?? entry.lastAccountId ?? entry.origin?.accountId) ?? void 0;
 	const roomId = resolveMatrixStoredRoomId({
-		deliveryTo: deliveryContext?.to,
-		originNativeChannelId: origin?.nativeChannelId,
-		originTo: origin?.to
+		deliveryTo: entry.deliveryContext?.to,
+		lastTo: entry.lastTo,
+		originNativeChannelId: entry.origin?.nativeChannelId,
+		originTo: entry.origin?.to
 	});
-	const chatType = normalizeOptionalString(origin?.chatType) ?? normalizeOptionalString(entry.chatType);
-	const directUserId = chatType === "direct" ? normalizeOptionalString(origin?.nativeDirectUserId) ?? resolveMatrixDirectUserId({
-		from: normalizeOptionalString(origin?.from),
-		to: (roomId ? `room:${roomId}` : void 0) ?? normalizeOptionalString(deliveryContext?.to) ?? normalizeOptionalString(origin?.to),
+	const chatType = trimMaybeString(entry.origin?.chatType) ?? trimMaybeString(entry.chatType) ?? void 0;
+	const directUserId = chatType === "direct" ? trimMaybeString(entry.origin?.nativeDirectUserId) ?? resolveMatrixDirectUserId({
+		from: trimMaybeString(entry.origin?.from),
+		to: (roomId ? `room:${roomId}` : void 0) ?? trimMaybeString(entry.deliveryContext?.to) ?? trimMaybeString(entry.lastTo) ?? trimMaybeString(entry.origin?.to),
 		chatType
 	}) : void 0;
 	if (!channel && !accountId && !roomId && !directUserId) return null;
@@ -844,8 +826,9 @@ function resolveMatrixCurrentDmRoomId(params) {
 	const sessionKey = parseThreadSessionSuffix(params.currentSessionKey).baseSessionKey ?? params.currentSessionKey?.trim();
 	if (!sessionKey) return;
 	try {
+		const storePath = resolveStorePath(params.cfg.session?.store, { agentId: params.agentId });
 		const currentSession = resolveMatrixStoredSessionMeta(getSessionEntry({
-			storePath: resolveStorePath(params.cfg.session?.store, { agentId: params.agentId }),
+			storePath,
 			sessionKey
 		}));
 		if (!currentSession) return;
@@ -881,18 +864,19 @@ function resolveMatrixOutboundSessionRoute(params) {
 	const chatType = target.kind === "user" ? "direct" : "channel";
 	const from = target.kind === "user" ? `matrix:${target.id}` : `matrix:channel:${target.id}`;
 	const to = `room:${roomScopedDmId ?? target.id}`;
+	const baseRoute = buildChannelOutboundSessionRoute({
+		cfg: params.cfg,
+		agentId: params.agentId,
+		channel: "matrix",
+		accountId: effectiveAccountId,
+		recipientSessionExact: target.kind === "room" ? dmSessionScope === "per-room" && target.id.startsWith("!") && target.id.includes(":") : dmSessionScope === "per-user" ? isMatrixQualifiedUserId(target.id) : roomScopedDmId !== void 0,
+		peer,
+		chatType,
+		from,
+		to
+	});
 	return buildThreadAwareOutboundSessionRoute({
-		route: buildChannelOutboundSessionRoute({
-			cfg: params.cfg,
-			agentId: params.agentId,
-			channel: "matrix",
-			accountId: effectiveAccountId,
-			recipientSessionExact: target.kind === "room" ? dmSessionScope === "per-room" && target.id.startsWith("!") && target.id.includes(":") : dmSessionScope === "per-user" ? isMatrixQualifiedUserId(target.id) : roomScopedDmId !== void 0,
-			peer,
-			chatType,
-			from,
-			to
-		}),
+		route: baseRoute,
 		replyToId: params.replyToId,
 		threadId: params.threadId,
 		currentSessionKey: params.currentSessionKey,
@@ -901,11 +885,75 @@ function resolveMatrixOutboundSessionRoute(params) {
 	});
 }
 //#endregion
+//#region extensions/matrix/src/startup-maintenance.ts
+function logWarningOnlyMatrixMigrationReasons(params) {
+	if (params.status.legacyState && "warning" in params.status.legacyState) params.log.warn?.(`matrix: ${params.status.legacyState.warning}`);
+	if (params.status.legacyCrypto.warnings.length > 0) params.log.warn?.(`matrix: legacy encrypted-state warnings:\n${params.status.legacyCrypto.warnings.map((entry) => `- ${entry}`).join("\n")}`);
+}
+async function runBestEffortMatrixMigrationStep(params) {
+	try {
+		await params.run();
+	} catch (err) {
+		params.log.warn?.(`${params.logPrefix?.trim() || "gateway"}: ${params.label} failed during Matrix migration; continuing startup: ${String(err)}`);
+	}
+}
+async function runMatrixStartupMaintenance(params) {
+	const env = params.env ?? process.env;
+	const createSnapshot = params.deps?.maybeCreateMatrixMigrationSnapshot ?? maybeCreateMatrixMigrationSnapshot;
+	const migrateLegacyState = params.deps?.autoMigrateLegacyMatrixState ?? autoMigrateLegacyMatrixState;
+	const prepareLegacyCrypto = params.deps?.autoPrepareLegacyMatrixCrypto ?? autoPrepareLegacyMatrixCrypto;
+	const trigger = params.trigger?.trim() || "gateway-startup";
+	const logPrefix = params.logPrefix?.trim() || "gateway";
+	const migrationStatus = resolveMatrixMigrationStatus({
+		cfg: params.cfg,
+		env
+	});
+	if (!migrationStatus.pending) return;
+	if (!migrationStatus.actionable) {
+		params.log.info?.("matrix: migration remains in a warning-only state; no pre-migration snapshot was needed yet");
+		logWarningOnlyMatrixMigrationReasons({
+			status: migrationStatus,
+			log: params.log
+		});
+		return;
+	}
+	try {
+		await createSnapshot({
+			trigger,
+			env,
+			log: params.log
+		});
+	} catch (err) {
+		params.log.warn?.(`${logPrefix}: failed creating a Matrix migration snapshot; skipping Matrix migration for now: ${String(err)}`);
+		return;
+	}
+	await runBestEffortMatrixMigrationStep({
+		label: "legacy Matrix state migration",
+		log: params.log,
+		logPrefix,
+		run: () => migrateLegacyState({
+			cfg: params.cfg,
+			env,
+			log: params.log
+		})
+	});
+	await runBestEffortMatrixMigrationStep({
+		label: "legacy Matrix encrypted-state preparation",
+		log: params.log,
+		logPrefix,
+		run: () => prepareLegacyCrypto({
+			cfg: params.cfg,
+			env,
+			log: params.log
+		})
+	});
+}
+//#endregion
 //#region extensions/matrix/src/channel.ts
 let matrixStartupLock = Promise.resolve();
-const loadMatrixSetupWizard = createLazyRuntimeNamedExport(() => import("./setup-surface-BBq3WeqX.js").then((n) => n.t), "matrixSetupWizard");
-const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-CLoF2S9T.js"), "matrixChannelRuntime");
-const loadMatrixDoctorModule = createLazyRuntimeModule(() => import("./doctor-CM8ijNpW.js"));
+const loadMatrixSetupWizard = createLazyRuntimeNamedExport(() => import("./setup-surface-05_G-MnT.mjs").then((n) => n.t), "matrixSetupWizard");
+const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-GHcIBJ7H.mjs"), "matrixChannelRuntime");
+const loadMatrixDoctorModule = createLazyRuntimeModule(() => import("./doctor-BGnvMzOR.mjs"));
 const meta = {
 	id: "matrix",
 	label: "Matrix",
@@ -1158,7 +1206,7 @@ const matrixPlugin = createChatChannelPlugin({
 		},
 		conversationBindings: {
 			supportsCurrentConversationBinding: true,
-			defaultTopLevelPlacement,
+			defaultTopLevelPlacement: "child",
 			setIdleTimeoutBySessionKey: ({ targetSessionKey, accountId, idleTimeoutMs }) => setMatrixThreadBindingIdleTimeoutBySessionKey({
 				targetSessionKey,
 				accountId: accountId ?? "",
@@ -1171,9 +1219,8 @@ const matrixPlugin = createChatChannelPlugin({
 			}).map(projectMatrixConversationBinding)
 		},
 		messaging: {
-			defaultMarkdownTableMode: "block",
+			defaultMarkdownTableMode: "bullets",
 			targetPrefixes: ["matrix"],
-			targetIdComparison: "case-sensitive",
 			normalizeTarget: normalizeMatrixMessagingTarget,
 			resolveInboundConversation: ({ to, conversationId, threadId }) => resolveMatrixInboundConversation({
 				to,
@@ -1222,12 +1269,6 @@ const matrixPlugin = createChatChannelPlugin({
 			namedAccountPromotionKeys,
 			resolveSingleAccountPromotionTarget
 		},
-		setupContract: {
-			...matrixSetupContract,
-			singleAccountKeysToMove,
-			namedAccountPromotionKeys,
-			resolveSingleAccountPromotionTarget
-		},
 		bindings: {
 			compileConfiguredBinding: ({ conversationId }) => normalizeMatrixAcpConversationId(conversationId),
 			matchInboundConversation: ({ compiledBinding, conversationId, parentConversationId }) => matchMatrixAcpConversation({
@@ -1284,7 +1325,7 @@ const matrixPlugin = createChatChannelPlugin({
 			await previousLock;
 			let monitorMatrixProvider;
 			try {
-				monitorMatrixProvider = (await import("./monitor-VyWlSLwo.js")).monitorMatrixProvider;
+				monitorMatrixProvider = (await import("./monitor-DNcW_oAN.mjs")).monitorMatrixProvider;
 			} finally {
 				releaseLock();
 			}
@@ -1300,6 +1341,7 @@ const matrixPlugin = createChatChannelPlugin({
 			});
 		} },
 		doctor: matrixDoctor,
+		lifecycle: { runStartupMaintenance: runMatrixStartupMaintenance },
 		heartbeat: {
 			sendTyping: async ({ cfg, to, accountId }) => {
 				await (await loadMatrixChannelRuntime()).sendTypingMatrix(to, true, {