@openclaw/matrix 2026.9.8 → 2026.10.1-beta.2

package/dist/.setup/{client-Ccv77kwh.mjs → client-kmih04ng.mjs}

@@ -1,25 +1,26 @@
-import { i as __exportAll } from "./doctor-contract-De6geW0h.mjs";
+import { i as __exportAll } from "./doctor-contract-CsTNmbMa.mjs";
 import { n as getMatrixRuntimeLifecycle } from "./runtime-1kn1P6io.mjs";
-import { c as hasReadyMatrixEnvAuth, d as resolveScopedMatrixEnvConfig, f as resolveMatrixAccountStringValues, i as requiresExplicitMatrixDefaultAccount, l as resolveGlobalMatrixEnvConfig, s as resolveMatrixDefaultOrOnlyAccountId, u as resolveMatrixEnvAuthReadiness } from "./account-selection-B7axQ80R.mjs";
+import { c as hasReadyMatrixEnvAuth, d as resolveScopedMatrixEnvConfig, f as resolveMatrixAccountStringValues, i as requiresExplicitMatrixDefaultAccount, l as resolveGlobalMatrixEnvConfig, s as resolveMatrixDefaultOrOnlyAccountId, u as resolveMatrixEnvAuthReadiness } from "./account-selection-BDeeqwwR.mjs";
 import { t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.mjs";
 import { o as resolveMatrixBaseConfig, r as listNormalizedMatrixAccountIds, t as findMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
 import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.mjs";
 import { n as validateMatrixHomeserverUrl, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-CF6pG6eE.mjs";
-import { i as repairCurrentTokenStorageMetaDeviceId } from "./storage-BXS2cB2i.mjs";
+import { i as repairCurrentTokenStorageMetaDeviceId } from "./storage-D7agewjH.mjs";
 import { createLazyRuntimeMethod, createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-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";
+import { ssrfPolicyFromDangerouslyAllowPrivateNetwork } from "openclaw/plugin-sdk/ssrf-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-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/auth-request.ts
-const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-DmRVM0VA.mjs").then((n) => n.t), import("./logging-mhnFQGzB.mjs").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
+const loadMatrixAuthClientDeps = createLazyRuntimeModule(() => Promise.all([import("./sdk-CgQGkCsS.mjs").then((n) => n.t), import("./logging-BKV8TYQq.mjs").then((n) => n.n)]).then(([sdkModule, loggingModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	ensureMatrixSdkLoggingConfigured: loggingModule.ensureMatrixSdkLoggingConfigured
 })));
@@ -88,8 +89,8 @@ async function fetchMatrixWhoamiIdentity(params) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/client/config.ts
-const loadMatrixCredentialsReadDeps = createLazyRuntimeModule(() => import("./credentials-read-KD4o5biZ.mjs").then((n) => n.i));
-const loadMatrixCredentialsWriteRuntime = createLazyRuntimeModule(() => import("./credentials-C9qDO5-2.mjs"));
+const loadMatrixCredentialsReadDeps = createLazyRuntimeModule(() => import("./credentials-read-CqRiEAQa.mjs").then((n) => n.i));
+const loadMatrixCredentialsWriteRuntime = createLazyRuntimeModule(() => import("./credentials-C2dvc_kB.mjs"));
 const loadMatrixSecretInputDeps = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/secret-input-runtime"));
 function credentialsMatchBackfillAuthLineage(params) {
 	if (!params.stored) return true;
@@ -178,7 +179,7 @@ function buildResolvedMatrixAuth(resolved, auth) {
 }
 function hasScopedMatrixEnvConfig(accountId, env) {
 	const scoped = resolveScopedMatrixEnvConfig(accountId, env);
-	return Boolean(scoped.homeserver || scoped.userId || scoped.accessToken || scoped.password || scoped.deviceId || scoped.deviceName);
+	return Object.values(scoped).some(Boolean);
 }
 function readMatrixConfigStrings(params) {
 	return Object.fromEntries(MATRIX_CONFIG_STRING_FIELDS.map((field) => [field, readMatrixConfigString({
@@ -237,7 +238,7 @@ function resolveMatrixAccountConfigSnapshot(cfg, accountId, env) {
 		globalEnv
 	});
 	const accountInitialSyncLimit = resolveOptionalIntegerOption(account.initialSyncLimit, { min: 0 });
-	const allowPrivateNetwork = isPrivateNetworkOptInEnabled(account) || isPrivateNetworkOptInEnabled(matrix) ? true : void 0;
+	const allowPrivateNetwork = account.network?.dangerouslyAllowPrivateNetwork === true || matrix.network?.dangerouslyAllowPrivateNetwork === true ? true : void 0;
 	return {
 		resolved: {
 			homeserver: resolvedStrings.homeserver,
@@ -526,7 +527,7 @@ async function awaitMatrixStartupWithAbort(promise, abortSignal) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/client/shared.ts
-const loadMatrixCreateClientDeps = createLazyRuntimeModule(() => import("./create-client-DRZ580E3.mjs"));
+const loadMatrixCreateClientDeps = createLazyRuntimeModule(() => import("./create-client-CbJVyFDy.mjs"));
 const MATRIX_RETIREMENT_DRAIN_TIMEOUT_MS = 5e3;
 const sharedClientStates = /* @__PURE__ */ new Map();
 const sharedClientPromises = /* @__PURE__ */ new Map();
@@ -543,23 +544,11 @@ function buildSharedClientKey(auth) {
 }
 async function createSharedMatrixClient(params) {
 	const { createMatrixClient } = await loadMatrixCreateClientDeps();
-	const client = await createMatrixClient({
-		homeserver: params.auth.homeserver,
-		userId: params.auth.userId,
-		accessToken: params.auth.accessToken,
-		password: params.auth.password,
-		deviceId: params.auth.deviceId,
-		encryption: params.auth.encryption,
-		localTimeoutMs: params.timeoutMs,
-		initialSyncLimit: params.auth.initialSyncLimit,
-		accountId: params.auth.accountId,
-		allowPrivateNetwork: params.auth.allowPrivateNetwork,
-		ssrfPolicy: params.auth.ssrfPolicy,
-		dispatcherPolicy: params.auth.dispatcherPolicy
-	});
 	return {
-		auth: params.auth,
-		client,
+		client: await createMatrixClient({
+			...params.auth,
+			localTimeoutMs: params.timeoutMs
+		}),
 		key: buildSharedClientKey(params.auth),
 		started: false,
 		startPromise: null,
@@ -704,19 +693,11 @@ function forceReleaseLeases(state, releasePromise) {
 }
 async function waitForRetirementDrain(state, task, isPending, timeoutMessage) {
 	if (!isPending()) return;
-	let deadline;
-	try {
-		await Promise.race([task, new Promise((_, reject) => {
-			deadline = setTimeout(() => {
-				if (!isPending()) return;
-				state.phase = "late-drain";
-				reject(new Error(timeoutMessage));
-			}, MATRIX_RETIREMENT_DRAIN_TIMEOUT_MS);
-			deadline.unref?.();
-		})]);
-	} finally {
-		if (deadline) clearTimeout(deadline);
-	}
+	await raceWithTimeout(task, MATRIX_RETIREMENT_DRAIN_TIMEOUT_MS, () => {
+		if (!isPending()) return task;
+		state.phase = "late-drain";
+		throw new Error(timeoutMessage);
+	}, { ref: false });
 }
 function beginGenerationRetirement(params) {
 	const { state } = params;
@@ -910,7 +891,7 @@ var client_exports = /* @__PURE__ */ __exportAll({
 	stopSharedClientForAccount: () => stopSharedClientForAccount,
 	validateMatrixHomeserverUrl: () => validateMatrixHomeserverUrl
 });
-const loadMatrixClientRuntime = createLazyRuntimeModule(() => import("./create-client-DRZ580E3.mjs"));
+const loadMatrixClientRuntime = createLazyRuntimeModule(() => import("./create-client-CbJVyFDy.mjs"));
 const createMatrixClient = createLazyRuntimeMethod(loadMatrixClientRuntime, (runtime) => runtime.createMatrixClient);
 //#endregion
 export { isMatrixStartupAbortError as a, getMatrixMonitorTaskSignal as c, resolveMatrixAuthContext as d, createMatrixStartupAbortError as i, backfillMatrixAuthDeviceIdAfterStartup as l, acquireSharedMatrixClient as n, throwIfMatrixStartupAborted as o, awaitMatrixStartupWithAbort as r, createMatrixMonitorTaskRunner as s, client_exports as t, resolveMatrixAuth as u };

package/dist/.setup/{client-support-Bn9Bk0-H.mjs → client-support-D7BlioUb.mjs}

@@ -1,4 +1,5 @@
 import { t as formatMatrixErrorReason } from "./errors-DKVS3_DO.mjs";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 //#region extensions/matrix/src/matrix/sync-state.ts
 function isMatrixReadySyncState(state) {
 	return state === "PREPARED" || state === "SYNCING" || state === "CATCHUP";
@@ -43,29 +44,19 @@ async function resolveMatrixDiagnostic(promise, timeoutMs) {
 	return (await resolveMatrixDiagnosticResult(promise, timeoutMs)).value;
 }
 async function resolveMatrixDiagnosticResult(promise, timeoutMs) {
-	let timeoutId;
-	try {
-		const guarded = promise.then((value) => ({
-			error: null,
-			timedOut: false,
-			value
-		})).catch((error) => ({
-			error,
-			timedOut: false,
-			value: null
-		}));
-		const timeout = new Promise((resolve) => {
-			timeoutId = setTimeout(() => resolve({
-				error: null,
-				timedOut: true,
-				value: null
-			}), timeoutMs);
-			timeoutId.unref?.();
-		});
-		return await Promise.race([guarded, timeout]);
-	} finally {
-		if (timeoutId) clearTimeout(timeoutId);
-	}
+	return await raceWithTimeout(promise.then((value) => ({
+		error: null,
+		timedOut: false,
+		value
+	})).catch((error) => ({
+		error,
+		timedOut: false,
+		value: null
+	})), timeoutMs, () => ({
+		error: null,
+		timedOut: true,
+		value: null
+	}), { ref: false });
 }
 function isMatrixAccessTokenInvalidatedError(error) {
 	if (!error || typeof error !== "object") return false;

package/dist/.setup/{config-update-5m1Un5gJ.mjs → config-update-CZndPxNd.mjs}

@@ -1,4 +1,4 @@
-import { i as __exportAll } from "./doctor-contract-De6geW0h.mjs";
+import { i as __exportAll } from "./doctor-contract-CsTNmbMa.mjs";
 import { t as findMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
 import { n as resolveMatrixConfigPath, r as shouldStoreMatrixAccountAtTopLevel, t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.mjs";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
@@ -11,37 +11,19 @@ var config_update_exports = /* @__PURE__ */ __exportAll({
 	shouldStoreMatrixAccountAtTopLevel: () => shouldStoreMatrixAccountAtTopLevel,
 	updateMatrixAccountConfig: () => updateMatrixAccountConfig
 });
-function applyNullableStringField(target, key, value) {
+function applyNullableField(target, key, value, normalize = (entry) => entry) {
 	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;
+	const normalized = value === null ? void 0 : normalize(value);
+	if (normalized === void 0) delete target[key];
+	else target[key] = normalized;
 }
-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;
-	}
+function normalizeMatrixSecretInput(value, key, defaults) {
+	if (typeof value === "string") return normalizeSecretInputString(value) || void 0;
 	const ref = coerceSecretRef(value, defaults);
 	if (!ref) throw new Error(`Invalid Matrix ${key} SecretInput.`);
-	target[key] = ref;
+	return ref;
 }
 function cloneMatrixDmConfig(dm) {
-	if (!dm) return dm;
 	return {
 		...dm,
 		...dm.allowFrom ? { allowFrom: [...dm.allowFrom] } : {}
@@ -51,33 +33,21 @@ function cloneMatrixRoomMap(rooms) {
 	if (!rooms) return rooms;
 	return Object.fromEntries(Object.entries(rooms).map(([roomId, roomCfg]) => [roomId, roomCfg ? { ...roomCfg } : roomCfg]));
 }
-function applyNullableArrayField(target, key, value) {
-	if (value === void 0) return;
-	if (value === null) {
-		delete target[key];
-		return;
-	}
-	target[key] = [...value];
-}
-function applyNullableScalarField(target, key, value) {
-	if (value === null) delete target[key];
-	else if (value !== void 0) 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 : {}) };
-	applyNullableStringField(nextAccount, "name", patch.name);
+	const trimString = (value) => value.trim() || void 0;
+	applyNullableField(nextAccount, "name", patch.name, trimString);
 	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);
+	applyNullableField(nextAccount, "homeserver", patch.homeserver, trimString);
+	applyNullableField(nextAccount, "proxy", patch.proxy, trimString);
+	applyNullableField(nextAccount, "userId", patch.userId, trimString);
+	for (const key of ["accessToken", "password"]) applyNullableField(nextAccount, key, patch[key], (value) => normalizeMatrixSecretInput(value, key, cfg.secrets?.defaults));
+	applyNullableField(nextAccount, "deviceId", patch.deviceId, trimString);
+	applyNullableField(nextAccount, "deviceName", patch.deviceName, trimString);
+	applyNullableField(nextAccount, "avatarUrl", patch.avatarUrl, trimString);
 	if (patch.allowPrivateNetwork !== void 0) {
 		const nextNetwork = nextAccount.network && typeof nextAccount.network === "object" ? { ...nextAccount.network } : {};
 		if (patch.allowPrivateNetwork === null) delete nextNetwork.dangerouslyAllowPrivateNetwork;
@@ -85,31 +55,18 @@ function updateMatrixAccountConfig(cfg, accountId, patch) {
 		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;
-		}
-	}
-	applyNullableScalarField(nextAccount, "encryption", patch.encryption);
-	applyNullableScalarField(nextAccount, "allowBots", patch.allowBots);
-	applyNullableScalarField(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
-		});
-	}
-	applyNullableScalarField(nextAccount, "groupPolicy", patch.groupPolicy);
-	applyNullableArrayField(nextAccount, "groupAllowFrom", patch.groupAllowFrom);
-	for (const key of ["groups", "rooms"]) if (patch[key] !== void 0) {
-		if (patch[key] === null) delete nextAccount[key];
-		else nextAccount[key] = cloneMatrixRoomMap(patch[key]);
-	}
+	applyNullableField(nextAccount, "initialSyncLimit", patch.initialSyncLimit, (value) => resolveOptionalIntegerOption(value, { min: 0 }));
+	applyNullableField(nextAccount, "encryption", patch.encryption);
+	applyNullableField(nextAccount, "allowBots", patch.allowBots);
+	applyNullableField(nextAccount, "autoJoin", patch.autoJoin);
+	applyNullableField(nextAccount, "autoJoinAllowlist", patch.autoJoinAllowlist, (value) => [...value]);
+	applyNullableField(nextAccount, "dm", patch.dm, (value) => cloneMatrixDmConfig({
+		...nextAccount.dm,
+		...value
+	}));
+	applyNullableField(nextAccount, "groupPolicy", patch.groupPolicy);
+	applyNullableField(nextAccount, "groupAllowFrom", patch.groupAllowFrom, (value) => [...value]);
+	for (const key of ["groups", "rooms"]) applyNullableField(nextAccount, key, patch[key], cloneMatrixRoomMap);
 	const nextAccounts = Object.fromEntries(Object.entries(matrix.accounts ?? {}).filter(([rawAccountId]) => rawAccountId === normalizedAccountId || normalizeAccountId(rawAccountId) !== normalizedAccountId));
 	if (shouldStoreMatrixAccountAtTopLevel(cfg, normalizedAccountId)) {
 		const { accounts: _ignoredAccounts, defaultAccount } = matrix;

package/dist/.setup/{create-client-DRZ580E3.mjs → create-client-CbJVyFDy.mjs}

@@ -1,16 +1,16 @@
 import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-CF6pG6eE.mjs";
-import { n as maybeMigrateLegacyStorage, o as resolveMatrixStoragePaths, s as writeStorageMeta } from "./storage-BXS2cB2i.mjs";
-import "./client-Ccv77kwh.mjs";
+import { n as maybeMigrateLegacyStorage, o as resolveMatrixStoragePaths, s as writeStorageMeta } from "./storage-D7agewjH.mjs";
+import "./client-kmih04ng.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ssrfPolicyFromDangerouslyAllowPrivateNetwork } from "openclaw/plugin-sdk/ssrf-runtime";
 import fs from "node:fs";
 //#region extensions/matrix/src/matrix/client/create-client.ts
 const loadMatrixCreateClientRuntimeDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./sdk-DmRVM0VA.mjs").then((n) => n.t),
-	import("./logging-mhnFQGzB.mjs").then((n) => n.n),
-	import("./file-sync-store-B-9bMb_O.mjs")
+	import("./sdk-CgQGkCsS.mjs").then((n) => n.t),
+	import("./logging-BKV8TYQq.mjs").then((n) => n.n),
+	import("./file-sync-store-Clc9iEdn.mjs")
 ]).then(([sdkModule, loggingModule, syncStoreModule]) => ({
 	MatrixClient: sdkModule.MatrixClient,
 	SqliteBackedMatrixSyncStore: syncStoreModule.SqliteBackedMatrixSyncStore,

package/dist/.setup/{credentials-C9qDO5-2.mjs → credentials-C2dvc_kB.mjs}

@@ -1,6 +1,6 @@
 import { i as normalizeMatrixStoredCredentials, n as isMatrixCredentialRevocation, r as matrixCredentialsStoreKey } from "./credentials-state-B3cuUFwZ.mjs";
 import { i as resolveMatrixCredentialsDir, o as resolveMatrixCredentialsPath } from "./storage-paths-B51JM-pC.mjs";
-import { a as loadMatrixCredentials, c as openMatrixCredentialsStore, n as clearMatrixCredentials, r as credentialsMatchConfig, s as openMatrixCredentialsAsyncStore } from "./credentials-read-KD4o5biZ.mjs";
+import { a as loadMatrixCredentials, c as openMatrixCredentialsStore, n as clearMatrixCredentials, r as credentialsMatchConfig, s as openMatrixCredentialsAsyncStore } from "./credentials-read-CqRiEAQa.mjs";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/credentials.ts
 async function saveMatrixCredentials(credentials, env = process.env, accountId) {

package/dist/.setup/{credentials-read-KD4o5biZ.mjs → credentials-read-CqRiEAQa.mjs}

@@ -1,4 +1,4 @@
-import { i as __exportAll } from "./doctor-contract-De6geW0h.mjs";
+import { i as __exportAll } from "./doctor-contract-CsTNmbMa.mjs";
 import { r as getOptionalMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { i as normalizeMatrixStoredCredentials, r as matrixCredentialsStoreKey, t as MATRIX_CREDENTIALS_NAMESPACE } from "./credentials-state-B3cuUFwZ.mjs";
 import { i as resolveMatrixCredentialsDir, o as resolveMatrixCredentialsPath } from "./storage-paths-B51JM-pC.mjs";