@openclaw/matrix 2026.8.1-beta.2 → 2026.9.1-beta.1

package/dist/{cli-CkTfKC_c.js → cli-DrTD2a_q.js}

@@ -2,19 +2,19 @@ import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { i as resolveMatrixAccount } from "./accounts-BCzyubQt.js";
 import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
-import { n as matrixSetupAdapter } from "./setup-core-DQn6b5vi.js";
-import { n as withResolvedActionClient } from "./client-sJesKQmp.js";
-import { l as resolveMatrixAuthContext } from "./client-CeGw0G5S.js";
-import { a as formatZonedTimestamp } from "./runtime-api-BGO16Fu8.js";
+import { n as matrixSetupAdapter } from "./setup-core-CyvaCOOr.js";
+import { n as withResolvedActionClient } from "./client-BUtHbzib.js";
+import { l as resolveMatrixAuthContext } from "./client-hs1ePy2O.js";
 import { t as resolveMatrixRoomKeyBackupIssue } from "./backup-health-Dm_YMVFT.js";
 import { i as setMatrixSdkLogMode, r as setMatrixSdkConsoleLogging } from "./logging-DRjvUOIh.js";
 import { n as isOpenClawManagedMatrixDevice, r as summarizeMatrixDeviceHealth } from "./device-health-B4-YXtJR.js";
-import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-BkgWYDIp.js";
-import { a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, g as runMatrixSelfVerification, h as restoreMatrixRoomKeyBackup, l as getMatrixVerificationSas, m as resetMatrixRoomKeyBackup, n as bootstrapMatrixVerification, p as requestMatrixVerification, r as cancelMatrixVerification, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-C7ig-bQE.js";
+import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-C61NR24_.js";
+import { a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, g as runMatrixSelfVerification, h as restoreMatrixRoomKeyBackup, l as getMatrixVerificationSas, m as resetMatrixRoomKeyBackup, n as bootstrapMatrixVerification, p as requestMatrixVerification, r as cancelMatrixVerification, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-BP-3-XYn.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { parseStrictInteger, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
+import { formatZonedTimestamp } from "openclaw/plugin-sdk/time-runtime";
 import { readByteStreamWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
 //#region extensions/matrix/src/cli-shared.ts
 let matrixCliExitScheduled = false;
@@ -412,7 +412,7 @@ async function addMatrixAccount(params) {
 		backupVersion: null
 	};
 	if (accountConfig.encryption === true) {
-		const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-BaXkhgJg.js");
+		const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-CpE6C3qV.js");
 		verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
 			previousCfg: cfg,
 			cfg: updated,
@@ -595,8 +595,8 @@ function registerMatrixDeviceCommands(root) {
 }
 //#endregion
 //#region extensions/matrix/src/cli-direct.ts
-const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-sJesKQmp.js").then((n) => n.t));
-const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-ZDLU4JTk.js").then((n) => n.S));
+const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-BUtHbzib.js").then((n) => n.t));
+const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-BKu9Ghi4.js").then((n) => n.S));
 function printDirectRoomCandidate(room) {
 	const members = room.joinedMembers === null ? "unavailable" : room.joinedMembers.map((member) => formatMatrixCliText(member)).join(", ") || "none";
 	console.log(`- ${formatMatrixCliText(room.roomId)} [${room.source}] strict=${room.strict ? "yes" : "no"} joined=${members}`);

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

package/dist/{client-sJesKQmp.js → client-BUtHbzib.js}

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

package/dist/{client-bootstrap-BFwT_2VT.js → client-bootstrap-BxdxjCwA.js}

@@ -7,7 +7,7 @@ var client_bootstrap_exports = /* @__PURE__ */ __exportAll({
 	resolveRuntimeMatrixClientWithReadiness: () => resolveRuntimeMatrixClientWithReadiness,
 	withResolvedRuntimeMatrixClient: () => withResolvedRuntimeMatrixClient
 });
-const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => import("./client-CeGw0G5S.js").then((n) => n.t).then((clientModule) => ({
+const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => import("./client-hs1ePy2O.js").then((n) => n.t).then((clientModule) => ({
 	acquireSharedMatrixClient: clientModule.acquireSharedMatrixClient,
 	resolveMatrixAuthContext: clientModule.resolveMatrixAuthContext
 })));

package/dist/{client-CeGw0G5S.js → client-hs1ePy2O.js}

@@ -9,18 +9,18 @@ import { d as writeStorageMeta, l as resolveMatrixStoragePaths, r as maybeMigrat
 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";
-import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1, normalizeOptionalAccountId, normalizeOptionalAccountId as normalizeOptionalAccountId$1 } from "openclaw/plugin-sdk/account-id";
+import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
 import { coerceSecretRef, normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input-runtime";
 import { formatErrorMessage, toErrorObject, toStringifiedError } from "openclaw/plugin-sdk/error-runtime";
 import { resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
-import { isPrivateNetworkOptInEnabled, ssrfPolicyFromDangerouslyAllowPrivateNetwork, ssrfPolicyFromDangerouslyAllowPrivateNetwork as ssrfPolicyFromDangerouslyAllowPrivateNetwork$1 } from "openclaw/plugin-sdk/ssrf-runtime";
+import { isPrivateNetworkOptInEnabled, ssrfPolicyFromDangerouslyAllowPrivateNetwork } from "openclaw/plugin-sdk/ssrf-runtime";
 import fs from "node:fs";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { retryAsync } from "openclaw/plugin-sdk/retry-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 //#region extensions/matrix/src/matrix/client/config.ts
-const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-DjaQFCHc.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-CljOKEvc.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
@@ -126,7 +126,7 @@ function buildMatrixNetworkFields(params) {
 	return {
 		...params.allowPrivateNetwork ? {
 			allowPrivateNetwork: true,
-			ssrfPolicy: ssrfPolicyFromDangerouslyAllowPrivateNetwork$1(true)
+			ssrfPolicy: ssrfPolicyFromDangerouslyAllowPrivateNetwork(true)
 		} : {},
 		...dispatcherPolicy ? { dispatcherPolicy } : {}
 	};
@@ -158,7 +158,7 @@ function readMatrixConfigStrings(params) {
 	})]));
 }
 function resolveMatrixAccountConfigSnapshot(cfg, accountId, env) {
-	const normalizedAccountId = normalizeAccountId$1(accountId);
+	const normalizedAccountId = normalizeAccountId(accountId);
 	const matrix = resolveMatrixBaseConfig(cfg);
 	const account = findMatrixAccountConfig(cfg, normalizedAccountId) ?? {};
 	const scopedKeys = getMatrixScopedEnvVarNames(normalizedAccountId);
@@ -173,7 +173,7 @@ function resolveMatrixAccountConfigSnapshot(cfg, accountId, env) {
 			value: scopedEnv[field],
 			path: scopedKeys[field]
 		},
-		...normalizedAccountId === DEFAULT_ACCOUNT_ID$1 ? [{
+		...normalizedAccountId === DEFAULT_ACCOUNT_ID ? [{
 			value: matrix[field],
 			path: resolveMatrixBaseConfigFieldPath(field)
 		}, {
@@ -228,17 +228,17 @@ function resolveMatrixAccountConfigSnapshot(cfg, accountId, env) {
 }
 function resolveImplicitMatrixAccountId(cfg, env = process.env) {
 	if (requiresExplicitMatrixDefaultAccount(cfg, env)) return null;
-	return normalizeAccountId$1(resolveMatrixDefaultOrOnlyAccountId(cfg, env));
+	return normalizeAccountId(resolveMatrixDefaultOrOnlyAccountId(cfg, env));
 }
 function resolveMatrixAuthState(params) {
 	const cfg = requireRuntimeConfig(params.cfg, "Matrix auth context");
 	const env = params?.env ?? process.env;
 	const requestedAccountId = params?.accountId?.trim();
-	const explicitAccountId = normalizeOptionalAccountId$1(params?.accountId);
+	const explicitAccountId = normalizeOptionalAccountId(params?.accountId);
 	if (requestedAccountId && !explicitAccountId) throw new Error(`Matrix account id "${requestedAccountId}" is invalid.`);
 	const effectiveAccountId = explicitAccountId ?? resolveImplicitMatrixAccountId(cfg, env);
 	if (!effectiveAccountId) throw new Error("Multiple Matrix accounts are configured and channels.matrix.defaultAccount is not set. Set \"channels.matrix.defaultAccount\" to the intended account or pass --account <id>.");
-	if (explicitAccountId && explicitAccountId !== DEFAULT_ACCOUNT_ID$1 && !listNormalizedMatrixAccountIds(cfg).includes(explicitAccountId) && !hasScopedMatrixEnvConfig(explicitAccountId, env)) throw new Error(`Matrix account "${explicitAccountId}" is not configured. Add channels.matrix.accounts.${explicitAccountId} or define scoped ${getMatrixScopedEnvVarNames(explicitAccountId).accessToken.replace(/_ACCESS_TOKEN$/, "")}_* variables.`);
+	if (explicitAccountId && explicitAccountId !== DEFAULT_ACCOUNT_ID && !listNormalizedMatrixAccountIds(cfg).includes(explicitAccountId) && !hasScopedMatrixEnvConfig(explicitAccountId, env)) throw new Error(`Matrix account "${explicitAccountId}" is not configured. Add channels.matrix.accounts.${explicitAccountId} or define scoped ${getMatrixScopedEnvVarNames(explicitAccountId).accessToken.replace(/_ACCESS_TOKEN$/, "")}_* variables.`);
 	const matrix = resolveMatrixBaseConfig(cfg);
 	const account = findMatrixAccountConfig(cfg, effectiveAccountId);
 	if (matrix.enabled === false || account?.enabled === false) throw new Error(`Matrix account "${effectiveAccountId}" is disabled.`);
@@ -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-DjaQFCHc.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixCreateClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-CljOKEvc.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
@@ -499,7 +499,7 @@ async function awaitMatrixStartupWithAbort(promise, abortSignal) {
 //#endregion
 //#region extensions/matrix/src/matrix/client/shared.ts
 const loadMatrixCreateClientDeps = createLazyRuntimeModule(() => Promise.resolve().then(() => create_client_exports).then((runtime) => ({ createMatrixClient: runtime.createMatrixClient })));
-const MATRIX_TRANSIENT_LEASE_DRAIN_TIMEOUT_MS = 5e3;
+const MATRIX_RETIREMENT_DRAIN_TIMEOUT_MS = 5e3;
 const sharedClientStates = /* @__PURE__ */ new Map();
 const sharedClientPromises = /* @__PURE__ */ new Map();
 function buildSharedClientKey(auth) {
@@ -565,7 +565,8 @@ async function ensureSharedClientStarted(state, abortSignal) {
 		} catch (err) {
 			LogService.warn("MatrixClientLite", "Failed to prepare crypto:", err);
 		}
-		await awaitMatrixStartupWithAbort(state.client.start({ abortSignal }), abortSignal);
+		await state.client.start({ abortSignal });
+		throwIfMatrixStartupAborted(abortSignal);
 		state.started = true;
 	})().finally(() => {
 		if (state.startPromise === guardedStart) state.startPromise = null;
@@ -645,22 +646,16 @@ function mergeReleaseMode(current, requested) {
 function abortTransientLeases(state) {
 	for (const lease of state.leases) if (lease.role === "transient") lease.abortController.abort();
 }
-function forceReleaseLeases(state, releasePromise = Promise.resolve()) {
-	for (const lease of state.leases) {
-		lease.abortController.abort();
-		lease.releasePromise ??= releasePromise;
-	}
-	state.leases.clear();
-	state.noLeases.resolve();
-}
-async function waitForLeaseDrain(state) {
-	if (state.leases.size === 0) return;
+async function waitForRetirementDrain(state, task, isPending, timeoutMessage) {
+	if (!isPending()) return;
 	let deadline;
 	try {
-		await Promise.race([state.noLeases.promise, new Promise((_, reject) => {
+		await Promise.race([task, new Promise((_, reject) => {
 			deadline = setTimeout(() => {
-				reject(/* @__PURE__ */ new Error(`Matrix transient leases did not drain within ${MATRIX_TRANSIENT_LEASE_DRAIN_TIMEOUT_MS}ms`));
-			}, MATRIX_TRANSIENT_LEASE_DRAIN_TIMEOUT_MS);
+				if (!isPending()) return;
+				state.phase = "late-drain";
+				reject(new Error(timeoutMessage));
+			}, MATRIX_RETIREMENT_DRAIN_TIMEOUT_MS);
 			deadline.unref?.();
 		})]);
 	} finally {
@@ -671,7 +666,27 @@ function beginGenerationRetirement(params) {
 	const { state } = params;
 	if (state.retirementPromise) return state.retirementPromise;
 	state.phase = "quiescing";
-	state.retirementPromise = Promise.resolve().then(async () => {
+	const result = createDeferred();
+	state.retirementPromise = result.promise;
+	Promise.resolve().then(async () => {
+		const startup = state.startPromise;
+		if (startup) try {
+			await waitForRetirementDrain(state, startup.catch(() => void 0), () => state.startPromise === startup, `Matrix client startup did not settle within ${MATRIX_RETIREMENT_DRAIN_TIMEOUT_MS}ms during retirement`);
+		} catch (error) {
+			state.poisonError = toStringifiedError(error);
+			result.reject(state.poisonError);
+			const failure = (await Promise.allSettled([
+				startup.catch(() => void 0).then(async () => {
+					state.started = false;
+					await state.client.stopWithoutPersist();
+				}),
+				retireMonitorLeases(state, params.monitorLeases ?? []),
+				state.noLeases.promise
+			])).find((outcome) => outcome.status === "rejected");
+			if (failure) state.poisonError = toStringifiedError(failure.reason);
+			else deleteSharedClientState(state);
+			throw state.poisonError;
+		}
 		try {
 			await state.client.quiesceSync();
 			state.started = false;
@@ -679,46 +694,50 @@ function beginGenerationRetirement(params) {
 		} catch (error) {
 			state.poisonError = toStringifiedError(error);
 		}
+		let monitorRetired = true;
 		try {
 			await retireMonitorLeases(state, params.monitorLeases ?? []);
 		} catch (error) {
 			state.poisonError ??= toStringifiedError(error);
+			monitorRetired = false;
 		}
 		state.phase = "closing";
+		let lateLeaseDrain = null;
 		try {
-			await waitForLeaseDrain(state);
+			await waitForRetirementDrain(state, state.noLeases.promise, () => state.leases.size > 0, `Matrix transient leases did not drain within ${MATRIX_RETIREMENT_DRAIN_TIMEOUT_MS}ms`);
 		} catch (error) {
 			state.poisonError ??= toStringifiedError(error);
-			forceReleaseLeases(state);
+			result.reject(state.poisonError);
+			lateLeaseDrain = state.noLeases.promise;
 		}
-		if (state.poisonError) {
-			await state.client.drainPendingDecryptions("matrix poisoned client shutdown").catch(() => void 0);
-			state.client.stopWithoutPersist();
-			throw state.poisonError;
-		}
-		try {
+		let failure = state.poisonError;
+		let canDelete = monitorRetired;
+		if (failure) canDelete = await state.client.drainPendingDecryptions("matrix poisoned client shutdown").then(() => true, () => false) && canDelete;
+		else try {
 			await state.client.drainPendingDecryptions("matrix shared client final shutdown");
 		} catch (error) {
-			state.poisonError = toStringifiedError(error);
-			try {
-				state.client.stopWithoutPersist();
-			} finally {
-				deleteSharedClientState(state);
-			}
-			throw state.poisonError;
+			failure = state.poisonError = toStringifiedError(error);
 		}
-		try {
-			if (state.releaseMode === "persist") await state.client.stopAndPersist();
-			else if (state.releaseMode === "discard") state.client.stopWithoutPersist();
-			else await state.client.stopAndPersist().catch(() => state.client.stopWithoutPersist());
-		} finally {
-			deleteSharedClientState(state);
+		let discard = failure !== null || state.releaseMode === "discard";
+		if (!discard) try {
+			await state.client.stopAndPersist();
+		} catch (error) {
+			discard = true;
+			if (state.releaseMode === "persist") failure = state.poisonError = toStringifiedError(error);
 		}
-	});
+		if (discard) await state.client.stopWithoutPersist().catch((error) => {
+			failure = state.poisonError = toStringifiedError(error);
+			canDelete = false;
+		});
+		await lateLeaseDrain;
+		if (canDelete) deleteSharedClientState(state);
+		if (failure) throw failure;
+	}).then(result.resolve, result.reject);
 	abortTransientLeases(state);
 	return state.retirementPromise;
 }
 function createSharedMatrixClientLease(state, role) {
+	if (state.phase !== "open" || state.poisonError) return null;
 	const leaseState = {
 		abortController: new AbortController(),
 		monitorRetirement: null,
@@ -747,6 +766,10 @@ function createSharedMatrixClientLease(state, role) {
 			state.releaseMode = mergeReleaseMode(state.releaseMode, releaseParams.mode ?? "stop");
 			state.leases.delete(leaseState);
 			if (state.leases.size === 0) state.noLeases.resolve();
+			if (state.phase === "late-drain") {
+				leaseState.releasePromise = Promise.resolve();
+				return leaseState.releasePromise;
+			}
 			const finalMonitor = role === "monitor" && !Array.from(state.leases).some((lease) => lease.role === "monitor");
 			if (role === "monitor" && !finalMonitor) {
 				leaseState.releasePromise = retireMonitorLease(state, leaseState);
@@ -765,14 +788,17 @@ function createSharedMatrixClientLease(state, role) {
 	};
 }
 async function acquireSharedMatrixClient(params = {}) {
-	const lease = createSharedMatrixClientLease(await resolveOpenSharedMatrixClientState(params), params.role ?? "transient");
-	if (params.startClient !== false) try {
-		await lease.start(params.abortSignal);
-	} catch (error) {
-		await lease.release({ mode: "stop" }).catch(() => void 0);
-		throw error;
+	while (true) {
+		const lease = createSharedMatrixClientLease(await resolveOpenSharedMatrixClientState(params), params.role ?? "transient");
+		if (!lease) continue;
+		if (params.startClient !== false) try {
+			await lease.start(params.abortSignal);
+		} catch (error) {
+			await lease.release({ mode: "stop" }).catch(() => void 0);
+			throw error;
+		}
+		return lease;
 	}
-	return lease;
 }
 //#endregion
 //#region extensions/matrix/src/matrix/client.ts

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-DQn6b5vi.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-DlhJdrNI.js";
+import { c as singleAccountKeysToMove, n as matrixSetupAdapter, o as namedAccountPromotionKeys, s as resolveSingleAccountPromotionTarget } from "./setup-core-CyvaCOOr.js";
+import { n as matrixOnboardingAdapter } from "./setup-surface-DtRvRcCT.js";
 export { matrixSetupAdapter, matrixOnboardingAdapter as matrixSetupWizard, namedAccountPromotionKeys, resolveSingleAccountPromotionTarget, singleAccountKeysToMove };

package/dist/{crypto-runtime-Bnz3zEcS.js → crypto-runtime-C4WDYxlP.js}

@@ -1,6 +1,6 @@
 import { t as ensureMatrixCryptoRuntime } from "./deps-CcVJfvRM.js";
 import { n as LogService, r as noop } from "./logger-B_71hN6W.js";
-import { i as restoreIdbFromDisk, n as persistIdbToDisk } from "./idb-persistence-BM0P27Zg.js";
+import { i as restoreIdbFromDisk, n as persistIdbToDisk } from "./idb-persistence-DfgW720p.js";
 import { n as isRepairableSecretStorageAccessError } from "./recovery-key-store-CognuDys.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { formatErrorMessage, toStringifiedError } from "openclaw/plugin-sdk/error-runtime";

package/dist/{directory-live-Bvg2wAnR.js → directory-live-D0KfJlby.js}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { n as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
-import { c as resolveMatrixAuth } from "./client-CeGw0G5S.js";
-import { t as MatrixAuthedHttpClient } from "./http-client-CycYxU9-.js";
+import { r as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
+import { c as resolveMatrixAuth } from "./client-hs1ePy2O.js";
+import { t as MatrixAuthedHttpClient } from "./http-client-D8o8b9u6.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

@@ -5,7 +5,7 @@ import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doc
 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-BsGuHngK.js";
 import { a as readLegacyMatrixSyncCacheState, i as openMatrixSyncCacheStoreOptions, o as writeMatrixSyncCacheStateToStore, r as hasMatrixSyncCacheStateInStore } from "./file-sync-store-DjskBX2o.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-BM0P27Zg.js";
+import { r as readLegacyMatrixIdbSnapshotStateUnlocked, t as isValidMatrixIdbSnapshotJson } from "./idb-persistence-DfgW720p.js";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { createHash, randomUUID } from "node:crypto";
@@ -508,7 +508,13 @@ const stateMigrations = [
 				}
 				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`);
+					changes.push(`Kept existing Matrix credentials for account ${source.accountId}`);
+					await archiveLegacyStateSource({
+						filePath: source.filePath,
+						label: "Matrix credentials",
+						changes,
+						warnings
+					});
 					continue;
 				}
 				if (!existing) try {

package/dist/{draft-stream-BRi7PRRS.js → draft-stream-B_m79Ynb.js}

@@ -1,4 +1,4 @@
-import { E as MsgType, a as sendSingleTextMessageMatrix, l as prepareMatrixSingleText, t as editMessageMatrix } from "./send-ZDLU4JTk.js";
+import { E as MsgType, a as sendSingleTextMessageMatrix, l as prepareMatrixSingleText, t as editMessageMatrix } from "./send-BKu9Ghi4.js";
 import { createFinalizableDraftStreamControlsForState } from "openclaw/plugin-sdk/channel-outbound";
 //#region extensions/matrix/src/matrix/draft-stream.ts
 const DEFAULT_THROTTLE_MS = 1e3;

package/dist/event-helpers-XRfAbOIh.js

@@ -0,0 +1,46 @@
+import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+//#region extensions/matrix/src/matrix/sdk/event-helpers.ts
+function matrixEventToRaw(event, opts = {}) {
+	const originalContent = event.getOriginalContent();
+	const content = opts.contentMode === "original" ? originalContent : event.getContent();
+	const relation = originalContent["m.relates_to"] || event.getWireContent()["m.relates_to"];
+	const normalizedContent = relation && !Object.hasOwn(content, "m.relates_to") ? {
+		...content,
+		"m.relates_to": relation
+	} : content;
+	const raw = {
+		event_id: event.getId() ?? "",
+		sender: event.getSender() ?? "",
+		type: event.getType() ?? "",
+		origin_server_ts: event.getTs() ?? 0,
+		content: normalizedContent,
+		unsigned: event.getUnsigned()
+	};
+	const stateKey = event.getStateKey() ?? event.getWireStateKey();
+	if (typeof stateKey === "string") raw.state_key = stateKey;
+	return raw;
+}
+function parseMxc(url) {
+	const match = /^mxc:\/\/([^/]+)\/(.+)$/.exec(url.trim());
+	if (!match) return null;
+	const server = match[1];
+	const mediaId = match[2];
+	if (!server || !mediaId) return null;
+	return {
+		server,
+		mediaId
+	};
+}
+function buildHttpError(statusCode, bodyText) {
+	let message = `Matrix HTTP ${statusCode}`;
+	if (bodyText.trim()) try {
+		const parsed = JSON.parse(bodyText);
+		if (typeof parsed.error === "string" && parsed.error.trim()) message = parsed.error.trim();
+		else message = truncateUtf16Safe(bodyText, 500);
+	} catch {
+		message = truncateUtf16Safe(bodyText, 500);
+	}
+	return Object.assign(new Error(message), { statusCode });
+}
+//#endregion
+export { matrixEventToRaw as n, parseMxc as r, buildHttpError as t };

package/dist/{http-client-CycYxU9-.js → http-client-D8o8b9u6.js}

@@ -1,53 +1,9 @@
-import { t as buildTimeoutAbortSignal } from "./timeout-abort-signal-DMrgRFIy.js";
+import { t as buildHttpError } from "./event-helpers-XRfAbOIh.js";
 import { parseMediaContentLength } from "openclaw/plugin-sdk/media-runtime";
-import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { buildTimeoutAbortSignal } from "openclaw/plugin-sdk/extension-shared";
 import { readResponseWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
 import { fetchWithRuntimeDispatcherOrMockedGlobal } from "openclaw/plugin-sdk/runtime-fetch";
 import { closeDispatcher, createPinnedDispatcher, resolvePinnedHostnameWithPolicy } from "openclaw/plugin-sdk/ssrf-dispatcher";
-//#region extensions/matrix/src/matrix/sdk/event-helpers.ts
-function matrixEventToRaw(event, opts = {}) {
-	const originalContent = event.getOriginalContent();
-	const content = opts.contentMode === "original" ? originalContent : event.getContent();
-	const relation = originalContent["m.relates_to"] || event.getWireContent()["m.relates_to"];
-	const normalizedContent = relation && !Object.hasOwn(content, "m.relates_to") ? {
-		...content,
-		"m.relates_to": relation
-	} : content;
-	const raw = {
-		event_id: event.getId() ?? "",
-		sender: event.getSender() ?? "",
-		type: event.getType() ?? "",
-		origin_server_ts: event.getTs() ?? 0,
-		content: normalizedContent,
-		unsigned: event.getUnsigned()
-	};
-	const stateKey = event.getStateKey() ?? event.getWireStateKey();
-	if (typeof stateKey === "string") raw.state_key = stateKey;
-	return raw;
-}
-function parseMxc(url) {
-	const match = /^mxc:\/\/([^/]+)\/(.+)$/.exec(url.trim());
-	if (!match) return null;
-	const server = match[1];
-	const mediaId = match[2];
-	if (!server || !mediaId) return null;
-	return {
-		server,
-		mediaId
-	};
-}
-function buildHttpError(statusCode, bodyText) {
-	let message = `Matrix HTTP ${statusCode}`;
-	if (bodyText.trim()) try {
-		const parsed = JSON.parse(bodyText);
-		if (typeof parsed.error === "string" && parsed.error.trim()) message = parsed.error.trim();
-		else message = truncateUtf16Safe(bodyText, 500);
-	} catch {
-		message = truncateUtf16Safe(bodyText, 500);
-	}
-	return Object.assign(new Error(message), { statusCode });
-}
-//#endregion
 //#region extensions/matrix/src/matrix/media-errors.ts
 const MATRIX_MEDIA_SIZE_LIMIT_ERROR_MESSAGE = "Matrix media exceeds configured size limit";
 var MatrixMediaSizeLimitError = class extends Error {
@@ -367,4 +323,4 @@ var MatrixAuthedHttpClient = class {
 	}
 };
 //#endregion
-export { matrixEventToRaw as a, isMatrixMediaSizeLimitError as i, createMatrixGuardedFetch as n, parseMxc as o, MatrixMediaSizeLimitError as r, MatrixAuthedHttpClient as t };
+export { isMatrixMediaSizeLimitError as i, createMatrixGuardedFetch as n, MatrixMediaSizeLimitError as r, MatrixAuthedHttpClient as t };

package/dist/{idb-persistence-BM0P27Zg.js → idb-persistence-DfgW720p.js}

@@ -195,7 +195,7 @@ async function persistIdbToDisk(params) {
 			}
 			throwIfLegacySnapshotNeedsDoctor(snapshotPath, storedSnapshotJson);
 			const snapshot = await dumpIndexedDatabases(params?.databasePrefix);
-			if (snapshot.length === 0) return 0;
+			if (params?.abortSignal?.aborted || snapshot.length === 0) return 0;
 			writeMatrixIdbSnapshotJson({
 				storageRootDir,
 				snapshotJson: JSON.stringify(snapshot),

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as registerMatrixCliMetadata } from "./cli-metadata-B1d1aGM5.js";
+import { n as registerMatrixCliMetadata } from "./cli-metadata-DrYVwQ_r.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-JudlYOSc.js → media-text-OR9uoC4W.js}

@@ -1,4 +1,5 @@
-import { _ as parsePollStartContent, d as buildPollResultsSummary, f as formatPollAsText, h as isPollStartType, m as isPollEventType, p as formatPollResultsAsText, v as resolvePollReferenceEventId } from "./send-ZDLU4JTk.js";
+import { _ as parsePollStartContent, d as buildPollResultsSummary, f as formatPollAsText, h as isPollStartType, m as isPollEventType, p as formatPollResultsAsText, v as resolvePollReferenceEventId } from "./send-BKu9Ghi4.js";
+import { asNullableObjectRecord, asNullableRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import path from "node:path";
 //#region extensions/matrix/src/matrix/poll-summary.ts
 function resolveMatrixPollRootEventId(event) {
@@ -10,11 +11,14 @@ function resolveMatrixPollRootEventId(event) {
 }
 async function readAllPollRelations(client, roomId, pollEventId) {
 	const relationEvents = [];
+	const seenCursors = /* @__PURE__ */ new Set();
 	let nextBatch;
 	do {
 		const page = await client.getRelations(roomId, pollEventId, "m.reference", void 0, { from: nextBatch });
 		relationEvents.push(...page.events);
 		nextBatch = page.nextBatch ?? void 0;
+		if (nextBatch && seenCursors.has(nextBatch)) throw new Error("Matrix poll pagination returned a repeated cursor");
+		if (nextBatch) seenCursors.add(nextBatch);
 	} while (nextBatch);
 	return relationEvents;
 }
@@ -94,6 +98,15 @@ function resolveCaptionOrFilename(params) {
 	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;
@@ -104,11 +117,6 @@ function resolveMatrixMessageAttachment(params) {
 		filename: resolved.filename
 	};
 }
-function resolveMatrixMessageBody(params) {
-	const attachment = resolveMatrixMessageAttachment(params);
-	if (!attachment) return (params.body?.trim() ?? "") || void 0;
-	return attachment.caption;
-}
 function formatMatrixAttachmentText(params) {
 	if (!params.attachment) return;
 	return formatMatrixAttachmentMarker({
@@ -118,9 +126,10 @@ function formatMatrixAttachmentText(params) {
 	});
 }
 function formatMatrixMessageText(params) {
-	const body = params.body?.trim() ?? "";
+	const attachment = resolveMatrixMessageAttachment(params);
+	const body = attachment ? attachment.caption ?? "" : params.body?.trim() ?? "";
 	const marker = formatMatrixAttachmentText({
-		attachment: params.attachment,
+		attachment,
 		tooLarge: params.tooLarge,
 		unavailable: params.unavailable
 	});
@@ -130,17 +139,15 @@ function formatMatrixMessageText(params) {
 }
 function formatMatrixMediaUnavailableText(params) {
 	return formatMatrixMessageText({
-		body: resolveMatrixMessageBody(params),
-		attachment: resolveMatrixMessageAttachment(params),
+		...params,
 		unavailable: true
 	}) ?? "";
 }
 function formatMatrixMediaTooLargeText(params) {
 	return formatMatrixMessageText({
-		body: resolveMatrixMessageBody(params),
-		attachment: resolveMatrixMessageAttachment(params),
+		...params,
 		tooLarge: true
 	}) ?? "";
 }
 //#endregion
-export { resolveMatrixMessageAttachment as a, fetchMatrixPollSnapshot as c, isLikelyBareFilename as i, resolveMatrixPollRootEventId as l, formatMatrixMediaUnavailableText as n, resolveMatrixMessageBody as o, formatMatrixMessageText as r, fetchMatrixPollMessageSummary as s, formatMatrixMediaTooLargeText as t };
+export { resolveBundledMatrixReplacementContent as a, fetchMatrixPollSnapshot as c, isLikelyBareFilename as i, resolveMatrixPollRootEventId as l, formatMatrixMediaUnavailableText as n, resolveMatrixMessageAttachment as o, formatMatrixMessageText as r, fetchMatrixPollMessageSummary as s, formatMatrixMediaTooLargeText as t };