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

package/dist/{cli-metadata-Xq1Xb15R.js → cli-metadata-DnXxNCoj.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-0EcKfqFw.js");
+		const { registerMatrixCli } = await import("./cli-0CNHkps5.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-Xq1Xb15R.js";
+import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-DnXxNCoj.js";
 export { cli_metadata_default as default, registerMatrixCliMetadata };

package/dist/{client-CA0PULls.js → client-BFRg0kd4.js}

@@ -3,8 +3,8 @@ import { t as getMatrixScopedEnvVarNames } from "./env-vars-B0NxQnPk.js";
 import { i as resolveScopedMatrixEnvConfig, r as resolveMatrixEnvAuthReadiness, t as hasReadyMatrixEnvAuth } from "./env-auth-CQsYbz-p.js";
 import { n as validateMatrixHomeserverUrl, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, m as resolveMatrixConfigForAccount, n as releaseSharedClientInstance, o as stopSharedClientForAccount, p as resolveMatrixAuthContext, r as removeSharedClientInstance, s as stopSharedClientInstance, t as acquireSharedMatrixClient } from "./shared-DquM1oz6.js";
-import { t as createMatrixClient } from "./create-client-WQExaby_.js";
+import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, m as resolveMatrixConfigForAccount, n as releaseSharedClientInstance, o as stopSharedClientForAccount, p as resolveMatrixAuthContext, r as removeSharedClientInstance, s as stopSharedClientInstance, t as acquireSharedMatrixClient } from "./shared-CUH5otj8.js";
+import { t as createMatrixClient } from "./create-client-f-CkRllE.js";
 //#region extensions/matrix/src/matrix/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({
 	acquireSharedMatrixClient: () => acquireSharedMatrixClient,

package/dist/{client-BtG4quUl.js → client-CitERujx.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { u as resolveMatrixRoomId } from "./send-BJbrdmNm.js";
-import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-Dk5EAn3n.js";
+import { c as resolveMatrixRoomId } from "./send-C9Ssx-iV.js";
+import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-CkAnkzB6.js";
 //#region extensions/matrix/src/matrix/actions/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({
 	withResolvedActionClient: () => withResolvedActionClient,

package/dist/{client-bootstrap-Dk5EAn3n.js → client-bootstrap-CkAnkzB6.js}

@@ -8,7 +8,7 @@ var client_bootstrap_exports = /* @__PURE__ */ __exportAll({
 	resolveRuntimeMatrixClientWithReadiness: () => resolveRuntimeMatrixClientWithReadiness,
 	withResolvedRuntimeMatrixClient: () => withResolvedRuntimeMatrixClient
 });
-const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./client-CA0PULls.js").then((n) => n.t), import("./shared-DquM1oz6.js").then((n) => n.a)]).then(([clientModule, sharedModule]) => ({
+const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./client-BFRg0kd4.js").then((n) => n.t), import("./shared-CUH5otj8.js").then((n) => n.a)]).then(([clientModule, sharedModule]) => ({
 	acquireSharedMatrixClient: clientModule.acquireSharedMatrixClient,
 	resolveMatrixAuthContext: clientModule.resolveMatrixAuthContext,
 	releaseSharedClientInstance: sharedModule.releaseSharedClientInstance

package/dist/{config-schema-B5GRV8wL.js → config-schema-BShrVROw.js}

@@ -1,5 +1,5 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { g as resolveMatrixAccount, h as resolveDefaultMatrixAccountId, p as listMatrixAccountIds } from "./setup-core-XCdAx1nY.js";
+import { _ as resolveMatrixAccount, g as resolveDefaultMatrixAccountId, m as listMatrixAccountIds } from "./setup-core-a542Ernq.js";
 import { adaptScopedAccountAccessor, createScopedChannelConfigAdapter } from "openclaw/plugin-sdk/channel-config-helpers";
 import { createChannelConfigUiHints } from "openclaw/plugin-sdk/channel-core";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -159,9 +159,7 @@ const matrixThreadBindingsSchema = z.object({
 	idleHours: z.number().nonnegative().optional(),
 	maxAgeHours: z.number().nonnegative().optional(),
 	spawnSessions: z.boolean().optional(),
-	defaultSpawnContext: z.enum(["isolated", "fork"]).optional(),
-	spawnSubagentSessions: z.boolean().optional(),
-	spawnAcpSessions: z.boolean().optional()
+	defaultSpawnContext: z.enum(["isolated", "fork"]).optional()
 }).optional();
 const matrixExecApprovalsSchema = z.object({
 	enabled: z.boolean().optional(),
@@ -208,15 +206,30 @@ const matrixStreamingSchema = z.object({
 		labels: z.array(z.string()).optional(),
 		maxLines: z.number().int().positive().optional(),
 		maxLineChars: z.number().int().positive().optional(),
-		toolProgress: z.boolean().optional()
+		toolProgress: z.boolean().optional(),
+		commandText: z.enum(["raw", "status"]).optional()
 	}).strict().optional(),
 	preview: z.object({ toolProgress: z.boolean().optional() }).strict().optional()
 }).strict();
+const retiredMatrixAccountStreamingKeys = [
+	"streamMode",
+	"chunkMode",
+	"blockStreaming",
+	"blockStreamingCoalesce",
+	"draftChunk"
+];
+function hasCanonicalMatrixAccountStreaming(account) {
+	if (typeof account !== "object" || account === null || Array.isArray(account)) return true;
+	if (retiredMatrixAccountStreamingKeys.some((key) => Object.hasOwn(account, key))) return false;
+	if (!Object.hasOwn(account, "streaming")) return true;
+	const streaming = account.streaming;
+	return typeof streaming === "object" && streaming !== null && !Array.isArray(streaming);
+}
 const MatrixChannelConfigSchema = buildChannelConfigSchema(z.object({
 	name: z.string().optional(),
 	enabled: z.boolean().optional(),
 	defaultAccount: z.string().optional(),
-	accounts: z.record(z.string(), z.unknown()).optional(),
+	accounts: z.record(z.string(), z.unknown().refine(hasCanonicalMatrixAccountStreaming, { message: "flat or scalar streaming values are no longer supported; use streaming.* and run \"openclaw doctor --fix\"" })).optional(),
 	markdown: MarkdownConfigSchema,
 	homeserver: z.string().optional(),
 	network: matrixNetworkSchema,

package/dist/contract-api.js

@@ -1,3 +1,3 @@
-import { d as resolveSingleAccountPromotionTarget, f as singleAccountKeysToMove, n as matrixSetupAdapter, u as namedAccountPromotionKeys } from "./setup-core-XCdAx1nY.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-CzUiTe_k.js";
+import { d as namedAccountPromotionKeys, f as resolveSingleAccountPromotionTarget, n as matrixSetupAdapter, p as singleAccountKeysToMove } from "./setup-core-a542Ernq.js";
+import { n as matrixOnboardingAdapter } from "./setup-surface-BJrCI6KT.js";
 export { matrixSetupAdapter, matrixOnboardingAdapter as matrixSetupWizard, namedAccountPromotionKeys, resolveSingleAccountPromotionTarget, singleAccountKeysToMove };

package/dist/{create-client-WQExaby_.js → create-client-f-CkRllE.js}

@@ -1,14 +1,14 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
-import { d as writeStorageMeta, l as resolveMatrixStoragePaths, r as maybeMigrateLegacyStorage } from "./storage-CzHxeF5E.js";
-import "./shared-DquM1oz6.js";
+import { d as writeStorageMeta, l as resolveMatrixStoragePaths, r as maybeMigrateLegacyStorage } from "./storage-BvAkgzvT.js";
+import "./shared-CUH5otj8.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ssrfPolicyFromDangerouslyAllowPrivateNetwork } from "openclaw/plugin-sdk/ssrf-runtime";
 import fs from "node:fs";
 //#region extensions/matrix/src/matrix/client/create-client.ts
 var create_client_exports = /* @__PURE__ */ __exportAll({ createMatrixClient: () => createMatrixClient });
-const loadMatrixCreateClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-CIDZXWpZ.js"), import("./logging-QH-48Gr6.js")]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixCreateClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-UzPd8tst.js"), import("./logging-DV-p52N0.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));

package/dist/{crypto-runtime-CAff-n15.js → crypto-runtime-D9_6J5tZ.js}

@@ -1,8 +1,8 @@
 import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
 import { t as ensureMatrixCryptoRuntime } from "./deps-CcVJfvRM.js";
 import { n as LogService, r as noop } from "./logger-D0GCSDQq.js";
-import { i as restoreIdbFromDisk, n as persistIdbToDisk } from "./idb-persistence-Dyy6ipgU.js";
-import { n as isRepairableSecretStorageAccessError } from "./recovery-key-store-CW6eePfp.js";
+import { i as restoreIdbFromDisk, n as persistIdbToDisk } from "./idb-persistence-B6x7dMsF.js";
+import { n as isRepairableSecretStorageAccessError } from "./recovery-key-store-BNnHvXdk.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { resolveDateTimestampMs, resolveTimestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { MatrixEventEvent } from "matrix-js-sdk/lib/matrix.js";

package/dist/{device-health-D4LBxuPq.js → device-health-B4-YXtJR.js}

@@ -1,4 +1,9 @@
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 //#region extensions/matrix/src/matrix/device-health.ts
+var device_health_exports = /* @__PURE__ */ __exportAll({
+	isOpenClawManagedMatrixDevice: () => isOpenClawManagedMatrixDevice,
+	summarizeMatrixDeviceHealth: () => summarizeMatrixDeviceHealth
+});
 const OPENCLAW_DEVICE_NAME_PREFIX = "OpenClaw ";
 function isOpenClawManagedMatrixDevice(displayName) {
 	return displayName?.startsWith(OPENCLAW_DEVICE_NAME_PREFIX) === true;
@@ -13,4 +18,4 @@ function summarizeMatrixDeviceHealth(devices) {
 	};
 }
 //#endregion
-export { isOpenClawManagedMatrixDevice, summarizeMatrixDeviceHealth };
+export { isOpenClawManagedMatrixDevice as n, summarizeMatrixDeviceHealth as r, device_health_exports as t };

package/dist/{directory-live-DiC-0XBC.js → directory-live-YRgYDx2w.js}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { n as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
-import { f as resolveMatrixAuth } from "./shared-DquM1oz6.js";
-import "./client-CA0PULls.js";
-import { t as MatrixAuthedHttpClient } from "./http-client-BmrgOZTL.js";
+import { f as resolveMatrixAuth } from "./shared-CUH5otj8.js";
+import "./client-BFRg0kd4.js";
+import { t as MatrixAuthedHttpClient } from "./http-client-CycYxU9-.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-DwUVm5Lw.js → doctor-CM8ijNpW.js}

@@ -1,4 +1,4 @@
-import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-BA2Y6Crx.js";
+import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-BMSJkkAE.js";
 import { detectPluginInstallPathIssue, formatPluginInstallPathIssue, removePluginFromConfig } from "openclaw/plugin-sdk/runtime-doctor";
 //#region extensions/matrix/src/doctor.ts
 async function collectMatrixInstallPathWarnings(cfg) {

package/dist/doctor-contract-BMSJkkAE.js

@@ -0,0 +1,167 @@
+import { t as isRecord } from "./record-shared-CWWx6fvI.js";
+import { defineChannelAliasMigration, defineKeyMoveMigration, hasLegacyAccountStreamingAliases, normalizeChannelConfigEntries, stripRetiredChannelKeys } from "openclaw/plugin-sdk/runtime-doctor";
+import { hasLegacyFlatAllowPrivateNetworkAlias, migrateLegacyFlatAllowPrivateNetworkAlias } from "openclaw/plugin-sdk/ssrf-runtime";
+//#region extensions/matrix/src/doctor-contract.ts
+function parseMatrixStreamingMode(value) {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim().toLowerCase();
+	return normalized === "partial" || normalized === "quiet" || normalized === "progress" || normalized === "off" ? normalized : null;
+}
+const streamingAliasMigration = defineChannelAliasMigration({
+	channelId: "matrix",
+	streaming: {
+		defaultMode: "off",
+		resolveMode: (entry) => {
+			const streaming = isRecord(entry.streaming) ? entry.streaming : null;
+			const parsed = parseMatrixStreamingMode(streaming ? streaming.mode : entry.streaming);
+			if (parsed) return parsed;
+			return entry.streaming === true ? "partial" : "off";
+		}
+	},
+	accountStreamingReplacesRoot: true
+});
+const roomAllowMigration = defineKeyMoveMigration({
+	scope: ["*"],
+	from: ["allow"],
+	to: ["enabled"],
+	sourceOwn: false,
+	match: (value) => typeof value === "boolean",
+	targetIsSet: (value) => typeof value === "boolean",
+	movedMessage: ({ sourcePath, targetPath, mappedValue }) => `Moved ${sourcePath} → ${targetPath} (${String(mappedValue)}).`,
+	existingMessage: ({ sourcePath, targetPath, targetValue }) => `Moved ${sourcePath} → ${targetPath} (${String(targetValue)}).`
+});
+function hasLegacyTrustedDmPolicy(value) {
+	const root = isRecord(value) ? value : null;
+	if (!root) return false;
+	return (isRecord(root.dm) ? root.dm : null)?.policy === "trusted";
+}
+function migrateLegacyTrustedDmPolicy(params) {
+	const dm = isRecord(params.entry.dm) ? params.entry.dm : null;
+	if (!dm || dm.policy !== "trusted") return {
+		entry: params.entry,
+		changed: false
+	};
+	const allowFromRaw = dm.allowFrom;
+	const allowFromEntries = Array.isArray(allowFromRaw) ? allowFromRaw.filter((entry) => typeof entry === "string" && entry.trim().length > 0).length : 0;
+	const nextPolicy = allowFromEntries > 0 ? "allowlist" : "pairing";
+	const nextDm = {
+		...dm,
+		policy: nextPolicy
+	};
+	params.changes.push(`Migrated ${params.pathPrefix}.dm.policy "trusted" → "${nextPolicy}" (legacy alias removed; ${allowFromEntries > 0 ? `preserved ${allowFromEntries} ${params.pathPrefix}.dm.allowFrom ${allowFromEntries === 1 ? "entry" : "entries"}` : "no allowFrom entries present, defaulting to pairing for safety"}).`);
+	return {
+		entry: {
+			...params.entry,
+			dm: nextDm
+		},
+		changed: true
+	};
+}
+const legacyConfigRules = [
+	...streamingAliasMigration.legacyConfigRules,
+	{
+		path: ["channels", "matrix"],
+		message: "channels.matrix.allowPrivateNetwork is legacy; use channels.matrix.network.dangerouslyAllowPrivateNetwork instead. Run \"openclaw doctor --fix\".",
+		match: (value) => hasLegacyFlatAllowPrivateNetworkAlias(isRecord(value) ? value : {})
+	},
+	{
+		path: [
+			"channels",
+			"matrix",
+			"accounts"
+		],
+		message: "channels.matrix.accounts.<id>.allowPrivateNetwork is legacy; use channels.matrix.accounts.<id>.network.dangerouslyAllowPrivateNetwork instead. Run \"openclaw doctor --fix\".",
+		match: (value) => hasLegacyAccountStreamingAliases(value, (account) => hasLegacyFlatAllowPrivateNetworkAlias(isRecord(account) ? account : {}))
+	},
+	{
+		path: [
+			"channels",
+			"matrix",
+			"groups"
+		],
+		message: "channels.matrix.groups.<room>.allow is legacy; use channels.matrix.groups.<room>.enabled instead. Run \"openclaw doctor --fix\".",
+		match: roomAllowMigration.hasLegacy
+	},
+	{
+		path: [
+			"channels",
+			"matrix",
+			"rooms"
+		],
+		message: "channels.matrix.rooms.<room>.allow is legacy; use channels.matrix.rooms.<room>.enabled instead. Run \"openclaw doctor --fix\".",
+		match: roomAllowMigration.hasLegacy
+	},
+	{
+		path: [
+			"channels",
+			"matrix",
+			"accounts"
+		],
+		message: "channels.matrix.accounts.<id>.{groups,rooms}.<room>.allow is legacy; use channels.matrix.accounts.<id>.{groups,rooms}.<room>.enabled instead. Run \"openclaw doctor --fix\".",
+		match: (value) => hasLegacyAccountStreamingAliases(value, (account) => {
+			if (!isRecord(account)) return false;
+			return roomAllowMigration.hasLegacy(account.groups) || roomAllowMigration.hasLegacy(account.rooms);
+		})
+	},
+	{
+		path: ["channels", "matrix"],
+		message: "channels.matrix.dm.policy \"trusted\" is legacy; use \"allowlist\" (with allowFrom entries) or \"pairing\" instead. Run \"openclaw doctor --fix\".",
+		match: hasLegacyTrustedDmPolicy
+	},
+	{
+		path: [
+			"channels",
+			"matrix",
+			"accounts"
+		],
+		message: "channels.matrix.accounts.<id>.dm.policy \"trusted\" is legacy; use \"allowlist\" (with allowFrom entries) or \"pairing\" instead. Run \"openclaw doctor --fix\".",
+		match: (value) => hasLegacyAccountStreamingAliases(value, hasLegacyTrustedDmPolicy)
+	}
+];
+function normalizeMatrixEntry(params) {
+	const network = migrateLegacyFlatAllowPrivateNetworkAlias(params);
+	const dmPolicy = migrateLegacyTrustedDmPolicy({
+		...params,
+		entry: network.entry
+	});
+	let entry = dmPolicy.entry;
+	let changed = network.changed || dmPolicy.changed;
+	for (const section of ["groups", "rooms"]) {
+		const roomMap = isRecord(entry[section]) ? entry[section] : null;
+		if (!roomMap) continue;
+		const normalized = roomAllowMigration.normalize({
+			entry: roomMap,
+			pathPrefix: `${params.pathPrefix}.${section}`,
+			changes: params.changes
+		});
+		if (normalized.changed) {
+			entry = Object.assign({}, entry, { [section]: normalized.entry });
+			changed = true;
+		}
+	}
+	return {
+		entry,
+		changed
+	};
+}
+function normalizeCompatibilityConfig({ cfg }) {
+	const changes = [];
+	const withoutJunkStreamMode = stripRetiredChannelKeys({
+		cfg,
+		channelId: "matrix",
+		keys: /* @__PURE__ */ new Set(["streamMode"]),
+		scope: "root-and-accounts",
+		onRemove: ({ key, pathPrefix }) => changes.push(`Removed ${pathPrefix}.${key} (never read by the Matrix runtime).`)
+	}).config;
+	return normalizeChannelConfigEntries({
+		cfg: streamingAliasMigration.normalizeChannelConfig({
+			cfg: withoutJunkStreamMode,
+			changes
+		}).config,
+		channelId: "matrix",
+		changes,
+		normalizeEntry: normalizeMatrixEntry
+	});
+}
+//#endregion
+export { normalizeCompatibilityConfig as n, legacyConfigRules as t };

package/dist/doctor-contract-api.js

@@ -2,18 +2,103 @@ import { a as resolveMatrixDefaultOrOnlyAccountId, n as requiresExplicitMatrixDe
 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 { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-BMSJkkAE.js";
+import { C as readLegacyMatrixRecoveryKeyState, O as writeMatrixIdbSnapshotJsonToStore, T as readMatrixIdbSnapshotJsonFromStore, 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, v as openMatrixIdbSnapshotStoreOptions, x as readLegacyMatrixLegacyCryptoMigrationState, y as openMatrixLegacyCryptoMigrationStoreOptions } from "./storage-BvAkgzvT.js";
+import { a as readLegacyMatrixSyncCacheState, i as openMatrixSyncCacheStoreOptions, o as writeMatrixSyncCacheStateToStore, r as hasMatrixSyncCacheStateInStore } from "./file-sync-store-DiiFsayX.js";
+import { n as MATRIX_IDB_SNAPSHOT_LOCK_OPTIONS } from "./idb-persistence-lock-DAJ49nZX.js";
+import { r as readLegacyMatrixIdbSnapshotStateUnlocked, t as isValidMatrixIdbSnapshotJson } from "./idb-persistence-B6x7dMsF.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-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 { createHash, randomUUID } from "node:crypto";
 import path from "node:path";
-import fs from "node:fs/promises";
+import fs from "node:fs";
+import fs$1 from "node:fs/promises";
+import { isDeepStrictEqual } from "node:util";
+import { withFileLock } from "openclaw/plugin-sdk/file-lock";
 import { createPersistentDedupeImportEntry } from "openclaw/plugin-sdk/persistent-dedupe";
+//#region extensions/matrix/src/matrix/crypto-snapshot-doctor.ts
+async function migrateLegacyMatrixIdbSnapshot(params) {
+	const snapshotPath = path.join(params.storageRootDir, MATRIX_IDB_SNAPSHOT_FILENAME);
+	try {
+		await withFileLock(snapshotPath, MATRIX_IDB_SNAPSHOT_LOCK_OPTIONS, () => migrateLegacyMatrixIdbSnapshotLocked(params));
+	} catch (err) {
+		params.warnings.push(`Failed locking Matrix IndexedDB snapshot for ${params.storageRootDir}: ${String(err)}; left legacy source in place`);
+	}
+}
+async function migrateLegacyMatrixIdbSnapshotLocked(params) {
+	const sourcePath = path.join(params.storageRootDir, MATRIX_IDB_SNAPSHOT_FILENAME);
+	let snapshot;
+	try {
+		snapshot = readLegacyMatrixIdbSnapshotStateUnlocked(params.storageRootDir);
+	} catch (err) {
+		params.warnings.push(`Failed reading Matrix IndexedDB snapshot legacy source for ${params.storageRootDir}: ${String(err)}; left source in place`);
+		return;
+	}
+	if (!snapshot) {
+		if (!fs.existsSync(sourcePath)) return;
+		const archived = await archiveLegacyMatrixIdbSnapshot(params);
+		params.warnings.push(archived ? `Matrix IndexedDB snapshot legacy source is invalid for ${params.storageRootDir}; archived without import` : `Matrix IndexedDB snapshot legacy source is invalid for ${params.storageRootDir}; left active because archival failed`);
+		return;
+	}
+	const snapshotJson = JSON.stringify(snapshot);
+	const store = params.context.openPluginStateKeyedStore(openMatrixIdbSnapshotStoreOptions(params.storageRootDir));
+	let persisted;
+	let hadPartialState;
+	try {
+		persisted = await readMatrixIdbSnapshotJsonFromStore({ store });
+		const persistedIsValid = persisted ? isValidMatrixIdbSnapshotJson(persisted) : false;
+		hadPartialState = !persistedIsValid && (await store.entries()).length > 0;
+		if (!persistedIsValid) persisted = null;
+	} catch (err) {
+		params.warnings.push(`Failed inspecting Matrix IndexedDB snapshot SQLite state for ${params.storageRootDir}: ${String(err)}; left legacy source in place`);
+		return;
+	}
+	if (persisted && !snapshotContentMatches(persisted, snapshot)) {
+		if (await archiveLegacyMatrixIdbSnapshot(params)) params.notices.push(`Kept the canonical Matrix IndexedDB snapshot in SQLite and archived a differing legacy source for ${params.storageRootDir}`);
+		return;
+	}
+	if (!persisted) {
+		try {
+			await writeMatrixIdbSnapshotJsonToStore({
+				snapshotJson,
+				databaseCount: snapshot.length,
+				store
+			});
+			persisted = await readMatrixIdbSnapshotJsonFromStore({ store });
+		} catch (err) {
+			params.warnings.push(`Failed importing Matrix IndexedDB snapshot for ${params.storageRootDir}: ${String(err)}; left legacy source in place`);
+			return;
+		}
+		if (!persisted || !snapshotContentMatches(persisted, snapshot)) {
+			params.warnings.push(`Failed verifying Matrix IndexedDB snapshot for ${params.storageRootDir}; left legacy source in place`);
+			return;
+		}
+		params.changes.push(hadPartialState ? `Repaired partial or invalid Matrix IndexedDB snapshot SQLite state for ${params.storageRootDir}` : `Migrated Matrix IndexedDB snapshot JSON to SQLite for ${params.storageRootDir}`);
+	}
+	await archiveLegacyMatrixIdbSnapshot(params);
+}
+function snapshotContentMatches(persistedJson, snapshot) {
+	try {
+		return isDeepStrictEqual(JSON.parse(persistedJson), snapshot);
+	} catch {
+		return false;
+	}
+}
+async function archiveLegacyMatrixIdbSnapshot(params) {
+	const sourcePath = path.join(params.storageRootDir, MATRIX_IDB_SNAPSHOT_FILENAME);
+	const archivePath = `${sourcePath}.migrated-${(/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-")}-${randomUUID()}`;
+	try {
+		await fs$1.rename(sourcePath, archivePath);
+		params.changes.push(`Archived Matrix IndexedDB snapshot legacy source -> ${archivePath}`);
+		return true;
+	} catch (err) {
+		params.warnings.push(`Failed archiving Matrix IndexedDB snapshot legacy source: ${String(err)}`);
+		return false;
+	}
+}
+//#endregion
 //#region extensions/matrix/src/matrix/monitor/inbound-dedupe-migration.ts
 const LEGACY_SQLITE_NAMESPACE = "inbound-dedupe";
 const LEGACY_SQLITE_MAX_ENTRIES = 2e4;
@@ -29,7 +114,7 @@ async function collectMatrixInboundDedupeSources(stateDir) {
 	async function visit(dir) {
 		let entries;
 		try {
-			entries = await fs.readdir(dir, { withFileTypes: true });
+			entries = await fs$1.readdir(dir, { withFileTypes: true });
 		} catch {
 			return;
 		}
@@ -113,7 +198,7 @@ async function retireLegacyInboundDedupeSqliteRows(io, storageRootDir) {
 }
 async function resolveJsonRootAccountId(storageRootDir) {
 	for (const filename of [STORAGE_META_FILENAME, `${STORAGE_META_FILENAME}.migrated`]) try {
-		const metadata = normalizeMatrixStorageMetadata(JSON.parse(await fs.readFile(path.join(storageRootDir, filename), "utf8")));
+		const metadata = normalizeMatrixStorageMetadata(JSON.parse(await fs$1.readFile(path.join(storageRootDir, filename), "utf8")));
 		if (metadata?.accountId) return metadata.accountId;
 	} catch {}
 	return "default";
@@ -125,7 +210,7 @@ async function resolveJsonRootAccountId(storageRootDir) {
 */
 async function readLegacyInboundDedupeJsonSource(storageRootDir) {
 	const jsonPath = path.join(storageRootDir, MATRIX_LEGACY_INBOUND_DEDUPE_FILENAME);
-	const raw = await fs.readFile(jsonPath, "utf8");
+	const raw = await fs$1.readFile(jsonPath, "utf8");
 	let parsed;
 	try {
 		parsed = JSON.parse(raw);
@@ -208,7 +293,7 @@ async function collectLegacyMatrixCredentialSources(params) {
 	const credentialsDir = resolveMatrixCredentialsDir(params.stateDir);
 	let entries;
 	try {
-		entries = await fs.readdir(credentialsDir, { withFileTypes: true });
+		entries = await fs$1.readdir(credentialsDir, { withFileTypes: true });
 	} catch {
 		return [];
 	}
@@ -227,8 +312,8 @@ async function collectLegacyMatrixCredentialSources(params) {
 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();
+		const raw = JSON.parse(await fs$1.readFile(source.filePath, "utf8"));
+		const createdAt = isRecord(raw) && typeof raw.createdAt === "string" && raw.createdAt ? raw.createdAt : (await fs$1.stat(source.filePath)).mtime.toISOString();
 		return normalizeMatrixStoredCredentials(isRecord(raw) ? {
 			...raw,
 			createdAt
@@ -237,13 +322,13 @@ async function readLegacyMatrixCredentials(source) {
 		return null;
 	}
 }
-async function collectLegacyMatrixStateRoots(stateDir, filename) {
+async function collectLegacyMatrixStateRoots(stateDir, filename, options) {
 	const matrixRoot = path.join(stateDir, "matrix");
 	const roots = [];
 	async function visit(dir) {
 		let entries;
 		try {
-			entries = await fs.readdir(dir, { withFileTypes: true });
+			entries = await fs$1.readdir(dir, { withFileTypes: true });
 		} catch {
 			return;
 		}
@@ -257,14 +342,14 @@ async function collectLegacyMatrixStateRoots(stateDir, filename) {
 		}
 	}
 	await visit(matrixRoot);
-	return roots.filter((root) => path.resolve(root) !== path.resolve(matrixRoot)).toSorted();
+	return roots.filter((root) => options?.includeMatrixRoot || path.resolve(root) !== path.resolve(matrixRoot)).toSorted();
 }
 async function collectLegacySyncCacheRoots(stateDir) {
 	return collectLegacyMatrixStateRoots(stateDir, MATRIX_SYNC_CACHE_FILENAME);
 }
 async function readLegacyMatrixStorageMetadata(storageRootDir) {
 	try {
-		return normalizeMatrixStorageMetadata(JSON.parse(await fs.readFile(path.join(storageRootDir, MATRIX_STORAGE_META_FILENAME), "utf8")));
+		return normalizeMatrixStorageMetadata(JSON.parse(await fs$1.readFile(path.join(storageRootDir, MATRIX_STORAGE_META_FILENAME), "utf8")));
 	} catch {
 		return null;
 	}
@@ -592,74 +677,23 @@ const stateMigrations = [
 			};
 		}
 	},
-	{
-		id: "matrix-idb-snapshot-json-to-plugin-state",
-		label: "Matrix IndexedDB snapshot",
-		async detectLegacyState(params) {
-			const previews = [];
-			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_IDB_SNAPSHOT_FILENAME)) {
-				if (!await readLegacyMatrixIdbSnapshotState(storageRootDir)) continue;
-				previews.push(`Matrix IndexedDB snapshot JSON can migrate to SQLite: ${storageRootDir}`);
-			}
-			return previews.length > 0 ? { preview: previews } : null;
-		},
-		async migrateLegacyState(params) {
-			const changes = [];
-			const warnings = [];
-			const notices = [];
-			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_IDB_SNAPSHOT_FILENAME)) {
-				const snapshot = await readLegacyMatrixIdbSnapshotState(storageRootDir);
-				if (!snapshot) continue;
-				const store = params.context.openPluginStateKeyedStore(openMatrixIdbSnapshotStoreOptions(storageRootDir));
-				if (await hasMatrixIdbSnapshotStateInStore({ store })) {
-					await archiveLegacyMatrixStateFile({
-						storageRootDir,
-						filename: MATRIX_IDB_SNAPSHOT_FILENAME,
-						label: "Matrix IndexedDB snapshot",
-						changes,
-						warnings,
-						notices,
-						notice: `Kept existing Matrix IndexedDB snapshot in SQLite and archived the legacy source for ${storageRootDir}`
-					});
-					continue;
-				}
-				await writeMatrixIdbSnapshotJsonToStore({
-					snapshotJson: JSON.stringify(snapshot),
-					databaseCount: snapshot.length,
-					store
-				});
-				changes.push(`Migrated Matrix IndexedDB snapshot JSON to SQLite for ${storageRootDir}`);
-				await archiveLegacyMatrixStateFile({
-					storageRootDir,
-					filename: MATRIX_IDB_SNAPSHOT_FILENAME,
-					label: "Matrix IndexedDB snapshot",
-					changes,
-					warnings
-				});
-			}
-			return {
-				changes,
-				warnings,
-				...notices.length > 0 ? { notices } : {}
-			};
-		}
-	},
 	{
 		id: "matrix-legacy-crypto-migration-json-to-plugin-state",
-		label: "Matrix legacy crypto migration",
+		label: "Matrix legacy crypto state",
 		async detectLegacyState(params) {
 			const previews = [];
-			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME)) {
+			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME, { includeMatrixRoot: true })) {
 				if (!readLegacyMatrixLegacyCryptoMigrationState(storageRootDir)) continue;
 				previews.push(`Matrix legacy crypto migration JSON can migrate to SQLite: ${storageRootDir}`);
 			}
+			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_IDB_SNAPSHOT_FILENAME, { includeMatrixRoot: true })) previews.push(`Matrix IndexedDB snapshot JSON can migrate to SQLite: ${storageRootDir}`);
 			return previews.length > 0 ? { preview: previews } : null;
 		},
 		async migrateLegacyState(params) {
 			const changes = [];
 			const warnings = [];
 			const notices = [];
-			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME)) {
+			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME, { includeMatrixRoot: true })) {
 				const state = readLegacyMatrixLegacyCryptoMigrationState(storageRootDir);
 				if (!state) continue;
 				const store = params.context.openPluginStateKeyedStore(openMatrixLegacyCryptoMigrationStoreOptions(storageRootDir));
@@ -688,6 +722,13 @@ const stateMigrations = [
 					warnings
 				});
 			}
+			for (const storageRootDir of await collectLegacyMatrixStateRoots(params.stateDir, MATRIX_IDB_SNAPSHOT_FILENAME, { includeMatrixRoot: true })) await migrateLegacyMatrixIdbSnapshot({
+				storageRootDir,
+				context: params.context,
+				changes,
+				notices,
+				warnings
+			});
 			return {
 				changes,
 				warnings,

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

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

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

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.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-CzHxeF5E.js";
+import { M as resolveMatrixSqliteStateEnv, t as claimCurrentTokenStorageState } from "./storage-BvAkgzvT.js";
 import { n as LogService } from "./logger-D0GCSDQq.js";
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";