@openclaw/matrix 2026.8.1-beta.2 → 2026.8.1

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as matrixPlugin } from "./channel-VSrHgTON.js";
+import { t as matrixPlugin } from "./channel-BkEcVUs_.js";
 export { matrixPlugin };

package/dist/{channel.runtime-pOOL0uT_.js → channel.runtime-CTLSBFsP.js}

@@ -1,19 +1,19 @@
-import { b as reconcileMatrixUnknownSend, i as sendPollMatrix, o as sendTypingMatrix, r as sendMessageMatrix, y as cleanupMatrixDeliveryPlans } from "./send-ZDLU4JTk.js";
+import { i as sendPollMatrix, o as sendTypingMatrix, r as sendMessageMatrix, v as cleanupMatrixDeliveryPlans, y as reconcileMatrixUnknownSend } from "./send-BL_iH5Ox.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { c as resolveMatrixAuth } from "./client-CeGw0G5S.js";
-import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-Bvg2wAnR.js";
-import { p as resolveOutboundSendDep, r as chunkTextForOutbound } from "./runtime-api-BGO16Fu8.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-BJAPY4Vb.js";
+import { c as resolveMatrixAuth } from "./client-kSi51NKp.js";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-DKr0w35b.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-qG6gceps.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { createMessageReceiptFromOutboundResults, createReplyToFanout } from "openclaw/plugin-sdk/channel-outbound";
+import { createMessageReceiptFromOutboundResults, createReplyToFanout, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
 import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { chunkTextForOutbound } from "openclaw/plugin-sdk/text-chunking";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { runChannelProbe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { attachChannelToResult } from "openclaw/plugin-sdk/channel-send-result";
 import { renderMessagePresentationFallbackText } from "openclaw/plugin-sdk/interactive-runtime";
 import { resolveSendableOutboundReplyParts, sendPayloadMediaSequence } from "openclaw/plugin-sdk/reply-payload";
 //#region extensions/matrix/src/matrix/probe.ts
-const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./probe.runtime-Dr91B_X3.js").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient })));
+const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./probe.runtime-Bxpr1FFy.js").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient })));
 async function probeMatrix(params) {
 	return await runChannelProbe(void 0, async () => {
 		const result = {
@@ -67,6 +67,16 @@ async function probeMatrix(params) {
 const MATRIX_OPENCLAW_PRESENTATION_KEY = "com.openclaw.presentation";
 const MATRIX_OPENCLAW_PRESENTATION_TYPE = "message.presentation";
 const MATRIX_EMPTY_PRESENTATION_FALLBACK_TEXT = "---";
+function toMatrixOutboundResult(result) {
+	const { roomId, ...delivery } = result;
+	return {
+		...delivery,
+		target: {
+			kind: "room",
+			id: roomId
+		}
+	};
+}
 function resolveMatrixChannelData(payload) {
 	const raw = asOptionalRecord(payload.channelData)?.matrix;
 	return asOptionalRecord(raw) ?? {};
@@ -113,7 +123,7 @@ function resolveMatrixExtraContent(payload) {
 }
 function resolveMatrixDeliveryProgress(onDeliveryResult) {
 	return onDeliveryResult ? async (result) => {
-		await onDeliveryResult(attachChannelToResult("matrix", result));
+		await onDeliveryResult(attachChannelToResult("matrix", toMatrixOutboundResult(result)));
 	} : void 0;
 }
 //#endregion
@@ -184,15 +194,15 @@ const matrixChannelRuntime = {
 						...part,
 						index
 					}));
-					return attachChannelToResult("matrix", {
+					return attachChannelToResult("matrix", toMatrixOutboundResult({
 						...lastResult,
 						primaryMessageId: receipt.primaryPlatformMessageId,
 						receipt,
 						content: sentResults.map((result) => result.content).join("\n")
-					});
+					}));
 				}
 			}
-			return attachChannelToResult("matrix", await send(to, payloadText, {
+			return attachChannelToResult("matrix", toMatrixOutboundResult(await send(to, payloadText, {
 				cfg,
 				mediaAccess,
 				mediaLocalRoots,
@@ -207,10 +217,10 @@ const matrixChannelRuntime = {
 				onPlatformSendDispatch,
 				extraContent: resolveMatrixExtraContent(payload),
 				onDeliveryResult: resolveMatrixDeliveryProgress(onDeliveryResult)
-			}));
+			})));
 		},
 		sendText: async ({ cfg, to, text, deps, replyToId, threadId, accountId, audioAsVoice, deliveryQueueId, deliveryPartIndex, deliveryPartCount, onPlatformSendDispatch, onDeliveryResult }) => {
-			return attachChannelToResult("matrix", await (resolveOutboundSendDep(deps, "matrix") ?? sendMessageMatrix)(to, text, {
+			return attachChannelToResult("matrix", toMatrixOutboundResult(await (resolveOutboundSendDep(deps, "matrix") ?? sendMessageMatrix)(to, text, {
 				cfg,
 				replyToId: replyToId ?? void 0,
 				threadId: threadId !== void 0 && threadId !== null ? String(threadId) : void 0,
@@ -221,10 +231,10 @@ const matrixChannelRuntime = {
 				...deliveryQueueId !== void 0 ? { deliveryPartCount } : {},
 				onPlatformSendDispatch,
 				onDeliveryResult: resolveMatrixDeliveryProgress(onDeliveryResult)
-			}));
+			})));
 		},
 		sendMedia: async ({ cfg, to, text, mediaUrl, mediaLocalRoots, mediaReadFile, mediaAccess, deps, replyToId, threadId, accountId, audioAsVoice, deliveryQueueId, deliveryPartIndex, deliveryPartCount, onPlatformSendDispatch, onDeliveryResult }) => {
-			return attachChannelToResult("matrix", await (resolveOutboundSendDep(deps, "matrix") ?? sendMessageMatrix)(to, text, {
+			return attachChannelToResult("matrix", toMatrixOutboundResult(await (resolveOutboundSendDep(deps, "matrix") ?? sendMessageMatrix)(to, text, {
 				cfg,
 				mediaUrl,
 				mediaLocalRoots,
@@ -239,7 +249,7 @@ const matrixChannelRuntime = {
 				...deliveryQueueId !== void 0 ? { deliveryPartCount } : {},
 				onPlatformSendDispatch,
 				onDeliveryResult: resolveMatrixDeliveryProgress(onDeliveryResult)
-			}));
+			})));
 		},
 		sendPoll: async ({ cfg, to, poll, threadId, accountId }) => {
 			const result = await sendPollMatrix(to, poll, {

package/dist/{channel.setup-PpxRP9Du.js → channel.setup-CSacbORr.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-DQn6b5vi.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-fC57n-Jo.js";
+import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-r6L0nno-.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";
@@ -19,13 +19,7 @@ function normalizeMatrixUser(raw) {
 	const value = (raw ?? "").trim();
 	if (!value) return "";
 	if (!value.startsWith("@") || !value.includes(":")) return normalizeLowercaseStringOrEmpty(value);
-	const withoutAt = value.slice(1);
-	const splitIndex = withoutAt.indexOf(":");
-	if (splitIndex === -1) return normalizeLowercaseStringOrEmpty(value);
-	const localpart = normalizeLowercaseStringOrEmpty(withoutAt.slice(0, splitIndex));
-	const server = normalizeLowercaseStringOrEmpty(withoutAt.slice(splitIndex + 1));
-	if (!server) return normalizeLowercaseStringOrEmpty(value);
-	return `@${localpart}:${server}`;
+	return value;
 }
 function normalizeMatrixUserId(raw) {
 	const trimmed = (raw ?? "").trim();
@@ -104,6 +98,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: {
@@ -231,8 +229,9 @@ const MatrixChannelConfigSchema = buildChannelConfigSchema(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,
@@ -313,7 +312,7 @@ const matrixPluginBase = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-DlhJdrNI.js").then((n) => n.t)).matrixSetupWizard })),
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-g174ElFO.js").then((n) => n.t)).matrixSetupWizard })),
 	setupContract: matrixSetupContract,
 	capabilities: {
 		chatTypes: [

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

@@ -1,20 +1,20 @@
-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-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 { i as resolveMatrixAccount } from "./accounts-fC57n-Jo.js";
+import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-DC0fWBxc.js";
+import { n as matrixSetupAdapter } from "./setup-core-r6L0nno-.js";
+import { n as withResolvedActionClient } from "./client-CZ_JvrO0.js";
+import { l as resolveMatrixAuthContext } from "./client-kSi51NKp.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-zXVCMg7y.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-4vsW_WSn.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;
@@ -328,16 +328,17 @@ function printVerificationStatus(status, verbose = false, accountId) {
 	const backupIssue = resolveMatrixRoomKeyBackupIssue(resolveBackupStatus(status));
 	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 +413,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-D8M7FmcO.js");
 		verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
 			previousCfg: cfg,
 			cfg: updated,
@@ -595,8 +596,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-CZ_JvrO0.js").then((n) => n.t));
+const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-BL_iH5Ox.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-B1d1aGM5.js → cli-metadata-Ddx_y4Os.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-DRVtgrq5.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-Ddx_y4Os.js";
 export { cli_metadata_default as default, registerMatrixCliMetadata };

package/dist/{client-sJesKQmp.js → client-CZ_JvrO0.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 { b as resolveMatrixRoomId } from "./send-BL_iH5Ox.js";
+import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-D8irSL2i.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-D8irSL2i.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-kSi51NKp.js").then((n) => n.t).then((clientModule) => ({
 	acquireSharedMatrixClient: clientModule.acquireSharedMatrixClient,
 	resolveMatrixAuthContext: clientModule.resolveMatrixAuthContext
 })));

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

@@ -1,26 +1,25 @@
 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-C8nnBTxi.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 { 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 { coerceSecretRef, normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input-runtime";
+import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
+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, 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-TZYyo0XQ.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
@@ -70,10 +69,9 @@ 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) {
@@ -126,7 +124,7 @@ function buildMatrixNetworkFields(params) {
 	return {
 		...params.allowPrivateNetwork ? {
 			allowPrivateNetwork: true,
-			ssrfPolicy: ssrfPolicyFromDangerouslyAllowPrivateNetwork$1(true)
+			ssrfPolicy: ssrfPolicyFromDangerouslyAllowPrivateNetwork(true)
 		} : {},
 		...dispatcherPolicy ? { dispatcherPolicy } : {}
 	};
@@ -158,7 +156,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 +171,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 +226,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 +414,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-TZYyo0XQ.js"), import("./logging-DRjvUOIh.js").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
@@ -499,7 +497,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 +563,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 +644,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 +664,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 +692,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 +764,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 +786,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/{config-update-Bor_Pjsv.js → config-update-DC0fWBxc.js}

@@ -1,10 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { t as findMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
+import { t as findMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
 import { n as resolveMatrixConfigPath$1, r as shouldStoreMatrixAccountAtTopLevel, t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import { normalizeSecretInputString } from "openclaw/plugin-sdk/setup";
+import { coerceSecretRef, normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";
 import { resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
-import { coerceSecretRef } from "openclaw/plugin-sdk/secret-ref-runtime";
 //#region extensions/matrix/src/matrix/config-update.ts
 var config_update_exports = /* @__PURE__ */ __exportAll({
 	resolveMatrixConfigFieldPath: () => resolveMatrixConfigFieldPath,

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-r6L0nno-.js";
+import { n as matrixOnboardingAdapter } from "./setup-surface-g174ElFO.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-DKr0w35b.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-kSi51NKp.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({