@openclaw/matrix 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/session-binding-contract-api.js

@@ -1,4 +1,3 @@
 import { r as setMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { s as resetMatrixThreadBindingsForTests } from "./thread-bindings-shared-CKnY4LSd.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-DGbl3vDW.js";
-export { createMatrixThreadBindingManager, resetMatrixThreadBindingsForTests, setMatrixRuntime };
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-BYEGfw3h.js";
+export { createMatrixThreadBindingManager, setMatrixRuntime };

package/dist/{setup-bootstrap-Deleiibz.js → setup-bootstrap-BGPjbA5N.js}

@@ -1,7 +1,7 @@
 import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import "./accounts-DfngqebB.js";
-import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { n as bootstrapMatrixVerification } from "./verification-DYMQ1QpI.js";
+import "./accounts-BCzyubQt.js";
+import { n as bootstrapMatrixVerification } from "./verification-CabtBTtB.js";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 //#region extensions/matrix/src/setup-bootstrap.ts
 async function maybeBootstrapNewEncryptedMatrixAccount(params) {
 	const accountConfig = resolveMatrixAccountConfig({
@@ -36,7 +36,7 @@ async function maybeBootstrapNewEncryptedMatrixAccount(params) {
 			success: false,
 			recoveryKeyCreatedAt: null,
 			backupVersion: null,
-			error: formatMatrixErrorMessage(err)
+			error: formatErrorMessage(err)
 		};
 	}
 }

package/dist/{setup-core-BVfBv2ai.js → setup-core-DigrLebY.js}

@@ -1,15 +1,13 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { a as resolveMatrixAccountConfig, t as findMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { r as resolveMatrixEnvAuthReadiness } from "./env-auth-CQsYbz-p.js";
-import { r as resolveDefaultMatrixAccountId } from "./accounts-DfngqebB.js";
-import { n as resolveMatrixConfigPath$1, r as shouldStoreMatrixAccountAtTopLevel, t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
+import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
+import { n as resolveMatrixEnvAuthReadiness } from "./env-auth-MVS-Vv41.js";
+import { r as resolveDefaultMatrixAccountId } from "./accounts-BCzyubQt.js";
+import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
+import { r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
+import { t as isSupportedMatrixAvatarSource } from "./profile-D-Wubo0A.js";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
-import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$2, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId as normalizeAccountId$2, normalizeAllowFromEntries, normalizeSecretInputString, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
-import { resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
-import { coerceSecretRef } from "openclaw/plugin-sdk/secret-ref-runtime";
+import { DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId, normalizeAllowFromEntries, normalizeSecretInputString, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
+import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
 import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 //#region extensions/matrix/src/setup-contract.ts
 const matrixSingleAccountKeysToMove = [
@@ -73,253 +71,6 @@ function resolveSingleAccountPromotionTarget(params) {
 	return DEFAULT_ACCOUNT_ID$1;
 }
 //#endregion
-//#region extensions/matrix/src/matrix/config-update.ts
-var config_update_exports = /* @__PURE__ */ __exportAll({
-	resolveMatrixConfigFieldPath: () => resolveMatrixConfigFieldPath,
-	resolveMatrixConfigPath: () => resolveMatrixConfigPath,
-	shouldStoreMatrixAccountAtTopLevel: () => shouldStoreMatrixAccountAtTopLevel,
-	updateMatrixAccountConfig: () => updateMatrixAccountConfig
-});
-const resolveMatrixConfigPath = resolveMatrixConfigPath$1;
-function applyNullableStringField(target, key, value) {
-	if (value === void 0) return;
-	if (value === null) {
-		delete target[key];
-		return;
-	}
-	const trimmed = value.trim();
-	if (!trimmed) {
-		delete target[key];
-		return;
-	}
-	target[key] = trimmed;
-}
-function applyNullableSecretInputField(target, key, value, defaults) {
-	if (value === void 0) return;
-	if (value === null) {
-		delete target[key];
-		return;
-	}
-	if (typeof value === "string") {
-		const normalized = normalizeSecretInputString(value);
-		if (normalized) target[key] = normalized;
-		else delete target[key];
-		return;
-	}
-	const ref = coerceSecretRef(value, defaults);
-	if (!ref) throw new Error(`Invalid Matrix ${key} SecretInput.`);
-	target[key] = ref;
-}
-function cloneMatrixDmConfig(dm) {
-	if (!dm) return dm;
-	return {
-		...dm,
-		...dm.allowFrom ? { allowFrom: [...dm.allowFrom] } : {}
-	};
-}
-function cloneMatrixRoomMap(rooms) {
-	if (!rooms) return rooms;
-	const clonedRoomEntries = [];
-	for (const [roomId, roomCfg] of Object.entries(rooms)) clonedRoomEntries.push([roomId, roomCfg ? { ...roomCfg } : roomCfg]);
-	return Object.fromEntries(clonedRoomEntries);
-}
-function applyNullableArrayField(target, key, value) {
-	if (value === void 0) return;
-	if (value === null) {
-		delete target[key];
-		return;
-	}
-	target[key] = [...value];
-}
-function updateMatrixAccountConfig(cfg, accountId, patch) {
-	const matrix = cfg.channels?.matrix ?? {};
-	const normalizedAccountId = normalizeAccountId(accountId);
-	const nextAccount = { ...findMatrixAccountConfig(cfg, normalizedAccountId) ?? (normalizedAccountId === DEFAULT_ACCOUNT_ID ? matrix : {}) };
-	if (patch.name !== void 0) if (patch.name === null) delete nextAccount.name;
-	else {
-		const trimmed = patch.name.trim();
-		if (trimmed) nextAccount.name = trimmed;
-		else delete nextAccount.name;
-	}
-	if (typeof patch.enabled === "boolean") nextAccount.enabled = patch.enabled;
-	else if (typeof nextAccount.enabled !== "boolean") nextAccount.enabled = true;
-	applyNullableStringField(nextAccount, "homeserver", patch.homeserver);
-	applyNullableStringField(nextAccount, "proxy", patch.proxy);
-	applyNullableStringField(nextAccount, "userId", patch.userId);
-	applyNullableSecretInputField(nextAccount, "accessToken", patch.accessToken, cfg.secrets?.defaults);
-	applyNullableSecretInputField(nextAccount, "password", patch.password, cfg.secrets?.defaults);
-	applyNullableStringField(nextAccount, "deviceId", patch.deviceId);
-	applyNullableStringField(nextAccount, "deviceName", patch.deviceName);
-	applyNullableStringField(nextAccount, "avatarUrl", patch.avatarUrl);
-	if (patch.allowPrivateNetwork !== void 0) {
-		const nextNetwork = nextAccount.network && typeof nextAccount.network === "object" ? { ...nextAccount.network } : {};
-		if (patch.allowPrivateNetwork === null) delete nextNetwork.dangerouslyAllowPrivateNetwork;
-		else nextNetwork.dangerouslyAllowPrivateNetwork = patch.allowPrivateNetwork;
-		if (Object.keys(nextNetwork).length > 0) nextAccount.network = nextNetwork;
-		else delete nextAccount.network;
-	}
-	if (patch.initialSyncLimit !== void 0) if (patch.initialSyncLimit === null) delete nextAccount.initialSyncLimit;
-	else {
-		const initialSyncLimit = resolveOptionalIntegerOption(patch.initialSyncLimit, { min: 0 });
-		if (initialSyncLimit === void 0) delete nextAccount.initialSyncLimit;
-		else nextAccount.initialSyncLimit = initialSyncLimit;
-	}
-	if (patch.encryption !== void 0) if (patch.encryption === null) delete nextAccount.encryption;
-	else nextAccount.encryption = patch.encryption;
-	if (patch.allowBots !== void 0) if (patch.allowBots === null) delete nextAccount.allowBots;
-	else nextAccount.allowBots = patch.allowBots;
-	if (patch.autoJoin !== void 0) if (patch.autoJoin === null) delete nextAccount.autoJoin;
-	else nextAccount.autoJoin = patch.autoJoin;
-	applyNullableArrayField(nextAccount, "autoJoinAllowlist", patch.autoJoinAllowlist);
-	if (patch.dm !== void 0) if (patch.dm === null) delete nextAccount.dm;
-	else nextAccount.dm = cloneMatrixDmConfig({
-		...nextAccount.dm,
-		...patch.dm
-	});
-	if (patch.groupPolicy !== void 0) if (patch.groupPolicy === null) delete nextAccount.groupPolicy;
-	else nextAccount.groupPolicy = patch.groupPolicy;
-	applyNullableArrayField(nextAccount, "groupAllowFrom", patch.groupAllowFrom);
-	if (patch.groups !== void 0) if (patch.groups === null) delete nextAccount.groups;
-	else nextAccount.groups = cloneMatrixRoomMap(patch.groups);
-	if (patch.rooms !== void 0) if (patch.rooms === null) delete nextAccount.rooms;
-	else nextAccount.rooms = cloneMatrixRoomMap(patch.rooms);
-	const nextAccounts = Object.fromEntries(Object.entries(matrix.accounts ?? {}).filter(([rawAccountId]) => rawAccountId === normalizedAccountId || normalizeAccountId(rawAccountId) !== normalizedAccountId));
-	if (shouldStoreMatrixAccountAtTopLevel(cfg, normalizedAccountId)) {
-		const { accounts: _ignoredAccounts, defaultAccount } = matrix;
-		const { accounts: _ignoredNextAccounts, defaultAccount: _ignoredNextDefaultAccount, ...topLevelAccount } = nextAccount;
-		return {
-			...cfg,
-			channels: {
-				...cfg.channels,
-				matrix: {
-					...defaultAccount ? { defaultAccount } : {},
-					enabled: true,
-					...topLevelAccount
-				}
-			}
-		};
-	}
-	return {
-		...cfg,
-		channels: {
-			...cfg.channels,
-			matrix: {
-				...matrix,
-				enabled: true,
-				accounts: {
-					...nextAccounts,
-					[normalizedAccountId]: nextAccount
-				}
-			}
-		}
-	};
-}
-//#endregion
-//#region extensions/matrix/src/matrix/profile.ts
-var profile_exports = /* @__PURE__ */ __exportAll({
-	isSupportedMatrixAvatarSource: () => isSupportedMatrixAvatarSource,
-	syncMatrixOwnProfile: () => syncMatrixOwnProfile
-});
-const MATRIX_PROFILE_AVATAR_MAX_BYTES = 10 * 1024 * 1024;
-function isMatrixMxcUri(value) {
-	return normalizeLowercaseStringOrEmpty(normalizeOptionalString(value)).startsWith("mxc://");
-}
-function isMatrixHttpAvatarUri(value) {
-	const normalized = normalizeLowercaseStringOrEmpty(normalizeOptionalString(value));
-	return normalized.startsWith("https://") || normalized.startsWith("http://");
-}
-function isSupportedMatrixAvatarSource(value) {
-	return isMatrixMxcUri(value) || isMatrixHttpAvatarUri(value);
-}
-async function uploadAvatarMedia(params) {
-	const media = await params.loadAvatar(params.avatarSource, params.avatarMaxBytes);
-	return await params.client.uploadContent(media.buffer, media.contentType, media.fileName || "avatar");
-}
-async function resolveAvatarUrl(params) {
-	const avatarPath = normalizeOptionalString(params.avatarPath) ?? null;
-	if (avatarPath) {
-		if (!params.loadAvatarFromPath) throw new Error("Matrix avatar path upload requires a media loader.");
-		return {
-			resolvedAvatarUrl: await uploadAvatarMedia({
-				client: params.client,
-				avatarSource: avatarPath,
-				avatarMaxBytes: params.avatarMaxBytes,
-				loadAvatar: params.loadAvatarFromPath
-			}),
-			uploadedAvatarSource: "path",
-			convertedAvatarFromHttp: false
-		};
-	}
-	const avatarUrl = normalizeOptionalString(params.avatarUrl) ?? null;
-	if (!avatarUrl) return {
-		resolvedAvatarUrl: null,
-		uploadedAvatarSource: null,
-		convertedAvatarFromHttp: false
-	};
-	if (isMatrixMxcUri(avatarUrl)) return {
-		resolvedAvatarUrl: avatarUrl,
-		uploadedAvatarSource: null,
-		convertedAvatarFromHttp: false
-	};
-	if (!isMatrixHttpAvatarUri(avatarUrl)) throw new Error("Matrix avatar URL must be an mxc:// URI or an http(s) URL.");
-	if (!params.loadAvatarFromUrl) throw new Error("Matrix avatar URL conversion requires a media loader.");
-	return {
-		resolvedAvatarUrl: await uploadAvatarMedia({
-			client: params.client,
-			avatarSource: avatarUrl,
-			avatarMaxBytes: params.avatarMaxBytes,
-			loadAvatar: params.loadAvatarFromUrl
-		}),
-		uploadedAvatarSource: "http",
-		convertedAvatarFromHttp: true
-	};
-}
-async function syncMatrixOwnProfile(params) {
-	const desiredDisplayName = normalizeOptionalString(params.displayName) ?? null;
-	const avatar = await resolveAvatarUrl({
-		client: params.client,
-		avatarUrl: params.avatarUrl ?? null,
-		avatarPath: params.avatarPath ?? null,
-		avatarMaxBytes: params.avatarMaxBytes ?? MATRIX_PROFILE_AVATAR_MAX_BYTES,
-		loadAvatarFromUrl: params.loadAvatarFromUrl,
-		loadAvatarFromPath: params.loadAvatarFromPath
-	});
-	const desiredAvatarUrl = avatar.resolvedAvatarUrl;
-	if (!desiredDisplayName && !desiredAvatarUrl) return {
-		skipped: true,
-		displayNameUpdated: false,
-		avatarUpdated: false,
-		resolvedAvatarUrl: null,
-		uploadedAvatarSource: avatar.uploadedAvatarSource,
-		convertedAvatarFromHttp: avatar.convertedAvatarFromHttp
-	};
-	let currentDisplayName;
-	let currentAvatarUrl;
-	try {
-		const currentProfile = await params.client.getUserProfile(params.userId);
-		currentDisplayName = normalizeOptionalString(currentProfile.displayname);
-		currentAvatarUrl = normalizeOptionalString(currentProfile.avatar_url);
-	} catch {}
-	let displayNameUpdated = false;
-	let avatarUpdated = false;
-	if (desiredDisplayName && currentDisplayName !== desiredDisplayName) {
-		await params.client.setDisplayName(desiredDisplayName);
-		displayNameUpdated = true;
-	}
-	if (desiredAvatarUrl && currentAvatarUrl !== desiredAvatarUrl) {
-		await params.client.setAvatarUrl(desiredAvatarUrl);
-		avatarUpdated = true;
-	}
-	return {
-		skipped: false,
-		displayNameUpdated,
-		avatarUpdated,
-		resolvedAvatarUrl: desiredAvatarUrl,
-		uploadedAvatarSource: avatar.uploadedAvatarSource,
-		convertedAvatarFromHttp: avatar.convertedAvatarFromHttp
-	};
-}
-//#endregion
 //#region extensions/matrix/src/setup-config.ts
 const channel$1 = "matrix";
 const COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE = /* @__PURE__ */ new Set([
@@ -356,8 +107,8 @@ function resolveSetupAvatarUrl(input) {
 	return avatarUrl.trim() || void 0;
 }
 function resolveExistingMatrixAccountKey(accounts, targetAccountId) {
-	const normalizedTargetAccountId = normalizeAccountId$2(targetAccountId);
-	return Object.keys(accounts).find((accountId) => normalizeAccountId$2(accountId) === normalizedTargetAccountId) ?? targetAccountId;
+	const normalizedTargetAccountId = normalizeAccountId(targetAccountId);
+	return Object.keys(accounts).find((accountId) => normalizeAccountId(accountId) === normalizedTargetAccountId) ?? targetAccountId;
 }
 function moveSingleMatrixAccountConfigToNamedAccount(cfg) {
 	const baseConfig = cfg.channels?.[channel$1];
@@ -412,9 +163,9 @@ function validateMatrixSetupInput(params) {
 }
 function applyMatrixSetupAccountConfig(params) {
 	const input = params.input;
-	const normalizedAccountId = normalizeAccountId$2(params.accountId);
+	const normalizedAccountId = normalizeAccountId(params.accountId);
 	const next = applyAccountNameToChannelSection({
-		cfg: normalizedAccountId !== DEFAULT_ACCOUNT_ID$2 ? moveSingleMatrixAccountConfigToNamedAccount(params.cfg) : params.cfg,
+		cfg: normalizedAccountId !== DEFAULT_ACCOUNT_ID ? moveSingleMatrixAccountConfigToNamedAccount(params.cfg) : params.cfg,
 		channelKey: channel$1,
 		accountId: normalizedAccountId,
 		name: input.name
@@ -462,7 +213,7 @@ function createMatrixSetupDmPolicy(promptAllowFrom) {
 		allowFromPath: "dm.allowFrom",
 		resolveAccount: (cfg, accountId) => {
 			const resolvedCfg = cfg;
-			const resolvedAccountId = normalizeAccountId$2(accountId?.trim() || resolveDefaultMatrixAccountId(resolvedCfg) || DEFAULT_ACCOUNT_ID$2);
+			const resolvedAccountId = normalizeAccountId(accountId?.trim() || resolveDefaultMatrixAccountId(resolvedCfg) || DEFAULT_ACCOUNT_ID);
 			const config = resolveMatrixAccountConfig({
 				cfg: resolvedCfg,
 				accountId: resolvedAccountId
@@ -494,7 +245,7 @@ function createMatrixSetupDmPolicy(promptAllowFrom) {
 //#region extensions/matrix/src/setup-core.ts
 const channel = "matrix";
 function resolveMatrixSetupAccountId(params) {
-	return normalizeAccountId$2(params.accountId?.trim() || params.name?.trim() || DEFAULT_ACCOUNT_ID$2);
+	return normalizeAccountId(params.accountId?.trim() || params.name?.trim() || DEFAULT_ACCOUNT_ID);
 }
 function createMatrixSetupWizardProxy(loadWizardModule) {
 	let wizardPromise = null;
@@ -559,7 +310,7 @@ const matrixSetupAdapter = {
 		input
 	}),
 	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-Deleiibz.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BGPjbA5N.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,
@@ -646,4 +397,4 @@ const matrixSetupContract = defineChannelSetupContract({
 	legacyAdapter: matrixSetupAdapter
 });
 //#endregion
-export { moveSingleMatrixAccountConfigToNamedAccount as a, config_update_exports as c, namedAccountPromotionKeys as d, resolveSingleAccountPromotionTarget as f, createMatrixSetupDmPolicy as i, resolveMatrixConfigPath as l, matrixSetupAdapter as n, profile_exports as o, singleAccountKeysToMove as p, matrixSetupContract as r, syncMatrixOwnProfile as s, createMatrixSetupWizardProxy as t, updateMatrixAccountConfig as u };
+export { moveSingleMatrixAccountConfigToNamedAccount as a, singleAccountKeysToMove as c, createMatrixSetupDmPolicy as i, matrixSetupAdapter as n, namedAccountPromotionKeys as o, matrixSetupContract as r, resolveSingleAccountPromotionTarget as s, createMatrixSetupWizardProxy as t };

package/dist/setup-plugin-api.js

@@ -1,45 +1,2 @@
-import { i as resolveMatrixAccount } from "./accounts-DfngqebB.js";
-import { r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-Djxw3C6b.js";
-import { n as matrixSetupAdapter, r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-BVfBv2ai.js";
-import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
-const matrixSetupPlugin = {
-	id: "matrix",
-	meta: {
-		id: "matrix",
-		label: "Matrix",
-		selectionLabel: "Matrix (plugin)",
-		docsPath: "/channels/matrix",
-		docsLabel: "matrix",
-		blurb: "open protocol; configure a homeserver + access token.",
-		order: 70,
-		quickstartAllowFrom: true
-	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-BBq3WeqX.js").then((n) => n.t)).matrixSetupWizard })),
-	setup: matrixSetupAdapter,
-	setupContract: matrixSetupContract,
-	capabilities: {
-		chatTypes: [
-			"direct",
-			"group",
-			"thread"
-		],
-		polls: true,
-		reactions: true,
-		threads: true,
-		media: true
-	},
-	reload: { configPrefixes: ["channels.matrix"] },
-	configSchema: MatrixChannelConfigSchema,
-	config: {
-		...matrixConfigAdapter,
-		isConfigured: (account) => account.configured,
-		describeAccount: (account) => describeAccountSnapshot({
-			account,
-			configured: account.configured,
-			extra: { baseUrl: account.homeserver }
-		}),
-		hasConfiguredState: ({ cfg }) => resolveMatrixAccount({ cfg }).configured
-	}
-};
-//#endregion
+import { n as matrixSetupPlugin } from "./channel.setup-aNaa3Uyn.js";
 export { matrixSetupPlugin };

package/dist/{setup-surface-BBq3WeqX.js → setup-surface-Dtn8sAWs.js}

@@ -1,9 +1,11 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.js";
+import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-CWuhuFn1.js";
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { r as resolveMatrixEnvAuthReadiness } from "./env-auth-CQsYbz-p.js";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-DfngqebB.js";
-import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy, u as updateMatrixAccountConfig } from "./setup-core-BVfBv2ai.js";
+import { n as resolveMatrixEnvAuthReadiness } from "./env-auth-MVS-Vv41.js";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BCzyubQt.js";
+import { n as isMatrixRoomId } from "./target-ids-Nwx7cMVE.js";
+import { r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
+import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-DigrLebY.js";
 import { n as validateMatrixHomeserverUrl, r as isPrivateOrLoopbackHost, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
 import { n as ensureMatrixSdkInstalled, r as isMatrixSdkAvailable } from "./deps-CcVJfvRM.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -30,7 +32,7 @@ function isMatrixInviteAutoJoinPolicy(value) {
 	return value === "allowlist" || value === "always" || value === "off";
 }
 function isMatrixInviteAutoJoinTarget(entry) {
-	return entry === "*" || entry.startsWith("!") && entry.includes(":") || entry.startsWith("#") && entry.includes(":");
+	return entry === "*" || isMatrixRoomId(entry) || entry.startsWith("#") && entry.includes(":");
 }
 function resolveMatrixOnboardingAccountId(cfg, accountId) {
 	return normalizeAccountId$1(normalizeOptionalString(accountId) || resolveDefaultMatrixAccountId(cfg) || DEFAULT_ACCOUNT_ID);
@@ -89,7 +91,7 @@ async function promptMatrixAllowFrom(params) {
 			pending.push(part);
 		}
 		if (pending.length > 0) {
-			const { resolveMatrixTargets } = await import("./resolve-targets-nm2L48sh.js").then((n) => n.n);
+			const { resolveMatrixTargets } = await import("./resolve-targets-e7AI0P75.js").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -159,7 +161,7 @@ async function configureMatrixInviteAutoJoin(params) {
 	while (true) {
 		const allowlist = normalizeUniqueStringEntries(splitSetupEntries(await params.prompter.text({
 			message: "Matrix invite auto-join allowlist (comma-separated)",
-			placeholder: "!roomId:server, #alias:server, *",
+			placeholder: "!roomId:server, !roomId, #alias:server, *",
 			initialValue: currentAllowlist[0] ? currentAllowlist.join(", ") : void 0,
 			validate: (value) => {
 				return splitSetupEntries(value).length > 0 ? void 0 : "Required";
@@ -167,7 +169,7 @@ async function configureMatrixInviteAutoJoin(params) {
 		})));
 		const invalidEntries = allowlist.filter((entry) => !isMatrixInviteAutoJoinTarget(entry));
 		if (allowlist.length === 0 || invalidEntries.length > 0) {
-			await params.prompter.note(["Use only stable Matrix invite targets for auto-join: !roomId:server, #alias:server, or *.", invalidEntries.length > 0 ? `Invalid: ${invalidEntries.join(", ")}` : void 0].filter(Boolean).join("\n"), "Matrix invite auto-join");
+			await params.prompter.note(["Use only stable Matrix invite targets for auto-join: !roomId:server (or the suffixless !roomId form on room version 12+), #alias:server, or *.", invalidEntries.length > 0 ? `Invalid: ${invalidEntries.join(", ")}` : void 0].filter(Boolean).join("\n"), "Matrix invite auto-join");
 			continue;
 		}
 		return setMatrixAutoJoin(params.cfg, "allowlist", allowlist, accountId);
@@ -190,7 +192,7 @@ async function configureMatrixAccessPrompts(params) {
 		label: "Matrix rooms",
 		currentPolicy: existingAccountConfig.groupPolicy ?? "allowlist",
 		currentEntries: Object.keys(existingGroups ?? {}),
-		placeholder: "!roomId:server, #alias:server, Project Room",
+		placeholder: "!roomId:server, !roomId, #alias:server, Project Room",
 		updatePrompt: Boolean(existingGroups)
 	});
 	if (accessConfig) if (accessConfig.policy !== "allowlist") next = updateMatrixAccountConfig(next, params.accountId, { groupPolicy: accessConfig.policy });
@@ -203,11 +205,11 @@ async function configureMatrixAccessPrompts(params) {
 				const trimmed = normalizeOptionalString(entry) ?? "";
 				if (!trimmed) continue;
 				const cleaned = trimmed.replace(/^(room|channel):/i, "").trim();
-				if (cleaned.startsWith("!") && cleaned.includes(":")) {
+				if (isMatrixRoomId(cleaned)) {
 					resolvedIds.push(cleaned);
 					continue;
 				}
-				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-C8dVBiCc.js").then((n) => n.t);
+				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-DLQzel12.js").then((n) => n.t);
 				const matches = await listMatrixDirectoryGroupsLive({
 					cfg: next,
 					accountId: params.accountId,
@@ -457,7 +459,7 @@ const matrixOnboardingAdapter = {
 		});
 	},
 	afterConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-Deleiibz.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BGPjbA5N.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,
@@ -479,9 +481,6 @@ const matrixOnboardingAdapter = {
 };
 //#endregion
 //#region extensions/matrix/src/setup-surface.ts
-var setup_surface_exports = /* @__PURE__ */ __exportAll({
-	matrixOnboardingAdapter: () => matrixOnboardingAdapter,
-	matrixSetupWizard: () => matrixOnboardingAdapter
-});
+var setup_surface_exports = /* @__PURE__ */ __exportAll({ matrixSetupWizard: () => matrixOnboardingAdapter });
 //#endregion
 export { matrixOnboardingAdapter as n, setup_surface_exports as t };

package/dist/{startup-verification-wm3_i88s.js → startup-verification-Cs08ca8u.js}

@@ -1,8 +1,8 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { M as resolveMatrixSqliteStateEnv, l as resolveMatrixStoragePaths, o as recordCurrentStorageMetaDeviceId } from "./storage-BvAkgzvT.js";
+import { M as resolveMatrixSqliteStateEnv, l as resolveMatrixStoragePaths, o as recordCurrentStorageMetaDeviceId } from "./storage-BsGuHngK.js";
 import { createHash } from "node:crypto";
 import path from "node:path";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import fs from "node:fs/promises";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
@@ -207,7 +207,7 @@ async function ensureMatrixStartupVerification(params) {
 			transactionId: request.transactionId ?? void 0
 		};
 	} catch (err) {
-		const error = formatMatrixErrorMessage(err);
+		const error = formatErrorMessage(err);
 		await writeStartupVerificationState({
 			auth: params.auth,
 			env: params.env,

package/dist/{storage-BvAkgzvT.js → storage-BsGuHngK.js}

@@ -1,6 +1,6 @@
-import { t as isRecord } from "./record-shared-CWWx6fvI.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { n as resolveMatrixAccountStorageRoot } from "./storage-paths-gUmSydsW.js";
+import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";
@@ -526,7 +526,7 @@ function resolveMatrixStateFilePath(params) {
 }
 async function maybeMigrateLegacyStorage(params) {
 	const hasAccountScopedLegacyStorageFile = fs.existsSync(params.storagePaths.storagePath);
-	const syncCache = hasAccountScopedLegacyStorageFile ? await import("./file-sync-store-DiiFsayX.js").then((n) => n.n) : null;
+	const syncCache = hasAccountScopedLegacyStorageFile ? await import("./file-sync-store-DjskBX2o.js").then((n) => n.n) : null;
 	const hasAccountScopedLegacyStorage = hasAccountScopedLegacyStorageFile && await syncCache?.readLegacyMatrixSyncCacheState(params.storagePaths.rootDir) !== null;
 	const hasAccountScopedRecoveryKey = fs.existsSync(params.storagePaths.recoveryKeyPath);
 	const hasAccountScopedLegacyCryptoMigration = fs.existsSync(path.join(params.storagePaths.rootDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME));
@@ -573,7 +573,7 @@ async function maybeMigrateLegacyStorage(params) {
 	if (skippedExistingTargets.length > 0) logger.warn?.(`matrix: legacy client storage files were left in place because their migrated targets already existed.\n${skippedExistingTargets.join("\n")}`);
 }
 async function migrateLegacySyncCacheToSqlite(params) {
-	const syncCache = await import("./file-sync-store-DiiFsayX.js").then((n) => n.n);
+	const syncCache = await import("./file-sync-store-DjskBX2o.js").then((n) => n.n);
 	const persisted = await syncCache.readLegacyMatrixSyncCacheState(params.sourceRootDir);
 	if (!persisted) return;
 	const store = getMatrixRuntime().state.openKeyedStore(syncCache.openMatrixSyncCacheStoreOptions(params.targetRootDir));

package/dist/subagent-hooks-CMoZaARG.js

@@ -0,0 +1,48 @@
+import { a as listBindingsForAccount, i as listAllBindings, n as getMatrixThreadBindingManager, o as removeBindingRecord, s as resolveBindingKey } from "./thread-bindings-shared-oNPiyMWY.js";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { getSessionBindingService } from "openclaw/plugin-sdk/conversation-binding-runtime";
+//#region extensions/matrix/src/matrix/subagent-hooks.ts
+async function handleMatrixSubagentEnded(event) {
+	const accountId = normalizeOptionalString(event.accountId) || void 0;
+	const matching = (accountId ? listBindingsForAccount(accountId) : listAllBindings()).filter((entry) => entry.targetSessionKey === event.targetSessionKey && entry.targetKind === "subagent");
+	const removedBindingKeys = /* @__PURE__ */ new Set();
+	if (event.sendFarewell) {
+		const bindingService = getSessionBindingService();
+		const reason = normalizeOptionalString(event.reason) || "subagent-ended";
+		for (const binding of matching) {
+			const bindingId = resolveBindingKey(binding);
+			if ((await bindingService.unbind({
+				bindingId,
+				reason
+			})).some((entry) => entry.bindingId === bindingId)) removedBindingKeys.add(bindingId);
+		}
+	}
+	const affectedAccountIds = /* @__PURE__ */ new Set();
+	for (const binding of matching) {
+		if (removedBindingKeys.has(resolveBindingKey(binding))) continue;
+		if (removeBindingRecord(binding)) affectedAccountIds.add(binding.accountId);
+	}
+	for (const acctId of affectedAccountIds) await getMatrixThreadBindingManager(acctId)?.persist();
+}
+function handleMatrixSubagentDeliveryTarget(event) {
+	if (!event.expectsCompletionMessage) return;
+	if (event.requesterOrigin?.channel?.trim().toLowerCase() !== "matrix") return;
+	const requesterAccountId = normalizeOptionalString(event.requesterOrigin?.accountId);
+	const requesterThreadId = event.requesterOrigin?.threadId != null && event.requesterOrigin.threadId !== "" ? String(event.requesterOrigin.threadId).trim() : "";
+	const bindings = (requesterAccountId ? listBindingsForAccount(requesterAccountId) : listAllBindings()).filter((entry) => entry.targetSessionKey === event.childSessionKey && entry.targetKind === "subagent");
+	if (bindings.length === 0) return;
+	let binding;
+	if (requesterThreadId) binding = bindings.find((entry) => entry.conversationId === requesterThreadId && (!requesterAccountId || entry.accountId === requesterAccountId));
+	if (!binding && bindings.length === 1) binding = bindings[0];
+	if (!binding) return;
+	const roomId = binding.parentConversationId ?? binding.conversationId;
+	const threadId = binding.parentConversationId && binding.parentConversationId !== binding.conversationId ? binding.conversationId : void 0;
+	return { origin: {
+		channel: "matrix",
+		accountId: binding.accountId,
+		to: `room:${roomId}`,
+		...threadId ? { threadId } : {}
+	} };
+}
+//#endregion
+export { handleMatrixSubagentDeliveryTarget, handleMatrixSubagentEnded };

package/dist/subagent-hooks-api.js

@@ -1,6 +1,6 @@
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/matrix/subagent-hooks-api.ts
-const loadMatrixSubagentHooksModule = createLazyRuntimeModule(() => import("./subagent-hooks-dkPAF6Et.js"));
+const loadMatrixSubagentHooksModule = createLazyRuntimeModule(() => import("./subagent-hooks-CMoZaARG.js"));
 function registerMatrixSubagentHooks(api) {
 	api.on("subagent_ended", async (event) => {
 		const { handleMatrixSubagentEnded } = await loadMatrixSubagentHooksModule();

package/dist/{target-ids-B-5aQxwn.js → target-ids-Nwx7cMVE.js}

@@ -52,6 +52,16 @@ function isMatrixQualifiedUserId(raw) {
 	const trimmed = raw.trim();
 	return trimmed.startsWith("@") && trimmed.includes(":");
 }
+/**
+* Whether `raw` is already a literal room ID rather than a name/query to resolve.
+* Room version 12 (MSC4291) dropped the trailing ":server" from room IDs — they're
+* now a hash of the create event — so this must not require a colon the way user
+* IDs and aliases still do.
+*/
+function isMatrixRoomId(raw) {
+	const trimmed = raw.trim();
+	return trimmed.startsWith("!") && trimmed.length > 1;
+}
 function normalizeMatrixResolvableTarget(raw) {
 	return stripKnownPrefixes(raw, [
 		MATRIX_PREFIX,
@@ -74,4 +84,4 @@ function resolveMatrixDirectUserId(params) {
 	return isMatrixQualifiedUserId(userId) ? userId : void 0;
 }
 //#endregion
-export { resolveMatrixTargetIdentity as a, resolveMatrixDirectUserId as i, normalizeMatrixMessagingTarget as n, normalizeMatrixResolvableTarget as r, isMatrixQualifiedUserId as t };
+export { resolveMatrixDirectUserId as a, normalizeMatrixResolvableTarget as i, isMatrixRoomId as n, resolveMatrixTargetIdentity as o, normalizeMatrixMessagingTarget as r, isMatrixQualifiedUserId as t };

package/dist/{thread-binding-api-DRbBZlhS.js → thread-binding-api-CzkeLZCU.js}

@@ -1,4 +1,4 @@
-import { a as resolveMatrixTargetIdentity } from "./target-ids-B-5aQxwn.js";
+import { o as resolveMatrixTargetIdentity } from "./target-ids-Nwx7cMVE.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/thread-binding-api.ts
 const defaultTopLevelPlacement = "child";

package/dist/thread-binding-api.js

@@ -1,2 +1,2 @@
-import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-DRbBZlhS.js";
+import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-CzkeLZCU.js";
 export { defaultTopLevelPlacement, resolveMatrixInboundConversation as resolveInboundConversation };