@openclaw/matrix 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/{channel-vj788dNZ.js → channel-CzQw5OZN.js}

@@ -1,21 +1,19 @@
-import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.js";
+import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-CWuhuFn1.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 { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BCzyubQt.js";
+import { a as normalizeMatrixUserId, r as DEFAULT_ACCOUNT_ID$2, t as matrixPluginBase } from "./channel.setup-aNaa3Uyn.js";
+import { t as normalizeMatrixApproverId } from "./approval-ids-CEcf-EiM.js";
+import { a as resolveMatrixDirectUserId, i as normalizeMatrixResolvableTarget, n as isMatrixRoomId, o as resolveMatrixTargetIdentity, r as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
+import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-DEt4O4Zt.js";
+import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
+import { f as setMatrixThreadBindingMaxAgeBySessionKey, u as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings-shared-oNPiyMWY.js";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-CufozuyJ.js";
+import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-CzkeLZCU.js";
 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, createConditionalWarningCollector, resolveScopeRequireMention, resolveScopeToolsPolicy } 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";
@@ -27,16 +25,19 @@ import { Type } from "typebox";
 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 { createChannelNativeOriginTargetResolver, doesApprovalRequestSelectChannelAccount, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
 import { createChannelApprovalAuth, 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 { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { buildAgentSessionKey, deriveLastRoutePolicy, parseAgentSessionKey, parseThreadSessionSuffix, resolveAgentIdFromSessionKey, resolveAgentRoute, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 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 { resolveConfiguredAcpBindingRecord } from "openclaw/plugin-sdk/acp-binding-resolve-runtime";
+import { inspectSessionBindingByConversation } from "openclaw/plugin-sdk/session-binding-runtime";
 import { deliveryContextFromSession, getSessionEntry, resolveStorePath, sessionDeliveryOrigin } from "openclaw/plugin-sdk/session-store-runtime";
 //#region extensions/matrix/src/actions.ts
 const MATRIX_PLUGIN_HANDLED_ACTIONS = /* @__PURE__ */ new Set([
@@ -82,7 +83,7 @@ function createMatrixExposedActions(params) {
 	if (params.gate("profile") && params.senderIsOwner === true) actions.add("set-profile");
 	if (params.gate("memberInfo")) actions.add("member-info");
 	if (params.gate("channelInfo")) actions.add("channel-info");
-	if (params.encryptionEnabled && params.gate("verification")) actions.add("permissions");
+	if (params.encryptionEnabled && params.gate("verification") && params.senderIsOwner === true) actions.add("permissions");
 	return actions;
 }
 function buildMatrixProfileToolSchema() {
@@ -95,18 +96,22 @@ function buildMatrixProfileToolSchema() {
 		}
 	};
 }
+function resolveMatrixActionAccount(params) {
+	if (!params.accountId && requiresExplicitMatrixDefaultAccount(params.cfg)) return null;
+	const account = resolveMatrixAccount({
+		cfg: params.cfg,
+		accountId: params.accountId ?? resolveDefaultMatrixAccountId(params.cfg)
+	});
+	return account.enabled && account.configured ? account : null;
+}
 const matrixMessageActions = {
+	providerOwnedReadGates: true,
 	describeMessageTool: ({ cfg, accountId, senderIsOwner }) => {
-		const resolvedCfg = cfg;
-		if (!accountId && requiresExplicitMatrixDefaultAccount(resolvedCfg)) return {
-			actions: [],
-			capabilities: []
-		};
-		const account = resolveMatrixAccount({
-			cfg: resolvedCfg,
-			accountId: accountId ?? resolveDefaultMatrixAccountId(resolvedCfg)
+		const account = resolveMatrixActionAccount({
+			cfg,
+			accountId
 		});
-		if (!account.enabled || !account.configured) return {
+		if (!account) return {
 			actions: [],
 			capabilities: []
 		};
@@ -127,13 +132,22 @@ const matrixMessageActions = {
 	extractToolSend: ({ args }) => {
 		return extractToolSend(args, "sendMessage");
 	},
+	prepareSendPayload: ({ ctx, payload }) => {
+		if (ctx.action !== "send") return null;
+		const account = resolveMatrixActionAccount({
+			cfg: ctx.cfg,
+			accountId: ctx.accountId
+		});
+		return account && createActionGate(account.config.actions)("messages") ? payload : null;
+	},
 	handleAction: async (ctx) => {
-		const { handleMatrixAction } = await import("./tool-actions.runtime-uu9blSqO.js");
+		const { handleMatrixAction } = await import("./tool-actions.runtime-ck6IJyP0.js");
 		const { action, params, cfg, accountId, mediaLocalRoots } = ctx;
 		const dispatch = async (actionParams) => await handleMatrixAction({
 			...actionParams,
 			...accountId ? { accountId } : {}
 		}, cfg, {
+			...action === "send" && ctx.mediaAccess ? { mediaAccess: ctx.mediaAccess } : {},
 			mediaLocalRoots,
 			readContext: {
 				accountId,
@@ -150,7 +164,8 @@ const matrixMessageActions = {
 			const mediaUrl = readStringParam(params, "media", { trim: false }) ?? readStringParam(params, "mediaUrl", { trim: false }) ?? readStringParam(params, "filePath", { trim: false }) ?? readStringParam(params, "path", { trim: false });
 			const content = readStringParam(params, "message", {
 				required: !mediaUrl,
-				allowEmpty: true
+				allowEmpty: true,
+				trim: false
 			});
 			const replyTo = readStringParam(params, "replyTo");
 			const threadId = readStringParam(params, "threadId");
@@ -204,7 +219,10 @@ const matrixMessageActions = {
 		}
 		if (action === "edit") {
 			const messageId = readStringParam(params, "messageId", { required: true });
-			const content = readStringParam(params, "message", { required: true });
+			const content = readStringParam(params, "message", {
+				required: true,
+				trim: false
+			});
 			return await dispatch({
 				action: "editMessage",
 				roomId: resolveRoomId(),
@@ -248,6 +266,7 @@ const matrixMessageActions = {
 			roomId: resolveRoomId()
 		});
 		if (action === "permissions") {
+			if (ctx.senderIsOwner !== true) throw new ToolAuthorizationError("Matrix verification actions require owner access.");
 			const operation = normalizeLowercaseStringOrEmpty(readStringParam(params, "operation") ?? readStringParam(params, "mode") ?? "verification-list");
 			const operationToAction = {
 				"encryption-status": "encryptionStatus",
@@ -307,51 +326,37 @@ function resolveMatrixExecApprovalConfig(params) {
 		enabled: account.enabled && account.configured ? config.enabled : false
 	};
 }
-function countMatrixExecApprovalEligibleAccounts(params) {
-	return listMatrixAccountIds(params.cfg).filter((accountId) => {
-		const account = resolveMatrixAccount({
-			cfg: params.cfg,
-			accountId
-		});
-		if (!account.enabled || !account.configured) return false;
-		const config = resolveMatrixExecApprovalConfig({
-			cfg: params.cfg,
-			accountId
-		});
-		const filters = config?.enabled ? {
-			agentFilter: config.agentFilter,
-			sessionFilter: config.sessionFilter
-		} : {
-			agentFilter: void 0,
-			sessionFilter: void 0
-		};
-		return isChannelExecApprovalClientEnabledFromConfig({
-			enabled: config?.enabled,
-			approverCount: getMatrixApprovalApprovers({
-				cfg: params.cfg,
-				accountId,
-				approvalKind: params.approvalKind
-			}).length
-		}) && matchesApprovalRequestFilters({
-			request: params.request.request,
-			agentFilter: filters.agentFilter,
-			sessionFilter: filters.sessionFilter
-		});
-	}).length;
+function isMatrixExecApprovalAccountEligible(params) {
+	const account = resolveMatrixAccount(params);
+	if (!account.enabled || !account.configured) return false;
+	const config = resolveMatrixExecApprovalConfig(params);
+	const filters = config?.enabled ? {
+		agentFilter: config.agentFilter,
+		sessionFilter: config.sessionFilter
+	} : {
+		agentFilter: void 0,
+		sessionFilter: void 0
+	};
+	return isChannelExecApprovalClientEnabledFromConfig({
+		enabled: config?.enabled,
+		approverCount: getMatrixApprovalApprovers(params).length
+	}) && matchesApprovalRequestFilters({
+		request: params.request.request,
+		agentFilter: filters.agentFilter,
+		sessionFilter: filters.sessionFilter
+	});
 }
 function matchesMatrixRequestAccount(params) {
-	const turnSourceChannel = normalizeLowercaseStringOrEmpty(params.request.request.turnSourceChannel);
-	const boundAccountId = resolveApprovalRequestChannelAccountId({
-		cfg: params.cfg,
-		request: params.request,
-		channel: "matrix"
+	const accountId = params.accountId ?? resolveDefaultMatrixAccountId(params.cfg);
+	return doesApprovalRequestSelectChannelAccount({
+		...params,
+		channel: "matrix",
+		defaultAccountId: resolveDefaultMatrixAccountId(params.cfg),
+		eligibleAccountIds: isMatrixExecApprovalAccountEligible({
+			...params,
+			accountId
+		}) ? [accountId] : []
 	});
-	if (turnSourceChannel && turnSourceChannel !== "matrix" && !boundAccountId) return countMatrixExecApprovalEligibleAccounts({
-		cfg: params.cfg,
-		request: params.request,
-		approvalKind: params.approvalKind
-	}) <= 1;
-	return !boundAccountId || !params.accountId || normalizeAccountId$1(boundAccountId) === normalizeAccountId$1(params.accountId);
 }
 function getMatrixExecApprovalApprovers(params) {
 	const account = resolveMatrixAccount(params).config;
@@ -427,6 +432,7 @@ function shouldHandleMatrixApprovalRequest(params) {
 }
 function buildFilterCheckRequest(params) {
 	if (params.metadata.approvalKind === "plugin") return {
+		approvalKind: "plugin",
 		id: params.metadata.approvalId,
 		request: {
 			title: "Plugin Approval Required",
@@ -438,6 +444,7 @@ function buildFilterCheckRequest(params) {
 		expiresAtMs: 0
 	};
 	return {
+		approvalKind: "exec",
 		id: params.metadata.approvalId,
 		request: {
 			command: "",
@@ -602,7 +609,7 @@ const matrixNativeApprovalCapability = createApproverRestrictedNativeApprovalCap
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-DSeaIsGa.js")).matrixApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-CSvueU9P.js")).matrixApprovalNativeRuntime
 	})
 });
 const splitMatrixApprovalCapability = splitChannelApprovalCapability(matrixNativeApprovalCapability);
@@ -700,7 +707,7 @@ function createMatrixProbeAccount(params) {
 		} catch (err) {
 			return {
 				ok: false,
-				error: formatMatrixErrorMessage(err),
+				error: formatErrorMessage(err),
 				elapsedMs: 0
 			};
 		}
@@ -720,6 +727,53 @@ function createMatrixPairingText(sendMessageMatrix) {
 	};
 }
 //#endregion
+//#region extensions/matrix/src/channel-message-adapter.ts
+function createMatrixMessageAdapter(params) {
+	const base = createChannelMessageAdapterFromOutbound({
+		id: "matrix",
+		outbound: params.outbound,
+		live: {
+			capabilities: {
+				draftPreview: true,
+				previewFinalization: true,
+				progressUpdates: true,
+				quietFinalization: true
+			},
+			finalizer: { capabilities: {
+				finalEdit: true,
+				normalFallback: true,
+				discardPending: true,
+				previewReceipt: true
+			} }
+		}
+	});
+	return {
+		...base,
+		durableFinal: {
+			...base.durableFinal,
+			automaticUnknownSendReconciliation: true,
+			capabilities: {
+				...base.durableFinal?.capabilities,
+				afterCommit: true,
+				reconcileUnknownSend: true
+			},
+			reconcileUnknownSendKinds: {
+				text: true,
+				media: true
+			},
+			reconcileUnknownSend: async (ctx) => await (await params.getRuntime()).reconcileMatrixUnknownSend(ctx),
+			afterUnknownSendTerminal: async (ctx) => await (await params.getRuntime()).cleanupMatrixDeliveryPlans({ queueId: ctx.queueId })
+		},
+		send: {
+			...base.send,
+			lifecycle: { afterCommit: async (ctx) => {
+				if (!ctx.deliveryQueueId) return;
+				await (await params.getRuntime()).cleanupMatrixDeliveryPlans({ queueId: ctx.deliveryQueueId });
+			} }
+		}
+	};
+}
+//#endregion
 //#region extensions/matrix/src/matrix/monitor/rooms.ts
 function readLegacyRoomAllowAlias(room) {
 	const rawRoom = room;
@@ -780,8 +834,195 @@ function resolveMatrixGroupToolPolicy(params) {
 	return resolveScopeToolsPolicy(resolveMatrixGroupScope(params));
 }
 //#endregion
+//#region extensions/matrix/src/matrix/monitor/types.ts
+const EventType = {
+	RoomMessage: "m.room.message",
+	RoomMessageEncrypted: "m.room.encrypted",
+	RoomMember: "m.room.member",
+	Location: "m.location",
+	Reaction: MATRIX_REACTION_EVENT_TYPE
+};
+const RelationType = {
+	Replace: "m.replace",
+	Thread: "m.thread"
+};
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/threads.ts
+function resolveMatrixThreadSessionKeys(params) {
+	return resolveThreadSessionKeys({
+		...params,
+		normalizeThreadId: (threadId) => threadId
+	});
+}
+function resolveMatrixRelatedReplyToEventId(relates) {
+	if (!relates || typeof relates !== "object") return;
+	if ("m.in_reply_to" in relates && typeof relates["m.in_reply_to"] === "object" && relates["m.in_reply_to"] && "event_id" in relates["m.in_reply_to"] && typeof relates["m.in_reply_to"].event_id === "string") return relates["m.in_reply_to"].event_id;
+}
+function resolveMatrixThreadRouting(params) {
+	const effectiveThreadReplies = params.isDirectMessage && params.dmThreadReplies !== void 0 ? params.dmThreadReplies : params.threadReplies;
+	const messageId = params.messageId.trim();
+	const threadRootId = params.threadRootId?.trim();
+	const inboundThreadId = threadRootId && threadRootId !== messageId ? threadRootId : void 0;
+	return { threadId: effectiveThreadReplies === "off" ? void 0 : effectiveThreadReplies === "inbound" ? inboundThreadId : inboundThreadId ?? (messageId || void 0) };
+}
+function resolveMatrixThreadRootId(params) {
+	const relates = params.content["m.relates_to"];
+	if (!relates || typeof relates !== "object") return;
+	if ("rel_type" in relates && relates.rel_type === RelationType.Thread) {
+		if ("event_id" in relates && typeof relates.event_id === "string") return relates.event_id;
+		return resolveMatrixRelatedReplyToEventId(relates);
+	}
+}
+function resolveMatrixReplyToEventId(content) {
+	return resolveMatrixRelatedReplyToEventId(content["m.relates_to"]);
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/route.ts
+function resolveMatrixDmSessionKey(params) {
+	if (params.dmSessionScope !== "per-room") return params.fallbackSessionKey;
+	return buildAgentSessionKey({
+		agentId: params.agentId,
+		channel: "matrix",
+		accountId: params.accountId,
+		peer: {
+			kind: "channel",
+			id: params.roomId
+		}
+	});
+}
+function shouldApplyMatrixPerRoomDmSessionScope(params) {
+	return params.isDirectMessage && !params.configuredSessionKey;
+}
+function resolveMatrixInboundRoute(params) {
+	const baseRoute = params.resolveAgentRoute({
+		cfg: params.cfg,
+		channel: "matrix",
+		accountId: params.accountId,
+		peer: {
+			kind: params.isDirectMessage ? "direct" : "channel",
+			id: params.isDirectMessage ? params.senderId : params.roomId
+		},
+		parentPeer: params.isDirectMessage ? {
+			kind: "channel",
+			id: params.roomId
+		} : void 0
+	});
+	const bindingConversationId = params.threadId ?? params.roomId;
+	const bindingParentConversationId = params.threadId ? params.roomId : void 0;
+	const bindingInspection = inspectSessionBindingByConversation({
+		channel: "matrix",
+		accountId: params.accountId,
+		conversationId: bindingConversationId,
+		parentConversationId: bindingParentConversationId
+	});
+	const runtimeBinding = bindingInspection.status === "available" ? bindingInspection.binding : null;
+	const boundSessionKey = runtimeBinding?.targetSessionKey?.trim();
+	if (runtimeBinding && boundSessionKey) return {
+		route: {
+			...baseRoute,
+			sessionKey: boundSessionKey,
+			agentId: resolveAgentIdFromSessionKey(boundSessionKey) || baseRoute.agentId,
+			lastRoutePolicy: deriveLastRoutePolicy({
+				sessionKey: boundSessionKey,
+				mainSessionKey: baseRoute.mainSessionKey
+			}),
+			matchedBy: "binding.channel"
+		},
+		configuredBinding: null,
+		bindingOwnerAvailable: true,
+		runtimeBindingId: runtimeBinding.bindingId
+	};
+	const configuredBinding = runtimeBinding == null ? resolveConfiguredAcpBindingRecord({
+		cfg: params.cfg,
+		channel: "matrix",
+		accountId: params.accountId,
+		conversationId: bindingConversationId,
+		parentConversationId: bindingParentConversationId
+	}) : null;
+	const configuredSessionKey = configuredBinding?.record.targetSessionKey?.trim();
+	const effectiveRoute = configuredBinding && configuredSessionKey ? {
+		...baseRoute,
+		sessionKey: configuredSessionKey,
+		agentId: resolveAgentIdFromSessionKey(configuredSessionKey) || configuredBinding.spec.agentId || baseRoute.agentId,
+		lastRoutePolicy: deriveLastRoutePolicy({
+			sessionKey: configuredSessionKey,
+			mainSessionKey: baseRoute.mainSessionKey
+		}),
+		matchedBy: "binding.channel"
+	} : baseRoute;
+	const dmSessionKey = shouldApplyMatrixPerRoomDmSessionScope({
+		isDirectMessage: params.isDirectMessage,
+		configuredSessionKey
+	}) ? resolveMatrixDmSessionKey({
+		accountId: params.accountId,
+		agentId: effectiveRoute.agentId,
+		roomId: params.roomId,
+		dmSessionScope: params.dmSessionScope,
+		fallbackSessionKey: effectiveRoute.sessionKey
+	}) : effectiveRoute.sessionKey;
+	const routeWithDmScope = dmSessionKey === effectiveRoute.sessionKey ? effectiveRoute : {
+		...effectiveRoute,
+		sessionKey: dmSessionKey,
+		lastRoutePolicy: "session"
+	};
+	if (!configuredBinding && !configuredSessionKey && params.threadId) {
+		const threadKeys = resolveMatrixThreadSessionKeys({
+			baseSessionKey: routeWithDmScope.sessionKey,
+			threadId: params.threadId,
+			parentSessionKey: routeWithDmScope.sessionKey
+		});
+		return {
+			route: {
+				...routeWithDmScope,
+				sessionKey: threadKeys.sessionKey,
+				mainSessionKey: threadKeys.parentSessionKey ?? routeWithDmScope.sessionKey,
+				lastRoutePolicy: deriveLastRoutePolicy({
+					sessionKey: threadKeys.sessionKey,
+					mainSessionKey: threadKeys.parentSessionKey ?? routeWithDmScope.sessionKey
+				})
+			},
+			configuredBinding,
+			bindingOwnerAvailable: bindingInspection.status === "available",
+			runtimeBindingId: runtimeBinding?.bindingId ?? null
+		};
+	}
+	return {
+		route: routeWithDmScope,
+		configuredBinding,
+		bindingOwnerAvailable: bindingInspection.status === "available",
+		runtimeBindingId: runtimeBinding?.bindingId ?? null
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/conversation-route-owner.ts
+function resolveMatrixConversationRouteOwner(params) {
+	const { cfg, accountId, conversation } = params;
+	const roomId = conversation.nativeChannelId?.trim() || (conversation.kind === "direct" ? "" : conversation.peerId.trim());
+	if (!roomId) return null;
+	const isDirectMessage = conversation.kind === "direct";
+	const result = resolveMatrixInboundRoute({
+		cfg,
+		accountId,
+		roomId,
+		senderId: conversation.peerId,
+		isDirectMessage,
+		dmSessionScope: resolveMatrixAccount({
+			cfg,
+			accountId
+		}).config.dm?.sessionScope,
+		threadId: conversation.threadId,
+		resolveAgentRoute
+	});
+	if (!result.bindingOwnerAvailable) return { kind: "unavailable" };
+	if (result.runtimeBindingId && !parseAgentSessionKey(result.route.sessionKey)?.agentId) return null;
+	return {
+		kind: "agent",
+		agentId: result.route.agentId
+	};
+}
+//#endregion
 //#region extensions/matrix/src/resolver.ts
-const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-DS6uPaEe.js"), "matrixResolverRuntime");
+const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-V8u0pHEb.js"), "matrixResolverRuntime");
 const matrixResolverAdapter = { resolveTargets: async ({ cfg, accountId, inputs, kind, runtime }) => (await loadMatrixChannelRuntime$1()).resolveMatrixTargets({
 	cfg,
 	accountId,
@@ -887,7 +1128,7 @@ function resolveMatrixOutboundSessionRoute(params) {
 			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,
+			recipientSessionExact: target.kind === "room" ? dmSessionScope === "per-room" && isMatrixRoomId(target.id) : dmSessionScope === "per-user" ? isMatrixQualifiedUserId(target.id) : roomScopedDmId !== void 0,
 			peer,
 			chatType,
 			from,
@@ -896,6 +1137,11 @@ function resolveMatrixOutboundSessionRoute(params) {
 		replyToId: params.replyToId,
 		threadId: params.threadId,
 		currentSessionKey: params.currentSessionKey,
+		precedence: [
+			"threadId",
+			"replyToId",
+			"currentSession"
+		],
 		normalizeThreadId: (threadId) => threadId,
 		canRecoverCurrentThread: ({ route }) => route.peer.kind !== "direct" || (params.cfg.session?.dmScope ?? "main") !== "main"
 	});
@@ -903,20 +1149,8 @@ function resolveMatrixOutboundSessionRoute(params) {
 //#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 meta = {
-	id: "matrix",
-	label: "Matrix",
-	selectionLabel: "Matrix (plugin)",
-	docsPath: "/channels/matrix",
-	docsLabel: "matrix",
-	blurb: "open protocol; configure a homeserver + access token.",
-	order: 70,
-	markdownCapable: true,
-	quickstartAllowFrom: true
-};
+const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-I9pBRQb3.js"), "matrixChannelRuntime");
+const loadMatrixDoctorModule = createLazyRuntimeModule(() => import("./doctor-EWf9CDso.js"));
 function buildMatrixTrafficStatusSummary(snapshot) {
 	return {
 		lastInboundAt: snapshot?.lastInboundAt ?? null,
@@ -979,7 +1213,7 @@ const resolveMatrixDmPolicy = createScopedDmSecurityResolver({
 	allowFromPathSuffix: "dm.",
 	normalizeEntry: (raw) => normalizeMatrixUserId(raw)
 });
-const collectMatrixSecurityWarnings = createAllowlistProviderOpenWarningCollector({
+const collectMatrixGroupPolicyWarnings = createAllowlistProviderOpenWarningCollector({
 	providerConfigPresent: (cfg) => cfg.channels?.matrix !== void 0,
 	resolveGroupPolicy: (account) => account.config.groupPolicy,
 	buildOpenWarning: {
@@ -991,18 +1225,28 @@ const collectMatrixSecurityWarnings = createAllowlistProviderOpenWarningCollecto
 function resolveMatrixAccountConfigPath(accountId, field) {
 	return accountId === DEFAULT_ACCOUNT_ID$2 ? `channels.matrix.${field}` : `channels.matrix.accounts.${accountId}.${field}`;
 }
-function collectMatrixSecurityWarningsForAccount(params) {
-	const warnings = collectMatrixSecurityWarnings(params);
+function collectMatrixGroupPolicyWarningsForAccount(params) {
+	const warnings = collectMatrixGroupPolicyWarnings(params);
 	if (params.account.accountId !== DEFAULT_ACCOUNT_ID$2) {
 		const groupPolicyPath = resolveMatrixAccountConfigPath(params.account.accountId, "groupPolicy");
 		const groupsPath = resolveMatrixAccountConfigPath(params.account.accountId, "groups");
 		const groupAllowFromPath = resolveMatrixAccountConfigPath(params.account.accountId, "groupAllowFrom");
 		return warnings.map((warning) => warning.replace("channels.matrix.groupPolicy", groupPolicyPath).replace("channels.matrix.groups", groupsPath).replace("channels.matrix.groupAllowFrom", groupAllowFromPath));
 	}
-	if (params.account.config.autoJoin !== "always") return warnings;
+	return warnings;
+}
+const collectMatrixOpenGroupFindings = createConditionalWarningCollector.findings({
+	collectWarnings: collectMatrixGroupPolicyWarningsForAccount,
+	checkId: "channels.matrix.groups.open",
+	severity: "critical",
+	title: "Matrix security warning"
+});
+function collectMatrixSecurityWarningsForAccount(params) {
+	const findings = collectMatrixOpenGroupFindings(params);
+	if (params.account.accountId !== DEFAULT_ACCOUNT_ID$2 || params.account.config.autoJoin !== "always") return findings;
 	const autoJoinPath = resolveMatrixAccountConfigPath(params.account.accountId, "autoJoin");
 	const autoJoinAllowlistPath = resolveMatrixAccountConfigPath(params.account.accountId, "autoJoinAllowlist");
-	return [...warnings, `- Matrix invites: autoJoin="always" joins any invited room before message policy applies. Set ${autoJoinPath}="allowlist" + ${autoJoinAllowlistPath} (or ${autoJoinPath}="off") to restrict joins.`];
+	return [...findings, `- Matrix invites: autoJoin="always" joins any invited room before message policy applies. Set ${autoJoinPath}="allowlist" + ${autoJoinAllowlistPath} (or ${autoJoinPath}="off") to restrict joins.`];
 }
 function normalizeMatrixAcpConversationId(conversationId) {
 	const target = resolveMatrixTargetIdentity(conversationId);
@@ -1052,6 +1296,13 @@ function resolveMatrixDeliveryTarget(params) {
 	if (conversationTarget?.kind === "room") return { to: `room:${conversationTarget.id}` };
 	return null;
 }
+function matchesMatrixToolContextRoom(params) {
+	const { toolContext } = params;
+	if (toolContext.currentChannelProvider && toolContext.currentChannelProvider !== "matrix") return false;
+	const currentTarget = toolContext.currentChannelId ? resolveMatrixTargetIdentity(toolContext.currentChannelId) : null;
+	const target = resolveMatrixTargetIdentity(params.target);
+	return currentTarget?.kind === "room" && target?.kind === "room" && currentTarget.id === target.id;
+}
 const matrixChannelOutbound = {
 	deliveryMode: "direct",
 	chunker: chunkTextForOutbound,
@@ -1063,7 +1314,9 @@ const matrixChannelOutbound = {
 		media: true,
 		replyTo: true,
 		thread: true,
-		messageSendingHooks: true
+		messageSendingHooks: true,
+		afterCommit: true,
+		reconcileUnknownSend: true
 	} },
 	presentationCapabilities: {
 		supported: true,
@@ -1105,52 +1358,21 @@ const matrixChannelOutbound = {
 		}
 	})
 };
-const matrixMessageAdapter = createChannelMessageAdapterFromOutbound({
-	id: "matrix",
+const matrixMessageAdapter = createMatrixMessageAdapter({
 	outbound: matrixChannelOutbound,
-	live: {
-		capabilities: {
-			draftPreview: true,
-			previewFinalization: true,
-			progressUpdates: true,
-			quietFinalization: true
-		},
-		finalizer: { capabilities: {
-			finalEdit: true,
-			normalFallback: true,
-			discardPending: true,
-			previewReceipt: true
-		} }
-	}
+	getRuntime: loadMatrixChannelRuntime
 });
 const matrixPlugin = createChatChannelPlugin({
 	base: {
-		id: "matrix",
-		meta,
-		setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: await loadMatrixSetupWizard() })),
+		...matrixPluginBase,
+		meta: {
+			...matrixPluginBase.meta,
+			markdownCapable: true
+		},
 		capabilities: {
-			chatTypes: [
-				"direct",
-				"group",
-				"thread"
-			],
-			polls: true,
-			reactions: true,
-			threads: true,
-			media: true,
+			...matrixPluginBase.capabilities,
 			tts: { voice: { synthesisTarget: "voice-note" } }
 		},
-		reload: { configPrefixes: ["channels.matrix"] },
-		configSchema: MatrixChannelConfigSchema,
-		config: {
-			...matrixConfigAdapter,
-			isConfigured: (account) => account.configured,
-			describeAccount: (account) => describeAccountSnapshot({
-				account,
-				configured: account.configured,
-				extra: { baseUrl: account.homeserver }
-			})
-		},
 		approvalCapability: matrixApprovalCapability,
 		groups: {
 			resolveRequireMention: resolveMatrixGroupRequireMention,
@@ -1158,6 +1380,7 @@ const matrixPlugin = createChatChannelPlugin({
 		},
 		conversationBindings: {
 			supportsCurrentConversationBinding: true,
+			bindingStore: "adapter",
 			defaultTopLevelPlacement,
 			setIdleTimeoutBySessionKey: ({ targetSessionKey, accountId, idleTimeoutMs }) => setMatrixThreadBindingIdleTimeoutBySessionKey({
 				targetSessionKey,
@@ -1175,6 +1398,10 @@ const matrixPlugin = createChatChannelPlugin({
 			targetPrefixes: ["matrix"],
 			targetIdComparison: "case-sensitive",
 			normalizeTarget: normalizeMatrixMessagingTarget,
+			inferTargetChatType: ({ to }) => {
+				const target = resolveMatrixTargetIdentity(to);
+				return target ? target.kind === "user" ? "direct" : "channel" : void 0;
+			},
 			resolveInboundConversation: ({ to, conversationId, threadId }) => resolveMatrixInboundConversation({
 				to,
 				conversationId,
@@ -1185,6 +1412,7 @@ const matrixPlugin = createChatChannelPlugin({
 				parentConversationId
 			}),
 			resolveOutboundSessionRoute: (params) => resolveMatrixOutboundSessionRoute(params),
+			resolveConversationRouteOwner: resolveMatrixConversationRouteOwner,
 			targetResolver: {
 				looksLikeId: (raw) => {
 					const trimmed = raw.trim();
@@ -1216,18 +1444,6 @@ const matrixPlugin = createChatChannelPlugin({
 			secretTargetRegistryEntries,
 			collectRuntimeConfigAssignments
 		},
-		setup: {
-			...matrixSetupAdapter,
-			singleAccountKeysToMove,
-			namedAccountPromotionKeys,
-			resolveSingleAccountPromotionTarget
-		},
-		setupContract: {
-			...matrixSetupContract,
-			singleAccountKeysToMove,
-			namedAccountPromotionKeys,
-			resolveSingleAccountPromotionTarget
-		},
 		bindings: {
 			compileConfiguredBinding: ({ conversationId }) => normalizeMatrixAcpConversationId(conversationId),
 			matchInboundConversation: ({ compiledBinding, conversationId, parentConversationId }) => matchMatrixAcpConversation({
@@ -1284,7 +1500,7 @@ const matrixPlugin = createChatChannelPlugin({
 			await previousLock;
 			let monitorMatrixProvider;
 			try {
-				monitorMatrixProvider = (await import("./monitor-VyWlSLwo.js")).monitorMatrixProvider;
+				monitorMatrixProvider = (await import("./monitor-FNrfkuWL.js")).monitorMatrixProvider;
 			} finally {
 				releaseLock();
 			}
@@ -1317,10 +1533,22 @@ const matrixPlugin = createChatChannelPlugin({
 	},
 	security: {
 		resolveDmPolicy: resolveMatrixDmPolicy,
-		collectWarnings: projectAccountConfigWarningCollector((cfg) => cfg, collectMatrixSecurityWarningsForAccount)
+		collectWarnings: ({ account, cfg }) => collectMatrixSecurityWarningsForAccount({
+			account,
+			cfg
+		})
 	},
 	pairing: { text: createMatrixPairingText(async (to, message, options) => await (await loadMatrixChannelRuntime()).sendMessageMatrix(to, message, options)) },
 	threading: {
+		matchesToolContextTarget: matchesMatrixToolContextRoom,
+		resolveAutoThreadId: ({ to, toolContext }) => {
+			const threadId = normalizeOptionalString(toolContext?.currentThreadTs);
+			if (!threadId || !toolContext) return;
+			return matchesMatrixToolContextRoom({
+				target: to,
+				toolContext
+			}) ? threadId : void 0;
+		},
 		resolveReplyToMode: createScopedAccountReplyToModeResolver({
 			resolveAccount: adaptScopedAccountAccessor(resolveMatrixAccountConfig),
 			resolveReplyToMode: (account) => account.replyToMode
@@ -1342,4 +1570,4 @@ const matrixPlugin = createChatChannelPlugin({
 	outbound: matrixChannelOutbound
 });
 //#endregion
-export { shouldHandleMatrixApprovalRequest as _, buildAllowlistResolutionSummary as a, createTypingCallbacks as c, logInboundDrop as d, logTypingFailure as f, isMatrixAnyApprovalClientEnabled as g, toLocationContext as h, addAllowlistUserEntriesFromConfigEntry as i, formatLocationText as l, summarizeMapping as m, resolveMatrixStoredSessionMeta as n, canonicalizeAllowlistWithResolvedIds as o, patchAllowlistUsersInConfigEntries as p, resolveMatrixRoomConfig as r, createReplyPrefixOptions as s, matrixPlugin as t, getAgentScopedMediaLocalRoots as u };
+export { shouldHandleMatrixApprovalRequest as C, isMatrixAnyApprovalClientEnabled as S, logInboundDrop as _, resolveMatrixThreadRootId as a, summarizeMapping as b, RelationType as c, buildAllowlistResolutionSummary as d, canonicalizeAllowlistWithResolvedIds as f, getAgentScopedMediaLocalRoots as g, formatLocationText as h, resolveMatrixReplyToEventId as i, resolveMatrixRoomConfig as l, createTypingCallbacks as m, resolveMatrixStoredSessionMeta as n, resolveMatrixThreadRouting as o, createReplyPrefixOptions as p, resolveMatrixInboundRoute as r, EventType as s, matrixPlugin as t, addAllowlistUserEntriesFromConfigEntry as u, logTypingFailure as v, toLocationContext as x, patchAllowlistUsersInConfigEntries as y };