From fcfb9ddb1d66232d0688ea36ddd48b98274bc077 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Thu, 2 Apr 2026 14:03:05 +0900
Subject: [PATCH] fix(matrix): preserve mocked auth context in bootstrap

---
 extensions/matrix/src/matrix/client-bootstrap.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/extensions/matrix/src/matrix/client-bootstrap.ts b/extensions/matrix/src/matrix/client-bootstrap.ts
index 6c1f0500c3a..28e72fd7274 100644
--- a/extensions/matrix/src/matrix/client-bootstrap.ts
+++ b/extensions/matrix/src/matrix/client-bootstrap.ts
@@ -20,10 +20,9 @@ type MatrixResolvedClientHook = (
 
 type MatrixSharedClientRuntimeDeps = Pick<
   typeof import("./client.js"),
-  "acquireSharedMatrixClient"
+  "acquireSharedMatrixClient" | "resolveMatrixAuthContext"
 > &
-  Pick<typeof import("./client/shared.js"), "releaseSharedClientInstance"> &
-  Pick<typeof import("./client/config.js"), "resolveMatrixAuthContext">;
+  Pick<typeof import("./client/shared.js"), "releaseSharedClientInstance">;
 
 let matrixSharedClientRuntimeDepsPromise: Promise<MatrixSharedClientRuntimeDeps> | undefined;
 
@@ -31,11 +30,10 @@ async function loadMatrixSharedClientRuntimeDeps(): Promise<MatrixSharedClientRu
   matrixSharedClientRuntimeDepsPromise ??= Promise.all([
     import("./client.js"),
     import("./client/shared.js"),
-    import("./client/config.js"),
-  ]).then(([clientModule, sharedModule, configModule]) => ({
+  ]).then(([clientModule, sharedModule]) => ({
     acquireSharedMatrixClient: clientModule.acquireSharedMatrixClient,
+    resolveMatrixAuthContext: clientModule.resolveMatrixAuthContext,
     releaseSharedClientInstance: sharedModule.releaseSharedClientInstance,
-    resolveMatrixAuthContext: configModule.resolveMatrixAuthContext,
   }));
   return await matrixSharedClientRuntimeDepsPromise;
 }