@openclaw/matrix 2026.7.2-beta.4 → 2026.7.2-beta.5

package/dist/session-binding-contract-api.js

@@ -1,4 +1,4 @@
 import { r as setMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { s as resetMatrixThreadBindingsForTests } from "./thread-bindings-shared-CKnY4LSd.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-BcYBELC7.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-D3RfVgAF.js";
 export { createMatrixThreadBindingManager, resetMatrixThreadBindingsForTests, setMatrixRuntime };

package/dist/{setup-bootstrap-C9w01xQK.js → setup-bootstrap-BBGpPKgy.js}

@@ -1,7 +1,7 @@
 import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import "./setup-core-D6gyoyeg.js";
+import "./setup-core-a542Ernq.js";
 import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { n as bootstrapMatrixVerification } from "./verification-DhMBWxOJ.js";
+import { n as bootstrapMatrixVerification } from "./verification-ZdAXdmuh.js";
 //#region extensions/matrix/src/setup-bootstrap.ts
 async function maybeBootstrapNewEncryptedMatrixAccount(params) {
 	const accountConfig = resolveMatrixAccountConfig({

package/dist/{setup-core-D6gyoyeg.js → setup-core-a542Ernq.js}

@@ -8,6 +8,7 @@ import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "opencl
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { hasConfiguredSecretInput } from "openclaw/plugin-sdk/secret-input-runtime";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
+import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$2, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId as normalizeAccountId$2, normalizeAllowFromEntries, normalizeSecretInputString, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
 import { resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
@@ -586,19 +587,6 @@ function resolveMatrixSetupAccountId(params) {
 function resolveMatrixSetupWizardAccountId(cfg, accountId) {
 	return normalizeAccountId$2(accountId?.trim() || resolveDefaultMatrixAccountId(cfg) || DEFAULT_ACCOUNT_ID$2);
 }
-function setMatrixDmPolicy(cfg, policy, accountId) {
-	const resolvedAccountId = resolveMatrixSetupWizardAccountId(cfg, accountId);
-	const existing = resolveMatrixAccountConfig({
-		cfg,
-		accountId: resolvedAccountId
-	});
-	const allowFrom = resolveMatrixSetupDmAllowFrom(policy, existing.dm?.allowFrom);
-	return updateMatrixAccountConfig(cfg, resolvedAccountId, { dm: {
-		...existing.dm,
-		policy,
-		allowFrom
-	} });
-}
 function createMatrixSetupWizardProxy(loadWizardModule) {
 	let wizardPromise = null;
 	const loadWizard = () => {
@@ -618,28 +606,42 @@ function createMatrixSetupWizardProxy(loadWizardModule) {
 			return await (wizard.configureWhenConfigured ?? wizard.configureInteractive ?? wizard.configure)(ctx);
 		},
 		afterConfigWritten: async (ctx) => await (await loadWizard()).afterConfigWritten?.(ctx),
-		dmPolicy: {
+		dmPolicy: createChannelDmPolicy({
 			label: "Matrix",
 			channel,
-			policyKey: "channels.matrix.dm.policy",
-			allowFromKey: "channels.matrix.dm.allowFrom",
-			resolveConfigKeys: (cfg, accountId) => {
-				const resolvedAccountId = resolveMatrixSetupWizardAccountId(cfg, accountId);
+			policyPath: "dm.policy",
+			allowFromPath: "dm.allowFrom",
+			resolveAccount: (cfg, accountId) => {
+				const accountIdResolved = resolveMatrixSetupWizardAccountId(cfg, accountId);
+				const config = resolveMatrixAccountConfig({
+					cfg,
+					accountId: accountIdResolved
+				});
 				return {
-					policyKey: resolveMatrixConfigFieldPath(cfg, resolvedAccountId, "dm.policy"),
-					allowFromKey: resolveMatrixConfigFieldPath(cfg, resolvedAccountId, "dm.allowFrom")
+					accountId: accountIdResolved,
+					config: {
+						dmPolicy: config.dm?.policy,
+						allowFrom: config.dm?.allowFrom,
+						dm: config.dm
+					}
 				};
 			},
-			getCurrent: (cfg, accountId) => resolveMatrixAccountConfig({
-				cfg,
-				accountId: resolveMatrixSetupWizardAccountId(cfg, accountId)
-			}).dm?.policy ?? "pairing",
-			setPolicy: (cfg, policy, accountId) => setMatrixDmPolicy(cfg, policy, accountId),
+			resolveConfigKeys: ({ cfg, account }) => ({
+				policyKey: resolveMatrixConfigFieldPath(cfg, account.accountId, "dm.policy"),
+				allowFromKey: resolveMatrixConfigFieldPath(cfg, account.accountId, "dm.allowFrom")
+			}),
+			resolveAllowFrom: ({ policy, account }) => resolveMatrixSetupDmAllowFrom(policy, account.config.allowFrom),
+			buildPatch: ({ account, policy, allowFrom }) => ({ dm: {
+				...account.config.dm,
+				policy,
+				allowFrom
+			} }),
+			applyPatch: ({ cfg, account, patch }) => updateMatrixAccountConfig(cfg, account.accountId, patch),
 			promptAllowFrom: async (params) => {
 				const promptAllowFrom = (await loadWizard()).dmPolicy?.promptAllowFrom;
 				return promptAllowFrom ? await promptAllowFrom(params) : params.cfg;
 			}
-		},
+		}),
 		disable: (cfg) => ({
 			...cfg,
 			channels: {
@@ -680,7 +682,7 @@ const matrixSetupAdapter = {
 		input
 	}),
 	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-C9w01xQK.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BBGpPKgy.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,

package/dist/setup-plugin-api.js

@@ -1,5 +1,5 @@
-import { _ as resolveMatrixAccount, n as matrixSetupAdapter, r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-D6gyoyeg.js";
-import { r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-CggnuwnJ.js";
+import { _ as resolveMatrixAccount, n as matrixSetupAdapter, r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-a542Ernq.js";
+import { r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-BShrVROw.js";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 const matrixSetupPlugin = {
 	id: "matrix",
@@ -13,7 +13,7 @@ const matrixSetupPlugin = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-DZIEWtQC.js").then((n) => n.t)).matrixSetupWizard })),
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-BJrCI6KT.js").then((n) => n.t)).matrixSetupWizard })),
 	setup: matrixSetupAdapter,
 	setupContract: matrixSetupContract,
 	capabilities: {

package/dist/{setup-surface-DZIEWtQC.js → setup-surface-BJrCI6KT.js}

@@ -2,12 +2,13 @@ import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.js";
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
 import { r as resolveMatrixEnvAuthReadiness } from "./env-auth-CQsYbz-p.js";
-import { _ as resolveMatrixAccount, a as moveSingleMatrixAccountConfigToNamedAccount, g as resolveDefaultMatrixAccountId, i as resolveMatrixSetupDmAllowFrom, m as listMatrixAccountIds, u as updateMatrixAccountConfig } from "./setup-core-D6gyoyeg.js";
+import { _ as resolveMatrixAccount, a as moveSingleMatrixAccountConfigToNamedAccount, g as resolveDefaultMatrixAccountId, i as resolveMatrixSetupDmAllowFrom, m as listMatrixAccountIds, u as updateMatrixAccountConfig } from "./setup-core-a542Ernq.js";
 import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
 import { n as validateMatrixHomeserverUrl, r as isPrivateOrLoopbackHost, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
 import { n as ensureMatrixSdkInstalled, r as isMatrixSdkAvailable } from "./deps-CcVJfvRM.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
+import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 import { formatDocsLink, hasConfiguredSecretInput, mergeAllowFromEntries, normalizeAccountId as normalizeAccountId$1, promptAccountId, promptChannelAccessConfig, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 import { isPrivateNetworkOptInEnabled } from "openclaw/plugin-sdk/ssrf-policy";
 //#region extensions/matrix/src/onboarding.ts
@@ -38,19 +39,6 @@ function normalizeMatrixInviteAutoJoinTargets(entries) {
 function resolveMatrixOnboardingAccountId(cfg, accountId) {
 	return normalizeAccountId$1(normalizeOptionalString(accountId) || resolveDefaultMatrixAccountId(cfg) || DEFAULT_ACCOUNT_ID);
 }
-function setMatrixDmPolicy(cfg, policy, accountId) {
-	const resolvedAccountId = resolveMatrixOnboardingAccountId(cfg, accountId);
-	const existing = resolveMatrixAccountConfig({
-		cfg,
-		accountId: resolvedAccountId
-	});
-	const allowFrom = resolveMatrixSetupDmAllowFrom(policy, existing.dm?.allowFrom);
-	return updateMatrixAccountConfig(cfg, resolvedAccountId, { dm: {
-		...existing.dm,
-		policy,
-		allowFrom
-	} });
-}
 async function noteMatrixAuthHelp(prompter) {
 	await prompter.note([
 		"Matrix requires a homeserver URL.",
@@ -105,7 +93,7 @@ async function promptMatrixAllowFrom(params) {
 			pending.push(part);
 		}
 		if (pending.length > 0) {
-			const { resolveMatrixTargets } = await import("./resolve-targets-Dn11HT76.js").then((n) => n.n);
+			const { resolveMatrixTargets } = await import("./resolve-targets-nNMcrV3W.js").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -233,7 +221,7 @@ async function configureMatrixAccessPrompts(params) {
 					resolvedIds.push(cleaned);
 					continue;
 				}
-				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-B6fbX6jf.js").then((n) => n.t);
+				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-YRgYDx2w.js").then((n) => n.t);
 				const matches = await listMatrixDirectoryGroupsLive({
 					cfg: next,
 					accountId: params.accountId,
@@ -258,25 +246,39 @@ async function configureMatrixAccessPrompts(params) {
 		accountId: params.accountId
 	});
 }
-const dmPolicy = {
+const dmPolicy = createChannelDmPolicy({
 	label: "Matrix",
 	channel,
-	policyKey: "channels.matrix.dm.policy",
-	allowFromKey: "channels.matrix.dm.allowFrom",
-	resolveConfigKeys: (cfg, accountId) => {
-		const effectiveAccountId = resolveMatrixOnboardingAccountId(cfg, accountId);
+	policyPath: "dm.policy",
+	allowFromPath: "dm.allowFrom",
+	resolveAccount: (cfg, accountId) => {
+		const accountIdResolved = resolveMatrixOnboardingAccountId(cfg, accountId);
+		const config = resolveMatrixAccountConfig({
+			cfg,
+			accountId: accountIdResolved
+		});
 		return {
-			policyKey: resolveMatrixConfigFieldPath(cfg, effectiveAccountId, "dm.policy"),
-			allowFromKey: resolveMatrixConfigFieldPath(cfg, effectiveAccountId, "dm.allowFrom")
+			accountId: accountIdResolved,
+			config: {
+				dmPolicy: config.dm?.policy,
+				allowFrom: config.dm?.allowFrom,
+				dm: config.dm
+			}
 		};
 	},
-	getCurrent: (cfg, accountId) => resolveMatrixAccountConfig({
-		cfg,
-		accountId: resolveMatrixOnboardingAccountId(cfg, accountId)
-	}).dm?.policy ?? "pairing",
-	setPolicy: (cfg, policy, accountId) => setMatrixDmPolicy(cfg, policy, accountId),
+	resolveConfigKeys: ({ cfg, account }) => ({
+		policyKey: resolveMatrixConfigFieldPath(cfg, account.accountId, "dm.policy"),
+		allowFromKey: resolveMatrixConfigFieldPath(cfg, account.accountId, "dm.allowFrom")
+	}),
+	resolveAllowFrom: ({ policy, account }) => resolveMatrixSetupDmAllowFrom(policy, account.config.allowFrom),
+	buildPatch: ({ account, policy, allowFrom }) => ({ dm: {
+		...account.config.dm,
+		policy,
+		allowFrom
+	} }),
+	applyPatch: ({ cfg, account, patch }) => updateMatrixAccountConfig(cfg, account.accountId, patch),
 	promptAllowFrom: promptMatrixAllowFrom
-};
+});
 async function runMatrixConfigure(params) {
 	let next = params.cfg;
 	await ensureMatrixSdkInstalled({
@@ -510,7 +512,7 @@ const matrixOnboardingAdapter = {
 		});
 	},
 	afterConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-C9w01xQK.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BBGpPKgy.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,

package/dist/{shared-C7Vm9RxI.js → shared-CUH5otj8.js}

@@ -5,18 +5,18 @@ import { o as resolveMatrixBaseConfig, r as listNormalizedMatrixAccountIds, t as
 import { i as resolveScopedMatrixEnvConfig, n as resolveGlobalMatrixEnvConfig } from "./env-auth-CQsYbz-p.js";
 import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
 import { t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
-import { s as repairCurrentTokenStorageMetaDeviceId } from "./storage-BrkTJZov.js";
+import { s as repairCurrentTokenStorageMetaDeviceId } from "./storage-BvAkgzvT.js";
 import { n as LogService } from "./logger-D0GCSDQq.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1, normalizeOptionalAccountId, normalizeOptionalAccountId as normalizeOptionalAccountId$1 } from "openclaw/plugin-sdk/account-id";
 import { coerceSecretRef, normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input-runtime";
-import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { formatErrorMessage, toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { isPrivateNetworkOptInEnabled, ssrfPolicyFromDangerouslyAllowPrivateNetwork as ssrfPolicyFromDangerouslyAllowPrivateNetwork$1 } from "openclaw/plugin-sdk/ssrf-runtime";
 import { resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { retryAsync } from "openclaw/plugin-sdk/retry-runtime";
 //#region extensions/matrix/src/matrix/client/config.ts
-const loadDefaultMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-DiRXiRRf.js"), import("./logging-QH-48Gr6.js")]).then(([sdkModule, loggingModule]) => ({
+const loadDefaultMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-UzPd8tst.js"), import("./logging-DV-p52N0.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
@@ -470,17 +470,10 @@ async function awaitMatrixStartupWithAbort(promise, abortSignal) {
 			resolve(value);
 		}, (error) => {
 			abortSignal.removeEventListener("abort", onAbort);
-			reject(toLintErrorObject(error, "Non-Error rejection"));
+			reject(toErrorObject(error, "Non-Error rejection"));
 		});
 	});
 }
-function toLintErrorObject(value, fallbackMessage) {
-	if (value instanceof Error) return value;
-	if (typeof value === "string") return new Error(value);
-	const error = new Error(fallbackMessage, { cause: value });
-	if (typeof value === "object" && value !== null || typeof value === "function") Object.assign(error, value);
-	return error;
-}
 //#endregion
 //#region extensions/matrix/src/matrix/client/shared.ts
 var shared_exports = /* @__PURE__ */ __exportAll({
@@ -492,7 +485,7 @@ var shared_exports = /* @__PURE__ */ __exportAll({
 	stopSharedClientForAccount: () => stopSharedClientForAccount,
 	stopSharedClientInstance: () => stopSharedClientInstance
 });
-const loadMatrixCreateClientDeps = createLazyRuntimeModule(() => import("./create-client-Und1YmJ2.js").then((n) => n.n).then((runtime) => ({ createMatrixClient: runtime.createMatrixClient })));
+const loadMatrixCreateClientDeps = createLazyRuntimeModule(() => import("./create-client-f-CkRllE.js").then((n) => n.n).then((runtime) => ({ createMatrixClient: runtime.createMatrixClient })));
 const sharedClientStates = /* @__PURE__ */ new Map();
 const sharedClientPromises = /* @__PURE__ */ new Map();
 function serializeDispatcherPolicyKey(auth) {

package/dist/{startup-verification-D1nscMh8.js → startup-verification-wm3_i88s.js}

@@ -1,6 +1,6 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { M as resolveMatrixSqliteStateEnv, l as resolveMatrixStoragePaths, o as recordCurrentStorageMetaDeviceId } from "./storage-BrkTJZov.js";
+import { M as resolveMatrixSqliteStateEnv, l as resolveMatrixStoragePaths, o as recordCurrentStorageMetaDeviceId } from "./storage-BvAkgzvT.js";
 import { createHash } from "node:crypto";
 import path from "node:path";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";

package/dist/{storage-BrkTJZov.js → storage-BvAkgzvT.js}

@@ -362,9 +362,8 @@ function openMatrixStorageMetaStoreOptions(storageRootDir) {
 function openStorageMetaStore(rootDir) {
 	return getMatrixRuntime().state.openSyncKeyedStore(openMatrixStorageMetaStoreOptions(rootDir));
 }
-function scoreStorageRoot(rootDir) {
+function scoreStorageRoot(rootDir, metadata = readStoredRootMetadata(rootDir)) {
 	let score = 0;
-	const metadata = readStoredRootMetadata(rootDir);
 	if (Object.keys(metadata).length > 0) score += 1;
 	if (metadata.currentTokenStateClaimed === true) score += 8;
 	if (fs.existsSync(path.join(rootDir, "crypto"))) score += 8;
@@ -417,8 +416,16 @@ function isCompatibleStorageRoot(params) {
 	return true;
 }
 function resolvePreferredMatrixStorageRoot(params) {
+	const canonical = {
+		rootDir: params.canonicalRootDir,
+		tokenHash: params.canonicalTokenHash
+	};
+	const deviceId = params.deviceId?.trim();
+	if (!deviceId) return canonical;
+	const canonicalMetadata = readStoredRootMetadata(params.canonicalRootDir);
+	if (canonicalMetadata.accessTokenHash === params.canonicalTokenHash && canonicalMetadata.deviceId?.trim() === deviceId && canonicalMetadata.currentTokenStateClaimed === true) return canonical;
 	const parentDir = path.dirname(params.canonicalRootDir);
-	const bestCurrentScore = scoreStorageRoot(params.canonicalRootDir);
+	const bestCurrentScore = scoreStorageRoot(params.canonicalRootDir, canonicalMetadata);
 	const bestCurrentMtimeMs = resolveStorageRootMtimeMs(params.canonicalRootDir);
 	let best = {
 		rootDir: params.canonicalRootDir,
@@ -426,10 +433,6 @@ function resolvePreferredMatrixStorageRoot(params) {
 		score: bestCurrentScore,
 		mtimeMs: bestCurrentMtimeMs
 	};
-	if (!params.deviceId?.trim()) return {
-		rootDir: best.rootDir,
-		tokenHash: best.tokenHash
-	};
 	let siblingEntries;
 	try {
 		siblingEntries = fs.readdirSync(parentDir, { withFileTypes: true });
@@ -450,8 +453,8 @@ function resolvePreferredMatrixStorageRoot(params) {
 			homeserver: params.homeserver,
 			userId: params.userId,
 			accountKey: params.accountKey,
-			deviceId: params.deviceId,
-			requireExplicitDeviceMatch: Boolean(params.deviceId)
+			deviceId,
+			requireExplicitDeviceMatch: true
 		})) continue;
 		const candidateScore = scoreStorageRoot(candidateRootDir);
 		if (candidateScore <= 0) continue;
@@ -463,15 +466,12 @@ function resolvePreferredMatrixStorageRoot(params) {
 			mtimeMs: resolveStorageRootMtimeMs(candidateRootDir)
 		});
 	}
-	const canonicalMetadata = readStoredRootMetadata(params.canonicalRootDir);
-	if (!(canonicalMetadata.accessTokenHash === params.canonicalTokenHash && canonicalMetadata.deviceId?.trim() === params.deviceId.trim() && canonicalMetadata.currentTokenStateClaimed === true)) {
-		for (const candidate of compatiblePopulatedSiblings) if (candidate.score > best.score || best.rootDir !== params.canonicalRootDir && candidate.score === best.score && candidate.mtimeMs > best.mtimeMs) best = {
-			rootDir: candidate.rootDir,
-			tokenHash: candidate.tokenHash,
-			score: candidate.score,
-			mtimeMs: candidate.mtimeMs
-		};
-	}
+	for (const candidate of compatiblePopulatedSiblings) if (candidate.score > best.score || best.rootDir !== params.canonicalRootDir && candidate.score === best.score && candidate.mtimeMs > best.mtimeMs) best = {
+		rootDir: candidate.rootDir,
+		tokenHash: candidate.tokenHash,
+		score: candidate.score,
+		mtimeMs: candidate.mtimeMs
+	};
 	if (populatedTokenHashes.length > 1) getMatrixRuntime().logging.getChildLogger({ module: "matrix-storage" }).warn("matrix: multiple populated token-hash storage roots detected", {
 		parentDir,
 		canonicalTokenHash: params.canonicalTokenHash,
@@ -526,7 +526,7 @@ function resolveMatrixStateFilePath(params) {
 }
 async function maybeMigrateLegacyStorage(params) {
 	const hasAccountScopedLegacyStorageFile = fs.existsSync(params.storagePaths.storagePath);
-	const syncCache = hasAccountScopedLegacyStorageFile ? await import("./file-sync-store-DUEWCEjb.js").then((n) => n.n) : null;
+	const syncCache = hasAccountScopedLegacyStorageFile ? await import("./file-sync-store-DiiFsayX.js").then((n) => n.n) : null;
 	const hasAccountScopedLegacyStorage = hasAccountScopedLegacyStorageFile && await syncCache?.readLegacyMatrixSyncCacheState(params.storagePaths.rootDir) !== null;
 	const hasAccountScopedRecoveryKey = fs.existsSync(params.storagePaths.recoveryKeyPath);
 	const hasAccountScopedLegacyCryptoMigration = fs.existsSync(path.join(params.storagePaths.rootDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME));
@@ -573,7 +573,7 @@ async function maybeMigrateLegacyStorage(params) {
 	if (skippedExistingTargets.length > 0) logger.warn?.(`matrix: legacy client storage files were left in place because their migrated targets already existed.\n${skippedExistingTargets.join("\n")}`);
 }
 async function migrateLegacySyncCacheToSqlite(params) {
-	const syncCache = await import("./file-sync-store-DUEWCEjb.js").then((n) => n.n);
+	const syncCache = await import("./file-sync-store-DiiFsayX.js").then((n) => n.n);
 	const persisted = await syncCache.readLegacyMatrixSyncCacheState(params.sourceRootDir);
 	if (!persisted) return;
 	const store = getMatrixRuntime().state.openKeyedStore(syncCache.openMatrixSyncCacheStoreOptions(params.targetRootDir));

package/dist/{thread-bindings-BcYBELC7.js → thread-bindings-D3RfVgAF.js}

@@ -1,12 +1,13 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { a as listBindingsForAccount, c as resolveBindingKey, f as setMatrixThreadBindingManagerEntry, h as toSessionBindingRecord, l as resolveEffectiveBindingExpiry, m as toMatrixBindingTargetKind, o as removeBindingRecord, r as getMatrixThreadBindingManagerEntry, t as deleteMatrixThreadBindingManagerEntry, u as setBindingRecord } from "./thread-bindings-shared-CKnY4LSd.js";
-import { M as resolveMatrixSqliteStateEnv, N as resolveMatrixSqliteStateKey, c as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-BrkTJZov.js";
-import { a as sendMessageMatrix } from "./send-CZCmDQu8.js";
+import { M as resolveMatrixSqliteStateEnv, N as resolveMatrixSqliteStateKey, c as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-BvAkgzvT.js";
+import { r as sendMessageMatrix } from "./send-C9Ssx-iV.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";
 import { registerSessionBindingAdapter, resolveThreadBindingFarewellText, unregisterSessionBindingAdapter } from "openclaw/plugin-sdk/thread-bindings-session-runtime";
 import fs from "node:fs/promises";
+import { resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-runtime";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
 import { resolveAgentIdFromSessionKey } from "openclaw/plugin-sdk/session-key-runtime";
 //#region extensions/matrix/src/matrix/thread-bindings.ts
@@ -353,7 +354,7 @@ async function createMatrixThreadBindingManager(params) {
 				...boundParentConversationId ? { parentConversationId: boundParentConversationId } : {},
 				targetKind: toMatrixBindingTargetKind(input.targetKind),
 				targetSessionKey,
-				agentId: normalizeOptionalString(input.metadata?.agentId) || resolveAgentIdFromSessionKey(targetSessionKey),
+				agentId: normalizeOptionalString(input.metadata?.agentId) || resolveAgentIdFromSessionKey(targetSessionKey, resolveDefaultAgentId(params.cfg)),
 				label: normalizeOptionalString(input.metadata?.label) || void 0,
 				boundBy: normalizeOptionalString(input.metadata?.boundBy) || "system",
 				boundAt: now,

package/dist/{tool-actions.runtime-Dbco_Vwn.js → tool-actions.runtime-Dh5ow2EK.js}

@@ -1,15 +1,15 @@
 import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-BZWN9tGS.js";
-import { _ as resolveMatrixAccount } from "./setup-core-D6gyoyeg.js";
-import { r as resolveMatrixRoomConfig } from "./channel-MBtrY36B.js";
+import { _ as resolveMatrixAccount } from "./setup-core-a542Ernq.js";
+import { r as resolveMatrixRoomConfig } from "./channel-Cmi248PA.js";
 import { r as normalizeMatrixResolvableTarget } from "./target-ids-B-5aQxwn.js";
-import { E as parsePollStart, T as isPollStartType, _ as readJoinedMatrixMembers, b as buildPollResponseContent, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, i as reactMatrixMessage, u as resolveMatrixRoomId } from "./send-CZCmDQu8.js";
+import { E as parsePollStart, T as isPollStartType, b as buildPollResponseContent, c as resolveMatrixRoomId, h as readJoinedMatrixMembers, m as isStrictDirectMembership, n as reactMatrixMessage, p as hasDirectMatrixMemberFlag } from "./send-C9Ssx-iV.js";
 import { i as buildMatrixReactionRelationsPath, o as selectOwnMatrixReactionEventIds, s as summarizeMatrixReactionEvents } from "./reaction-common-DkrQdBSZ.js";
-import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-BwX6rURh.js";
-import { a as fetchEventSummary, c as resolveMatrixActionLimit, i as sendMatrixMessage, n as editMatrixMessage, o as readPinnedEvents, r as readMatrixMessages, s as EventType, t as deleteMatrixMessage } from "./messages-ClTgfFl6.js";
+import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-CitERujx.js";
+import { a as fetchEventSummary, c as resolveMatrixActionLimit, i as sendMatrixMessage, n as editMatrixMessage, o as readPinnedEvents, r as readMatrixMessages, s as EventType, t as deleteMatrixMessage } from "./messages-Bf_s--M9.js";
 import { c as readReactionParams, d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, i as createActionGate, l as readStringArrayParam, n as ToolAuthorizationError, o as jsonResult, s as readPositiveIntegerParam, u as readStringParam } from "./runtime-api-D1xI_cvh.js";
-import { t as applyMatrixProfileUpdate } from "./profile-update-C2My3TML.js";
-import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-DhMBWxOJ.js";
-import { t as createMatrixRoomInfoResolver } from "./room-info-B6vKD5DF.js";
+import { t as applyMatrixProfileUpdate } from "./profile-update-z3aM46KS.js";
+import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-ZdAXdmuh.js";
+import { t as createMatrixRoomInfoResolver } from "./room-info-CAFZ3Z9J.js";
 import { normalizeOptionalLowercaseString, uniqueStrings, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/actions/polls.ts

package/dist/{verification-DhMBWxOJ.js → verification-ZdAXdmuh.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { i as withStartedActionClient, n as withResolvedActionClient } from "./client-BwX6rURh.js";
+import { i as withStartedActionClient, n as withResolvedActionClient } from "./client-CitERujx.js";
 import { n as formatMatrixEncryptionUnavailableError } from "./encryption-guidance-CbEFe38F.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/matrix",
-  "version": "2026.7.2-beta.4",
+  "version": "2026.7.2-beta.5",
   "description": "OpenClaw Matrix channel plugin for rooms and direct messages.",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
     "zod": "4.4.3"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.7.2-beta.4"
+    "openclaw": ">=2026.7.2-beta.5"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -167,10 +167,10 @@
       "allowInvalidConfigRecovery": true
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.4"
+      "pluginApi": ">=2026.7.2-beta.5"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.4"
+      "openclawVersion": "2026.7.2-beta.5"
     },
     "release": {
       "publishToClawHub": true,
@@ -184,7 +184,6 @@
   "files": [
     "dist/**",
     "openclaw.plugin.json",
-    "npm-shrinkwrap.json",
     "README.md"
   ],
   "bundledDependencies": [

package/dist/probe.runtime-BWkgfbiE.js

@@ -1,3 +0,0 @@
-import { t as createMatrixClient } from "./create-client-Und1YmJ2.js";
-import "./client-Dg8dk8NW.js";
-export { createMatrixClient };