@openclaw/matrix 2026.9.1 → 2026.9.3

package/dist/{cli-metadata-B7MQjR5S.js → cli-metadata-D19lmKmz.js}

@@ -2,7 +2,7 @@ import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 //#region extensions/matrix/src/cli-metadata.ts
 function registerMatrixCliMetadata(api) {
 	api.registerCli(async ({ program }) => {
-		const { registerMatrixCli } = await import("./cli-CtYeU7ol.js");
+		const { registerMatrixCli } = await import("./cli-_49Vsqs4.js");
 		registerMatrixCli({ program });
 	}, { descriptors: [{
 		name: "matrix",

package/dist/cli-metadata.js

@@ -1,2 +1,2 @@
-import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-B7MQjR5S.js";
+import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-D19lmKmz.js";
 export { cli_metadata_default as default, registerMatrixCliMetadata };

package/dist/{client-D2utPQ1E.js → client-BXQCQDfY.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { b as resolveMatrixRoomId } from "./send-DG7Bnj7_.js";
-import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-n1Rqc8Go.js";
+import { O as resolveMatrixRoomId } from "./send-B9l1lKau.js";
+import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-CQwf9qrm.js";
 //#region extensions/matrix/src/matrix/actions/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({
 	withResolvedActionClient: () => withResolvedActionClient,

package/dist/{client-Dj4mcf-s.js → client-COLiUdWe.js}

@@ -1,10 +1,10 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { a as resolveMatrixDefaultOrOnlyAccountId, c as resolveScopedMatrixEnvConfig, l as resolveMatrixAccountStringValues, n as requiresExplicitMatrixDefaultAccount, o as resolveGlobalMatrixEnvConfig } from "./account-selection-DA-jfx22.js";
+import { l as resolveScopedMatrixEnvConfig, o as resolveMatrixDefaultOrOnlyAccountId, r as requiresExplicitMatrixDefaultAccount, s as resolveGlobalMatrixEnvConfig, u as resolveMatrixAccountStringValues } from "./account-selection-Bbtc483D.js";
 import { t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.js";
 import { o as resolveMatrixBaseConfig, r as listNormalizedMatrixAccountIds, t as findMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
 import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
 import { t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
-import { d as writeStorageMeta, l as resolveMatrixStoragePaths, r as maybeMigrateLegacyStorage, s as repairCurrentTokenStorageMetaDeviceId } from "./storage-BVf4uucD.js";
+import { i as repairCurrentTokenStorageMetaDeviceId, n as maybeMigrateLegacyStorage, o as resolveMatrixStoragePaths, s as writeStorageMeta } from "./storage-CV-pfV_2.js";
 import { n as LogService } from "./logger-B_71hN6W.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -20,13 +20,13 @@ import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region extensions/matrix/src/matrix/client/config.ts
-const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-C1yfda1L.js").then((n) => n.t), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-CX9b0N8Q.js").then((n) => n.t), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
 const MATRIX_AUTH_REQUEST_RETRY_RE = /\b(fetch failed|econnreset|econnrefused|enotfound|etimedout|ehostunreach|enetunreach|eai_again|und_err_|socket hang up|network|headers timeout|body timeout|connect timeout)\b/i;
-const loadMatrixCredentialsReadDeps = createLazyRuntimeModule(() => import("./credentials-read-mexhw-Ur.js").then((n) => n.r));
-const loadMatrixCredentialsWriteRuntime = createLazyRuntimeModule(() => import("./credentials-write.runtime-DQt-kgJq.js"));
+const loadMatrixCredentialsReadDeps = createLazyRuntimeModule(() => import("./credentials-read-WWpqi88V.js").then((n) => n.r));
+const loadMatrixCredentialsWriteRuntime = createLazyRuntimeModule(() => import("./credentials-write.runtime-D22lPwRO.js"));
 const loadMatrixSecretInputDeps = createLazyRuntimeModule(() => import("./config-secret-input.runtime-CwsP3--c.js"));
 function shouldRetryMatrixAuthRequest(err) {
 	return MATRIX_AUTH_REQUEST_RETRY_RE.test(formatErrorMessage(err));
@@ -416,7 +416,7 @@ async function backfillMatrixAuthDeviceIdAfterStartup(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/client/create-client.ts
 var create_client_exports = /* @__PURE__ */ __exportAll({ createMatrixClient: () => createMatrixClient });
-const loadMatrixCreateClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-C1yfda1L.js").then((n) => n.t), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixCreateClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-CX9b0N8Q.js").then((n) => n.t), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));

package/dist/{client-bootstrap-n1Rqc8Go.js → client-bootstrap-CQwf9qrm.js}

@@ -1,5 +1,4 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 //#region extensions/matrix/src/matrix/client-bootstrap.ts
@@ -7,7 +6,7 @@ var client_bootstrap_exports = /* @__PURE__ */ __exportAll({
 	resolveRuntimeMatrixClientWithReadiness: () => resolveRuntimeMatrixClientWithReadiness,
 	withResolvedRuntimeMatrixClient: () => withResolvedRuntimeMatrixClient
 });
-const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => import("./client-Dj4mcf-s.js").then((n) => n.t).then((clientModule) => ({
+const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => import("./client-COLiUdWe.js").then((n) => n.t).then((clientModule) => ({
 	acquireSharedMatrixClient: clientModule.acquireSharedMatrixClient,
 	resolveMatrixAuthContext: clientModule.resolveMatrixAuthContext
 })));
@@ -19,11 +18,7 @@ async function ensureResolvedClientReadiness(params) {
 	}
 	if (params.readiness === "prepared" || !params.readiness && params.preparedByDefault) await params.client.prepareForOneOff();
 }
-function ensureMatrixNodeRuntime() {
-	if (isBunRuntime()) throw new Error("Matrix support requires Node (bun runtime not supported)");
-}
 async function resolveRuntimeMatrixClientWithReadiness(opts) {
-	ensureMatrixNodeRuntime();
 	if (opts.client) {
 		await ensureResolvedClientReadiness({
 			client: opts.client,

package/dist/contract-api.js

@@ -1,3 +1,3 @@
-import { c as singleAccountKeysToMove, n as matrixSetupAdapter, o as namedAccountPromotionKeys, s as resolveSingleAccountPromotionTarget } from "./setup-core-CEF6exLW.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-BSlj1vnL.js";
+import { c as singleAccountKeysToMove, n as matrixSetupAdapter, o as namedAccountPromotionKeys, s as resolveSingleAccountPromotionTarget } from "./setup-core-DuTlyqRz.js";
+import { n as matrixOnboardingAdapter } from "./setup-surface-fZing1WZ.js";
 export { matrixSetupAdapter, matrixOnboardingAdapter as matrixSetupWizard, namedAccountPromotionKeys, resolveSingleAccountPromotionTarget, singleAccountKeysToMove };

package/dist/{credentials-DJj2xs3q.js → credentials-DysXbkv2.js}

@@ -1,6 +1,6 @@
 import { i as normalizeMatrixStoredCredentials, n as isMatrixCredentialRevocation, r as matrixCredentialsStoreKey } from "./credentials-state-B3cuUFwZ.js";
-import { a as resolveMatrixCredentialsPath, r as resolveMatrixCredentialsDir } from "./storage-paths-gUmSydsW.js";
-import { a as openMatrixCredentialsStore, i as loadMatrixCredentials, n as credentialsMatchConfig, t as clearMatrixCredentials } from "./credentials-read-mexhw-Ur.js";
+import { i as resolveMatrixCredentialsDir, o as resolveMatrixCredentialsPath } from "./storage-paths-DVCANXTc.js";
+import { a as openMatrixCredentialsStore, i as loadMatrixCredentials, n as credentialsMatchConfig, t as clearMatrixCredentials } from "./credentials-read-WWpqi88V.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/credentials.ts
 async function saveMatrixCredentials(credentials, env = process.env, accountId) {

package/dist/{credentials-read-mexhw-Ur.js → credentials-read-WWpqi88V.js}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { n as getOptionalMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { i as normalizeMatrixStoredCredentials, r as matrixCredentialsStoreKey, t as MATRIX_CREDENTIALS_NAMESPACE } from "./credentials-state-B3cuUFwZ.js";
-import { a as resolveMatrixCredentialsPath, r as resolveMatrixCredentialsDir } from "./storage-paths-gUmSydsW.js";
+import { i as resolveMatrixCredentialsDir, o as resolveMatrixCredentialsPath } from "./storage-paths-DVCANXTc.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { createPluginStateSyncKeyedStore } from "openclaw/plugin-sdk/plugin-state-store-runtime";
 //#region extensions/matrix/src/matrix/credentials-read.ts

package/dist/{credentials-write.runtime-DQt-kgJq.js → credentials-write.runtime-D22lPwRO.js}

@@ -1,6 +1,6 @@
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/matrix/src/matrix/credentials-write.runtime.ts
-const loadMatrixCredentialsRuntime = createLazyRuntimeModule(() => import("./credentials-DJj2xs3q.js"));
+const loadMatrixCredentialsRuntime = createLazyRuntimeModule(() => import("./credentials-DysXbkv2.js"));
 async function saveMatrixCredentials(...args) {
 	return (await loadMatrixCredentialsRuntime()).saveMatrixCredentials(...args);
 }

package/dist/{crypto-runtime-m1eplj3b.js → crypto-runtime-BvunIYVn.js}

@@ -1,7 +1,7 @@
 import { t as ensureMatrixCryptoRuntime } from "./deps-mtxF2mHI.js";
 import { n as LogService, r as noop } from "./logger-B_71hN6W.js";
-import { i as restoreIdbFromDisk, n as persistIdbToDisk } from "./idb-persistence-CU7CNLlX.js";
-import { n as isRepairableSecretStorageAccessError } from "./sdk-C1yfda1L.js";
+import { i as restoreIdbFromDisk, n as persistIdbToDisk } from "./idb-persistence-DBdwHSWg.js";
+import { n as isRepairableSecretStorageAccessError } from "./sdk-CX9b0N8Q.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { formatErrorMessage, toStringifiedError } from "openclaw/plugin-sdk/error-runtime";
 import { resolveDateTimestampMs, resolveTimestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";

package/dist/{crypto-snapshot-doctor.runtime-D0v841D_.js → crypto-snapshot-doctor.runtime-DxgUMXUy.js}

@@ -1,6 +1,6 @@
-import { O as writeMatrixIdbSnapshotJsonToStore, T as readMatrixIdbSnapshotJsonFromStore, f as MATRIX_IDB_SNAPSHOT_FILENAME, v as openMatrixIdbSnapshotStoreOptions } from "./storage-BVf4uucD.js";
+import { T as writeMatrixIdbSnapshotJsonToStore, m as openMatrixIdbSnapshotStoreOptions, o as MATRIX_IDB_SNAPSHOT_FILENAME, x as readMatrixIdbSnapshotJsonFromStore } from "./storage-metadata-DYArLcq1.js";
 import { n as MATRIX_IDB_SNAPSHOT_LOCK_OPTIONS } from "./idb-persistence-lock-B3fZXyF_.js";
-import { r as readLegacyMatrixIdbSnapshotStateUnlocked, t as isValidMatrixIdbSnapshotJson } from "./idb-persistence-CU7CNLlX.js";
+import { r as readLegacyMatrixIdbSnapshotStateUnlocked, t as isValidMatrixIdbSnapshotJson } from "./idb-persistence-DBdwHSWg.js";
 import { randomUUID } from "node:crypto";
 import path from "node:path";
 import fs from "node:fs";

package/dist/{directory-live-DLUgWBhA.js → directory-live-DABCxf8j.js}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { r as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
-import { l as resolveMatrixAuth } from "./client-Dj4mcf-s.js";
-import { t as MatrixAuthedHttpClient } from "./http-client-DOmFvKvB.js";
+import { l as resolveMatrixAuth } from "./client-COLiUdWe.js";
+import { t as MatrixAuthedHttpClient } from "./http-client-BfPeF4CE.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/directory-live.ts
 var directory_live_exports = /* @__PURE__ */ __exportAll({

package/dist/doctor-contract-api.js

@@ -1,9 +1,8 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId, n as requiresExplicitMatrixDefaultAccount } from "./account-selection-DA-jfx22.js";
 import { i as normalizeMatrixStoredCredentials, n as isMatrixCredentialRevocation, r as matrixCredentialsStoreKey, t as MATRIX_CREDENTIALS_NAMESPACE } from "./credentials-state-B3cuUFwZ.js";
-import { r as resolveMatrixCredentialsDir } from "./storage-paths-gUmSydsW.js";
+import { c as resolveMatrixStateLayoutChildDepth, i as resolveMatrixCredentialsDir } from "./storage-paths-DVCANXTc.js";
 import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-HyWFZQVG.js";
-import { C as readLegacyMatrixRecoveryKeyState, M as resolveMatrixSqliteStateEnv, a as openMatrixStorageMetaStoreOptions, b as openMatrixRecoveryKeyStoreOptions, f as MATRIX_IDB_SNAPSHOT_FILENAME, g as hasMatrixRecoveryKeyStateInStore, h as hasMatrixLegacyCryptoMigrationStateInStore, 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, x as readLegacyMatrixLegacyCryptoMigrationState, y as openMatrixLegacyCryptoMigrationStoreOptions } from "./storage-BVf4uucD.js";
-import { a as readLegacyMatrixSyncCacheState, c as writeMatrixSyncCacheStateToStore, i as openMatrixSyncCacheStoreOptions, r as hasMatrixSyncCacheStateInStore } from "./sync-cache-state-d-A_OhbU.js";
+import { E as writeMatrixLegacyCryptoMigrationStateToStore, O as writeMatrixRecoveryKeyStateToStore, _ as readLegacyMatrixLegacyCryptoMigrationState, a as writeMatrixStorageMetaStateToStore, c as MATRIX_RECOVERY_KEY_FILENAME, g as openMatrixRecoveryKeyStoreOptions, h as openMatrixLegacyCryptoMigrationStoreOptions, i as openMatrixStorageMetaStoreOptions, k as resolveMatrixSqliteStateEnv, l as hasMatrixLegacyCryptoMigrationStateInStore, n as hasMatrixStorageMetaStateInStore, o as MATRIX_IDB_SNAPSHOT_FILENAME, r as normalizeMatrixStorageMetadata, s as MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME, u as hasMatrixRecoveryKeyStateInStore, y as readLegacyMatrixRecoveryKeyState } from "./storage-metadata-DYArLcq1.js";
+import { a as readLegacyMatrixSyncCacheState, c as writeMatrixSyncCacheStateToStore, i as openMatrixSyncCacheStoreOptions, r as hasMatrixSyncCacheStateInStore } from "./sync-cache-state-C-mhj3xb.js";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { createHash } from "node:crypto";
@@ -13,9 +12,9 @@ import fs from "node:fs/promises";
 //#region extensions/matrix/src/matrix/account-state-schema-doctor.ts
 const STATE_DATABASE_FILENAME = "openclaw.sqlite";
 async function collectMatrixAccountStateRoots(stateDir) {
-	const accountsRoot = path.join(stateDir, "matrix", "accounts");
+	const matrixRoot = path.join(stateDir, "matrix");
 	const roots = /* @__PURE__ */ new Set();
-	async function visit(dir, allowMissing = false) {
+	async function visit(dir, depth, allowMissing = false) {
 		let entries;
 		try {
 			entries = await fs.readdir(dir, { withFileTypes: true });
@@ -25,11 +24,20 @@ async function collectMatrixAccountStateRoots(stateDir) {
 		}
 		for (const entry of entries) {
 			const entryPath = path.join(dir, entry.name);
-			if (entry.isFile() && entry.name === STATE_DATABASE_FILENAME && path.basename(dir) === "state") roots.add(path.dirname(dir));
-			else if (entry.isDirectory()) await visit(entryPath);
+			if (entry.isFile() && depth === 5 && entry.name === STATE_DATABASE_FILENAME) {
+				roots.add(path.dirname(dir));
+				continue;
+			}
+			if (!entry.isDirectory()) continue;
+			if ((depth === 2 || depth === 4) && entry.name === "state") {
+				await visit(entryPath, 5);
+				continue;
+			}
+			const childDepth = resolveMatrixStateLayoutChildDepth(depth, entry.name);
+			if (childDepth !== null) await visit(entryPath, childDepth);
 		}
 	}
-	await visit(accountsRoot, true);
+	await visit(matrixRoot, 0, true);
 	return [...roots].toSorted();
 }
 function describeMatrixAccountStateMigration(storageRootDir, migration) {
@@ -39,9 +47,9 @@ const matrixAccountStateSchemaMigration = {
 	id: "matrix-account-sqlite-schema",
 	label: "Matrix account SQLite schemas",
 	async detectLegacyState(params) {
-		const { detectOpenClawStateDatabaseSchemaMigrations } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 		const preview = [];
 		for (const storageRootDir of await collectMatrixAccountStateRoots(params.stateDir)) {
+			const { detectOpenClawStateDatabaseSchemaMigrations } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 			const env = resolveMatrixSqliteStateEnv({
 				env: params.env,
 				stateDir: storageRootDir
@@ -51,10 +59,10 @@ const matrixAccountStateSchemaMigration = {
 		return preview.length > 0 ? { preview } : null;
 	},
 	async migrateLegacyState(params) {
-		const { detectOpenClawStateDatabaseSchemaMigrations, repairOpenClawStateDatabaseSchema } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 		const changes = [];
 		const warnings = [];
 		for (const storageRootDir of await collectMatrixAccountStateRoots(params.stateDir)) {
+			const { detectOpenClawStateDatabaseSchemaMigrations, repairOpenClawStateDatabaseSchema } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 			const env = resolveMatrixSqliteStateEnv({
 				env: params.env,
 				stateDir: storageRootDir
@@ -115,7 +123,7 @@ async function collectMatrixInboundDedupeSources(stateDir) {
 	const sqliteRoots = /* @__PURE__ */ new Set();
 	const jsonRoots = /* @__PURE__ */ new Set();
 	const warnings = [];
-	async function visit(dir, allowMissing = false) {
+	async function visit(dir, depth, allowMissing = false) {
 		let entries;
 		try {
 			entries = await fs.readdir(dir, { withFileTypes: true });
@@ -124,17 +132,24 @@ async function collectMatrixInboundDedupeSources(stateDir) {
 			warnings.push(`Failed scanning Matrix inbound dedupe sources under ${dir}: ${String(err)}`);
 			return;
 		}
+		const isStorageRoot = depth === 0 || depth === 2 || depth === 4;
 		for (const entry of entries) {
 			const entryPath = path.join(dir, entry.name);
 			if (entry.isFile()) {
-				if (entry.name === "openclaw.sqlite" && path.basename(dir) === "state") sqliteRoots.add(path.dirname(dir));
-				else if (entry.name === "inbound-dedupe.json") jsonRoots.add(dir);
+				if (isStorageRoot && entry.name === "inbound-dedupe.json") jsonRoots.add(dir);
+				else if (depth === 5 && entry.name === "openclaw.sqlite") sqliteRoots.add(path.dirname(dir));
+				continue;
+			}
+			if (!entry.isDirectory()) continue;
+			if (isStorageRoot && entry.name === "state") {
+				await visit(entryPath, 5);
 				continue;
 			}
-			if (entry.isDirectory()) await visit(entryPath);
+			const childDepth = resolveMatrixStateLayoutChildDepth(depth, entry.name);
+			if (childDepth !== null) await visit(entryPath, childDepth);
 		}
 	}
-	await visit(matrixRoot, true);
+	await visit(matrixRoot, 0, true);
 	const matrixRootResolved = path.resolve(matrixRoot);
 	const isAccountRoot = (root) => path.resolve(root) !== matrixRootResolved;
 	const roots = {
@@ -368,11 +383,14 @@ async function collectLegacyMatrixCredentialSources(params) {
 	} catch {
 		return [];
 	}
-	return entries.filter((entry) => entry.isFile() && /^credentials(?:-[a-z0-9._-]+)?\.json$/iu.test(entry.name)).toSorted((left, right) => {
+	const files = 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) => {
+	});
+	if (files.length === 0) return [];
+	const { requiresExplicitMatrixDefaultAccount, resolveMatrixDefaultOrOnlyAccountId } = await import("./account-selection-Bbtc483D.js").then((n) => n.t);
+	return files.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)),
@@ -396,7 +414,7 @@ async function readLegacyMatrixCredentials(source) {
 async function collectLegacyMatrixStateRoots(stateDir, filename, options) {
 	const matrixRoot = path.join(stateDir, "matrix");
 	const roots = [];
-	async function visit(dir) {
+	async function visit(dir, depth) {
 		let entries;
 		try {
 			entries = await fs.readdir(dir, { withFileTypes: true });
@@ -405,14 +423,16 @@ async function collectLegacyMatrixStateRoots(stateDir, filename, options) {
 		}
 		for (const entry of entries) {
 			const entryPath = path.join(dir, entry.name);
-			if (entry.isFile() && entry.name === filename) {
+			if ((depth === 0 || depth === 2 || depth === 4) && entry.isFile() && entry.name === filename) {
 				roots.push(dir);
 				continue;
 			}
-			if (entry.isDirectory()) await visit(entryPath);
+			if (!entry.isDirectory()) continue;
+			const childDepth = resolveMatrixStateLayoutChildDepth(depth, entry.name);
+			if (childDepth !== null) await visit(entryPath, childDepth);
 		}
 	}
-	await visit(matrixRoot);
+	await visit(matrixRoot, 0);
 	return roots.filter((root) => options?.includeMatrixRoot || path.resolve(root) !== path.resolve(matrixRoot)).toSorted();
 }
 async function* readLegacyMatrixSyncCaches(stateDir) {
@@ -818,7 +838,7 @@ const stateMigrations = [
 				});
 			}
 			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_IDB_SNAPSHOT_FILENAME, { includeMatrixRoot: true })) {
-				const { migrateLegacyMatrixIdbSnapshot } = await import("./crypto-snapshot-doctor.runtime-D0v841D_.js");
+				const { migrateLegacyMatrixIdbSnapshot } = await import("./crypto-snapshot-doctor.runtime-DxgUMXUy.js");
 				await migrateLegacyMatrixIdbSnapshot({
 					storageRootDir,
 					context: params.context,

package/dist/{draft-stream-DPYdv4fE.js → draft-stream-DSwgyyBi.js}

@@ -1,4 +1,5 @@
-import { T as MsgType, a as sendSingleTextMessageMatrix, c as prepareMatrixSingleText, t as editMessageMatrix } from "./send-DG7Bnj7_.js";
+import { a as sendSingleTextMessageMatrix, m as prepareMatrixSingleText, t as editMessageMatrix } from "./send-B9l1lKau.js";
+import { i as MsgType } from "./types-DzSc7Sqm.js";
 import { createFinalizableDraftStreamControlsForState } from "openclaw/plugin-sdk/channel-outbound";
 //#region extensions/matrix/src/matrix/draft-stream.ts
 const DEFAULT_THROTTLE_MS = 1e3;
@@ -114,24 +115,34 @@ function createMatrixDraftStream(params) {
 		await stopDraft();
 		return currentEventId;
 	};
-	const reset = () => {
-		replyToId = params.preserveReplyId ? params.replyToId : void 0;
+	const resetCurrentMessage = () => {
 		currentEventId = void 0;
 		lastSentText = "";
 		lastSentContent = "";
-		streamState.stopped = false;
-		streamState.final = false;
 		sendFailed = false;
 		finalizeInPlaceBlocked = false;
 		liveFinalized = false;
 		loop.resetPending();
 		loop.resetThrottleWindow();
 	};
+	const reset = () => {
+		replyToId = params.preserveReplyId ? params.replyToId : void 0;
+		streamState.stopped = false;
+		streamState.final = false;
+		resetCurrentMessage();
+	};
+	const deleteCurrentMessage = async () => {
+		loop.resetPending();
+		await loop.waitForInFlight();
+		if (currentEventId) await client.redactEvent(roomId, currentEventId);
+		resetCurrentMessage();
+	};
 	return {
 		update,
 		flush: loop.flush,
 		stop,
 		discardPending,
+		deleteCurrentMessage,
 		finalizeLive,
 		reset,
 		eventId: () => currentEventId,

package/dist/{encryption-guidance-BNcZNQZI.js → encryption-guidance-mDyxJV9U.js}

@@ -1,4 +1,4 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId } from "./account-selection-DA-jfx22.js";
+import { o as resolveMatrixDefaultOrOnlyAccountId } from "./account-selection-Bbtc483D.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/{event-helpers-XRfAbOIh.js → event-helpers-CspuhE9k.js}

@@ -1,5 +1,9 @@
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/matrix/src/matrix/sdk/event-helpers.ts
+const matrixEventProjections = /* @__PURE__ */ new WeakMap();
+function getMatrixEventProjection(event) {
+	return matrixEventProjections.get(event);
+}
 function matrixEventToRaw(event, opts = {}) {
 	const originalContent = event.getOriginalContent();
 	const content = opts.contentMode === "original" ? originalContent : event.getContent();
@@ -18,6 +22,10 @@ function matrixEventToRaw(event, opts = {}) {
 	};
 	const stateKey = event.getStateKey() ?? event.getWireStateKey();
 	if (typeof stateKey === "string") raw.state_key = stateKey;
+	matrixEventProjections.set(raw, {
+		decryptionFailure: event.isDecryptionFailure(),
+		originalContent
+	});
 	return raw;
 }
 function parseMxc(url) {
@@ -43,4 +51,4 @@ function buildHttpError(statusCode, bodyText) {
 	return Object.assign(new Error(message), { statusCode });
 }
 //#endregion
-export { matrixEventToRaw as n, parseMxc as r, buildHttpError as t };
+export { parseMxc as i, getMatrixEventProjection as n, matrixEventToRaw as r, buildHttpError as t };

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-DA-jfx22.js";
+import { a as resolveMatrixChannelConfig, i as resolveConfiguredMatrixAccountIds, n as findMatrixAccountEntry, o as resolveMatrixDefaultOrOnlyAccountId, r as requiresExplicitMatrixDefaultAccount } from "./account-selection-Bbtc483D.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";
-export { findMatrixAccountEntry, getMatrixScopedEnvVarNames, hashMatrixAccessToken, listMatrixEnvAccountIds, requiresExplicitMatrixDefaultAccount, resolveConfiguredMatrixAccountIds, resolveMatrixAccountStorageRoot, resolveMatrixChannelConfig, resolveMatrixCredentialsDir, resolveMatrixCredentialsFilename, resolveMatrixCredentialsPath, resolveMatrixDefaultOrOnlyAccountId, resolveMatrixEnvAccountToken, resolveMatrixHomeserverKey, sanitizeMatrixPathSegment };
+import { a as resolveMatrixCredentialsFilename, c as resolveMatrixStateLayoutChildDepth, i as resolveMatrixCredentialsDir, l as sanitizeMatrixPathSegment, n as isMatrixActiveTokenRootDirectory, o as resolveMatrixCredentialsPath, r as resolveMatrixAccountStorageRoot, s as resolveMatrixHomeserverKey, t as hashMatrixAccessToken } from "./storage-paths-DVCANXTc.js";
+export { findMatrixAccountEntry, getMatrixScopedEnvVarNames, hashMatrixAccessToken, isMatrixActiveTokenRootDirectory, listMatrixEnvAccountIds, requiresExplicitMatrixDefaultAccount, resolveConfiguredMatrixAccountIds, resolveMatrixAccountStorageRoot, resolveMatrixChannelConfig, resolveMatrixCredentialsDir, resolveMatrixCredentialsFilename, resolveMatrixCredentialsPath, resolveMatrixDefaultOrOnlyAccountId, resolveMatrixEnvAccountToken, resolveMatrixHomeserverKey, resolveMatrixStateLayoutChildDepth, sanitizeMatrixPathSegment };

package/dist/{http-client-DOmFvKvB.js → http-client-BfPeF4CE.js}

@@ -1,4 +1,4 @@
-import { t as buildHttpError } from "./event-helpers-XRfAbOIh.js";
+import { t as buildHttpError } from "./event-helpers-CspuhE9k.js";
 import { parseMediaContentLength } from "openclaw/plugin-sdk/media-runtime";
 import { buildTimeoutAbortSignal } from "openclaw/plugin-sdk/extension-shared";
 import { readResponseWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";

package/dist/{idb-persistence-CU7CNLlX.js → idb-persistence-DBdwHSWg.js}

@@ -1,4 +1,4 @@
-import { D as writeMatrixIdbSnapshotJson, f as MATRIX_IDB_SNAPSHOT_FILENAME, w as readMatrixIdbSnapshotJson } from "./storage-BVf4uucD.js";
+import { b as readMatrixIdbSnapshotJson, o as MATRIX_IDB_SNAPSHOT_FILENAME, w as writeMatrixIdbSnapshotJson } from "./storage-metadata-DYArLcq1.js";
 import { n as LogService } from "./logger-B_71hN6W.js";
 import { n as MATRIX_IDB_SNAPSHOT_LOCK_OPTIONS } from "./idb-persistence-lock-B3fZXyF_.js";
 import path from "node:path";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as registerMatrixCliMetadata } from "./cli-metadata-B7MQjR5S.js";
+import { n as registerMatrixCliMetadata } from "./cli-metadata-D19lmKmz.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/{messages-C1U3b1oN.js → messages-H4mi9Cap.js}

@@ -1,9 +1,8 @@
+import { S as isPollStartType, T as resolvePollReferenceEventId, b as formatPollResultsAsText, f as resolveMatrixMessageAttachment, p as resolveMatrixReplacementContent, r as sendMessageMatrix, t as editMessageMatrix, v as buildPollResultsSummary, w as parsePollStartContent, x as isPollEventType, y as formatPollAsText } from "./send-B9l1lKau.js";
 import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
-import { _ as resolvePollReferenceEventId, d as formatPollAsText, f as formatPollResultsAsText, g as parsePollStartContent, m as isPollStartType, p as isPollEventType, r as sendMessageMatrix, t as editMessageMatrix, u as buildPollResultsSummary } from "./send-DG7Bnj7_.js";
-import { r as withResolvedRoomAction } from "./client-D2utPQ1E.js";
+import { r as withResolvedRoomAction } from "./client-BXQCQDfY.js";
 import { n as isMatrixNotFoundError } from "./errors-DKVS3_DO.js";
-import { asNullableObjectRecord, asNullableRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import path from "node:path";
+import { asNullableObjectRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/matrix/poll-summary.ts
 function resolveMatrixPollRootEventId(event) {
 	if (isPollStartType(event.type)) {
@@ -67,97 +66,6 @@ function resolveMatrixActionLimit(raw, fallback) {
 	return Math.max(1, Math.floor(raw !== void 0 && Number.isFinite(raw) ? raw : fallback));
 }
 //#endregion
-//#region extensions/matrix/src/matrix/media-text.ts
-const MATRIX_MEDIA_KINDS = {
-	"m.audio": "audio",
-	"m.file": "file",
-	"m.image": "image",
-	"m.sticker": "sticker",
-	"m.video": "video"
-};
-function resolveMatrixMediaKind(msgtype) {
-	return MATRIX_MEDIA_KINDS[msgtype ?? ""] ?? null;
-}
-function resolveMatrixMediaLabel(kind, fallback = "media") {
-	return `${kind ?? fallback} attachment`;
-}
-function formatMatrixAttachmentMarker(params) {
-	const label = resolveMatrixMediaLabel(params.kind);
-	if (params.tooLarge) return `[matrix ${label} too large]`;
-	return params.unavailable ? `[matrix ${label} unavailable]` : `[matrix ${label}]`;
-}
-function isLikelyBareFilename(text) {
-	const trimmed = text.trim();
-	if (!trimmed || trimmed.includes("\n") || /\s/.test(trimmed)) return false;
-	if (path.basename(trimmed) !== trimmed) return false;
-	return path.extname(trimmed).length > 1;
-}
-function resolveCaptionOrFilename(params) {
-	const body = params.body?.trim() ?? "";
-	const filename = params.filename?.trim() ?? "";
-	if (filename) {
-		if (!body || body === filename) return { filename };
-		return {
-			caption: body,
-			filename
-		};
-	}
-	if (!body) return {};
-	if (isLikelyBareFilename(body)) return { filename: body };
-	return { caption: body };
-}
-function resolveBundledMatrixReplacementContent(event) {
-	const replacement = asNullableObjectRecord(event.unsigned?.["m.relations"]?.["m.replace"]);
-	if (!replacement || event.state_key !== void 0) return;
-	const content = asNullableObjectRecord(replacement.content);
-	const relation = asNullableObjectRecord(content?.["m.relates_to"]);
-	const newContent = content?.["m.new_content"];
-	if (replacement.sender !== event.sender || replacement.type !== event.type || replacement.state_key !== void 0 || asNullableObjectRecord(replacement.unsigned)?.redacted_because || !relation || relation.rel_type !== "m.replace" || relation.event_id !== event.event_id) return;
-	return asNullableRecord(newContent) ?? void 0;
-}
-function resolveMatrixMessageAttachment(params) {
-	const kind = resolveMatrixMediaKind(params.msgtype);
-	if (!kind) return;
-	const resolved = resolveCaptionOrFilename(params);
-	return {
-		kind,
-		caption: resolved.caption,
-		filename: resolved.filename
-	};
-}
-function formatMatrixAttachmentText(params) {
-	if (!params.attachment) return;
-	return formatMatrixAttachmentMarker({
-		kind: params.attachment.kind,
-		tooLarge: params.tooLarge,
-		unavailable: params.unavailable
-	});
-}
-function formatMatrixMessageText(params) {
-	const attachment = resolveMatrixMessageAttachment(params);
-	const body = attachment ? attachment.caption ?? "" : params.body?.trim() ?? "";
-	const marker = formatMatrixAttachmentText({
-		attachment,
-		tooLarge: params.tooLarge,
-		unavailable: params.unavailable
-	});
-	if (!marker) return body || void 0;
-	if (!body) return marker;
-	return `${body}\n\n${marker}`;
-}
-function formatMatrixMediaUnavailableText(params) {
-	return formatMatrixMessageText({
-		...params,
-		unavailable: true
-	}) ?? "";
-}
-function formatMatrixMediaTooLargeText(params) {
-	return formatMatrixMessageText({
-		...params,
-		tooLarge: true
-	}) ?? "";
-}
-//#endregion
 //#region extensions/matrix/src/matrix/actions/types.ts
 const EventType = {
 	RoomMessage: "m.room.message",
@@ -190,7 +98,7 @@ function parseMatrixRawEvent(value) {
 function summarizeMatrixRawEvent(event) {
 	const content = event.content;
 	const relates = content["m.relates_to"];
-	const displayContent = relates?.rel_type === "m.replace" ? content["m.new_content"] ?? content : resolveBundledMatrixReplacementContent(event) ?? content;
+	const displayContent = relates?.rel_type === "m.replace" ? content["m.new_content"] ?? content : resolveMatrixReplacementContent(event) ?? content;
 	let relType;
 	let eventId;
 	if (relates) {
@@ -254,8 +162,7 @@ function resolveLatestMatrixReplacements(events) {
 	for (const event of events) {
 		const targetId = resolveMatrixReplacementTarget(event);
 		const original = targetId ? originals.get(targetId) : void 0;
-		const newContent = event.content["m.new_content"];
-		if (!targetId || !original || event.sender !== original.sender || event.type !== original.type || event.state_key !== void 0 || event.unsigned?.redacted_because || !newContent || typeof newContent !== "object" || Array.isArray(newContent)) continue;
+		if (!targetId || !original || !resolveMatrixReplacementContent(original, event)) continue;
 		const latest = replacements.get(targetId);
 		if (!latest || event.origin_server_ts > latest.origin_server_ts || event.origin_server_ts === latest.origin_server_ts && event.event_id > latest.event_id) replacements.set(targetId, event);
 	}
@@ -407,4 +314,4 @@ async function isMatrixPollRootThreaded(params) {
 	return hydratedRoot ? isMatrixThreadEvent(hydratedRoot) : false;
 }
 //#endregion
-export { fetchEventSummary as a, formatMatrixMediaTooLargeText as c, isLikelyBareFilename as d, resolveBundledMatrixReplacementContent as f, sendMatrixMessage as i, formatMatrixMediaUnavailableText as l, fetchMatrixPollSnapshot as m, editMatrixMessage as n, readPinnedEvents as o, resolveMatrixActionLimit as p, readMatrixMessages as r, EventType as s, deleteMatrixMessage as t, formatMatrixMessageText as u };
+export { fetchEventSummary as a, resolveMatrixActionLimit as c, sendMatrixMessage as i, fetchMatrixPollSnapshot as l, editMatrixMessage as n, readPinnedEvents as o, readMatrixMessages as r, EventType as s, deleteMatrixMessage as t };