@openclaw/matrix 2026.9.1-beta.1 → 2026.9.1

package/dist/channel.runtime-BkqjwEDU.js

@@ -0,0 +1,76 @@
+import { o as sendTypingMatrix, r as sendMessageMatrix, v as cleanupMatrixDeliveryPlans, y as reconcileMatrixUnknownSend } from "./send-DG7Bnj7_.js";
+import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
+import { l as resolveMatrixAuth } from "./client-Dj4mcf-s.js";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-DLUgWBhA.js";
+import { t as matrixOutbound } from "./outbound-CeCEtF_q.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-B64O69Nd.js";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { runChannelProbe } from "openclaw/plugin-sdk/text-utility-runtime";
+//#region extensions/matrix/src/matrix/probe.ts
+const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./probe.runtime-B1YPxG9x.js").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient })));
+async function probeMatrix(params) {
+	return await runChannelProbe(void 0, async () => {
+		const result = {
+			ok: false,
+			status: null,
+			error: null
+		};
+		if (isBunRuntime()) return {
+			...result,
+			error: "Matrix probe requires Node (bun runtime not supported)"
+		};
+		if (!params.homeserver?.trim()) return {
+			...result,
+			error: "missing homeserver"
+		};
+		if (!params.accessToken?.trim()) return {
+			...result,
+			error: "missing access token"
+		};
+		const { createMatrixClient } = await loadMatrixProbeRuntimeDeps();
+		const inputUserId = normalizeOptionalString(params.userId);
+		const userId = await (await createMatrixClient({
+			homeserver: params.homeserver,
+			userId: void 0,
+			accessToken: params.accessToken,
+			deviceId: params.deviceId,
+			persistStorage: false,
+			localTimeoutMs: params.timeoutMs,
+			accountId: params.accountId,
+			allowPrivateNetwork: params.allowPrivateNetwork,
+			ssrfPolicy: params.ssrfPolicy,
+			dispatcherPolicy: params.dispatcherPolicy
+		})).getUserId();
+		if (inputUserId && inputUserId !== userId) return {
+			...result,
+			error: "Matrix access token user does not match configured userId"
+		};
+		return {
+			...result,
+			ok: true,
+			userId
+		};
+	}, (error) => ({
+		ok: false,
+		status: typeof error === "object" && error && "statusCode" in error ? Number(error.statusCode) : null,
+		error: formatErrorMessage(error)
+	}));
+}
+//#endregion
+//#region extensions/matrix/src/channel.runtime.ts
+const matrixChannelRuntime = {
+	cleanupMatrixDeliveryPlans,
+	listMatrixDirectoryGroupsLive,
+	listMatrixDirectoryPeersLive,
+	matrixOutbound,
+	probeMatrix,
+	resolveMatrixAuth,
+	resolveMatrixTargets,
+	reconcileMatrixUnknownSend,
+	sendMessageMatrix,
+	sendTypingMatrix
+};
+//#endregion
+export { matrixChannelRuntime };

package/dist/{channel.setup-sWPOGyQG.js → channel.setup-BY42QaL7.js}

@@ -1,6 +1,6 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BCzyubQt.js";
-import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-CyvaCOOr.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-DR1c4xF_.js";
+import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-CEF6exLW.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";
@@ -50,22 +50,23 @@ function resolveMatrixAllowListMatch(params) {
 		matchSource: "wildcard"
 	};
 	const userId = normalizeMatrixUser(params.userId);
+	const candidates = [
+		{
+			value: userId,
+			source: "id"
+		},
+		{
+			value: userId ? `matrix:${userId}` : "",
+			source: "prefixed-id"
+		},
+		{
+			value: userId ? `user:${userId}` : "",
+			source: "prefixed-user"
+		}
+	];
 	return resolveAllowlistMatchByCandidates({
 		allowList,
-		candidates: [
-			{
-				value: userId,
-				source: "id"
-			},
-			{
-				value: userId ? `matrix:${userId}` : "",
-				source: "prefixed-id"
-			},
-			{
-				value: userId ? `user:${userId}` : "",
-				source: "prefixed-user"
-			}
-		]
+		candidates
 	});
 }
 //#endregion
@@ -98,6 +99,10 @@ const matrixConfigAdapter = createScopedChannelConfigAdapter({
 //#endregion
 //#region extensions/matrix/src/config-ui-hints.ts
 const matrixChannelConfigUiHints = {
+	joinIntro: {
+		label: "Matrix Group Join Introduction",
+		help: "Post one brief introduction when the bot joins an allowed group room (default: true). Account settings override the channel-wide setting."
+	},
 	...createChannelConfigUiHints({
 		channelLabel: "Matrix",
 		mentionPatterns: {
@@ -221,12 +226,13 @@ function hasCanonicalMatrixAccountStreaming(account) {
 	const streaming = account.streaming;
 	return typeof streaming === "object" && streaming !== null && !Array.isArray(streaming);
 }
-const MatrixChannelConfigSchema = buildChannelConfigSchema(z.object({
+const MatrixConfigSchema = z.object({
 	name: z.string().optional(),
 	enabled: z.boolean().optional(),
 	configWrites: z.boolean().optional(),
+	joinIntro: z.boolean().optional(),
 	defaultAccount: z.string().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(),
+	accounts: z.record(z.string(), z.object({ joinIntro: z.boolean().optional() }).passthrough().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,
@@ -294,7 +300,8 @@ const MatrixChannelConfigSchema = buildChannelConfigSchema(z.object({
 	groups: z.object({}).catchall(matrixRoomSchema).optional(),
 	rooms: z.object({}).catchall(matrixRoomSchema).optional(),
 	actions: matrixActionSchema
-}), { uiHints: matrixChannelConfigUiHints });
+});
+const MatrixChannelConfigSchema = buildChannelConfigSchema(MatrixConfigSchema, { uiHints: matrixChannelConfigUiHints });
 const matrixPluginBase = {
 	id: "matrix",
 	meta: {
@@ -307,7 +314,7 @@ const matrixPluginBase = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-DtRvRcCT.js").then((n) => n.t)).matrixSetupWizard })),
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-BSlj1vnL.js").then((n) => n.t)).matrixSetupWizard })),
 	setupContract: matrixSetupContract,
 	capabilities: {
 		chatTypes: [

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

@@ -1,15 +1,15 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.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-CyvaCOOr.js";
-import { n as withResolvedActionClient } from "./client-BUtHbzib.js";
-import { l as resolveMatrixAuthContext } from "./client-hs1ePy2O.js";
+import { i as resolveMatrixAccount } from "./accounts-DR1c4xF_.js";
+import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-BnX26jCO.js";
+import { n as matrixSetupAdapter } from "./setup-core-CEF6exLW.js";
+import { n as withResolvedActionClient } from "./client-D2utPQ1E.js";
+import { u as resolveMatrixAuthContext } from "./client-Dj4mcf-s.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-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 { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-Cd1p8ABr.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-D-iOebn4.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";
@@ -18,7 +18,7 @@ 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;
-const MATRIX_CLI_RECOVERY_KEY_STDIN_MAX_BYTES = 1024 * 1024;
+const MATRIX_CLI_RECOVERY_KEY_STDIN_MAX_BYTES = 1048576;
 function scheduleMatrixCliExit() {
 	if (matrixCliExitScheduled || process.env.VITEST) return;
 	matrixCliExitScheduled = true;
@@ -292,10 +292,12 @@ function printBackupSummary(backup) {
 function buildVerificationGuidance(status, accountId) {
 	const backup = resolveBackupStatus(status);
 	const nextSteps = /* @__PURE__ */ new Set();
-	if (!status.verified) if (status.recoveryKeyAccepted === true && status.backupUsable === true) {
-		nextSteps.add(`Recovery key can unlock the room-key backup, but full Matrix identity trust is still incomplete. Run ${formatMatrixCliCommand("verify self", accountId)}, accept the request in another verified Matrix client, and confirm the SAS only if it matches.`);
-		nextSteps.add(`If you intend to replace the current cross-signing identity, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify bootstrap --recovery-key-stdin --force-reset-cross-signing", accountId)}.`);
-	} else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify device --recovery-key-stdin", accountId)}. If you do not have the recovery key but still have another verified Matrix client, run ${formatMatrixCliCommand("verify self", accountId)} instead.`);
+	if (!status.verified) {
+		if (status.recoveryKeyAccepted === true && status.backupUsable === true) {
+			nextSteps.add(`Recovery key can unlock the room-key backup, but full Matrix identity trust is still incomplete. Run ${formatMatrixCliCommand("verify self", accountId)}, accept the request in another verified Matrix client, and confirm the SAS only if it matches.`);
+			nextSteps.add(`If you intend to replace the current cross-signing identity, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify bootstrap --recovery-key-stdin --force-reset-cross-signing", accountId)}.`);
+		} else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify device --recovery-key-stdin", accountId)}. If you do not have the recovery key but still have another verified Matrix client, run ${formatMatrixCliCommand("verify self", accountId)} instead.`);
+	}
 	if (status.serverDeviceKnown === false) nextSteps.add(`This Matrix device is no longer listed on the homeserver. Create a new OpenClaw Matrix device with ${formatMatrixCliCommand("account add --homeserver <url> --user-id <@user:server> --password <password> --device-name OpenClaw-Gateway", accountId)}. If you use token auth, create a fresh Matrix access token in your Matrix client or admin UI, then run ${formatMatrixCliCommand("account add --homeserver <url> --access-token <token>", accountId)}.`);
 	for (const step of buildBackupGuidance(backup, accountId, { recoveryKeyStored: status.recoveryKeyStored })) nextSteps.add(step);
 	if (status.pendingVerifications > 0) nextSteps.add(`Review pending verification requests with ${formatMatrixCliCommand("verify list", accountId)}. Complete each active request with ${formatMatrixCliCommand("verify sas <id>", accountId)} and ${formatMatrixCliCommand("verify confirm-sas <id>", accountId)}, or cancel stale requests with ${formatMatrixCliCommand("verify cancel <id>", accountId)}.`);
@@ -305,9 +307,10 @@ function buildBackupGuidance(backup, accountId, options = {}) {
 	const backupIssue = resolveMatrixRoomKeyBackupIssue(backup);
 	const nextSteps = /* @__PURE__ */ new Set();
 	if (backupIssue.code === "missing-server-backup") nextSteps.add(`Run ${formatMatrixCliCommand("verify bootstrap", accountId)} to create a room key backup.`);
-	else if (backupIssue.code === "key-load-failed" || backupIssue.code === "key-not-loaded" || backupIssue.code === "inactive") if (options.recoveryKeyStored) nextSteps.add(`Backup key is not loaded on this device. Run ${formatMatrixCliCommand("verify backup restore", accountId)} to load it and restore old room keys. If restore still cannot load the key, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)}.`);
-	else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)} to load the server backup and store the key for future restores.`);
-	else if (backupIssue.code === "key-mismatch") {
+	else if (backupIssue.code === "key-load-failed" || backupIssue.code === "key-not-loaded" || backupIssue.code === "inactive") {
+		if (options.recoveryKeyStored) nextSteps.add(`Backup key is not loaded on this device. Run ${formatMatrixCliCommand("verify backup restore", accountId)} to load it and restore old room keys. If restore still cannot load the key, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)}.`);
+		else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)} to load the server backup and store the key for future restores.`);
+	} else if (backupIssue.code === "key-mismatch") {
 		nextSteps.add(`Backup key mismatch on this device. Run the shown printf pipeline with the active server backup recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)}.`);
 		nextSteps.add(`If you want a fresh backup baseline and accept losing unrecoverable history, run ${formatMatrixCliCommand("verify backup reset --yes", accountId)}. Add --rotate-recovery-key only when the old recovery key should stop unlocking the fresh backup.`);
 	} else if (backupIssue.code === "untrusted-signature") {
@@ -325,19 +328,21 @@ function printGuidance(lines) {
 function printVerificationStatus(status, verbose = false, accountId) {
 	console.log(`Verified by owner: ${status.verified ? "yes" : "no"}`);
 	if (status.serverDeviceKnown === false) console.log("Device issue: current Matrix device is missing from the homeserver device list");
-	const backupIssue = resolveMatrixRoomKeyBackupIssue(resolveBackupStatus(status));
+	const backup = resolveBackupStatus(status);
+	const backupIssue = resolveMatrixRoomKeyBackupIssue(backup);
 	printVerificationBackupSummary(status);
 	if (backupIssue.message) console.log(`Backup issue: ${backupIssue.message}`);
+	console.log(`Recovery key stored: ${status.recoveryKeyStored ? "yes" : "no"}`);
+	if (status.recoveryKey) console.log("Recovery key: available (re-run with --json to include the raw key value in output)");
 	if (verbose) {
 		console.log("Diagnostics:");
 		printVerificationIdentity(status);
 		if (status.serverDeviceKnown !== void 0) console.log(`Device present on server: ${yesNoUnknown(status.serverDeviceKnown ?? null)}`);
 		printVerificationTrustDiagnostics(status);
 		printVerificationBackupStatus(status);
-		console.log(`Recovery key stored: ${status.recoveryKeyStored ? "yes" : "no"}`);
 		printTimestamp("Recovery key created at", status.recoveryKeyCreatedAt);
 		console.log(`Pending verifications: ${status.pendingVerifications}`);
-	} else console.log(`Recovery key stored: ${status.recoveryKeyStored ? "yes" : "no"}`);
+	}
 	printVerificationGuidance(status, accountId);
 }
 //#endregion
@@ -412,7 +417,7 @@ async function addMatrixAccount(params) {
 		backupVersion: null
 	};
 	if (accountConfig.encryption === true) {
-		const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-CpE6C3qV.js");
+		const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-Co985F63.js");
 		verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
 			previousCfg: cfg,
 			cfg: updated,
@@ -437,7 +442,8 @@ async function addMatrixAccount(params) {
 		});
 		let resolvedAvatarUrl = synced.resolvedAvatarUrl;
 		if (synced.convertedAvatarFromHttp && synced.resolvedAvatarUrl) {
-			const withAvatar = updateMatrixAccountConfig(runtime.config.current(), accountId, { avatarUrl: synced.resolvedAvatarUrl });
+			const latestCfg = runtime.config.current();
+			const withAvatar = updateMatrixAccountConfig(latestCfg, accountId, { avatarUrl: synced.resolvedAvatarUrl });
 			await runtime.config.replaceConfigFile({
 				nextConfig: withAvatar,
 				afterWrite: { mode: "auto" }
@@ -513,20 +519,24 @@ function registerMatrixAccountCommands(root) {
 				console.log(`Config path: ${formatMatrixCliText(result.configPath)}`);
 				console.log(`Credentials source: ${result.useEnv ? "MATRIX_* / MATRIX_<ACCOUNT_ID>_* env vars" : "inline config"}`);
 				console.log(`Encryption: ${result.encryptionEnabled ? "enabled" : "disabled"}`);
-				if (result.verificationBootstrap.attempted) if (result.verificationBootstrap.success) {
-					console.log("Matrix verification bootstrap: complete");
-					printTimestamp("Recovery key created at", result.verificationBootstrap.recoveryKeyCreatedAt);
-					if (result.verificationBootstrap.backupVersion) console.log(`Backup version: ${formatMatrixCliText(result.verificationBootstrap.backupVersion)}`);
-				} else console.error(`Matrix verification bootstrap warning: ${formatMatrixCliText(result.verificationBootstrap.error)}`);
+				if (result.verificationBootstrap.attempted) {
+					if (result.verificationBootstrap.success) {
+						console.log("Matrix verification bootstrap: complete");
+						printTimestamp("Recovery key created at", result.verificationBootstrap.recoveryKeyCreatedAt);
+						if (result.verificationBootstrap.backupVersion) console.log(`Backup version: ${formatMatrixCliText(result.verificationBootstrap.backupVersion)}`);
+					} else console.error(`Matrix verification bootstrap warning: ${formatMatrixCliText(result.verificationBootstrap.error)}`);
+				}
 				if (result.deviceHealth.error) console.error(`Matrix device health warning: ${formatMatrixCliText(result.deviceHealth.error)}`);
 				else if (result.deviceHealth.staleOpenClawDeviceIds.length > 0) {
 					const staleDeviceIds = result.deviceHealth.staleOpenClawDeviceIds.map((deviceId) => formatMatrixCliText(deviceId)).join(", ");
 					console.log(`Matrix device hygiene warning: stale OpenClaw devices detected (${staleDeviceIds}). Run ${formatMatrixCliCommand("devices prune-stale", result.accountId)}.`);
 				}
-				if (result.profile.attempted) if (result.profile.error) console.error(`Profile sync warning: ${formatMatrixCliText(result.profile.error)}`);
-				else {
-					console.log(`Profile sync: name ${result.profile.displayNameUpdated ? "updated" : "unchanged"}, avatar ${result.profile.avatarUpdated ? "updated" : "unchanged"}`);
-					if (result.profile.convertedAvatarFromHttp && result.profile.resolvedAvatarUrl) console.log(`Avatar converted and saved as: ${formatMatrixCliText(result.profile.resolvedAvatarUrl)}`);
+				if (result.profile.attempted) {
+					if (result.profile.error) console.error(`Profile sync warning: ${formatMatrixCliText(result.profile.error)}`);
+					else {
+						console.log(`Profile sync: name ${result.profile.displayNameUpdated ? "updated" : "unchanged"}, avatar ${result.profile.avatarUpdated ? "updated" : "unchanged"}`);
+						if (result.profile.convertedAvatarFromHttp && result.profile.resolvedAvatarUrl) console.log(`Avatar converted and saved as: ${formatMatrixCliText(result.profile.resolvedAvatarUrl)}`);
+					}
 				}
 				const bindHint = `openclaw agents bind --agent <id> --bind matrix:${result.accountId}`;
 				console.log(`Bind this account to an agent: ${bindHint}`);
@@ -595,8 +605,8 @@ function registerMatrixDeviceCommands(root) {
 }
 //#endregion
 //#region extensions/matrix/src/cli-direct.ts
-const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-BUtHbzib.js").then((n) => n.t));
-const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-BKu9Ghi4.js").then((n) => n.S));
+const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-D2utPQ1E.js").then((n) => n.t));
+const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-DG7Bnj7_.js").then((n) => n.x));
 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-DrYVwQ_r.js → cli-metadata-B7MQjR5S.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-DrTD2a_q.js");
+		const { registerMatrixCli } = await import("./cli-CtYeU7ol.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-DrYVwQ_r.js";
+import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-B7MQjR5S.js";
 export { cli_metadata_default as default, registerMatrixCliMetadata };

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

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

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

@@ -1,16 +1,15 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { a as resolveMatrixDefaultOrOnlyAccountId, n as requiresExplicitMatrixDefaultAccount, o as resolveMatrixAccountStringValues } from "./account-selection-CWuhuFn1.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId, c as resolveScopedMatrixEnvConfig, l as resolveMatrixAccountStringValues, n as requiresExplicitMatrixDefaultAccount, o as resolveGlobalMatrixEnvConfig } from "./account-selection-DA-jfx22.js";
 import { t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.js";
-import { o as resolveMatrixBaseConfig, r as listNormalizedMatrixAccountIds, t as findMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { r as resolveScopedMatrixEnvConfig, t as resolveGlobalMatrixEnvConfig } from "./env-auth-MVS-Vv41.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-BsGuHngK.js";
+import { d as writeStorageMeta, l as resolveMatrixStoragePaths, r as maybeMigrateLegacyStorage, s as repairCurrentTokenStorageMetaDeviceId } from "./storage-BVf4uucD.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";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
-import { coerceSecretRef, normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input-runtime";
+import { coerceSecretRef, isBuiltInDefaultSecretProviderRef, normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input";
 import { formatErrorMessage, toErrorObject, toStringifiedError } from "openclaw/plugin-sdk/error-runtime";
 import { resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 import { isPrivateNetworkOptInEnabled, ssrfPolicyFromDangerouslyAllowPrivateNetwork } from "openclaw/plugin-sdk/ssrf-runtime";
@@ -19,14 +18,15 @@ 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";
+import { AsyncLocalStorage } from "node:async_hooks";
 //#region extensions/matrix/src/matrix/client/config.ts
-const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-CljOKEvc.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-C1yfda1L.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-B37cQknZ.js").then((n) => n.r));
-const loadMatrixCredentialsWriteRuntime = createLazyRuntimeModule(() => import("./credentials-write.runtime-nAV2-5uR.js"));
+const loadMatrixCredentialsReadDeps = createLazyRuntimeModule(() => import("./credentials-read-mexhw-Ur.js").then((n) => n.r));
+const loadMatrixCredentialsWriteRuntime = createLazyRuntimeModule(() => import("./credentials-write.runtime-DQt-kgJq.js"));
 const loadMatrixSecretInputDeps = createLazyRuntimeModule(() => import("./config-secret-input.runtime-CwsP3--c.js"));
 function shouldRetryMatrixAuthRequest(err) {
 	return MATRIX_AUTH_REQUEST_RETRY_RE.test(formatErrorMessage(err));
@@ -70,21 +70,21 @@ const MATRIX_CONFIG_STRING_FIELDS = [
 const MATRIX_AUTH_SECRET_FIELDS = ["accessToken", "password"];
 function readMatrixEnvSecretRef(params) {
 	const provider = params.cfg.secrets?.providers?.[params.ref.provider];
-	if (provider) {
-		if (provider.source !== "env") throw new Error(`Secret provider "${params.ref.provider}" has source "${provider.source}" but ref requests "env".`);
+	if (provider?.source === "env") {
 		if (provider.allowlist && !provider.allowlist.includes(params.ref.id)) throw new Error(`Environment variable "${params.ref.id}" is not allowlisted in secrets.providers.${params.ref.provider}.allowlist.`);
-	} else if (params.ref.provider !== (params.cfg.secrets?.defaults?.env?.trim() || "default")) throw new Error(`Secret provider "${params.ref.provider}" is not configured (ref: env:${params.ref.provider}:${params.ref.id}).`);
+	} else if (!isBuiltInDefaultSecretProviderRef(params.cfg, params.ref)) throw new Error(provider ? `Secret provider "${params.ref.provider}" has source "${provider.source}" but ref requests "env".` : `Secret provider "${params.ref.provider}" is not configured (ref: env:${params.ref.provider}:${params.ref.id}).`);
 	return params.env[params.ref.id]?.trim() || void 0;
 }
 function readMatrixConfigString(params) {
 	const ref = coerceSecretRef(params.value, params.cfg.secrets?.defaults);
 	if (params.suppressSecretRef && ref) return "";
+	const value = params.allowEnvSecretRef ? ref?.source === "env" ? readMatrixEnvSecretRef({
+		ref,
+		cfg: params.cfg,
+		env: params.env
+	}) ?? params.value : ref ? "" : params.value : params.value;
 	return normalizeResolvedSecretInputString({
-		value: params.allowEnvSecretRef ? ref?.source === "env" ? readMatrixEnvSecretRef({
-			ref,
-			cfg: params.cfg,
-			env: params.env
-		}) ?? params.value : ref ? "" : params.value : params.value,
+		value,
 		path: params.path,
 		defaults: params.cfg.secrets?.defaults
 	}) ?? "";
@@ -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-CljOKEvc.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixCreateClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-C1yfda1L.js").then((n) => n.t), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
@@ -466,6 +466,44 @@ async function createMatrixClient(params) {
 	});
 }
 //#endregion
+//#region extensions/matrix/src/matrix/monitor/task-runner.ts
+const monitorTaskSignal = new AsyncLocalStorage();
+function getMatrixMonitorTaskSignal() {
+	return monitorTaskSignal.getStore();
+}
+function createMatrixMonitorTaskRunner(params) {
+	const inFlight = /* @__PURE__ */ new Map();
+	let closed = false;
+	const runDetachedTask = (label, task) => {
+		if (closed) return Promise.resolve();
+		const controller = new AbortController();
+		const trackedTask = monitorTaskSignal.run(controller.signal, () => Promise.resolve().then(task)).catch((error) => {
+			const message = String(error);
+			params.logVerboseMessage(`matrix: ${label} failed (${message})`);
+			params.logger.warn("matrix background task failed", {
+				task: label,
+				error: message
+			});
+		}).finally(() => {
+			controller.abort();
+			inFlight.delete(trackedTask);
+		});
+		inFlight.set(trackedTask, controller);
+		return trackedTask;
+	};
+	const waitForIdle = async () => {
+		while (inFlight.size > 0) await Promise.allSettled(Array.from(inFlight.keys()));
+	};
+	return {
+		close: () => {
+			closed = true;
+			for (const controller of inFlight.values()) controller.abort();
+		},
+		runDetachedTask,
+		waitForIdle
+	};
+}
+//#endregion
 //#region extensions/matrix/src/matrix/startup-abort.ts
 function createMatrixStartupAbortError() {
 	const error = /* @__PURE__ */ new Error("Matrix startup aborted");
@@ -592,6 +630,7 @@ async function resolveSharedMatrixAuth(params) {
 }
 async function resolveOpenSharedMatrixClientState(params) {
 	const auth = await resolveSharedMatrixAuth(params);
+	throwIfMatrixStartupAborted(params.abortSignal);
 	const key = buildSharedClientKey(auth);
 	while (true) {
 		const existing = sharedClientStates.get(key);
@@ -775,8 +814,8 @@ function createSharedMatrixClientLease(state, role) {
 				leaseState.releasePromise = retireMonitorLease(state, leaseState);
 				return leaseState.releasePromise;
 			}
-			if (!(finalMonitor || state.leases.size === 0)) {
-				leaseState.releasePromise = Promise.resolve();
+			if (!(state.phase === "open" && (finalMonitor || state.leases.size === 0))) {
+				leaseState.releasePromise = state.poisonError ? Promise.reject(state.poisonError) : Promise.resolve();
 				return leaseState.releasePromise;
 			}
 			leaseState.releasePromise = beginGenerationRetirement({
@@ -788,11 +827,23 @@ function createSharedMatrixClientLease(state, role) {
 	};
 }
 async function acquireSharedMatrixClient(params = {}) {
+	const taskSignal = getMatrixMonitorTaskSignal();
+	const abortSignal = taskSignal && params.abortSignal ? AbortSignal.any([taskSignal, params.abortSignal]) : taskSignal ?? params.abortSignal;
+	const acquisition = {
+		...params,
+		abortSignal
+	};
 	while (true) {
-		const lease = createSharedMatrixClientLease(await resolveOpenSharedMatrixClientState(params), params.role ?? "transient");
+		throwIfMatrixStartupAborted(abortSignal);
+		const state = await resolveOpenSharedMatrixClientState(acquisition);
+		if (abortSignal?.aborted) {
+			if (state.phase === "open" && state.leases.size === 0) await beginGenerationRetirement({ state });
+			throwIfMatrixStartupAborted(abortSignal);
+		}
+		const lease = createSharedMatrixClientLease(state, params.role ?? "transient");
 		if (!lease) continue;
 		if (params.startClient !== false) try {
-			await lease.start(params.abortSignal);
+			await lease.start(abortSignal);
 		} catch (error) {
 			await lease.release({ mode: "stop" }).catch(() => void 0);
 			throw error;
@@ -807,4 +858,4 @@ var client_exports = /* @__PURE__ */ __exportAll({
 	resolveMatrixAuthContext: () => resolveMatrixAuthContext
 });
 //#endregion
-export { throwIfMatrixStartupAborted as a, resolveMatrixAuth as c, isMatrixStartupAbortError as i, resolveMatrixAuthContext as l, acquireSharedMatrixClient as n, createMatrixClient as o, createMatrixStartupAbortError as r, backfillMatrixAuthDeviceIdAfterStartup as s, client_exports as t };
+export { throwIfMatrixStartupAborted as a, backfillMatrixAuthDeviceIdAfterStartup as c, isMatrixStartupAbortError as i, resolveMatrixAuth as l, acquireSharedMatrixClient as n, createMatrixMonitorTaskRunner as o, createMatrixStartupAbortError as r, createMatrixClient as s, client_exports as t, resolveMatrixAuthContext as u };

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

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