@openclaw/matrix 2026.7.2-beta.7 → 2026.7.34

package/dist/{setup-surface-BBq3WeqX.js → .setup/setup-surface-05_G-MnT.mjs}

@@ -1,12 +1,12 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.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 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";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-BOQeTqax.mjs";
+import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.mjs";
+import { n as resolveMatrixEnvAuthReadiness } from "./env-auth-CYJL1jNl.mjs";
+import { g as resolveMatrixAccount, h as resolveDefaultMatrixAccountId, i as moveSingleMatrixAccountConfigToNamedAccount, l as updateMatrixAccountConfig, p as listMatrixAccountIds, r as resolveMatrixSetupDmAllowFrom } from "./setup-core-bhdcEo7v.mjs";
+import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.mjs";
+import { n as validateMatrixHomeserverUrl, r as isPrivateOrLoopbackHost, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.mjs";
+import { n as ensureMatrixSdkInstalled, r as isMatrixSdkAvailable } from "./deps-Dy6yreL4.mjs";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { formatDocsLink, hasConfiguredSecretInput, mergeAllowFromEntries, normalizeAccountId as normalizeAccountId$1, promptAccountId, promptChannelAccessConfig, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 import { isPrivateNetworkOptInEnabled } from "openclaw/plugin-sdk/ssrf-policy";
@@ -32,9 +32,25 @@ function isMatrixInviteAutoJoinPolicy(value) {
 function isMatrixInviteAutoJoinTarget(entry) {
 	return entry === "*" || entry.startsWith("!") && entry.includes(":") || entry.startsWith("#") && entry.includes(":");
 }
+function normalizeMatrixInviteAutoJoinTargets(entries) {
+	return [...new Set(entries.map((entry) => normalizeOptionalString(entry)).filter((entry) => Boolean(entry)))];
+}
 function resolveMatrixOnboardingAccountId(cfg, accountId) {
 	return normalizeAccountId$1(normalizeOptionalString(accountId) || resolveDefaultMatrixAccountId(cfg) || DEFAULT_ACCOUNT_ID);
 }
+function setMatrixDmPolicy(cfg, policy, accountId) {
+	const resolvedAccountId = resolveMatrixOnboardingAccountId(cfg, accountId);
+	const existing = resolveMatrixAccountConfig({
+		cfg,
+		accountId: resolvedAccountId
+	});
+	const allowFrom = resolveMatrixSetupDmAllowFrom(policy, existing.dm?.allowFrom);
+	return updateMatrixAccountConfig(cfg, resolvedAccountId, { dm: {
+		...existing.dm,
+		policy,
+		allowFrom
+	} });
+}
 async function noteMatrixAuthHelp(prompter) {
 	await prompter.note([
 		"Matrix requires a homeserver URL.",
@@ -67,12 +83,13 @@ async function promptMatrixAllowFrom(params) {
 	}).configured;
 	const isFullUserId = (value) => value.startsWith("@") && value.includes(":");
 	while (true) {
-		const parts = splitSetupEntries(await prompter.text({
+		const entry = await prompter.text({
 			message: "Matrix allowFrom (full @user:server; display name only if unique)",
 			placeholder: "@user:server",
 			initialValue: existingAllowFrom[0] ? String(existingAllowFrom[0]) : void 0,
 			validate: (value) => normalizeOptionalString(value) ? void 0 : "Required"
-		}));
+		});
+		const parts = splitSetupEntries(entry);
 		const resolvedIds = [];
 		const pending = [];
 		const unresolved = [];
@@ -89,7 +106,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-Bq80X9Sn.mjs").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -120,6 +137,16 @@ async function promptMatrixAllowFrom(params) {
 		} });
 	}
 }
+function setMatrixGroupPolicy(cfg, groupPolicy, accountId) {
+	return updateMatrixAccountConfig(cfg, resolveMatrixOnboardingAccountId(cfg, accountId), { groupPolicy });
+}
+function setMatrixGroupRooms(cfg, roomKeys, accountId) {
+	const groups = Object.fromEntries(roomKeys.map((key) => [key, { enabled: true }]));
+	return updateMatrixAccountConfig(cfg, resolveMatrixOnboardingAccountId(cfg, accountId), {
+		groups,
+		rooms: null
+	});
+}
 function setMatrixAutoJoin(cfg, autoJoin, autoJoinAllowlist, accountId) {
 	return updateMatrixAccountConfig(cfg, resolveMatrixOnboardingAccountId(cfg, accountId), {
 		autoJoin,
@@ -157,14 +184,15 @@ async function configureMatrixInviteAutoJoin(params) {
 	}
 	if (policy === "always") return setMatrixAutoJoin(params.cfg, policy, [], accountId);
 	while (true) {
-		const allowlist = normalizeUniqueStringEntries(splitSetupEntries(await params.prompter.text({
+		const rawAllowlist = await params.prompter.text({
 			message: "Matrix invite auto-join allowlist (comma-separated)",
 			placeholder: "!roomId:server, #alias:server, *",
 			initialValue: currentAllowlist[0] ? currentAllowlist.join(", ") : void 0,
 			validate: (value) => {
 				return splitSetupEntries(value).length > 0 ? void 0 : "Required";
 			}
-		})));
+		});
+		const allowlist = normalizeMatrixInviteAutoJoinTargets(splitSetupEntries(rawAllowlist));
 		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");
@@ -193,41 +221,40 @@ async function configureMatrixAccessPrompts(params) {
 		placeholder: "!roomId:server, #alias:server, Project Room",
 		updatePrompt: Boolean(existingGroups)
 	});
-	if (accessConfig) if (accessConfig.policy !== "allowlist") next = updateMatrixAccountConfig(next, params.accountId, { groupPolicy: accessConfig.policy });
-	else {
-		let roomKeys = accessConfig.entries;
-		if (accessConfig.entries.length > 0) try {
-			const resolvedIds = [];
-			const unresolved = [];
-			for (const entry of accessConfig.entries) {
-				const trimmed = normalizeOptionalString(entry) ?? "";
-				if (!trimmed) continue;
-				const cleaned = trimmed.replace(/^(room|channel):/i, "").trim();
-				if (cleaned.startsWith("!") && cleaned.includes(":")) {
-					resolvedIds.push(cleaned);
-					continue;
+	if (accessConfig) {
+		if (accessConfig.policy !== "allowlist") next = setMatrixGroupPolicy(next, accessConfig.policy, params.accountId);
+		else {
+			let roomKeys = accessConfig.entries;
+			if (accessConfig.entries.length > 0) try {
+				const resolvedIds = [];
+				const unresolved = [];
+				for (const entry of accessConfig.entries) {
+					const trimmed = normalizeOptionalString(entry) ?? "";
+					if (!trimmed) continue;
+					const cleaned = trimmed.replace(/^(room|channel):/i, "").trim();
+					if (cleaned.startsWith("!") && cleaned.includes(":")) {
+						resolvedIds.push(cleaned);
+						continue;
+					}
+					const { listMatrixDirectoryGroupsLive } = await import("./directory-live-BTEYxMwy.mjs").then((n) => n.t);
+					const matches = await listMatrixDirectoryGroupsLive({
+						cfg: next,
+						accountId: params.accountId,
+						query: trimmed,
+						limit: 10
+					});
+					const best = matches.find((match) => normalizeLowercaseStringOrEmpty(match.name) === normalizeLowercaseStringOrEmpty(trimmed)) ?? matches[0];
+					if (best?.id) resolvedIds.push(best.id);
+					else unresolved.push(entry);
 				}
-				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-C8dVBiCc.js").then((n) => n.t);
-				const matches = await listMatrixDirectoryGroupsLive({
-					cfg: next,
-					accountId: params.accountId,
-					query: trimmed,
-					limit: 10
-				});
-				const best = matches.find((match) => normalizeLowercaseStringOrEmpty(match.name) === normalizeLowercaseStringOrEmpty(trimmed)) ?? matches[0];
-				if (best?.id) resolvedIds.push(best.id);
-				else unresolved.push(entry);
+				roomKeys = [...resolvedIds, ...unresolved.map((entry) => normalizeOptionalString(entry)).filter((entry) => Boolean(entry))];
+				if (resolvedIds.length > 0 || unresolved.length > 0) await params.prompter.note([resolvedIds.length > 0 ? `Resolved: ${resolvedIds.join(", ")}` : void 0, unresolved.length > 0 ? `Unresolved (kept as typed): ${unresolved.join(", ")}` : void 0].filter(Boolean).join("\n"), "Matrix rooms");
+			} catch (err) {
+				await params.prompter.note(`Room lookup failed; keeping entries as typed. ${String(err)}`, "Matrix rooms");
 			}
-			roomKeys = [...resolvedIds, ...unresolved.map((entry) => normalizeOptionalString(entry)).filter((entry) => Boolean(entry))];
-			if (resolvedIds.length > 0 || unresolved.length > 0) await params.prompter.note([resolvedIds.length > 0 ? `Resolved: ${resolvedIds.join(", ")}` : void 0, unresolved.length > 0 ? `Unresolved (kept as typed): ${unresolved.join(", ")}` : void 0].filter(Boolean).join("\n"), "Matrix rooms");
-		} catch (err) {
-			await params.prompter.note(`Room lookup failed; keeping entries as typed. ${String(err)}`, "Matrix rooms");
+			next = setMatrixGroupPolicy(next, "allowlist", params.accountId);
+			next = setMatrixGroupRooms(next, roomKeys, params.accountId);
 		}
-		next = updateMatrixAccountConfig(next, params.accountId, {
-			groupPolicy: "allowlist",
-			groups: Object.fromEntries(roomKeys.map((key) => [key, { enabled: true }])),
-			rooms: null
-		});
 	}
 	return await configureMatrixInviteAutoJoin({
 		cfg: next,
@@ -235,7 +262,25 @@ async function configureMatrixAccessPrompts(params) {
 		accountId: params.accountId
 	});
 }
-const dmPolicy = createMatrixSetupDmPolicy(promptMatrixAllowFrom);
+const dmPolicy = {
+	label: "Matrix",
+	channel,
+	policyKey: "channels.matrix.dm.policy",
+	allowFromKey: "channels.matrix.dm.allowFrom",
+	resolveConfigKeys: (cfg, accountId) => {
+		const effectiveAccountId = resolveMatrixOnboardingAccountId(cfg, accountId);
+		return {
+			policyKey: resolveMatrixConfigFieldPath(cfg, effectiveAccountId, "dm.policy"),
+			allowFromKey: resolveMatrixConfigFieldPath(cfg, effectiveAccountId, "dm.allowFrom")
+		};
+	},
+	getCurrent: (cfg, accountId) => resolveMatrixAccountConfig({
+		cfg,
+		accountId: resolveMatrixOnboardingAccountId(cfg, accountId)
+	}).dm?.policy ?? "pairing",
+	setPolicy: (cfg, policy, accountId) => setMatrixDmPolicy(cfg, policy, accountId),
+	promptAllowFrom: promptMatrixAllowFrom
+};
 async function runMatrixConfigure(params) {
 	let next = params.cfg;
 	await ensureMatrixSdkInstalled({
@@ -334,40 +379,40 @@ async function runMatrixConfigure(params) {
 			userId = "";
 		}
 	}
-	if (!hasConfiguredSecretInput(accessToken) && !hasConfiguredSecretInput(password)) if (await params.prompter.select({
-		message: "Matrix auth method",
-		options: [{
-			value: "token",
-			label: "Access token (user ID fetched automatically)"
-		}, {
-			value: "password",
-			label: "Password (requires user ID)"
-		}]
-	}) === "token") {
-		accessToken = normalizeStringifiedOptionalString(await params.prompter.text({
-			message: "Matrix access token",
-			sensitive: true,
-			validate: (value) => normalizeOptionalString(value) ? void 0 : "Required"
-		})) ?? "";
-		password = void 0;
-		userId = "";
-	} else {
-		userId = normalizeStringifiedOptionalString(await params.prompter.text({
-			message: "Matrix user ID",
-			initialValue: existing.userId ?? envUserId,
-			validate: (value) => {
-				const raw = normalizeOptionalString(value) ?? "";
-				if (!raw) return "Required";
-				if (!raw.startsWith("@")) return "Matrix user IDs should start with @";
-				if (!raw.includes(":")) return "Matrix user IDs should include a server (:server)";
-			}
-		})) ?? "";
-		password = normalizeStringifiedOptionalString(await params.prompter.text({
-			message: "Matrix password",
-			sensitive: true,
-			validate: (value) => normalizeOptionalString(value) ? void 0 : "Required"
-		})) ?? "";
-		accessToken = void 0;
+	if (!hasConfiguredSecretInput(accessToken) && !hasConfiguredSecretInput(password)) {
+		if (await params.prompter.select({
+			message: "Matrix auth method",
+			options: [{
+				value: "token",
+				label: "Access token (user ID fetched automatically)"
+			}, {
+				value: "password",
+				label: "Password (requires user ID)"
+			}]
+		}) === "token") {
+			accessToken = normalizeStringifiedOptionalString(await params.prompter.text({
+				message: "Matrix access token",
+				validate: (value) => normalizeOptionalString(value) ? void 0 : "Required"
+			})) ?? "";
+			password = void 0;
+			userId = "";
+		} else {
+			userId = normalizeStringifiedOptionalString(await params.prompter.text({
+				message: "Matrix user ID",
+				initialValue: existing.userId ?? envUserId,
+				validate: (value) => {
+					const raw = normalizeOptionalString(value) ?? "";
+					if (!raw) return "Required";
+					if (!raw.startsWith("@")) return "Matrix user IDs should start with @";
+					if (!raw.includes(":")) return "Matrix user IDs should include a server (:server)";
+				}
+			})) ?? "";
+			password = normalizeStringifiedOptionalString(await params.prompter.text({
+				message: "Matrix password",
+				validate: (value) => normalizeOptionalString(value) ? void 0 : "Required"
+			})) ?? "";
+			accessToken = void 0;
+		}
 	}
 	const deviceName = normalizeStringifiedOptionalString(await params.prompter.text({
 		message: "Matrix device name (optional)",
@@ -420,18 +465,26 @@ const matrixOnboardingAdapter = {
 			selectionHint: !sdkReady ? "install Matrix deps" : configured ? "configured" : "needs auth"
 		};
 	},
-	configure: async (params) => await runMatrixConfigure({
-		...params,
-		cfg: params.cfg,
+	configure: async ({ cfg, runtime, prompter, forceAllowFrom, accountOverrides, shouldPromptAccountIds }) => await runMatrixConfigure({
+		cfg,
+		runtime,
+		prompter,
+		forceAllowFrom,
+		accountOverrides,
+		shouldPromptAccountIds,
 		intent: "update"
 	}),
-	configureInteractive: async (params) => {
-		if (!params.configured) return await runMatrixConfigure({
-			...params,
-			cfg: params.cfg,
+	configureInteractive: async ({ cfg, runtime, prompter, forceAllowFrom, accountOverrides, shouldPromptAccountIds, configured }) => {
+		if (!configured) return await runMatrixConfigure({
+			cfg,
+			runtime,
+			prompter,
+			forceAllowFrom,
+			accountOverrides,
+			shouldPromptAccountIds,
 			intent: "update"
 		});
-		const action = await params.prompter.select({
+		const action = await prompter.select({
 			message: "Matrix already configured. What do you want to do?",
 			options: [
 				{
@@ -451,13 +504,17 @@ const matrixOnboardingAdapter = {
 		});
 		if (action === "skip") return "skip";
 		return await runMatrixConfigure({
-			...params,
-			cfg: params.cfg,
+			cfg,
+			runtime,
+			prompter,
+			forceAllowFrom,
+			accountOverrides,
+			shouldPromptAccountIds,
 			intent: action === "add-account" ? "add-account" : "update"
 		});
 	},
 	afterConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-Deleiibz.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-DUXBC8X2.mjs");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,

package/dist/{startup-verification-wm3_i88s.js → .setup/startup-verification-BTwIGu1J.mjs}

@@ -1,11 +1,12 @@
-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 { createHash } from "node:crypto";
+import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.mjs";
+import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.mjs";
+import { O as resolveMatrixSqliteStateEnv } from "./crypto-state-store-B43k3z3W.mjs";
+import { l as resolveMatrixStoragePaths, o as recordCurrentStorageMetaDeviceId } from "./storage-NGZq5zet.mjs";
 import path from "node:path";
+import { createHash } from "node:crypto";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
-import fs from "node:fs/promises";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
+import fs from "node:fs/promises";
 //#region extensions/matrix/src/matrix/monitor/startup-verification.ts
 const STARTUP_VERIFICATION_STATE_FILENAME = "startup-verification.json";
 const STARTUP_VERIFICATION_NAMESPACE = "startup-verification";
@@ -13,7 +14,7 @@ const STARTUP_VERIFICATION_MIGRATIONS_NAMESPACE = "startup-verification-migratio
 const STARTUP_VERIFICATION_MAX_ENTRIES = 1e3;
 const DEFAULT_STARTUP_VERIFICATION_MODE = "if-unverified";
 const DEFAULT_STARTUP_VERIFICATION_COOLDOWN_HOURS = 24;
-const DEFAULT_STARTUP_VERIFICATION_FAILURE_COOLDOWN_MS = 3600 * 1e3;
+const DEFAULT_STARTUP_VERIFICATION_FAILURE_COOLDOWN_MS = 36e5;
 function normalizeCooldownHours(value) {
 	if (typeof value !== "number" || !Number.isFinite(value)) return DEFAULT_STARTUP_VERIFICATION_COOLDOWN_HOURS;
 	return Math.max(0, value);