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

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-DGbl3vDW.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-BldGYG8g.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-uu9blSqO.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 { i as resolveMatrixAccount } from "./accounts-DfngqebB.js";
+import { r as resolveMatrixRoomConfig } from "./channel-vj788dNZ.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-BldGYG8g.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-6eRENr7k.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-DxQJkhxs.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-CffmyW_4.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-DYMQ1QpI.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
@@ -324,6 +324,15 @@ const verificationActions = /* @__PURE__ */ new Set([
 	"verificationBackupStatus",
 	"verificationBackupRestore"
 ]);
+function projectMatrixMessagesForDisplay(messages) {
+	return messages.map((message) => ({
+		...message,
+		...message.eventId ? { id: message.eventId } : {},
+		...message.sender ? { authorTag: message.sender } : {},
+		...message.body !== void 0 ? { content: message.body } : {},
+		...typeof message.timestamp === "number" && Number.isFinite(message.timestamp) && Math.abs(message.timestamp) <= 864e13 ? { ts: new Date(message.timestamp).toISOString() } : {}
+	}));
+}
 function readRoomId(params, required = true) {
 	const direct = readStringParam(params, "roomId") ?? readStringParam(params, "channelId");
 	if (direct) return direct;
@@ -503,15 +512,17 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 				return jsonResult({
 					ok: true,
 					...await withReadTarget(roomId, async (target) => {
+						const messages = await readMatrixMessages(target.roomId, {
+							limit: limit ?? void 0,
+							before: before ?? void 0,
+							after: after ?? void 0,
+							threadId: threadId ?? void 0,
+							...clientOpts,
+							client: target.client
+						});
 						return {
-							...await readMatrixMessages(target.roomId, {
-								limit: limit ?? void 0,
-								before: before ?? void 0,
-								after: after ?? void 0,
-								threadId: threadId ?? void 0,
-								...clientOpts,
-								client: target.client
-							}),
+							...messages,
+							messages: projectMatrixMessagesForDisplay(messages.messages),
 							roomId: target.roomId,
 							...threadId ? { threadId } : {}
 						};
@@ -548,7 +559,8 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 			return jsonResult({
 				ok: true,
 				pinned: result.pinned,
-				events: result.events
+				events: result.events,
+				pins: projectMatrixMessagesForDisplay(result.events)
 			});
 		});
 	}

package/dist/{verification-DhMBWxOJ.js → verification-DYMQ1QpI.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-6eRENr7k.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/node_modules/@matrix-org/matrix-sdk-crypto-wasm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matrix-org/matrix-sdk-crypto-wasm",
-    "version": "18.3.1",
+    "version": "18.4.0",
     "homepage": "https://github.com/matrix-org/matrix-sdk-crypto-wasm",
     "description": "WebAssembly bindings of the matrix-sdk-crypto encryption library",
     "license": "Apache-2.0",

package/node_modules/@matrix-org/matrix-sdk-crypto-wasm/pkg/matrix_sdk_crypto_wasm.d.ts

@@ -2428,8 +2428,14 @@ export class OlmMachine {
      *
      * * `logger` - Optional logger to use for all operations on this machine.
      *   An instance of `JsLogger`.
+     *
+     * * `ca_certs_pem` - Optional PEM-formatted string that provides CA
+     *   certificates. These will be used to check X.509 signatures on user
+     *   identities. Any user identity that has a valid signature according to
+     *   the supplied CAs will be considered verified, without any manual
+     *   verification taking place. A PEM-formatted string.
      */
-    static initFromStore(user_id: UserId, device_id: DeviceId, store_handle: StoreHandle, logger?: JsLogger): Promise<OlmMachine>;
+    static initFromStore(user_id: UserId, device_id: DeviceId, store_handle: StoreHandle, logger?: JsLogger, ca_certs_pem?: String): Promise<OlmMachine>;
     /**
      * Create a new `OlmMachine`.
      *
@@ -2455,8 +2461,14 @@ export class OlmMachine {
      *
      * * `logger` - Optional logger to use for all operations on this machine.
      *   An instance of `JsLogger`.
+     *
+     * * `ca_certs_pem` - Optional PEM-formatted string that provides CA
+     *   certificates. These will be used to check X.509 signatures on user
+     *   identities. Any user identity that has a valid signature according to
+     *   the supplied CAs will be considered verified, without any manual
+     *   verification taking place. A PEM-formatted string.
      */
-    static initialize(user_id: UserId, device_id: DeviceId, store_name?: string, store_passphrase?: string, logger?: JsLogger): Promise<OlmMachine>;
+    static initialize(user_id: UserId, device_id: DeviceId, store_name?: string, store_passphrase?: string, logger?: JsLogger, ca_certs_pem?: String): Promise<OlmMachine>;
     /**
      * Invalidate the currently active outbound group session for the
      * given room.