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

package/dist/{account-selection-kqquRzCf.js → account-selection-CWuhuFn1.js}

@@ -1,9 +1,8 @@
-import { n as listMatrixEnvAccountIds, t as getMatrixScopedEnvVarNames } from "./env-vars-B0NxQnPk.js";
-import { t as isRecord$1 } from "./record-shared-CWWx6fvI.js";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { n as listMatrixEnvAccountIds, t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.js";
+import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { listCombinedAccountIds, listConfiguredAccountIds, resolveListedDefaultAccountId, resolveNormalizedAccountEntry } from "openclaw/plugin-sdk/account-core";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
-import { hasConfiguredSecretInput } from "openclaw/plugin-sdk/secret-input-runtime";
+import { hasConfiguredSecretInput } from "openclaw/plugin-sdk/secret-input";
 //#region extensions/matrix/src/auth-precedence.ts
 const MATRIX_DEFAULT_ACCOUNT_AUTH_ONLY_FIELDS = /* @__PURE__ */ new Set([
 	"userId",
@@ -102,20 +101,20 @@ function hasConfiguredDefaultMatrixAccountSource(params) {
 	});
 }
 function resolveMatrixChannelConfig(cfg) {
-	return isRecord$1(cfg.channels?.matrix) ? cfg.channels.matrix : null;
+	return isRecord(cfg.channels?.matrix) ? cfg.channels.matrix : null;
 }
 function findMatrixAccountEntry(cfg, accountId) {
 	const channel = resolveMatrixChannelConfig(cfg);
 	if (!channel) return null;
-	const accounts = isRecord$1(channel.accounts) ? channel.accounts : null;
+	const accounts = isRecord(channel.accounts) ? channel.accounts : null;
 	if (!accounts) return null;
 	const entry = resolveNormalizedAccountEntry(accounts, accountId, normalizeAccountId);
-	return isRecord$1(entry) ? entry : null;
+	return isRecord(entry) ? entry : null;
 }
 function resolveConfiguredMatrixAccountIds(cfg, env = process.env) {
 	const channel = resolveMatrixChannelConfig(cfg);
 	const configuredAccountIds = listConfiguredAccountIds({
-		accounts: channel && isRecord$1(channel.accounts) ? channel.accounts : void 0,
+		accounts: channel && isRecord(channel.accounts) ? channel.accounts : void 0,
 		normalizeAccountId
 	});
 	if (hasConfiguredDefaultMatrixAccountSource({

package/dist/{accounts-DfngqebB.js → accounts-BCzyubQt.js}

@@ -1,7 +1,7 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId, o as resolveMatrixAccountStringValues, r as resolveConfiguredMatrixAccountIds } from "./account-selection-kqquRzCf.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId, o as resolveMatrixAccountStringValues, r as resolveConfiguredMatrixAccountIds } from "./account-selection-CWuhuFn1.js";
 import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig, t as findMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { i as resolveScopedMatrixEnvConfig, n as resolveGlobalMatrixEnvConfig } from "./env-auth-CQsYbz-p.js";
-import { o as loadMatrixCredentials, r as credentialsMatchConfig } from "./credentials-read-DVmFCm7X.js";
+import { r as resolveScopedMatrixEnvConfig, t as resolveGlobalMatrixEnvConfig } from "./env-auth-MVS-Vv41.js";
+import { i as loadMatrixCredentials, n as credentialsMatchConfig } from "./credentials-read-B37cQknZ.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { hasConfiguredSecretInput } from "openclaw/plugin-sdk/secret-input-runtime";

package/dist/api.js

@@ -1,12 +1,9 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-kqquRzCf.js";
-import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./env-vars-B0NxQnPk.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-CWuhuFn1.js";
+import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.js";
 import { a as resolveMatrixCredentialsPath, i as resolveMatrixCredentialsFilename, n as resolveMatrixAccountStorageRoot, o as resolveMatrixHomeserverKey, r as resolveMatrixCredentialsDir, s as sanitizeMatrixPathSegment, t as hashMatrixAccessToken } from "./storage-paths-gUmSydsW.js";
-import { t as matrixPlugin } from "./channel-vj788dNZ.js";
+import { t as matrixPlugin } from "./channel-VSrHgTON.js";
+import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-DQn6b5vi.js";
 import { d as setMatrixThreadBindingIdleTimeoutBySessionKey, n as getMatrixThreadBindingManager, p as setMatrixThreadBindingMaxAgeBySessionKey, s as resetMatrixThreadBindingsForTests } from "./thread-bindings-shared-CKnY4LSd.js";
-import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-BVfBv2ai.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-BBq3WeqX.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-DGbl3vDW.js";
-//#region extensions/matrix/api.ts
-const matrixSessionBindingAdapterChannels = ["matrix"];
-//#endregion
-export { createMatrixSetupWizardProxy, createMatrixThreadBindingManager, findMatrixAccountEntry, getMatrixScopedEnvVarNames, getMatrixThreadBindingManager, hashMatrixAccessToken, listMatrixEnvAccountIds, matrixOnboardingAdapter, matrixOnboardingAdapter as matrixSetupWizard, matrixPlugin, matrixSessionBindingAdapterChannels, matrixSetupAdapter, requiresExplicitMatrixDefaultAccount, resetMatrixThreadBindingsForTests, resolveConfiguredMatrixAccountIds, resolveMatrixAccountStorageRoot, resolveMatrixChannelConfig, resolveMatrixCredentialsDir, resolveMatrixCredentialsFilename, resolveMatrixCredentialsPath, resolveMatrixDefaultOrOnlyAccountId, resolveMatrixEnvAccountToken, resolveMatrixHomeserverKey, sanitizeMatrixPathSegment, setMatrixThreadBindingIdleTimeoutBySessionKey, setMatrixThreadBindingMaxAgeBySessionKey };
+import { n as matrixOnboardingAdapter } from "./setup-surface-DlhJdrNI.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-CcHZP3w2.js";
+export { createMatrixSetupWizardProxy, createMatrixThreadBindingManager, findMatrixAccountEntry, getMatrixScopedEnvVarNames, getMatrixThreadBindingManager, hashMatrixAccessToken, listMatrixEnvAccountIds, matrixOnboardingAdapter, matrixOnboardingAdapter as matrixSetupWizard, matrixPlugin, matrixSetupAdapter, requiresExplicitMatrixDefaultAccount, resetMatrixThreadBindingsForTests, resolveConfiguredMatrixAccountIds, resolveMatrixAccountStorageRoot, resolveMatrixChannelConfig, resolveMatrixCredentialsDir, resolveMatrixCredentialsFilename, resolveMatrixCredentialsPath, resolveMatrixDefaultOrOnlyAccountId, resolveMatrixEnvAccountToken, resolveMatrixHomeserverKey, sanitizeMatrixPathSegment, setMatrixThreadBindingIdleTimeoutBySessionKey, setMatrixThreadBindingMaxAgeBySessionKey };

package/dist/{approval-handler.runtime-DSeaIsGa.js → approval-handler.runtime-CJXCUdRg.js}

@@ -1,9 +1,9 @@
-import { i as resolveMatrixAccount } from "./accounts-DfngqebB.js";
-import { _ as shouldHandleMatrixApprovalRequest, g as isMatrixAnyApprovalClientEnabled } from "./channel-vj788dNZ.js";
+import { i as resolveMatrixAccount } from "./accounts-BCzyubQt.js";
+import { _ as shouldHandleMatrixApprovalRequest, g as isMatrixAnyApprovalClientEnabled } from "./channel-VSrHgTON.js";
 import { a as resolveMatrixTargetIdentity } from "./target-ids-B-5aQxwn.js";
-import { a as sendSingleTextMessageMatrix, d as repairMatrixDirectRooms, n as reactMatrixMessage, r as sendMessageMatrix } from "./send-BldGYG8g.js";
-import { a as unregisterMatrixApprovalReactionTarget, n as listMatrixApprovalReactionBindings, r as registerMatrixApprovalReactionTarget, t as buildMatrixApprovalReactionHint } from "./approval-reactions-D-BxBK_L.js";
-import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-DxQJkhxs.js";
+import { a as sendSingleTextMessageMatrix, n as reactMatrixMessage, r as sendMessageMatrix, w as repairMatrixDirectRooms } from "./send-ZDLU4JTk.js";
+import { a as unregisterMatrixApprovalReactionTarget, n as listMatrixApprovalReactionBindings, r as registerMatrixApprovalReactionTarget, t as buildMatrixApprovalReactionHint } from "./approval-reactions-tXh9KYrW.js";
+import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-BW0s-6Y9.js";
 import { listMessageReceiptPlatformIds, resolveMessageReceiptPrimaryId } from "openclaw/plugin-sdk/channel-outbound";
 import { normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";

package/dist/{approval-ids-BdJGPAJT.js → approval-ids-7rf7etWE.js}

@@ -1,4 +1,4 @@
-import { a as normalizeMatrixUserId } from "./config-schema-Djxw3C6b.js";
+import { a as normalizeMatrixUserId } from "./channel.setup-PpxRP9Du.js";
 //#region extensions/matrix/src/approval-ids.ts
 function normalizeMatrixApproverId(value) {
 	return normalizeMatrixUserId(String(value)) || void 0;

package/dist/{approval-reaction-auth-BjOpELxu.js → approval-reaction-auth-wBwbEDpZ.js}

@@ -1,5 +1,5 @@
-import { i as resolveMatrixAccount } from "./accounts-DfngqebB.js";
-import { t as normalizeMatrixApproverId } from "./approval-ids-BdJGPAJT.js";
+import { i as resolveMatrixAccount } from "./accounts-BCzyubQt.js";
+import { t as normalizeMatrixApproverId } from "./approval-ids-7rf7etWE.js";
 import { resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
 //#region extensions/matrix/src/approval-reaction-auth.ts
 function normalizeMatrixExecApproverId(value) {

package/dist/{approval-reactions-D-BxBK_L.js → approval-reactions-tXh9KYrW.js}

@@ -1,6 +1,7 @@
 import { n as getOptionalMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/routing";
 import { createApprovalReactionTargetStore } from "openclaw/plugin-sdk/approval-reaction-runtime";
+import { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
 //#region extensions/matrix/src/approval-reactions.ts
 const MATRIX_APPROVAL_REACTION_META = {
 	"allow-once": {
@@ -24,14 +25,7 @@ const MATRIX_APPROVAL_REACTION_ORDER = [
 const PERSISTENT_NAMESPACE = "matrix.approval-reactions";
 const PERSISTENT_MAX_ENTRIES = 1e3;
 const DEFAULT_REACTION_TARGET_TTL_MS = 1440 * 60 * 1e3;
-function reportPersistentApprovalReactionError(error) {
-	try {
-		getOptionalMatrixRuntime()?.logging.getChildLogger({
-			plugin: "matrix",
-			feature: "approval-reaction-state"
-		}).warn("Matrix persistent approval reaction state failed", { error: String(error) });
-	} catch {}
-}
+const reportPersistentApprovalReactionError = createPluginStateErrorReporter(getOptionalMatrixRuntime, "matrix", "approval-reaction-state", "Matrix persistent approval reaction state failed");
 function readPersistedTarget(target) {
 	const value = target;
 	const accountId = typeof value?.accountId === "string" ? normalizeOptionalAccountId(value.accountId) : void 0;

package/dist/auth-presence.js

@@ -1,5 +1,5 @@
-import { c as normalizeMatrixStoredCredentials, t as MATRIX_CREDENTIALS_NAMESPACE } from "./credentials-read-DVmFCm7X.js";
-import { createPluginStateSyncKeyedStore } from "openclaw/plugin-sdk/runtime-doctor";
+import { i as normalizeMatrixStoredCredentials, t as MATRIX_CREDENTIALS_NAMESPACE } from "./credentials-state-B3cuUFwZ.js";
+import { createPluginStateSyncKeyedStore } from "openclaw/plugin-sdk/plugin-state-store-runtime";
 //#region extensions/matrix/auth-presence.ts
 function hasAnyMatrixAuth(params, env = process.env) {
 	const resolvedEnv = params && typeof params === "object" && "cfg" in params ? params.env ?? env : env;

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

@@ -1,17 +1,14 @@
-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 { 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-PpxRP9Du.js";
+import { t as normalizeMatrixApproverId } from "./approval-ids-7rf7etWE.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 { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-DEt4O4Zt.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 collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-CufozuyJ.js";
 import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-DRbBZlhS.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";
@@ -27,13 +24,14 @@ 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 { parseThreadSessionSuffix } 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";
@@ -82,7 +80,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 +93,21 @@ 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 = {
 	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 +128,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-DmdRL0bN.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 +160,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 +215,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 +262,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 +322,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;
@@ -602,7 +603,7 @@ const matrixNativeApprovalCapability = createApproverRestrictedNativeApprovalCap
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-DSeaIsGa.js")).matrixApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-CJXCUdRg.js")).matrixApprovalNativeRuntime
 	})
 });
 const splitMatrixApprovalCapability = splitChannelApprovalCapability(matrixNativeApprovalCapability);
@@ -700,7 +701,7 @@ function createMatrixProbeAccount(params) {
 		} catch (err) {
 			return {
 				ok: false,
-				error: formatMatrixErrorMessage(err),
+				error: formatErrorMessage(err),
 				elapsedMs: 0
 			};
 		}
@@ -720,6 +721,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;
@@ -781,7 +829,7 @@ function resolveMatrixGroupToolPolicy(params) {
 }
 //#endregion
 //#region extensions/matrix/src/resolver.ts
-const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-DS6uPaEe.js"), "matrixResolverRuntime");
+const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-LWJELYq5.js"), "matrixResolverRuntime");
 const matrixResolverAdapter = { resolveTargets: async ({ cfg, accountId, inputs, kind, runtime }) => (await loadMatrixChannelRuntime$1()).resolveMatrixTargets({
 	cfg,
 	accountId,
@@ -896,6 +944,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 +956,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-pOOL0uT_.js"), "matrixChannelRuntime");
+const loadMatrixDoctorModule = createLazyRuntimeModule(() => import("./doctor-EWf9CDso.js"));
 function buildMatrixTrafficStatusSummary(snapshot) {
 	return {
 		lastInboundAt: snapshot?.lastInboundAt ?? null,
@@ -1052,6 +1093,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 +1111,9 @@ const matrixChannelOutbound = {
 		media: true,
 		replyTo: true,
 		thread: true,
-		messageSendingHooks: true
+		messageSendingHooks: true,
+		afterCommit: true,
+		reconcileUnknownSend: true
 	} },
 	presentationCapabilities: {
 		supported: true,
@@ -1105,52 +1155,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,
@@ -1175,6 +1194,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,
@@ -1216,18 +1239,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 +1295,7 @@ const matrixPlugin = createChatChannelPlugin({
 			await previousLock;
 			let monitorMatrixProvider;
 			try {
-				monitorMatrixProvider = (await import("./monitor-VyWlSLwo.js")).monitorMatrixProvider;
+				monitorMatrixProvider = (await import("./monitor-Ddfc-vjX.js")).monitorMatrixProvider;
 			} finally {
 				releaseLock();
 			}
@@ -1321,6 +1332,15 @@ const matrixPlugin = createChatChannelPlugin({
 	},
 	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

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as matrixPlugin } from "./channel-vj788dNZ.js";
+import { t as matrixPlugin } from "./channel-VSrHgTON.js";
 export { matrixPlugin };