From 874f2a03fcdcabfb3bf624e19df1f0629d752074 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 3 Apr 2026 15:54:26 -0400
Subject: [PATCH] fix: address minor review findings N3, N5, N6

- N3: Type deleteClientRegistration param as TokenMethods['deleteTokens']
  instead of Promise<unknown>
- N5: Elevate deletion failure logging from debug to warn for operator
  visibility when stale client cleanup fails
- N6: Use getLogPrefix() instead of hardcoded log prefix to respect
  system-user privacy convention
---
 packages/api/src/mcp/MCPConnectionFactory.ts | 2 +-
 packages/api/src/mcp/oauth/tokens.ts         | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/api/src/mcp/MCPConnectionFactory.ts b/packages/api/src/mcp/MCPConnectionFactory.ts
index 02deb18c37..8561b0c480 100644
--- a/packages/api/src/mcp/MCPConnectionFactory.ts
+++ b/packages/api/src/mcp/MCPConnectionFactory.ts
@@ -362,7 +362,7 @@ export class MCPConnectionFactory {
                 serverName: this.serverName,
                 deleteTokens: this.tokenMethods.deleteTokens,
               }).catch((err) => {
-                logger.debug(`${this.logPrefix} Failed to clear stale client registration`, err);
+                logger.warn(`${this.logPrefix} Failed to clear stale client registration`, err);
               });
             }
             const oldState = oldMeta?.state;
diff --git a/packages/api/src/mcp/oauth/tokens.ts b/packages/api/src/mcp/oauth/tokens.ts
index d470ace103..61b442ca8c 100644
--- a/packages/api/src/mcp/oauth/tokens.ts
+++ b/packages/api/src/mcp/oauth/tokens.ts
@@ -484,7 +484,7 @@ export class MCPTokenStorage {
   }: {
     userId: string;
     serverName: string;
-    deleteTokens: (query: { userId: string; type: string; identifier: string }) => Promise<unknown>;
+    deleteTokens: TokenMethods['deleteTokens'];
   }): Promise<void> {
     const identifier = `mcp:${serverName}`;
     await deleteTokens({
@@ -492,9 +492,8 @@ export class MCPTokenStorage {
       type: 'mcp_oauth_client',
       identifier: `${identifier}:client`,
     });
-    logger.debug(
-      `[MCPTokenStorage] Cleared stored client registration for ${serverName} (userId: ${userId})`,
-    );
+    const logPrefix = this.getLogPrefix(userId, serverName);
+    logger.debug(`${logPrefix} Cleared stored client registration`);
   }
 
   /**