@openclaw/matrix 2026.7.2-beta.2 → 2026.7.2-beta.3

package/dist/doctor-contract-api.js

@@ -1,12 +1,17 @@
-import { t as isRecord } from "./record-shared-CvzjvHRn.js";
-import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-D2qTLe-C.js";
-import { O as writeMatrixIdbSnapshotJsonToStore, S as readLegacyMatrixLegacyCryptoMigrationState, _ as hasMatrixRecoveryKeyStateInStore, a as openMatrixStorageMetaStoreOptions, b as openMatrixLegacyCryptoMigrationStoreOptions, f as MATRIX_IDB_SNAPSHOT_FILENAME, g as hasMatrixLegacyCryptoMigrationStateInStore, h as hasMatrixIdbSnapshotStateInStore, i as normalizeMatrixStorageMetadata, j as writeMatrixRecoveryKeyStateToStore, k as writeMatrixLegacyCryptoMigrationStateToStore, m as MATRIX_RECOVERY_KEY_FILENAME, n as hasMatrixStorageMetaStateInStore, p as MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME, u as writeMatrixStorageMetaStateToStore, w as readLegacyMatrixRecoveryKeyState, x as openMatrixRecoveryKeyStoreOptions, y as openMatrixIdbSnapshotStoreOptions } from "./storage-DD-EnNJE.js";
-import { a as readLegacyMatrixSyncCacheState, i as openMatrixSyncCacheStoreOptions, o as writeMatrixSyncCacheStateToStore, r as hasMatrixSyncCacheStateInStore } from "./file-sync-store-CUE9WwD2.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId, n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.js";
+import { t as isRecord$1 } from "./record-shared-CWWx6fvI.js";
+import { r as resolveMatrixCredentialsDir } from "./storage-paths-gUmSydsW.js";
+import { a as isMatrixCredentialRevocation, c as normalizeMatrixStoredCredentials, s as matrixCredentialsStoreKey, t as MATRIX_CREDENTIALS_NAMESPACE } from "./credentials-read-DVmFCm7X.js";
+import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-BA2Y6Crx.js";
+import { O as writeMatrixIdbSnapshotJsonToStore, S as readLegacyMatrixLegacyCryptoMigrationState, _ as hasMatrixRecoveryKeyStateInStore, a as openMatrixStorageMetaStoreOptions, b as openMatrixLegacyCryptoMigrationStoreOptions, f as MATRIX_IDB_SNAPSHOT_FILENAME, g as hasMatrixLegacyCryptoMigrationStateInStore, h as hasMatrixIdbSnapshotStateInStore, i as normalizeMatrixStorageMetadata, j as writeMatrixRecoveryKeyStateToStore, k as writeMatrixLegacyCryptoMigrationStateToStore, m as MATRIX_RECOVERY_KEY_FILENAME, n as hasMatrixStorageMetaStateInStore, p as MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME, u as writeMatrixStorageMetaStateToStore, w as readLegacyMatrixRecoveryKeyState, x as openMatrixRecoveryKeyStoreOptions, y as openMatrixIdbSnapshotStoreOptions } from "./storage-CzHxeF5E.js";
+import { a as readLegacyMatrixSyncCacheState, i as openMatrixSyncCacheStoreOptions, o as writeMatrixSyncCacheStateToStore, r as hasMatrixSyncCacheStateInStore } from "./file-sync-store-CPkgnSXp.js";
 import { a as resolveMatrixInboundDedupeStateNamespace, n as MATRIX_INBOUND_DEDUPE_TTL_MS, r as buildMatrixInboundDedupeEventKey } from "./inbound-dedupe-CaBLblef.js";
-import { r as readLegacyMatrixIdbSnapshotState } from "./idb-persistence-BiHEEzD7.js";
-import path from "node:path";
-import { createHash } from "node:crypto";
+import { r as readLegacyMatrixIdbSnapshotState } from "./idb-persistence-Dyy6ipgU.js";
+import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { archiveLegacyStateSource } from "openclaw/plugin-sdk/runtime-doctor";
+import { createHash } from "node:crypto";
+import path from "node:path";
 import fs from "node:fs/promises";
 import { createPersistentDedupeImportEntry } from "openclaw/plugin-sdk/persistent-dedupe";
 //#region extensions/matrix/src/matrix/monitor/inbound-dedupe-migration.ts
@@ -71,7 +76,7 @@ function normalizeLegacyTimestamp(raw) {
 	return Math.max(0, Math.floor(raw));
 }
 function parseLegacySqliteRow(row) {
-	const value = isRecord(row.value) ? row.value : {};
+	const value = isRecord$1(row.value) ? row.value : {};
 	const roomId = typeof value.roomId === "string" ? value.roomId.trim() : "";
 	const eventId = typeof value.eventId === "string" ? value.eventId.trim() : "";
 	const ts = normalizeLegacyTimestamp(value.ts);
@@ -127,11 +132,11 @@ async function readLegacyInboundDedupeJsonSource(storageRootDir) {
 	} catch {
 		return null;
 	}
-	if (!isRecord(parsed) || parsed.version !== LEGACY_JSON_VERSION || !Array.isArray(parsed.entries)) return null;
+	if (!isRecord$1(parsed) || parsed.version !== LEGACY_JSON_VERSION || !Array.isArray(parsed.entries)) return null;
 	const accountId = await resolveJsonRootAccountId(storageRootDir);
 	const markers = [];
 	for (const entry of parsed.entries) {
-		if (!isRecord(entry) || typeof entry.key !== "string") continue;
+		if (!isRecord$1(entry) || typeof entry.key !== "string") continue;
 		const separator = entry.key.indexOf("|");
 		if (separator <= 0) continue;
 		const roomId = entry.key.slice(0, separator).trim();
@@ -199,6 +204,39 @@ async function importNewestInboundDedupeMarkers(params) {
 //#region extensions/matrix/doctor-contract-api.ts
 const MATRIX_SYNC_CACHE_FILENAME = "bot-storage.json";
 const MATRIX_STORAGE_META_FILENAME = "storage-meta.json";
+async function collectLegacyMatrixCredentialSources(params) {
+	const credentialsDir = resolveMatrixCredentialsDir(params.stateDir);
+	let entries;
+	try {
+		entries = await fs.readdir(credentialsDir, { withFileTypes: true });
+	} catch {
+		return [];
+	}
+	return entries.filter((entry) => entry.isFile() && /^credentials(?:-[a-z0-9._-]+)?\.json$/iu.test(entry.name)).toSorted((left, right) => {
+		if (left.name === "credentials.json") return 1;
+		if (right.name === "credentials.json") return -1;
+		return left.name.localeCompare(right.name);
+	}).map((entry) => {
+		const namedAccount = /^credentials(?:-([a-z0-9._-]+))?\.json$/iu.exec(entry.name)?.[1];
+		return {
+			accountId: namedAccount ? normalizeAccountId(namedAccount) : requiresExplicitMatrixDefaultAccount(params.config, params.env) ? null : normalizeAccountId(resolveMatrixDefaultOrOnlyAccountId(params.config, params.env)),
+			filePath: path.join(credentialsDir, entry.name)
+		};
+	});
+}
+async function readLegacyMatrixCredentials(source) {
+	if (!source.accountId) return null;
+	try {
+		const raw = JSON.parse(await fs.readFile(source.filePath, "utf8"));
+		const createdAt = isRecord(raw) && typeof raw.createdAt === "string" && raw.createdAt ? raw.createdAt : (await fs.stat(source.filePath)).mtime.toISOString();
+		return normalizeMatrixStoredCredentials(isRecord(raw) ? {
+			...raw,
+			createdAt
+		} : raw, source.accountId);
+	} catch {
+		return null;
+	}
+}
 async function collectLegacyMatrixStateRoots(stateDir, filename) {
 	const matrixRoot = path.join(stateDir, "matrix");
 	const roots = [];
@@ -249,6 +287,74 @@ async function archiveLegacyMatrixStateFile(params) {
 	if (params.notice && params.warnings.length === warningCount) params.notices?.push(params.notice);
 }
 const stateMigrations = [
+	{
+		id: "matrix-credentials-json-to-plugin-state",
+		label: "Matrix credentials",
+		async detectLegacyState(params) {
+			const sources = await collectLegacyMatrixCredentialSources(params);
+			return sources.length > 0 ? { preview: [`Matrix credential JSON can migrate to SQLite (${sources.length} ${sources.length === 1 ? "file" : "files"})`] } : null;
+		},
+		async migrateLegacyState(params) {
+			const changes = [];
+			const warnings = [];
+			const sources = await collectLegacyMatrixCredentialSources(params);
+			const store = params.context.openPluginStateKeyedStore({
+				namespace: MATRIX_CREDENTIALS_NAMESPACE,
+				maxEntries: 256,
+				overflowPolicy: "reject-new"
+			});
+			for (const source of sources) {
+				if (!source.accountId) {
+					warnings.push(`Left ambiguous Matrix credential legacy source in place because no default account is selected: ${source.filePath}`);
+					continue;
+				}
+				const credentials = await readLegacyMatrixCredentials(source);
+				if (!credentials) {
+					warnings.push(`Left invalid Matrix credential legacy source in place: ${source.filePath}`);
+					continue;
+				}
+				const key = matrixCredentialsStoreKey(source.accountId);
+				const stored = await store.lookup(key);
+				if (isMatrixCredentialRevocation(stored, source.accountId)) {
+					changes.push(`Archived revoked Matrix credential legacy source for account ${source.accountId}`);
+					await archiveLegacyStateSource({
+						filePath: source.filePath,
+						label: "Matrix credentials",
+						changes,
+						warnings
+					});
+					continue;
+				}
+				const existing = normalizeMatrixStoredCredentials(stored, source.accountId);
+				if (existing && JSON.stringify(existing) !== JSON.stringify(credentials)) {
+					warnings.push(`Kept existing Matrix credentials for account ${source.accountId}; left differing legacy source in place`);
+					continue;
+				}
+				if (!existing) try {
+					await store.registerIfAbsent(key, credentials);
+				} catch (error) {
+					warnings.push(`Failed importing Matrix credentials for account ${source.accountId}: ${String(error)}; left legacy source in place`);
+					continue;
+				}
+				const persisted = normalizeMatrixStoredCredentials(await store.lookup(key), source.accountId);
+				if (!persisted || JSON.stringify(persisted) !== JSON.stringify(credentials)) {
+					warnings.push(`Failed verifying Matrix credentials for account ${source.accountId}; left legacy source in place`);
+					continue;
+				}
+				changes.push(`Migrated Matrix credentials for account ${source.accountId} to SQLite`);
+				await archiveLegacyStateSource({
+					filePath: source.filePath,
+					label: "Matrix credentials",
+					changes,
+					warnings
+				});
+			}
+			return {
+				changes,
+				warnings
+			};
+		}
+	},
 	{
 		id: "matrix-inbound-dedupe-to-claimable-dedupe",
 		label: "Matrix inbound dedupe markers",

package/dist/{draft-stream-GOdPZMBm.js → draft-stream-CTLKtJJ0.js}

@@ -1,4 +1,4 @@
-import { n as editMessageMatrix, r as prepareMatrixSingleText, s as sendSingleTextMessageMatrix, y as MsgType } from "./send-yre1krm8.js";
+import { n as editMessageMatrix, r as prepareMatrixSingleText, s as sendSingleTextMessageMatrix, y as MsgType } from "./send-BJbrdmNm.js";
 import { createDraftStreamLoop } from "openclaw/plugin-sdk/channel-outbound";
 //#region extensions/matrix/src/matrix/draft-stream.ts
 const DEFAULT_THROTTLE_MS = 1e3;

package/dist/{encryption-guidance-BFfgq7c7.js → encryption-guidance-CbEFe38F.js}

@@ -1,4 +1,4 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId } from "./account-selection-Bz00QTmQ.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId } from "./account-selection-kqquRzCf.js";
 import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
 import { normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/encryption-guidance.ts

package/dist/{file-sync-store-CUE9WwD2.js → file-sync-store-CPkgnSXp.js}

@@ -1,13 +1,30 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { t as isRecord } from "./record-shared-CvzjvHRn.js";
+import { t as isRecord } from "./record-shared-CWWx6fvI.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { M as resolveMatrixSqliteStateEnv, t as claimCurrentTokenStorageState } from "./storage-DD-EnNJE.js";
-import { t as createAsyncLock } from "./async-lock-BcLS4KOc.js";
+import { M as resolveMatrixSqliteStateEnv, t as claimCurrentTokenStorageState } from "./storage-CzHxeF5E.js";
 import { n as LogService } from "./logger-D0GCSDQq.js";
-import path from "node:path";
 import { createHash, randomUUID } from "node:crypto";
+import path from "node:path";
 import fs from "node:fs/promises";
 import { Category, MemoryStore, SyncAccumulator } from "matrix-js-sdk/lib/matrix.js";
+//#region extensions/matrix/src/matrix/async-lock.ts
+function createAsyncLock() {
+	let lock = Promise.resolve();
+	return async function withLock(fn) {
+		const previous = lock;
+		let release;
+		lock = new Promise((resolve) => {
+			release = resolve;
+		});
+		await previous;
+		try {
+			return await fn();
+		} finally {
+			release?.();
+		}
+	};
+}
+//#endregion
 //#region extensions/matrix/src/matrix/client/file-sync-store.ts
 var file_sync_store_exports = /* @__PURE__ */ __exportAll({
 	SqliteBackedMatrixSyncStore: () => SqliteBackedMatrixSyncStore,

package/dist/helper-api.js

@@ -1,4 +1,4 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-Bz00QTmQ.js";
+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 resolveMatrixCredentialsPath, i as resolveMatrixCredentialsFilename, n as resolveMatrixAccountStorageRoot, o as resolveMatrixHomeserverKey, r as resolveMatrixCredentialsDir, s as sanitizeMatrixPathSegment, t as hashMatrixAccessToken } from "./storage-paths-B4_I9iqO.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";
 export { findMatrixAccountEntry, getMatrixScopedEnvVarNames, hashMatrixAccessToken, listMatrixEnvAccountIds, requiresExplicitMatrixDefaultAccount, resolveConfiguredMatrixAccountIds, resolveMatrixAccountStorageRoot, resolveMatrixChannelConfig, resolveMatrixCredentialsDir, resolveMatrixCredentialsFilename, resolveMatrixCredentialsPath, resolveMatrixDefaultOrOnlyAccountId, resolveMatrixEnvAccountToken, resolveMatrixHomeserverKey, sanitizeMatrixPathSegment };

package/dist/{idb-persistence-BiHEEzD7.js → idb-persistence-Dyy6ipgU.js}

@@ -1,9 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { D as writeMatrixIdbSnapshotJson, T as readMatrixIdbSnapshotJson, f as MATRIX_IDB_SNAPSHOT_FILENAME } from "./storage-DD-EnNJE.js";
+import { D as writeMatrixIdbSnapshotJson, T as readMatrixIdbSnapshotJson, f as MATRIX_IDB_SNAPSHOT_FILENAME } from "./storage-CzHxeF5E.js";
 import { n as LogService } from "./logger-D0GCSDQq.js";
 import { n as MATRIX_IDB_SNAPSHOT_LOCK_OPTIONS } from "./idb-persistence-lock-DAJ49nZX.js";
-import fs from "node:fs";
 import path from "node:path";
+import fs from "node:fs";
 import { indexedDB } from "fake-indexeddb";
 import { withFileLock } from "openclaw/plugin-sdk/file-lock";
 //#region extensions/matrix/src/matrix/sdk/idb-persistence.ts

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as registerMatrixCliMetadata } from "./cli-metadata-9Naf7in0.js";
+import { n as registerMatrixCliMetadata } from "./cli-metadata-Xq1Xb15R.js";
 import { registerMatrixSubagentHooks } from "./subagent-hooks-api.js";
 import { defineBundledChannelEntry } from "openclaw/plugin-sdk/channel-entry-contract";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";

package/dist/{media-text-DPCtdFjk.js → media-text-BMXEXb1j.js}

@@ -1,4 +1,4 @@
-import { C as formatPollResultsAsText, D as parsePollStartContent, O as resolvePollReferenceEventId, S as formatPollAsText, T as isPollStartType, w as isPollEventType, x as buildPollResultsSummary } from "./send-yre1krm8.js";
+import { C as formatPollResultsAsText, D as parsePollStartContent, O as resolvePollReferenceEventId, S as formatPollAsText, T as isPollStartType, w as isPollEventType, x as buildPollResultsSummary } from "./send-BJbrdmNm.js";
 import path from "node:path";
 //#region extensions/matrix/src/matrix/poll-summary.ts
 function resolveMatrixPollRootEventId(event) {

package/dist/{messages-DCRbGLMh.js → messages-3UBHfZrN.js}

@@ -1,8 +1,8 @@
 import { r as isMatrixNotFoundError } from "./errors-C47hvAF8.js";
-import { T as isPollStartType, a as sendMessageMatrix, n as editMessageMatrix, w as isPollEventType } from "./send-yre1krm8.js";
+import { T as isPollStartType, a as sendMessageMatrix, n as editMessageMatrix, w as isPollEventType } from "./send-BJbrdmNm.js";
 import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
-import { a as resolveMatrixMessageAttachment, l as resolveMatrixPollRootEventId, o as resolveMatrixMessageBody, s as fetchMatrixPollMessageSummary } from "./media-text-DPCtdFjk.js";
-import { r as withResolvedRoomAction } from "./client-BUai6s29.js";
+import { a as resolveMatrixMessageAttachment, l as resolveMatrixPollRootEventId, o as resolveMatrixMessageBody, s as fetchMatrixPollMessageSummary } from "./media-text-BMXEXb1j.js";
+import { r as withResolvedRoomAction } from "./client-BtG4quUl.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/matrix/src/matrix/actions/limits.ts

package/dist/{monitor-C5EOF9et.js → monitor-BtUIds8T.js}

@@ -1,22 +1,22 @@
 import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-BZWN9tGS.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-CYQRY2oG.js";
-import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-B1woOUgk.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-BTSatSY3.js";
+import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-XCdAx1nY.js";
+import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-j331Xd7b.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-B5GRV8wL.js";
 import { t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
 import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, _ as readJoinedMatrixMembers, a as sendMessageMatrix, f as promoteMatrixDirectRoomCandidate, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, t as chunkMatrixText, v as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, w as isPollEventType } from "./send-yre1krm8.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-U5ZroBeZ.js";
+import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, _ as readJoinedMatrixMembers, a as sendMessageMatrix, f as promoteMatrixDirectRoomCandidate, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, t as chunkMatrixText, v as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, w as isPollEventType } from "./send-BJbrdmNm.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-Cw194yEn.js";
 import { i as createMatrixInboundEventDeduper } from "./inbound-dedupe-CaBLblef.js";
-import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-DPCtdFjk.js";
+import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-BMXEXb1j.js";
 import { n as setActiveMatrixClient } from "./active-client-DXvz2gCo.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, p as resolveMatrixAuthContext, u as throwIfMatrixStartupAborted } from "./shared-BfW4lxGu.js";
-import "./client-CPuYbNL8.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-Jw5_bwQo.js";
+import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, p as resolveMatrixAuthContext, u as throwIfMatrixStartupAborted } from "./shared-DquM1oz6.js";
+import "./client-CA0PULls.js";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-BmrgOZTL.js";
 import { d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, g as warnMissingProviderGroupPolicyFallbackOnce, h as resolveThreadBindingMaxAgeMsForChannel, m as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL } from "./runtime-api-D1xI_cvh.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-Cx1VVArA.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-BFfgq7c7.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-DVoj-YxB.js";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-CbEFe38F.js";
 import { n as isMatrixReadySyncState, r as isMatrixTerminalSyncState, t as isMatrixDisconnectedSyncState } from "./sync-state-CWbp0QSY.js";
 import { a as EventType, i as resolveMatrixThreadRouting, n as resolveMatrixReplyToEventId, o as RelationType, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
 import { t as createMatrixRoomInfoResolver } from "./room-info-B6vKD5DF.js";
@@ -25,8 +25,8 @@ import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate,
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
 import { resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
-import { buildChannelInboundEventContext, hasFinalInboundReplyDispatch, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
-import { getSessionEntry } from "openclaw/plugin-sdk/session-store-runtime";
+import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, hasFinalInboundReplyDispatch, resolveInboundMentionDecision, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
+import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { format } from "node:util";
@@ -36,6 +36,7 @@ import { resolveAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { createChannelIngressResolver, defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
+import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
@@ -817,7 +818,7 @@ const matrixVerificationConstants = {
 const MAX_TRACKED_VERIFICATION_EVENTS = 1024;
 const SAS_NOTICE_RETRY_DELAY_MS = 750;
 const VERIFICATION_EVENT_STARTUP_GRACE_MS = 3e4;
-const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-yre1krm8.js").then((n) => n.d), import("./send-yre1krm8.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-BJbrdmNm.js").then((n) => n.d), import("./send-BJbrdmNm.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -2204,11 +2205,11 @@ function createMatrixThreadContextResolver(params) {
 const ALLOW_FROM_STORE_CACHE_TTL_MS = 3e4;
 const PAIRING_REPLY_COOLDOWN_MS = 5 * 6e4;
 const MATRIX_TOOL_PROGRESS_MAX_CHARS = 300;
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-yre1krm8.js").then((n) => n.l));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-BJbrdmNm.js").then((n) => n.l));
 const loadAcpBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/acp-binding-runtime"));
 const loadSessionBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/session-binding-runtime"));
-const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-QUgxkQKQ.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-GOdPZMBm.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-BwAKtUyQ.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-CTLKtJJ0.js"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -2328,7 +2329,7 @@ function formatMatrixToolProgressMarkdownCode(text) {
 	return `\`${(text.length <= MATRIX_TOOL_PROGRESS_MAX_CHARS ? text : `${truncateUtf16Safe(text, MATRIX_TOOL_PROGRESS_MAX_CHARS - 1).trimEnd()}...`).replaceAll("`", "'")}\``;
 }
 function createMatrixRoomMessageHandler(params) {
-	const { client, core, cfg, accountId, accountConfig, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], roomsConfig, accountAllowBots, configuredBotUserIds = /* @__PURE__ */ new Set(), groupPolicy, replyToMode, threadReplies, dmThreadReplies, dmSessionScope, streaming, previewToolProgressEnabled, blockStreamingEnabled, dmEnabled, dmPolicy, textLimit, mediaMaxBytes, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getRoomInfo, getMemberDisplayName, needsRoomAliasesForConfig, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist } = params;
+	const { client, core, cfg, accountId, accountConfig, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], roomsConfig, accountAllowBots, configuredBotUserIds = /* @__PURE__ */ new Set(), groupPolicy, replyToMode, threadReplies, dmThreadReplies, dmSessionScope, streaming, previewToolProgressEnabled, blockStreamingEnabled, dmEnabled, dmPolicy, textLimit, mediaMaxBytes, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getRoomInfo, getMemberDisplayName, needsRoomAliasesForConfig, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, finalizeInboundContext, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
 	const contextVisibilityMode = resolveChannelContextVisibilityMode({
 		cfg,
 		channel: "matrix",
@@ -2821,9 +2822,23 @@ function createMatrixRoomMessageHandler(params) {
 					return;
 				}
 				const shouldRequireMention = isRoom ? roomConfig?.autoReply === true ? false : roomConfig?.autoReply === false ? true : typeof roomConfig?.requireMention === "boolean" ? roomConfig?.requireMention : true : false;
-				const shouldBypassMention = allowTextCommands && isRoom && shouldRequireMention && !wasMentioned && !hasExplicitMention && commandAuthorized && hasControlCommandInMessage;
+				const mentionDecision = resolveInboundMentionDecision({
+					facts: {
+						canDetectMention: true,
+						wasMentioned,
+						hasAnyMention: hasExplicitMention
+					},
+					policy: {
+						isGroup: isRoom,
+						requireMention: shouldRequireMention,
+						allowTextCommands,
+						hasControlCommand: hasControlCommandInMessage,
+						commandAuthorized
+					}
+				});
+				const { effectiveWasMentioned, shouldBypassMention } = mentionDecision;
 				const canDetectMention = agentMentionRegexes.length > 0 || hasExplicitMention;
-				if (isRoom && shouldRequireMention && !wasMentioned && !shouldBypassMention) {
+				if (mentionDecision.shouldSkip) {
 					const pendingHistoryBody = preflightAudioTranscript ? formatMatrixAudioTranscript(preflightAudioTranscript) : pendingHistoryText || pendingHistoryPollText;
 					if (historyLimit > 0 && pendingHistoryBody) {
 						const pendingEntry = {
@@ -2956,6 +2971,7 @@ function createMatrixRoomMessageHandler(params) {
 					isRoom,
 					shouldRequireMention,
 					wasMentioned,
+					effectiveWasMentioned,
 					shouldBypassMention,
 					canDetectMention,
 					commandAuthorized,
@@ -2998,7 +3014,7 @@ function createMatrixRoomMessageHandler(params) {
 			})();
 			if (!resolvedIngressResult) return;
 			if ("deferredPrefix" in resolvedIngressResult) return;
-			const { route: _route, hasExplicitSessionBinding, roomConfig, isDirectMessage, isRoom, shouldRequireMention, wasMentioned, shouldBypassMention, canDetectMention, commandAuthorized, inboundHistory, senderName, bodyText, commandBodyText, media, preflightAudioTranscript, locationPayload, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection, effectiveGroupAllowFrom, effectiveRoomUsers } = resolvedIngressResult;
+			const { route: _route, hasExplicitSessionBinding, roomConfig, isDirectMessage, isRoom, shouldRequireMention, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, commandAuthorized, inboundHistory, senderName, bodyText, commandBodyText, media, preflightAudioTranscript, locationPayload, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection, effectiveGroupAllowFrom, effectiveRoomUsers } = resolvedIngressResult;
 			const replyToEventId = resolveMatrixReplyToEventId(event.content);
 			const threadTarget = thread.threadId;
 			const isRoomContextSenderAllowed = (contextSenderId) => {
@@ -3046,11 +3062,10 @@ function createMatrixRoomMessageHandler(params) {
 			const roomName = (isRoom ? await getRoomInfo(roomId) : void 0)?.name;
 			const envelopeFrom = isDirectMessage ? senderName : roomName ?? roomId;
 			const textWithId = `${bodyText}\n[matrix event id: ${messageId} room: ${roomId}]`;
-			const storePath = core.channel.session.resolveStorePath(cfg.session?.store, { agentId: _route.agentId });
-			const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
-			const previousTimestamp = core.channel.session.readSessionUpdatedAt({
-				storePath,
-				sessionKey: _route.sessionKey
+			const storePath = resolveStorePathImpl(cfg.session?.store, { agentId: _route.agentId });
+			const buildEnvelope = createChannelInboundEnvelopeBuilderImpl({
+				cfg,
+				route: _route
 			});
 			const sharedDmNoticeSessionKey = threadTarget ? _route.mainSessionKey || _route.sessionKey : _route.sessionKey;
 			const sharedDmContextNotice = isDirectMessage ? hasExplicitSessionBinding ? null : resolveMatrixSharedDmContextNotice({
@@ -3062,12 +3077,10 @@ function createMatrixRoomMessageHandler(params) {
 				sentRooms: sharedDmContextNoticeRooms,
 				logVerboseMessage
 			}) : null;
-			const body = core.channel.reply.formatAgentEnvelope({
+			const body = buildEnvelope({
 				channel: "Matrix",
 				from: envelopeFrom,
 				timestamp: eventTs ?? void 0,
-				previousTimestamp,
-				envelope: envelopeOptions,
 				body: textWithId
 			});
 			const groupSystemPrompt = normalizeOptionalString(roomConfig?.systemPrompt);
@@ -3078,8 +3091,8 @@ function createMatrixRoomMessageHandler(params) {
 			}).include);
 			const ctxPayload = buildChannelInboundEventContext({
 				channel: "matrix",
-				finalize: core.channel.reply.finalizeInboundContext,
 				contextVisibility: contextVisibilityMode,
+				finalize: finalizeInboundContext,
 				supplemental: {
 					quote: replyContext ? {
 						id: threadTarget ? void 0 : replyToEventId ?? void 0,
@@ -3116,6 +3129,7 @@ function createMatrixRoomMessageHandler(params) {
 				},
 				route: {
 					agentId: _route.agentId,
+					dmScope: _route.dmScope,
 					accountId: _route.accountId,
 					routeSessionKey: _route.sessionKey
 				},
@@ -3169,7 +3183,7 @@ function createMatrixRoomMessageHandler(params) {
 				isMentionableGroup: isRoom,
 				requireMention: shouldRequireMention,
 				canDetectMention,
-				effectiveWasMentioned: wasMentioned || shouldBypassMention,
+				effectiveWasMentioned,
 				shouldBypassMention
 			}));
 			if (shouldAckReaction() && messageId) loadMatrixSendModule().then(({ reactMatrixMessage }) => reactMatrixMessage(roomId, messageId, ackReaction, client)).catch((err) => {
@@ -3350,7 +3364,7 @@ function createMatrixRoomMessageHandler(params) {
 					},
 					onPlanUpdate: async (payload) => {
 						if (payload.phase !== "update") return;
-						await pushPlanProgress(payload.planSteps, payload.explanation);
+						await pushPlanProgress(payload.steps, payload.explanation);
 					},
 					onApprovalEvent: async (payload) => {
 						if (payload.phase !== "requested") return;
@@ -3439,9 +3453,9 @@ function createMatrixRoomMessageHandler(params) {
 				progressDraftGate.reset();
 				resetPreviewToolProgress();
 			};
-			const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } = core.channel.reply.createReplyDispatcherWithTyping({
+			const { deliver: deliverReply, onError: onReplyError, ...turnDispatcherOptions } = {
 				...prefixOptions,
-				humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, _route.agentId),
+				humanDelay: resolveHumanDelayConfigImpl(cfg, _route.agentId),
 				deliver: async (payload, info) => {
 					if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
 						const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
@@ -3626,7 +3640,7 @@ function createMatrixRoomMessageHandler(params) {
 				},
 				onReplyStart: typingCallbacks.onReplyStart,
 				onIdle: typingCallbacks.onIdle
-			});
+			};
 			const pinnedMainDmOwner = isDirectMessage ? await (async () => {
 				const livePinnedCfg = core.config.current();
 				const livePinnedAllowlists = resolveMatrixAccountAllowlistConfig({
@@ -3665,12 +3679,14 @@ function createMatrixRoomMessageHandler(params) {
 						raw: event
 					}),
 					resolveTurn: () => ({
+						cfg,
 						channel: "matrix",
 						accountId: _route.accountId,
-						routeSessionKey: _route.sessionKey,
-						storePath,
+						route: {
+							agentId: _route.agentId,
+							sessionKey: _route.sessionKey
+						},
 						ctxPayload,
-						recordInboundSession: core.channel.session.recordInboundSession,
 						botLoopProtection,
 						record: {
 							updateLastRoute: isDirectMessage ? {
@@ -3694,14 +3710,7 @@ function createMatrixRoomMessageHandler(params) {
 								});
 							}
 						},
-						onPreDispatchFailure: () => core.channel.reply.settleReplyDispatcher({
-							dispatcher,
-							onSettled: () => {
-								markRunComplete();
-								markDispatchIdle();
-							}
-						}),
-						runDispatch: async () => {
+						afterRecord: async () => {
 							if (sharedDmContextNotice && markTrackedRoomIfFirst(sharedDmContextNoticeRooms, roomId)) try {
 								await client.sendMessage(roomId, {
 									msgtype: "m.notice",
@@ -3710,46 +3719,35 @@ function createMatrixRoomMessageHandler(params) {
 							} catch (err) {
 								logVerboseMessage(`matrix: failed sending shared DM session notice room=${roomId}: ${String(err)}`);
 							}
-							return await core.channel.reply.withReplyDispatcher({
-								dispatcher,
-								onSettled: () => {
-									markDispatchIdle();
-								},
-								run: async () => {
-									try {
-										return await core.channel.reply.dispatchReplyFromConfig({
-											ctx: ctxPayload,
-											cfg,
-											dispatcher,
-											replyOptions: {
-												...replyOptions,
-												skillFilter: roomConfig?.skills,
-												disableBlockStreaming: !blockStreamingEnabled,
-												onPartialReply: draftStream ? (payload) => {
-													if (progressDraftStreaming) return;
-													latestDraftFullText = payload.text ?? "";
-													suppressPreviewToolProgressForAnswerText(latestDraftFullText);
-													updateDraftFromLatestFullText();
-												} : void 0,
-												onBlockReplyQueued: draftStream ? (payload, context) => {
-													if (payload.isCompactionNotice === true) return;
-													queueDraftBlockBoundary(payload, context);
-												} : void 0,
-												onAssistantMessageStart: draftStream ? () => {
-													resetDraftBlockOffsets();
-													resetPreviewToolProgress();
-												} : void 0,
-												onQueuedFollowupAdmitted: draftStream ? resetDraftDeliveryState : void 0,
-												...buildPreviewToolProgressReplyOptions(),
-												onModelSelected
-											}
-										});
-									} finally {
-										progressDraftGate.cancel();
-										markRunComplete();
-									}
-								}
-							});
+						},
+						delivery: {
+							deliver: deliverReply,
+							onError: (err, info) => onReplyError(err, info)
+						},
+						dispatcherOptions: {
+							...turnDispatcherOptions,
+							onSettled: () => progressDraftGate.cancel()
+						},
+						replyOptions: {
+							skillFilter: roomConfig?.skills,
+							disableBlockStreaming: !blockStreamingEnabled,
+							onPartialReply: draftStream ? (payload) => {
+								if (progressDraftStreaming) return;
+								latestDraftFullText = payload.text ?? "";
+								suppressPreviewToolProgressForAnswerText(latestDraftFullText);
+								updateDraftFromLatestFullText();
+							} : void 0,
+							onBlockReplyQueued: draftStream ? (payload, context) => {
+								if (payload.isCompactionNotice === true) return;
+								queueDraftBlockBoundary(payload, context);
+							} : void 0,
+							onAssistantMessageStart: draftStream ? () => {
+								resetDraftBlockOffsets();
+								resetPreviewToolProgress();
+							} : void 0,
+							onQueuedFollowupAdmitted: draftStream ? resetDraftDeliveryState : void 0,
+							...buildPreviewToolProgressReplyOptions(),
+							onModelSelected
 						}
 					})
 				}
@@ -3807,10 +3805,10 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./setup-core-CYQRY2oG.js").then((n) => n.s),
+	import("./setup-core-XCdAx1nY.js").then((n) => n.s),
 	import("./device-health-D4LBxuPq.js"),
-	import("./setup-core-CYQRY2oG.js").then((n) => n.a),
-	import("./startup-verification-DSiyDKM5.js")
+	import("./setup-core-XCdAx1nY.js").then((n) => n.a),
+	import("./startup-verification-CA00kebL.js")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,

package/dist/plugin-entry.handlers.runtime.js

@@ -2,7 +2,7 @@ import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/plugin-entry.runtime.ts
-const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-CGnI9k1O.js").then((n) => n.y));
+const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-DjxyWTNP.js").then((n) => n.y));
 function sendError(respond, err) {
 	respond(false, { error: formatMatrixErrorMessage(err) });
 }

package/dist/probe.runtime-sBV-Govx.js

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

package/dist/{profile-update-DompcDyu.js → profile-update-Bh2XtJwN.js}

@@ -1,6 +1,6 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { c as resolveMatrixConfigPath, l as updateMatrixAccountConfig, o as syncMatrixOwnProfile } from "./setup-core-CYQRY2oG.js";
-import { n as withResolvedActionClient } from "./client-BUai6s29.js";
+import { c as resolveMatrixConfigPath, l as updateMatrixAccountConfig, o as syncMatrixOwnProfile } from "./setup-core-XCdAx1nY.js";
+import { n as withResolvedActionClient } from "./client-BtG4quUl.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/actions/profile.ts
 async function updateMatrixOwnProfile(opts = {}) {