@openclaw/matrix 2026.7.2-beta.5 → 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-BCzyubQt.js

@@ -0,0 +1,130 @@
+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 { 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";
+//#region extensions/matrix/src/matrix/accounts.ts
+function clean(value) {
+	return normalizeOptionalString(value) ?? "";
+}
+function resolveMatrixAccountAuthView(params) {
+	const normalizedAccountId = normalizeAccountId(params.accountId);
+	const matrix = resolveMatrixBaseConfig(params.cfg);
+	const account = findMatrixAccountConfig(params.cfg, normalizedAccountId) ?? {};
+	const resolvedStrings = resolveMatrixAccountStringValues({
+		accountId: normalizedAccountId,
+		account: {
+			homeserver: clean(account.homeserver),
+			userId: clean(account.userId),
+			accessToken: typeof account.accessToken === "string" ? clean(account.accessToken) : "",
+			password: typeof account.password === "string" ? clean(account.password) : "",
+			deviceId: clean(account.deviceId),
+			deviceName: clean(account.deviceName)
+		},
+		scopedEnv: resolveScopedMatrixEnvConfig(normalizedAccountId, params.env),
+		channel: {
+			homeserver: clean(matrix.homeserver),
+			userId: clean(matrix.userId),
+			accessToken: typeof matrix.accessToken === "string" ? clean(matrix.accessToken) : "",
+			password: typeof matrix.password === "string" ? clean(matrix.password) : "",
+			deviceId: clean(matrix.deviceId),
+			deviceName: clean(matrix.deviceName)
+		},
+		globalEnv: resolveGlobalMatrixEnvConfig(params.env)
+	});
+	return {
+		homeserver: resolvedStrings.homeserver,
+		userId: resolvedStrings.userId,
+		accessToken: resolvedStrings.accessToken || void 0,
+		password: resolvedStrings.password || void 0
+	};
+}
+function resolveMatrixAccountUserId(params) {
+	const env = params.env ?? process.env;
+	const authView = resolveMatrixAccountAuthView({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		env
+	});
+	const configuredUserId = authView.userId.trim();
+	if (configuredUserId) return configuredUserId;
+	const stored = loadMatrixCredentials(env, params.accountId);
+	if (!stored) return null;
+	if (authView.homeserver && stored.homeserver !== authView.homeserver) return null;
+	if (authView.accessToken && stored.accessToken !== authView.accessToken) return null;
+	return stored.userId.trim() || null;
+}
+function listMatrixAccountIds(cfg) {
+	const ids = resolveConfiguredMatrixAccountIds(cfg, process.env);
+	return ids.length > 0 ? ids : [DEFAULT_ACCOUNT_ID];
+}
+function resolveDefaultMatrixAccountId(cfg) {
+	return normalizeAccountId(resolveMatrixDefaultOrOnlyAccountId(cfg));
+}
+function resolveConfiguredMatrixBotUserIds(params) {
+	const env = params.env ?? process.env;
+	const currentAccountId = normalizeAccountId(params.accountId);
+	const accountIds = new Set(resolveConfiguredMatrixAccountIds(params.cfg, env));
+	if (resolveMatrixAccount({
+		cfg: params.cfg,
+		accountId: DEFAULT_ACCOUNT_ID,
+		env
+	}).configured) accountIds.add(DEFAULT_ACCOUNT_ID);
+	const ids = /* @__PURE__ */ new Set();
+	for (const accountId of accountIds) {
+		if (normalizeAccountId(accountId) === currentAccountId) continue;
+		if (!resolveMatrixAccount({
+			cfg: params.cfg,
+			accountId,
+			env
+		}).configured) continue;
+		const userId = resolveMatrixAccountUserId({
+			cfg: params.cfg,
+			accountId,
+			env
+		});
+		if (userId) ids.add(userId);
+	}
+	return ids;
+}
+function resolveMatrixAccount(params) {
+	const env = params.env ?? process.env;
+	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultMatrixAccountId(params.cfg));
+	const matrixBase = resolveMatrixBaseConfig(params.cfg);
+	const base = resolveMatrixAccountConfig({
+		cfg: params.cfg,
+		accountId,
+		env
+	});
+	const explicitAuthConfig = accountId === DEFAULT_ACCOUNT_ID ? base : findMatrixAccountConfig(params.cfg, accountId) ?? {};
+	const enabled = base.enabled !== false && matrixBase.enabled !== false;
+	const authView = resolveMatrixAccountAuthView({
+		cfg: params.cfg,
+		accountId,
+		env
+	});
+	const hasHomeserver = Boolean(authView.homeserver);
+	const hasUserId = Boolean(authView.userId);
+	const hasAccessToken = Boolean(authView.accessToken) || hasConfiguredSecretInput(explicitAuthConfig.accessToken);
+	const hasPassword = Boolean(authView.password);
+	const hasPasswordAuth = hasUserId && (hasPassword || hasConfiguredSecretInput(explicitAuthConfig.password));
+	const stored = loadMatrixCredentials(env, accountId);
+	const hasStored = stored && authView.homeserver ? credentialsMatchConfig(stored, {
+		homeserver: authView.homeserver,
+		userId: authView.userId || ""
+	}) : false;
+	const configured = hasHomeserver && (hasAccessToken || hasPasswordAuth || hasStored);
+	return {
+		accountId,
+		enabled,
+		name: normalizeOptionalString(base.name),
+		configured,
+		homeserver: authView.homeserver || void 0,
+		userId: authView.userId || void 0,
+		config: base
+	};
+}
+//#endregion
+export { resolveMatrixAccount as i, resolveConfiguredMatrixBotUserIds as n, resolveDefaultMatrixAccountId as r, listMatrixAccountIds as t };

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 { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-a542Ernq.js";
-import { t as matrixPlugin } from "./channel-Cmi248PA.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 matrixOnboardingAdapter } from "./setup-surface-BJrCI6KT.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-D3RfVgAF.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-D1ibJgSk.js → approval-handler.runtime-CJXCUdRg.js}

@@ -1,9 +1,9 @@
-import { _ as resolveMatrixAccount } from "./setup-core-a542Ernq.js";
-import { _ as shouldHandleMatrixApprovalRequest, g as isMatrixAnyApprovalClientEnabled } from "./channel-Cmi248PA.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-C9Ssx-iV.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-Bf_s--M9.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-2OQj32-K.js → approval-ids-7rf7etWE.js}

@@ -1,4 +1,4 @@
-import { a as normalizeMatrixUserId } from "./config-schema-BShrVROw.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-CCAWWkbu.js → approval-reaction-auth-wBwbEDpZ.js}

@@ -1,5 +1,5 @@
-import { _ as resolveMatrixAccount } from "./setup-core-a542Ernq.js";
-import { t as normalizeMatrixApproverId } from "./approval-ids-2OQj32-K.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;