@openclaw/matrix 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{storage-D7agewjH.mjs → storage-DkC6bHgA.mjs}

@@ -1,10 +1,11 @@
 import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { n as isMatrixActiveTokenRootDirectory, r as resolveMatrixAccountStorageRoot } from "./storage-paths-B51JM-pC.mjs";
-import { c as chunkMatrixStateJson, i as assertMatrixSupportedStateRoot, l as readMatrixStateChunks, o as resolveMatrixSqliteStateEnv, r as assertMatrixSupportedStateFile, u as writeMatrixStateChunks } from "./retired-state-BXUQ2I-C.mjs";
+import { c as updateMatrixKeyedState, d as writeMatrixStateChunks, i as assertMatrixSupportedStateRoot, l as chunkMatrixStateJson, o as resolveMatrixSqliteStateEnv, r as assertMatrixSupportedStateFile, u as readMatrixStateChunks } from "./retired-state-DW5pLH05.mjs";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";
+import { asSafeIntegerInRange } from "openclaw/plugin-sdk/number-runtime";
 import fs from "node:fs";
 import os from "node:os";
 //#region extensions/matrix/src/matrix/crypto-state-store.ts
@@ -45,37 +46,20 @@ async function readMatrixRecoveryKeyStateForPathAsync(recoveryKeyPath, stateRunt
 async function writeMatrixRecoveryKeyStateForPathAsync(params) {
 	const payload = normalizeMatrixStoredRecoveryKey(params.payload);
 	if (!payload) throw new Error("Invalid Matrix recovery key state");
+	const store = params.stateRuntime.openKeyedStore(openMatrixRecoveryKeyStoreOptions(path.dirname(params.recoveryKeyPath)));
+	const key = resolveRecoveryKeyStateKeyForPath(params.recoveryKeyPath);
 	if (params.preserveEncodedPrivateKey) {
-		await updateMatrixRecoveryKeyState(params, (current) => normalizeMatrixStoredRecoveryKey({
+		const update = (current) => normalizeMatrixStoredRecoveryKey({
 			...payload,
 			encodedPrivateKey: normalizeMatrixStoredRecoveryKey(current)?.encodedPrivateKey
-		}) ?? void 0);
-		return;
-	}
-	await params.stateRuntime.openKeyedStore(openMatrixRecoveryKeyStoreOptions(path.dirname(params.recoveryKeyPath))).register(resolveRecoveryKeyStateKeyForPath(params.recoveryKeyPath), payload);
-}
-async function updateMatrixRecoveryKeyState(params, update) {
-	const store = params.stateRuntime.openKeyedStore(openMatrixRecoveryKeyStoreOptions(path.dirname(params.recoveryKeyPath)));
-	const key = resolveRecoveryKeyStateKeyForPath(params.recoveryKeyPath);
-	if (!store.observe || !store.compareAndApply) {
-		if (!store.update) throw new Error("Matrix recovery key store does not support atomic updates");
-		await store.update(key, update);
-		return;
-	}
-	let observation = await store.observe(key);
-	for (;;) {
-		const value = update(observation.value);
-		const result = await store.compareAndApply(key, observation.comparison, value === void 0 ? {
-			operation: "update",
-			action: "keep"
-		} : {
-			operation: "update",
-			action: "set",
-			value
+		}) ?? void 0;
+		await updateMatrixKeyedState(store, key, update, async () => {
+			if (!store.update) throw new Error("Matrix recovery key store does not support atomic updates");
+			return await store.update(key, update);
 		});
-		if (result.status !== "conflict") return;
-		observation = result.current;
+		return;
 	}
+	await store.register(key, payload);
 }
 async function readMatrixIdbSnapshotJson(storageRootDir, stateRuntime = getMatrixRuntime().state) {
 	const store = stateRuntime.openKeyedStore(openMatrixIdbSnapshotStoreOptions(storageRootDir));
@@ -143,7 +127,6 @@ function buildIdbSnapshotRows(snapshotJson, databaseCount) {
 	}));
 	return {
 		chunks,
-		nextChunkKeys: new Set(chunks.map((chunk) => chunk.key)),
 		meta: {
 			key: idbMetaKey(),
 			value: {
@@ -171,7 +154,10 @@ function digestText(value) {
 	return createHash("sha256").update(value, "utf8").digest("hex");
 }
 function isIdbSnapshotMeta(value) {
-	return isRecord(value) && value.kind === "meta" && value.version === 1 && typeof value.generation === "string" && value.generation.trim() !== "" && typeof value.chunkCount === "number" && Number.isSafeInteger(value.chunkCount) && value.chunkCount >= 0 && value.chunkCount <= IDB_SNAPSHOT_MAX_CHUNKS && typeof value.digest === "string" && typeof value.databaseCount === "number" && Number.isSafeInteger(value.databaseCount) && value.databaseCount >= 0 && typeof value.persistedAt === "string";
+	return isRecord(value) && value.kind === "meta" && value.version === 1 && typeof value.generation === "string" && value.generation.trim() !== "" && asSafeIntegerInRange(value.chunkCount, {
+		min: 0,
+		max: IDB_SNAPSHOT_MAX_CHUNKS
+	}) !== void 0 && typeof value.digest === "string" && asSafeIntegerInRange(value.databaseCount, { min: 0 }) !== void 0 && typeof value.persistedAt === "string";
 }
 //#endregion
 //#region extensions/matrix/src/matrix/client/storage-metadata.ts
@@ -266,7 +252,7 @@ async function resolvePreferredMatrixStorageRoot(params) {
 			tokenHash: best.tokenHash
 		};
 	}
-	const compatiblePopulatedSiblings = [];
+	const populatedSiblingTokenHashes = [];
 	const populatedTokenHashes = bestCurrentScore > 0 ? [params.canonicalTokenHash] : [];
 	for (const entry of siblingEntries.toSorted((a, b) => a.name.localeCompare(b.name))) {
 		if (!entry.isDirectory()) continue;
@@ -284,20 +270,21 @@ async function resolvePreferredMatrixStorageRoot(params) {
 		const candidateScore = await scoreStorageRoot(candidateRootDir, metadata);
 		if (candidateScore <= 0) continue;
 		populatedTokenHashes.push(entry.name);
-		compatiblePopulatedSiblings.push({
+		populatedSiblingTokenHashes.push(entry.name);
+		const candidate = {
 			rootDir: candidateRootDir,
 			tokenHash: entry.name,
 			score: candidateScore,
 			mtimeMs: resolveStorageRootMtimeMs(candidateRootDir)
-		});
+		};
+		if (candidate.score > best.score || best.rootDir !== params.canonicalRootDir && candidate.score === best.score && candidate.mtimeMs > best.mtimeMs) best = candidate;
 	}
-	for (const candidate of compatiblePopulatedSiblings) if (candidate.score > best.score || best.rootDir !== params.canonicalRootDir && candidate.score === best.score && candidate.mtimeMs > best.mtimeMs) best = candidate;
 	if (populatedTokenHashes.length > 1) getMatrixRuntime().logging.getChildLogger({ module: "matrix-storage" }).warn("matrix: multiple populated token-hash storage roots detected", {
 		parentDir,
 		canonicalTokenHash: params.canonicalTokenHash,
 		selectedTokenHash: best.tokenHash,
 		populatedTokenHashes,
-		populatedSiblingTokenHashes: compatiblePopulatedSiblings.map((root) => root.tokenHash),
+		populatedSiblingTokenHashes,
 		populatedRootCount: populatedTokenHashes.length
 	});
 	return {
@@ -349,7 +336,7 @@ async function maybeMigrateLegacyStorage({ storagePaths }) {
 	const { rootDir, storagePath } = storagePaths;
 	await assertMatrixSupportedStateRoot(rootDir);
 	if (!fs.existsSync(storagePath)) return;
-	const syncCache = await import("./sync-cache-state-C2z64uyk.mjs").then((n) => n.o);
+	const syncCache = await import("./sync-cache-state-D4G-fi3t.mjs").then((n) => n.o);
 	if (!await syncCache.readLegacyMatrixSyncCacheState(rootDir)) return;
 	const logger = getMatrixRuntime().logging.getChildLogger({ module: "matrix-storage" });
 	fs.mkdirSync(rootDir, { recursive: true });
@@ -395,25 +382,13 @@ async function mutateStorageMeta(rootDir, mutation) {
 	try {
 		const store = openStorageMetaStore(rootDir);
 		const decode = (value) => normalizeMatrixStorageMetadata(value) ?? {};
-		if (!store.observe || !store.compareAndApply) {
+		return await updateMatrixKeyedState(store, STORAGE_META_STATE_KEY, (current) => prepareStorageMetaMutation(decode(current), mutation) ?? void 0, () => {
 			const legacyStore = getMatrixRuntime().state.openSyncKeyedStore(openMatrixStorageMetaStoreOptions(rootDir));
 			const next = prepareStorageMetaMutation(decode(legacyStore.lookup(STORAGE_META_STATE_KEY)), mutation);
 			if (!next) return false;
 			legacyStore.register(STORAGE_META_STATE_KEY, next);
 			return true;
-		}
-		let observation = await store.observe(STORAGE_META_STATE_KEY);
-		for (;;) {
-			const next = prepareStorageMetaMutation(decode(observation.value), mutation);
-			if (!next) return false;
-			const result = await store.compareAndApply(STORAGE_META_STATE_KEY, observation.comparison, {
-				operation: "update",
-				action: "set",
-				value: next
-			});
-			if (result.status !== "conflict") return true;
-			observation = result.current;
-		}
+		}, "skip");
 	} catch {
 		return false;
 	}

package/dist/.setup/{subagent-hooks-D5kd_kzN.mjs → subagent-hooks-D8jyeQsO.mjs}

@@ -1,4 +1,4 @@
-import { a as listBindingsForAccount, i as listAllBindings, n as getMatrixThreadBindingManager, o as removeBindingRecord, s as resolveBindingKey } from "./thread-bindings-shared-hxKkYC1W.mjs";
+import { a as listBindingsForAccount, i as listAllBindings, n as getMatrixThreadBindingManager, o as removeBindingRecord, s as resolveBindingKey } from "./thread-bindings-shared-CbsFNbAY.mjs";
 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

package/dist/.setup/{sync-cache-state-C2z64uyk.mjs → sync-cache-state-D4G-fi3t.mjs}

@@ -1,8 +1,9 @@
 import { i as __exportAll } from "./doctor-contract-CsTNmbMa.mjs";
-import { c as chunkMatrixStateJson, l as readMatrixStateChunks, o as resolveMatrixSqliteStateEnv, u as writeMatrixStateChunks } from "./retired-state-BXUQ2I-C.mjs";
+import { d as writeMatrixStateChunks, l as chunkMatrixStateJson, o as resolveMatrixSqliteStateEnv, u as readMatrixStateChunks } from "./retired-state-DW5pLH05.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";
+import { asSafeIntegerInRange } from "openclaw/plugin-sdk/number-runtime";
 import fs from "node:fs/promises";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 //#region extensions/matrix/src/matrix/client/sync-cache-state.ts
@@ -18,7 +19,8 @@ var sync_cache_state_exports = /* @__PURE__ */ __exportAll({
 const SYNC_CACHE_NAMESPACE = "sync-cache";
 const SYNC_CACHE_MAX_ENTRIES = 2e4;
 const SYNC_CACHE_MAX_CHUNKS = Math.floor(19999 / 2);
-const SYNC_CACHE_STATE_KEY = "current";
+const SYNC_CACHE_META_KEY = "current:meta";
+const SYNC_CACHE_CHUNK_PREFIX = "current:sync:";
 const SYNC_CACHE_CHUNK_BYTES = 24e3;
 const syncCacheOperations = new KeyedAsyncQueue();
 function normalizeRoomsData(value) {
@@ -41,15 +43,6 @@ function toPersistedSyncData(value) {
 			roomsData
 		};
 	}
-	if (typeof value.next_batch === "string" && value.next_batch.trim()) {
-		const roomsData = normalizeRoomsData(value.rooms);
-		if (!roomsData) return null;
-		return {
-			nextBatch: value.next_batch,
-			accountData: isRecord(value.account_data) && Array.isArray(value.account_data.events) ? value.account_data.events : [],
-			roomsData
-		};
-	}
 	return null;
 }
 function normalizePersistedStore(value) {
@@ -75,15 +68,14 @@ async function readPersistedStoreFromStore(params) {
 	return syncCacheOperations.enqueue(path.resolve(storageRootDir), () => readPersistedStore(store));
 }
 async function readPersistedStore(store) {
-	const stateKey = SYNC_CACHE_STATE_KEY;
-	const meta = await store.lookup(metaKey(stateKey));
+	const meta = await store.lookup(SYNC_CACHE_META_KEY);
 	if (!isSyncCacheMeta(meta)) return null;
-	const chunks = await readMatrixStateChunks(store, Array.from({ length: meta.chunkCount }, (_, index) => chunkKey(stateKey, meta.generation, index)), "sync-chunk");
+	const chunks = await readMatrixStateChunks(store, Array.from({ length: meta.chunkCount }, (_, index) => chunkKey(meta.generation, index)), "sync-chunk");
 	const syncJson = chunks?.join("") ?? "";
 	const intact = chunks !== null && (chunks.length === 0 || meta.syncDigest === digestText(syncJson));
 	let savedSync = null;
 	if (intact && chunks.length > 0) try {
-		savedSync = toPersistedSyncData(JSON.parse(syncJson));
+		savedSync = JSON.parse(syncJson);
 	} catch {
 		savedSync = null;
 	}
@@ -94,14 +86,8 @@ async function readPersistedStore(store) {
 		cleanShutdown: intact && meta.cleanShutdown
 	});
 }
-function metaKey(stateKey) {
-	return `${stateKey}:meta`;
-}
-function chunkKeyPrefix(stateKey) {
-	return `${stateKey}:sync:`;
-}
-function chunkKey(stateKey, generation, index) {
-	return `${chunkKeyPrefix(stateKey)}${generation}:${index}`;
+function chunkKey(generation, index) {
+	return `${SYNC_CACHE_CHUNK_PREFIX}${generation}:${index}`;
 }
 function resolveLegacySyncCachePath(storageRootDir) {
 	return path.join(storageRootDir, "bot-storage.json");
@@ -110,13 +96,16 @@ function digestText(value) {
 	return createHash("sha256").update(value, "utf8").digest("hex");
 }
 function isSyncCacheMeta(value) {
-	return isRecord(value) && value.kind === "meta" && value.version === 1 && typeof value.generation === "string" && value.generation.trim() !== "" && typeof value.chunkCount === "number" && Number.isSafeInteger(value.chunkCount) && value.chunkCount >= 0 && value.chunkCount <= SYNC_CACHE_MAX_CHUNKS;
+	return isRecord(value) && value.kind === "meta" && value.version === 1 && typeof value.generation === "string" && value.generation.trim() !== "" && asSafeIntegerInRange(value.chunkCount, {
+		min: 0,
+		max: SYNC_CACHE_MAX_CHUNKS
+	}) !== void 0;
 }
-function buildSyncCacheRows(stateKey, payload) {
+function buildSyncCacheRows(payload) {
 	const generation = randomUUID().replaceAll("-", "");
 	const syncJson = payload.savedSync ? JSON.stringify(payload.savedSync) : "";
 	const chunks = chunkMatrixStateJson(syncJson, SYNC_CACHE_CHUNK_BYTES, SYNC_CACHE_MAX_CHUNKS, "Matrix sync cache exceeds SQLite chunk limit").map((data, index) => ({
-		key: chunkKey(stateKey, generation, index),
+		key: chunkKey(generation, index),
 		value: {
 			kind: "sync-chunk",
 			index,
@@ -125,9 +114,8 @@ function buildSyncCacheRows(stateKey, payload) {
 	}));
 	return {
 		chunks,
-		nextChunkKeys: new Set(chunks.map((chunk) => chunk.key)),
 		meta: {
-			key: metaKey(stateKey),
+			key: SYNC_CACHE_META_KEY,
 			value: {
 				kind: "meta",
 				version: 1,
@@ -155,9 +143,8 @@ async function hasMatrixSyncCacheStateInStore(params) {
 }
 async function writeMatrixSyncCacheStateToStore(params) {
 	const { storageRootDir, store, payload } = params;
-	const stateKey = SYNC_CACHE_STATE_KEY;
-	const rows = buildSyncCacheRows(stateKey, payload);
-	return syncCacheOperations.enqueue(path.resolve(storageRootDir), () => writeMatrixStateChunks(store, rows, chunkKeyPrefix(stateKey)));
+	const rows = buildSyncCacheRows(payload);
+	return syncCacheOperations.enqueue(path.resolve(storageRootDir), () => writeMatrixStateChunks(store, rows, SYNC_CACHE_CHUNK_PREFIX));
 }
 function openMatrixSyncCacheStoreOptions(storageRootDir) {
 	return {
@@ -169,8 +156,8 @@ function openMatrixSyncCacheStoreOptions(storageRootDir) {
 async function deleteMatrixSyncCacheStateFromStore(params) {
 	const { storageRootDir, store } = params;
 	return syncCacheOperations.enqueue(path.resolve(storageRootDir), async () => {
-		await store.delete(metaKey(SYNC_CACHE_STATE_KEY));
-		for (const row of await store.entries()) if (row.key.startsWith(chunkKeyPrefix(SYNC_CACHE_STATE_KEY))) await store.delete(row.key);
+		await store.delete(SYNC_CACHE_META_KEY);
+		for (const row of await store.entries()) if (row.key.startsWith(SYNC_CACHE_CHUNK_PREFIX)) await store.delete(row.key);
 		await fs.rm(resolveLegacySyncCachePath(storageRootDir), { force: true }).catch(() => void 0);
 	});
 }

package/dist/.setup/{target-ids-Nwx7cMVE.mjs → target-ids-HhcaKX1n.mjs}

@@ -62,6 +62,20 @@ function isMatrixRoomId(raw) {
 	const trimmed = raw.trim();
 	return trimmed.startsWith("!") && trimmed.length > 1;
 }
+/**
+* Whether `raw` is an invite auto-join target the room matcher can ever accept:
+* the wildcard, a literal room ID, or a full `#alias:server` with both a local
+* part and a server name. This is the shared contract for
+* `channels.matrix.autoJoinAllowlist`; the setup wizard rejects other values and
+* the invite handler reports them as inert.
+*/
+function isMatrixInviteAutoJoinTarget(raw) {
+	const trimmed = raw.trim();
+	if (trimmed === "*" || isMatrixRoomId(trimmed)) return true;
+	if (!trimmed.startsWith("#")) return false;
+	const [localPart, serverName] = trimmed.slice(1).split(":", 2);
+	return Boolean(localPart) && Boolean(serverName);
+}
 function normalizeMatrixResolvableTarget(raw) {
 	return stripKnownPrefixes(raw, [
 		MATRIX_PREFIX,
@@ -84,4 +98,4 @@ function resolveMatrixDirectUserId(params) {
 	return isMatrixQualifiedUserId(userId) ? userId : void 0;
 }
 //#endregion
-export { resolveMatrixDirectUserId as a, normalizeMatrixResolvableTarget as i, isMatrixRoomId as n, resolveMatrixTargetIdentity as o, normalizeMatrixMessagingTarget as r, isMatrixQualifiedUserId as t };
+export { normalizeMatrixResolvableTarget as a, normalizeMatrixMessagingTarget as i, isMatrixQualifiedUserId as n, resolveMatrixDirectUserId as o, isMatrixRoomId as r, resolveMatrixTargetIdentity as s, isMatrixInviteAutoJoinTarget as t };

package/dist/.setup/{thread-binding-api-DRMC62cs.mjs → thread-binding-api-BvuaKpd0.mjs}

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

package/dist/.setup/{thread-bindings-DveHVZqN.mjs → thread-bindings-CT4P-OSZ.mjs}

@@ -1,8 +1,8 @@
 import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
-import { a as listBindingsForAccount, c as setBindingRecord, f as toMatrixBindingTargetKind, o as removeBindingRecord, p as toSessionBindingRecord, r as getMatrixThreadBindingManagerEntry, s as resolveBindingKey, t as deleteMatrixThreadBindingManagerEntry, u as setMatrixThreadBindingManagerEntry } from "./thread-bindings-shared-hxKkYC1W.mjs";
-import { o as resolveMatrixSqliteStateEnv, r as assertMatrixSupportedStateFile, s as resolveMatrixSqliteStateKey } from "./retired-state-BXUQ2I-C.mjs";
-import { a as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-D7agewjH.mjs";
-import { r as sendMessageMatrix } from "./send-B1Y2L4wj.mjs";
+import { a as listBindingsForAccount, c as setBindingRecord, f as toSessionBindingRecord, o as removeBindingRecord, r as getMatrixThreadBindingManagerEntry, s as resolveBindingKey, t as deleteMatrixThreadBindingManagerEntry, u as setMatrixThreadBindingManagerEntry } from "./thread-bindings-shared-CbsFNbAY.mjs";
+import { o as resolveMatrixSqliteStateEnv, r as assertMatrixSupportedStateFile, s as resolveMatrixSqliteStateKey } from "./retired-state-DW5pLH05.mjs";
+import { a as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-DkC6bHgA.mjs";
+import { r as sendMessageMatrix } from "./send-LCOuTVc1.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";
@@ -169,7 +169,10 @@ async function createMatrixThreadBindingManager(params) {
 		const targetSessionKey = input.targetSessionKey.trim();
 		if (!targetSessionKey) return [];
 		const now = Date.now();
-		const nextBindings = listBindingsForAccount(params.accountId).filter((entry) => entry.targetSessionKey === targetSessionKey).map((entry) => input.update(entry, now));
+		const nextBindings = listBindingsForAccount(params.accountId).filter((entry) => entry.targetSessionKey === targetSessionKey).map((entry) => Object.assign({}, entry, {
+			[input.field]: Math.max(0, Math.floor(input.value)),
+			lastActivityAt: now
+		}));
 		if (nextBindings.length === 0) return [];
 		for (const entry of nextBindings) setBindingRecord(entry);
 		persistSafely(input.persistReason);
@@ -198,28 +201,18 @@ async function createMatrixThreadBindingManager(params) {
 			schedulePersist(TOUCH_PERSIST_DELAY_MS);
 			return nextRecord;
 		},
-		setIdleTimeoutBySessionKey: ({ targetSessionKey, idleTimeoutMs }) => {
-			return updateBindingsBySessionKey({
-				targetSessionKey,
-				persistReason: "idle-timeout-update",
-				update: (entry, now) => ({
-					...entry,
-					idleTimeoutMs: Math.max(0, Math.floor(idleTimeoutMs)),
-					lastActivityAt: now
-				})
-			});
-		},
-		setMaxAgeBySessionKey: ({ targetSessionKey, maxAgeMs }) => {
-			return updateBindingsBySessionKey({
-				targetSessionKey,
-				persistReason: "max-age-update",
-				update: (entry, now) => ({
-					...entry,
-					maxAgeMs: Math.max(0, Math.floor(maxAgeMs)),
-					lastActivityAt: now
-				})
-			});
-		},
+		setIdleTimeoutBySessionKey: ({ targetSessionKey, idleTimeoutMs }) => updateBindingsBySessionKey({
+			targetSessionKey,
+			field: "idleTimeoutMs",
+			value: idleTimeoutMs,
+			persistReason: "idle-timeout-update"
+		}),
+		setMaxAgeBySessionKey: ({ targetSessionKey, maxAgeMs }) => updateBindingsBySessionKey({
+			targetSessionKey,
+			field: "maxAgeMs",
+			value: maxAgeMs,
+			persistReason: "max-age-update"
+		}),
 		stop: async () => {
 			if (sweepTimer) clearInterval(sweepTimer);
 			let finalPersist = persistQueue;
@@ -241,27 +234,20 @@ async function createMatrixThreadBindingManager(params) {
 		}
 	};
 	let sweepTimer = null;
-	const removeRecords = (records) => {
-		return records.map((record) => removeBindingRecord(record)).filter((record) => Boolean(record));
-	};
-	const sendFarewellMessages = async (removed, reason) => {
-		await Promise.all(removed.map(async (record) => {
-			await sendFarewellMessage({
-				cfg: params.cfg,
-				client: params.client,
-				accountId: params.accountId,
-				record,
-				defaultIdleTimeoutMs: defaults.idleTimeoutMs,
-				defaultMaxAgeMs: defaults.maxAgeMs,
-				reason: typeof reason === "function" ? reason(record) : reason
-			});
-		}));
-	};
-	const unbindRecords = async (records, reason) => {
-		const removed = removeRecords(records);
+	const unbindRecords = async (records, reason, onRemoved) => {
+		const removed = records.map((record) => removeBindingRecord(record)).filter((record) => Boolean(record));
 		if (removed.length === 0) return [];
+		removed.forEach((record) => onRemoved?.(record));
 		await persist();
-		await sendFarewellMessages(removed, reason);
+		await Promise.all(removed.map((record) => sendFarewellMessage({
+			cfg: params.cfg,
+			client: params.client,
+			accountId: params.accountId,
+			record,
+			defaultIdleTimeoutMs: defaults.idleTimeoutMs,
+			defaultMaxAgeMs: defaults.maxAgeMs,
+			reason: typeof reason === "function" ? reason(record) : reason
+		})));
 		return removed.map((record) => toSessionBindingRecord(record, defaults));
 	};
 	const sessionBindingAdapter = {
@@ -301,7 +287,7 @@ async function createMatrixThreadBindingManager(params) {
 				accountId: params.accountId,
 				conversationId: boundConversationId,
 				...boundParentConversationId ? { parentConversationId: boundParentConversationId } : {},
-				targetKind: toMatrixBindingTargetKind(input.targetKind),
+				targetKind: input.targetKind === "subagent" ? "subagent" : "acp",
 				targetSessionKey,
 				agentId: normalizeOptionalString(input.metadata?.agentId) ?? resolveSessionAgentIdStrict({
 					config: params.cfg,
@@ -339,7 +325,7 @@ async function createMatrixThreadBindingManager(params) {
 			manager.touchBinding(bindingId, at);
 		},
 		unbind: async (input) => {
-			return await unbindRecords(listBindingsForAccount(params.accountId).filter((record) => {
+			return unbindRecords(listBindingsForAccount(params.accountId).filter((record) => {
 				if (input.bindingId?.trim()) return resolveBindingKey(record) === input.bindingId.trim();
 				if (input.targetSessionKey?.trim()) return record.targetSessionKey === input.targetSessionKey.trim();
 				return false;
@@ -360,16 +346,10 @@ async function createMatrixThreadBindingManager(params) {
 			})).filter((entry) => typeof entry.lifecycle.expiresAt === "number" && entry.lifecycle.expiresAt <= now && Boolean(entry.lifecycle.reason));
 			if (expired.length === 0) return;
 			const reasonByBindingKey = new Map(expired.map(({ record, lifecycle }) => [resolveBindingKey(record), lifecycle.reason]));
-			(async () => {
-				const removed = removeRecords(expired.map(({ record }) => record));
-				if (removed.length === 0) return;
-				for (const record of removed) {
-					const reason = reasonByBindingKey.get(resolveBindingKey(record));
-					params.logVerboseMessage?.(`matrix: auto-unbinding ${record.conversationId} due to ${reason}`);
-				}
-				await persist();
-				await sendFarewellMessages(removed, (record) => reasonByBindingKey.get(resolveBindingKey(record)));
-			})().catch((err) => {
+			unbindRecords(expired.map(({ record }) => record), (record) => reasonByBindingKey.get(resolveBindingKey(record)), (record) => {
+				const reason = reasonByBindingKey.get(resolveBindingKey(record));
+				params.logVerboseMessage?.(`matrix: auto-unbinding ${record.conversationId} due to ${reason}`);
+			}).catch((err) => {
 				params.logVerboseMessage?.(`matrix: failed auto-unbinding expired bindings account=${params.accountId}: ${String(err)}`);
 			});
 		}, THREAD_BINDINGS_SWEEP_INTERVAL_MS);

package/dist/.setup/{thread-bindings-shared-hxKkYC1W.mjs → thread-bindings-shared-CbsFNbAY.mjs}

@@ -1,16 +1,10 @@
-import { resolveThreadBindingLifecycle } from "openclaw/plugin-sdk/thread-bindings-session-runtime";
+import { projectThreadBindingRecord, resolveThreadBindingLifecycle } from "openclaw/plugin-sdk/thread-bindings-session-runtime";
 //#region extensions/matrix/src/matrix/thread-bindings-shared.ts
 const MANAGERS_BY_ACCOUNT_ID = /* @__PURE__ */ new Map();
 const BINDINGS_BY_ACCOUNT_CONVERSATION = /* @__PURE__ */ new Map();
 function resolveBindingKey(params) {
 	return `${params.accountId}:${params.parentConversationId?.trim() || "-"}:${params.conversationId}`;
 }
-function toSessionBindingTargetKind(raw) {
-	return raw === "subagent" ? "subagent" : "session";
-}
-function toMatrixBindingTargetKind(raw) {
-	return raw === "subagent" ? "subagent" : "acp";
-}
 function toSessionBindingRecord(record, defaults) {
 	const lifecycle = resolveThreadBindingLifecycle({
 		record,
@@ -19,28 +13,20 @@ function toSessionBindingRecord(record, defaults) {
 	});
 	const idleTimeoutMs = typeof record.idleTimeoutMs === "number" ? record.idleTimeoutMs : defaults.idleTimeoutMs;
 	const maxAgeMs = typeof record.maxAgeMs === "number" ? record.maxAgeMs : defaults.maxAgeMs;
-	return {
-		bindingId: resolveBindingKey(record),
-		targetSessionKey: record.targetSessionKey,
-		targetKind: toSessionBindingTargetKind(record.targetKind),
+	return projectThreadBindingRecord(record, {
 		conversation: {
 			channel: "matrix",
-			accountId: record.accountId,
 			conversationId: record.conversationId,
 			parentConversationId: record.parentConversationId
 		},
-		status: "active",
-		boundAt: record.boundAt,
-		expiresAt: lifecycle.expiresAt,
-		metadata: {
-			agentId: record.agentId,
-			label: record.label,
-			boundBy: record.boundBy,
-			lastActivityAt: record.lastActivityAt,
+		bindingId: resolveBindingKey(record),
+		targetKind: record.targetKind === "subagent" ? "subagent" : "session",
+		lifecycle: {
+			...lifecycle,
 			idleTimeoutMs,
 			maxAgeMs
 		}
-	};
+	});
 }
 function setBindingRecord(record) {
 	BINDINGS_BY_ACCOUNT_CONVERSATION.set(resolveBindingKey(record), record);
@@ -69,21 +55,17 @@ function deleteMatrixThreadBindingManagerEntry(accountId) {
 function getMatrixThreadBindingManager(accountId) {
 	return MANAGERS_BY_ACCOUNT_ID.get(accountId)?.manager ?? null;
 }
-function setMatrixThreadBindingIdleTimeoutBySessionKey(params) {
-	const manager = MANAGERS_BY_ACCOUNT_ID.get(params.accountId)?.manager;
-	if (!manager) return [];
-	return manager.setIdleTimeoutBySessionKey(params).map((record) => toSessionBindingRecord(record, {
-		idleTimeoutMs: manager.getIdleTimeoutMs(),
-		maxAgeMs: manager.getMaxAgeMs()
-	}));
-}
-function setMatrixThreadBindingMaxAgeBySessionKey(params) {
-	const manager = MANAGERS_BY_ACCOUNT_ID.get(params.accountId)?.manager;
-	if (!manager) return [];
-	return manager.setMaxAgeBySessionKey(params).map((record) => toSessionBindingRecord(record, {
-		idleTimeoutMs: manager.getIdleTimeoutMs(),
-		maxAgeMs: manager.getMaxAgeMs()
-	}));
+function createMatrixThreadBindingTimeoutSetter(update) {
+	return (params) => {
+		const manager = MANAGERS_BY_ACCOUNT_ID.get(params.accountId)?.manager;
+		if (!manager) return [];
+		return update(manager, params).map((record) => toSessionBindingRecord(record, {
+			idleTimeoutMs: manager.getIdleTimeoutMs(),
+			maxAgeMs: manager.getMaxAgeMs()
+		}));
+	};
 }
+const setMatrixThreadBindingIdleTimeoutBySessionKey = createMatrixThreadBindingTimeoutSetter((manager, params) => manager.setIdleTimeoutBySessionKey(params));
+const setMatrixThreadBindingMaxAgeBySessionKey = createMatrixThreadBindingTimeoutSetter((manager, params) => manager.setMaxAgeBySessionKey(params));
 //#endregion
-export { listBindingsForAccount as a, setBindingRecord as c, setMatrixThreadBindingMaxAgeBySessionKey as d, toMatrixBindingTargetKind as f, listAllBindings as i, setMatrixThreadBindingIdleTimeoutBySessionKey as l, getMatrixThreadBindingManager as n, removeBindingRecord as o, toSessionBindingRecord as p, getMatrixThreadBindingManagerEntry as r, resolveBindingKey as s, deleteMatrixThreadBindingManagerEntry as t, setMatrixThreadBindingManagerEntry as u };
+export { listBindingsForAccount as a, setBindingRecord as c, setMatrixThreadBindingMaxAgeBySessionKey as d, toSessionBindingRecord as f, listAllBindings as i, setMatrixThreadBindingIdleTimeoutBySessionKey as l, getMatrixThreadBindingManager as n, removeBindingRecord as o, getMatrixThreadBindingManagerEntry as r, resolveBindingKey as s, deleteMatrixThreadBindingManagerEntry as t, setMatrixThreadBindingManagerEntry as u };

package/dist/.setup/{tool-actions-BqlK2ilM.mjs → tool-actions-DAp6_XSJ.mjs}

@@ -1,18 +1,18 @@
 import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-CRsKoMqJ.mjs";
-import { r as resolveDefaultMatrixAccountId } from "./accounts-C_r0UlEm.mjs";
-import { o as resolveMatrixRoomConfig } from "./channel-CeRXEAEP.mjs";
-import { i as normalizeMatrixResolvableTarget } from "./target-ids-Nwx7cMVE.mjs";
+import { g as resolveDefaultMatrixAccountId } from "./setup-core-CKnNTfgD.mjs";
+import { o as resolveMatrixRoomConfig } from "./channel-BcwGspPw.mjs";
+import { a as normalizeMatrixResolvableTarget } from "./target-ids-HhcaKX1n.mjs";
 import { l as selectOwnMatrixReactionEventIds, s as buildMatrixReactionRelationsPath, u as summarizeMatrixReactionEvents } from "./send-currentness-C2rMVVIQ.mjs";
-import { c as isStrictDirectMembership, s as hasDirectMatrixMemberFlag, u as readJoinedMatrixMembers } from "./direct-management-DJtQhLKH.mjs";
-import { C as resolveMatrixRoomId, n as reactMatrixMessage, p as buildPollResponseContent, v as isPollStartType, y as parsePollStart } from "./send-B1Y2L4wj.mjs";
-import { i as parseMxc } from "./event-helpers-CspuhE9k.mjs";
-import { a as sendMatrixMessage, c as EventType, i as readMatrixMessages, l as resolveMatrixActionLimit, n as editMatrixMessage, o as fetchEventSummary, r as readMatrixMessage, s as readPinnedEvents, t as deleteMatrixMessage } from "./messages-uCbwLRKS.mjs";
-import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-DY3HExqI.mjs";
-import { t as applyMatrixProfileUpdate } from "./profile-update-C1n8SRqH.mjs";
-import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-kMlFYUn0.mjs";
-import { n as getMatrixMemberInfo, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-BPMbwe8I.mjs";
+import { c as isStrictDirectMembership, s as hasDirectMatrixMemberFlag, u as readJoinedMatrixMembers } from "./direct-management-B3wYhx_M.mjs";
+import { C as resolveMatrixRoomId, n as reactMatrixMessage, p as buildPollResponseContent, v as isPollStartType, y as parsePollStart } from "./send-LCOuTVc1.mjs";
+import { i as parseMxc } from "./event-helpers-CxNgMQqH.mjs";
+import { a as sendMatrixMessage, c as EventType, i as readMatrixMessages, l as resolveMatrixActionLimit, n as editMatrixMessage, o as fetchEventSummary, r as readMatrixMessage, s as readPinnedEvents, t as deleteMatrixMessage } from "./messages-B1CZqU8u.mjs";
+import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-BlTvpEWC.mjs";
+import { t as applyMatrixProfileUpdate } from "./profile-update-C7bjaGR6.mjs";
+import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-B3VswneT.mjs";
+import { n as getMatrixMemberInfo, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-9Uqlpt1V.mjs";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import { isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, uniqueStrings, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeUniqueTrimmedStringList, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ToolAuthorizationError, createActionGate, jsonResult, readPositiveIntegerParam, readReactionParams, readStringArrayParam, readStringParam } from "openclaw/plugin-sdk/channel-actions";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { captureChannelReadAuthority } from "openclaw/plugin-sdk/fetch-runtime";
@@ -47,19 +47,16 @@ function normalizeOptionIndexes(indexes) {
 	const normalized = indexes.map((index) => Math.trunc(index)).filter((index) => Number.isFinite(index) && index > 0);
 	return uniqueValues(normalized);
 }
-function normalizeOptionIds(optionIds) {
-	return uniqueStrings(optionIds.map((optionId) => optionId.trim()).filter((optionId) => optionId.length > 0));
-}
 function resolveSelectedAnswerIds(params) {
 	const parsed = parsePollStart(params.pollContent);
 	if (!parsed) throw new Error("Matrix poll vote requires a valid poll start event.");
-	const selectedById = normalizeOptionIds(params.optionIds ?? []);
+	const selectedById = normalizeUniqueTrimmedStringList(params.optionIds);
 	const selectedByIndex = normalizeOptionIndexes(params.optionIndexes ?? []).map((index) => {
 		const answer = parsed.answers[index - 1];
 		if (!answer) throw new Error(`Matrix poll option index ${index} is out of range for a poll with ${parsed.answers.length} options.`);
 		return answer.id;
 	});
-	const answerIds = normalizeOptionIds([...selectedById, ...selectedByIndex]);
+	const answerIds = normalizeUniqueTrimmedStringList([...selectedById, ...selectedByIndex]);
 	if (answerIds.length === 0) throw new Error("Matrix poll vote requires at least one poll option id or index.");
 	if (answerIds.length > parsed.maxSelections) throw new Error(`Matrix poll allows at most ${parsed.maxSelections} selection${parsed.maxSelections === 1 ? "" : "s"}.`);
 	const answerMap = new Map(parsed.answers.map((answer) => [answer.id, answer.text]));
@@ -281,7 +278,9 @@ async function withAuthorizedMatrixReadTarget(params) {
 		const groupPolicy = account.config.allowlistOnly && resolvedGroupPolicy === "open" ? "allowlist" : resolvedGroupPolicy;
 		const dmPolicy = account.config.allowlistOnly ? account.config.dm?.policy === "disabled" ? "disabled" : "allowlist" : account.config.dm?.policy ?? "pairing";
 		const directOperator = params.context?.conversationReadOrigin === "direct-operator";
-		if (!(finalPolicy.blocked ? false : directOperator ? classification.kind === "direct" ? account.config.dm?.enabled !== false && dmPolicy !== "disabled" : classification.kind === "group" ? groupPolicy !== "disabled" : groupPolicy !== "disabled" && dmPolicy !== "disabled" && account.config.dm?.enabled !== false : classification.kind === "direct" ? account.config.dm?.enabled !== false && dmPolicy !== "disabled" && (current || includesEntry(account.config.dm?.allowFrom, classification.remoteUserId)) : classification.kind === "group" ? groupPolicy !== "disabled" && (current || groupPolicy === "open" || room.config !== void 0) : current ? groupPolicy !== "disabled" && dmPolicy !== "disabled" && account.config.dm?.enabled !== false : groupPolicy === "open" && dmPolicy !== "disabled" && account.config.dm?.enabled !== false && hasWildcardEntry(account.config.dm?.allowFrom))) throw new ToolAuthorizationError("Matrix read target is not allowed.");
+		const dmEnabled = account.config.dm?.enabled !== false && dmPolicy !== "disabled";
+		const groupEnabled = groupPolicy !== "disabled";
+		if (!(!finalPolicy.blocked && (classification.kind === "direct" ? dmEnabled && (directOperator || current || includesEntry(account.config.dm?.allowFrom, classification.remoteUserId)) : classification.kind === "group" ? groupEnabled && (directOperator || current || groupPolicy === "open" || room.config !== void 0) : groupEnabled && dmEnabled && (directOperator || current || groupPolicy === "open" && hasWildcardEntry(account.config.dm?.allowFrom))))) throw new ToolAuthorizationError("Matrix read target is not allowed.");
 		return await params.run({
 			client,
 			roomId