@openclaw/matrix 2026.7.2-beta.7 → 2026.7.34

package/dist/{messages-DxQJkhxs.js → .setup/messages-D4DYGHYX.mjs}

@@ -1,8 +1,8 @@
-import { r as isMatrixNotFoundError } from "./errors-C47hvAF8.js";
-import { T as isPollStartType, r as sendMessageMatrix, t as editMessageMatrix, w as isPollEventType } from "./send-BldGYG8g.js";
-import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
-import { a as resolveMatrixMessageAttachment, l as resolveMatrixPollRootEventId, o as resolveMatrixMessageBody, s as fetchMatrixPollMessageSummary } from "./media-text-BTwzADS_.js";
-import { r as withResolvedRoomAction } from "./client-6eRENr7k.js";
+import { r as isMatrixNotFoundError } from "./errors-C47hvAF8.mjs";
+import { T as isPollStartType, a as sendMessageMatrix, n as editMessageMatrix, w as isPollEventType } from "./send-CGgl0uTn.mjs";
+import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.mjs";
+import { a as resolveMatrixMessageAttachment, l as resolveMatrixPollRootEventId, o as resolveMatrixMessageBody, s as fetchMatrixPollMessageSummary } from "./media-text-Cib-dxkn.mjs";
+import { r as withResolvedRoomAction } from "./client-Ct0bUHCo.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/matrix/src/matrix/actions/limits.ts
@@ -19,20 +19,9 @@ const EventType = {
 };
 //#endregion
 //#region extensions/matrix/src/matrix/actions/summary.ts
-function resolveBundledMatrixReplacementContent(event) {
-	const rawReplacement = event.unsigned?.["m.relations"]?.["m.replace"];
-	if (!rawReplacement || typeof rawReplacement !== "object" || event.state_key !== void 0) return;
-	const replacement = rawReplacement;
-	const content = replacement.content;
-	const relation = content?.["m.relates_to"];
-	const newContent = content?.["m.new_content"];
-	if (replacement.sender !== event.sender || replacement.type !== event.type || replacement.state_key !== void 0 || replacement.unsigned?.redacted_because || !relation || typeof relation !== "object" || relation.rel_type !== "m.replace" || relation.event_id !== event.event_id || !newContent || typeof newContent !== "object" || Array.isArray(newContent)) return;
-	return newContent;
-}
 function summarizeMatrixRawEvent(event) {
 	const content = event.content;
 	const relates = content["m.relates_to"];
-	const displayContent = relates?.rel_type === "m.replace" ? content["m.new_content"] ?? content : resolveBundledMatrixReplacementContent(event) ?? content;
 	let relType;
 	let eventId;
 	if (relates) {
@@ -49,15 +38,15 @@ function summarizeMatrixRawEvent(event) {
 		eventId: event.event_id,
 		sender: event.sender,
 		body: resolveMatrixMessageBody({
-			body: displayContent.body,
-			filename: displayContent.filename,
-			msgtype: displayContent.msgtype
+			body: content.body,
+			filename: content.filename,
+			msgtype: content.msgtype
 		}),
-		msgtype: displayContent.msgtype,
+		msgtype: content.msgtype,
 		attachment: resolveMatrixMessageAttachment({
-			body: displayContent.body,
-			filename: displayContent.filename,
-			msgtype: displayContent.msgtype
+			body: content.body,
+			filename: content.filename,
+			msgtype: content.msgtype
 		}),
 		timestamp: event.origin_server_ts,
 		relatesTo
@@ -85,29 +74,6 @@ async function fetchEventSummary(client, roomId, eventId) {
 //#endregion
 //#region extensions/matrix/src/matrix/actions/messages.ts
 const MATRIX_THREAD_RELATIONS_START_CURSOR_PREFIX = "openclaw.matrix.thread-relations-start:";
-function resolveMatrixReplacementTarget(event) {
-	const relation = event.content["m.relates_to"];
-	if (!relation || typeof relation !== "object") return;
-	const replacement = relation;
-	return replacement.rel_type === "m.replace" && typeof replacement.event_id === "string" ? replacement.event_id : void 0;
-}
-function resolveLatestMatrixReplacements(events) {
-	const pageEventIds = new Set(events.map((event) => event.event_id));
-	const originals = new Map(events.filter((event) => event.type === EventType.RoomMessage && !event.unsigned?.redacted_because && event.state_key === void 0 && !resolveMatrixReplacementTarget(event)).map((event) => [event.event_id, event]));
-	const replacements = /* @__PURE__ */ new Map();
-	for (const event of events) {
-		const targetId = resolveMatrixReplacementTarget(event);
-		const original = targetId ? originals.get(targetId) : void 0;
-		const newContent = event.content["m.new_content"];
-		if (!targetId || !original || event.sender !== original.sender || event.type !== original.type || event.state_key !== void 0 || event.unsigned?.redacted_because || !newContent || typeof newContent !== "object" || Array.isArray(newContent)) continue;
-		const latest = replacements.get(targetId);
-		if (!latest || event.origin_server_ts > latest.origin_server_ts || event.origin_server_ts === latest.origin_server_ts && event.event_id > latest.event_id) replacements.set(targetId, event);
-	}
-	return {
-		pageEventIds,
-		replacements
-	};
-}
 async function sendMatrixMessage(to, content, opts = {}) {
 	if (!opts.cfg) throw new Error("Matrix message actions require a resolved runtime config.");
 	return await sendMessageMatrix(to, content, {
@@ -165,7 +131,6 @@ async function readMatrixMessages(roomId, opts = {}) {
 			from: token
 		});
 		const hydratedChunk = await client.hydrateEvents(resolvedRoom, relationPage ? rootFillsThreadPage ? [] : relationPage.events : flatPage?.chunk ?? []);
-		const { pageEventIds, replacements } = resolveLatestMatrixReplacements(hydratedChunk);
 		const messages = [];
 		if (threadRootSummary) messages.push(threadRootSummary);
 		for (const event of hydratedChunk) {
@@ -173,22 +138,7 @@ async function readMatrixMessages(roomId, opts = {}) {
 			if (!threadId && isMatrixThreadEvent(event)) continue;
 			if (event.type === EventType.RoomMessage) {
 				if (threadId && event.event_id === threadId) continue;
-				const replacementTarget = resolveMatrixReplacementTarget(event);
-				if (replacementTarget) {
-					const newContent = event.content["m.new_content"];
-					if (pageEventIds.has(replacementTarget) || !newContent || typeof newContent !== "object" || Array.isArray(newContent)) continue;
-					messages.push(summarizeMatrixRawEvent(event));
-					continue;
-				}
-				const replacement = replacements.get(event.event_id);
-				const originalRelation = event.content["m.relates_to"];
-				messages.push(summarizeMatrixRawEvent(replacement ? {
-					...event,
-					content: {
-						...replacement.content["m.new_content"],
-						"m.relates_to": originalRelation
-					}
-				} : event));
+				messages.push(summarizeMatrixRawEvent(event));
 				continue;
 			}
 			if (!isPollEventType(event.type)) continue;
@@ -222,10 +172,8 @@ function isMatrixThreadRelationsStartCursor(raw, threadId) {
 	if (!raw?.startsWith(MATRIX_THREAD_RELATIONS_START_CURSOR_PREFIX)) return false;
 	const encoded = raw.slice(39);
 	try {
-		const bytes = Buffer.from(encoded, "base64url");
-		if (bytes.toString("base64url") !== encoded) return false;
-		const decoded = JSON.parse(bytes.toString("utf8"));
-		return decoded.v === 1 && decoded.threadId === threadId && encodeMatrixThreadRelationsStartCursor(decoded.threadId) === raw;
+		const decoded = JSON.parse(Buffer.from(encoded, "base64url").toString("utf8"));
+		return decoded.v === 1 && decoded.threadId === threadId;
 	} catch {
 		return false;
 	}

package/dist/.setup/migration-snapshot-backup-CpgYhiUp.mjs

@@ -0,0 +1,70 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { resolveRequiredHomeDir, resolveStateDir } from "openclaw/plugin-sdk/state-paths";
+import { writeJsonFileAtomically } from "openclaw/plugin-sdk/json-store";
+//#region extensions/matrix/src/migration-snapshot-backup.ts
+const MATRIX_MIGRATION_SNAPSHOT_DIRNAME = "openclaw-migrations";
+function loadSnapshotMarker(filePath) {
+	try {
+		if (!fs.existsSync(filePath)) return null;
+		const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
+		if (parsed.version !== 1 || typeof parsed.createdAt !== "string" || typeof parsed.archivePath !== "string" || typeof parsed.trigger !== "string") return null;
+		return {
+			version: 1,
+			createdAt: parsed.createdAt,
+			archivePath: parsed.archivePath,
+			trigger: parsed.trigger,
+			includeWorkspace: parsed.includeWorkspace === true
+		};
+	} catch {
+		return null;
+	}
+}
+function resolveMatrixMigrationSnapshotMarkerPath(env = process.env) {
+	const stateDir = resolveStateDir(env, os.homedir);
+	return path.join(stateDir, "matrix", "migration-snapshot.json");
+}
+function resolveMatrixMigrationSnapshotOutputDir(env = process.env) {
+	const homeDir = resolveRequiredHomeDir(env, os.homedir);
+	return path.join(homeDir, "Backups", MATRIX_MIGRATION_SNAPSHOT_DIRNAME);
+}
+async function maybeCreateMatrixMigrationSnapshot(params) {
+	const env = params.env ?? process.env;
+	const createBackupArchive = params.createBackupArchive ?? (await import("openclaw/plugin-sdk/runtime")).createBackupArchive;
+	const markerPath = resolveMatrixMigrationSnapshotMarkerPath(env);
+	const existingMarker = loadSnapshotMarker(markerPath);
+	if (existingMarker?.archivePath && fs.existsSync(existingMarker.archivePath)) {
+		params.log?.info?.(`matrix: reusing existing pre-migration backup snapshot: ${existingMarker.archivePath}`);
+		return {
+			created: false,
+			archivePath: existingMarker.archivePath,
+			markerPath
+		};
+	}
+	if (existingMarker?.archivePath && !fs.existsSync(existingMarker.archivePath)) params.log?.warn?.(`matrix: previous migration snapshot is missing (${existingMarker.archivePath}); creating a replacement backup before continuing`);
+	const snapshot = await createBackupArchive({
+		output: (() => {
+			const outputDir = params.outputDir ?? resolveMatrixMigrationSnapshotOutputDir(env);
+			fs.mkdirSync(outputDir, { recursive: true });
+			return outputDir;
+		})(),
+		includeWorkspace: false
+	});
+	const marker = {
+		version: 1,
+		createdAt: snapshot.createdAt,
+		archivePath: snapshot.archivePath,
+		trigger: params.trigger,
+		includeWorkspace: snapshot.includeWorkspace
+	};
+	await writeJsonFileAtomically(markerPath, marker);
+	params.log?.info?.(`matrix: created pre-migration backup snapshot: ${snapshot.archivePath}`);
+	return {
+		created: true,
+		archivePath: snapshot.archivePath,
+		markerPath
+	};
+}
+//#endregion
+export { maybeCreateMatrixMigrationSnapshot as t };

package/dist/.setup/migration-snapshot.runtime-O8qkMVaC.mjs

@@ -0,0 +1,2 @@
+import { t as maybeCreateMatrixMigrationSnapshot } from "./migration-snapshot-backup-CpgYhiUp.mjs";
+export { maybeCreateMatrixMigrationSnapshot };