From 22f56433e0045ba92fd88bbd54882e1fbe6a34b7 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Mon, 30 Mar 2026 12:42:51 +0900
Subject: [PATCH] fix(perf): bypass matrix facade for core helpers

---
 src/infra/matrix-account-selection.test.ts        | 2 +-
 src/infra/matrix-legacy-crypto.test.ts            | 2 +-
 src/infra/matrix-migration-snapshot.test.ts       | 2 +-
 src/secrets/runtime-config-collectors-channels.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/infra/matrix-account-selection.test.ts b/src/infra/matrix-account-selection.test.ts
index 7114085a017..a0e0d6c5d0d 100644
--- a/src/infra/matrix-account-selection.test.ts
+++ b/src/infra/matrix-account-selection.test.ts
@@ -6,7 +6,7 @@ import {
   requiresExplicitMatrixDefaultAccount,
   resolveConfiguredMatrixAccountIds,
   resolveMatrixDefaultOrOnlyAccountId,
-} from "../plugin-sdk/matrix.js";
+} from "./matrix-config-helpers.js";
 
 describe("matrix account selection", () => {
   it("resolves configured account ids from non-canonical account keys", () => {
diff --git a/src/infra/matrix-legacy-crypto.test.ts b/src/infra/matrix-legacy-crypto.test.ts
index 1bc33af98a1..03e210cd79a 100644
--- a/src/infra/matrix-legacy-crypto.test.ts
+++ b/src/infra/matrix-legacy-crypto.test.ts
@@ -3,7 +3,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { withTempHome } from "../../test/helpers/temp-home.js";
 import type { OpenClawConfig } from "../config/config.js";
-import { resolveMatrixAccountStorageRoot } from "../plugin-sdk/matrix.js";
+import { resolveMatrixAccountStorageRoot } from "./matrix-config-helpers.js";
 import { autoPrepareLegacyMatrixCrypto, detectLegacyMatrixCrypto } from "./matrix-legacy-crypto.js";
 import { MATRIX_LEGACY_CRYPTO_INSPECTOR_UNAVAILABLE_MESSAGE } from "./matrix-plugin-helper.js";
 import {
diff --git a/src/infra/matrix-migration-snapshot.test.ts b/src/infra/matrix-migration-snapshot.test.ts
index c782791781f..df774ca7672 100644
--- a/src/infra/matrix-migration-snapshot.test.ts
+++ b/src/infra/matrix-migration-snapshot.test.ts
@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { describe, expect, it } from "vitest";
 import { withTempHome } from "../../test/helpers/temp-home.js";
-import { resolveMatrixAccountStorageRoot } from "../plugin-sdk/matrix.js";
+import { resolveMatrixAccountStorageRoot } from "./matrix-config-helpers.js";
 import { detectLegacyMatrixCrypto } from "./matrix-legacy-crypto.js";
 import {
   hasActionableMatrixMigration,
diff --git a/src/secrets/runtime-config-collectors-channels.ts b/src/secrets/runtime-config-collectors-channels.ts
index 9d6a351e355..6e8e0578c2e 100644
--- a/src/secrets/runtime-config-collectors-channels.ts
+++ b/src/secrets/runtime-config-collectors-channels.ts
@@ -1,6 +1,6 @@
 import type { OpenClawConfig } from "../config/config.js";
 import { coerceSecretRef, resolveSecretInputRef } from "../config/types.secrets.js";
-import { getMatrixScopedEnvVarNames } from "../plugin-sdk/matrix.js";
+import { getMatrixScopedEnvVarNames } from "../infra/matrix-config-helpers.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../routing/account-id.js";
 import { collectTtsApiKeyAssignments } from "./runtime-config-collectors-tts.js";
 import {