From b58fb0a14c9dc9e8bc3f0938b8cb9b01f4846dea Mon Sep 17 00:00:00 2001 From: abhinav7x94 <204053250+abhinav7x94@users.noreply.github.com> Date: Sun, 16 Aug 2026 03:31:30 +0530 Subject: [PATCH] refactor(mcp): simplify unscoped client selection --- apps/mcp/src/server/tools/search-memory.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/mcp/src/server/tools/search-memory.ts b/apps/mcp/src/server/tools/search-memory.ts index 990fead2..e093aed6 100644 --- a/apps/mcp/src/server/tools/search-memory.ts +++ b/apps/mcp/src/server/tools/search-memory.ts @@ -35,11 +35,13 @@ export function register(deps: ToolDeps) { let effectiveTag = await deps.resolveSelectedContainerTag( args.containerTag, ) - let unscopedClient: ReturnType | undefined - if (args.containerTag === undefined && effectiveTag) { + const unscopedClient = + args.containerTag === undefined && effectiveTag + ? deps.getClient() + : undefined + if (unscopedClient) { // Active state is account-wide and can outlive an OAuth grant. // Revalidate inherited state before sending it as an explicit scope. - unscopedClient = deps.getClient() const visibleTags = await unscopedClient.listContainerTags() if (!visibleTags.some((tag) => tag.containerTag === effectiveTag)) { effectiveTag = undefined