From 517801282aafc6b265fcc4eaa6f4f7e91933836b Mon Sep 17 00:00:00 2001 From: Masato Hoshino Date: Mon, 20 Apr 2026 04:35:34 +0900 Subject: [PATCH] fix(matrix): pin event-helpers import to canonical matrix-js-sdk subpath (refs #50477) (#68498) Merged via squash. Prepared head SHA: 32e08e4d8e72afa98c4fac7ff6ea0d228bcd5bd8 Co-authored-by: masatohoshino <246810661+masatohoshino@users.noreply.github.com> Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com> Reviewed-by: @gumadeiras --- CHANGELOG.md | 1 + extensions/matrix/src/matrix/client/file-sync-store.test.ts | 2 +- extensions/matrix/src/matrix/sdk/event-helpers.test.ts | 2 +- extensions/matrix/src/matrix/sdk/event-helpers.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89852f62a96..dfc52e48c7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -115,6 +115,7 @@ Docs: https://docs.openclaw.ai - Google/Antigravity: resolve forward-compatible Gemini 3.1 Pro custom-tools and Flash variants from the bundled Google plugin templates, so `google-antigravity/gemini-3.1-pro-preview-customtools` no longer falls through to an unknown-model error. Fixes #35512. - Active Memory: raise the blocking recall timeout ceiling to 120 seconds and reject larger config values during plugin schema validation. Fixes #68410. (#68480) Thanks @Bartok9. - Control UI/chat: keep history-backed user image uploads visible after chat reload while filtering blocked or non-image transcript media paths. (#68415) Thanks @mraleko. +- Matrix/plugins: keep remaining Matrix event helpers on the canonical `matrix-js-sdk` subpath so build and plugin-load entrypoint checks stay consistent. (#68498) Thanks @masatohoshino. ## 2026.4.15 diff --git a/extensions/matrix/src/matrix/client/file-sync-store.test.ts b/extensions/matrix/src/matrix/client/file-sync-store.test.ts index 665925798b6..8404a1eefdf 100644 --- a/extensions/matrix/src/matrix/client/file-sync-store.test.ts +++ b/extensions/matrix/src/matrix/client/file-sync-store.test.ts @@ -1,7 +1,7 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; -import type { ISyncResponse } from "matrix-js-sdk"; +import type { ISyncResponse } from "matrix-js-sdk/lib/matrix.js"; import * as jsonStore from "openclaw/plugin-sdk/json-store"; import { afterEach, describe, expect, it, vi } from "vitest"; import { FileBackedMatrixSyncStore } from "./file-sync-store.js"; diff --git a/extensions/matrix/src/matrix/sdk/event-helpers.test.ts b/extensions/matrix/src/matrix/sdk/event-helpers.test.ts index b768262cd24..9020b1e8b7b 100644 --- a/extensions/matrix/src/matrix/sdk/event-helpers.test.ts +++ b/extensions/matrix/src/matrix/sdk/event-helpers.test.ts @@ -1,4 +1,4 @@ -import type { MatrixEvent } from "matrix-js-sdk"; +import type { MatrixEvent } from "matrix-js-sdk/lib/matrix.js"; import { describe, expect, it } from "vitest"; import { buildHttpError, matrixEventToRaw, parseMxc } from "./event-helpers.js"; diff --git a/extensions/matrix/src/matrix/sdk/event-helpers.ts b/extensions/matrix/src/matrix/sdk/event-helpers.ts index 994efc882b7..74a0b9da7ea 100644 --- a/extensions/matrix/src/matrix/sdk/event-helpers.ts +++ b/extensions/matrix/src/matrix/sdk/event-helpers.ts @@ -1,4 +1,4 @@ -import type { MatrixEvent } from "matrix-js-sdk"; +import type { MatrixEvent } from "matrix-js-sdk/lib/matrix.js"; import type { MatrixRawEvent } from "./types.js"; export type MatrixEventContentMode = "current" | "original";