From 408dcfc82715a3b67dba7be0e53b6d2c5428aa27 Mon Sep 17 00:00:00 2001 From: Umais-Adeed Date: Sat, 21 Nov 2026 08:19:14 +0500 Subject: [PATCH 1/3] fix(server): Claude plugin MCP servers no longer flood threads with sign-in notices Every installed Claude Code plugin that ships an OAuth MCP server the user never connected (for example legal, engineering, design) added a "needs a sign-in" row to each thread. Skip plugin-sourced servers the same way unconnected claude.ai connectors are skipped, falling back to the `plugin:` name prefix for CLIs that predate the `source` field. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 4 +++- .../Adapters/ClaudeAdapterV2.ts | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index c09aca71dfc2..828d7b557ade 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -7102,13 +7102,15 @@ describe("ClaudeAdapterV2 background wake turns", () => { ), ); - it.effect("asks to sign in to a configured MCP server, but not to a claude.ai connector", () => + it.effect("asks to sign in to a configured MCP server, but not to a connector or plugin", () => Effect.gen(function* () { const harness = yield* makeWakeHarnessWithOptions({ mcp: { mcpServerStatus: Effect.succeed([ { name: "linear", status: "needs-auth" }, { name: "claude.ai Gmail", status: "needs-auth", scope: "claudeai" }, + { name: "plugin:legal:slack", status: "needs-auth", source: "plugin" }, + { name: "plugin:design:figma", status: "needs-auth" }, { name: "docs", status: "connected" }, ]), readMcpResource: () => Effect.die("unexpected MCP resource read"), diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index 3b3e2b273977..761dd5c66ccc 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -977,6 +977,10 @@ async function sendClaudeControlRequest( return Predicate.isObject(reply) ? reply.response : undefined; } +// Older CLIs omit `source`; plugin servers are always named `plugin::`. +const isClaudePluginMcpServer = (server: { readonly name: string; readonly source?: string }) => + server.source === "plugin" || server.name.startsWith("plugin:"); + const decodeClaudeMcpAuthenticateReply = Schema.decodeUnknownEffect( Schema.Struct({ authUrl: Schema.optional(Schema.String), @@ -8802,8 +8806,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( ); liveQuery.checkMcpSignIns = statuses.some((status) => status.status === "pending"); for (const status of statuses) { - // Every claude.ai connector the user never connected reports this too. - if (status.status !== "needs-auth" || status.scope === "claudeai") continue; + // Unconnected claude.ai connectors and plugin-bundled servers report this too. + if ( + status.status !== "needs-auth" || + status.scope === "claudeai" || + isClaudePluginMcpServer(status) + ) { + continue; + } const key = `${liveQuery.nativeThreadId}\u0000${status.name}`; if (announcedMcpSignIns.has(key)) continue; announcedMcpSignIns.add(key); @@ -13364,8 +13374,9 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( context.checkMcpSignIns = (message.mcp_servers ?? []).some( (server) => (server.status === "pending" || server.status === "needs-auth") && - // claude.ai connectors the user never connected need a sign-in too. - !server.name.startsWith("claude.ai "), + // claude.ai connectors and plugin servers the user never connected need a sign-in too. + !server.name.startsWith("claude.ai ") && + !isClaudePluginMcpServer(server), ); } if ( From 8c8e28cdac4142a3b362d6863f0bf78de1afd134 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Sat, 21 Nov 2026 04:21:50 +0000 Subject: [PATCH 2/3] fix(server): clarify plugin MCP exclusion comment Co-Authored-By: Claude Opus 5.5 --- apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index 761dd5c66ccc..c1ffec77d776 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -13374,7 +13374,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( context.checkMcpSignIns = (message.mcp_servers ?? []).some( (server) => (server.status === "pending" || server.status === "needs-auth") && - // claude.ai connectors and plugin servers the user never connected need a sign-in too. + // Unconnected claude.ai connectors and plugin servers are never announced. !server.name.startsWith("claude.ai ") && !isClaudePluginMcpServer(server), ); From 15d377d881b6e04542d31e786872e8754175a2d7 Mon Sep 17 00:00:00 2001 From: Umais-Adeed Date: Sat, 21 Nov 2026 20:51:11 +0500 Subject: [PATCH 3/3] test(server): cover the plugin MCP exclusion in the init check Test suggested by @advwebin in review. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index 828d7b557ade..b344702e2738 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -7167,6 +7167,61 @@ describe("ClaudeAdapterV2 background wake turns", () => { ), ); + it.effect("skips the MCP status request when init lists only plugins and connectors", () => + Effect.gen(function* () { + let statusRequests = 0; + const harness = yield* makeWakeHarnessWithOptions({ + mcp: { + mcpServerStatus: Effect.sync(() => { + statusRequests += 1; + return []; + }), + readMcpResource: () => Effect.die("unexpected MCP resource read"), + callMcpTool: () => Effect.die("unexpected MCP tool call"), + }, + }); + yield* harness.runtime.startTurn( + makeClaudeTestTurnInput({ + threadId: harness.threadId, + providerThread: harness.providerThread, + now: yield* DateTime.now, + attemptId: RunAttemptId.make("mcp-plugin-init"), + text: "Plan the sprint", + attachments: [], + }), + ); + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "system", + subtype: "init", + uuid: "mcp-plugin-init", + session_id: WAKE_NATIVE_SESSION, + mcp_servers: [ + { name: "plugin:legal:slack", status: "pending" }, + { name: "plugin:design:figma", status: "needs-auth" }, + { name: "claude.ai Gmail", status: "needs-auth" }, + ], + }), + ); + yield* Queue.offer( + harness.sdkMessages, + makeResultFrame({ uuid: "mcp-plugin-init-result", result: "Planned" }), + ); + yield* Queue.take(harness.terminalReceipts); + assert.strictEqual(statusRequests, 0); + }).pipe( + Effect.scoped, + Effect.provide( + Layer.mergeAll( + IdAllocator.layer, + McpProviderSessions.layer, + NodeServices.layer, + NodeCrypto.layer, + ), + ), + ), + ); + // regression: #38284 an MCP app's update-model-context note must reach Claude's next turn it.effect("sends MCP app model context with the next Claude turn", () => Effect.gen(function* () {