A self-improving RLM agent for coding workflows and long-running autonomous tasks.
Rust
fix(coding-agent): refresh MCP providers after add (#1629)
Seth Kartena3d86fbe593d
diff --git a/packages/coding-agent/.changes/eng-5433-mcp-oauth-refresh.md b/packages/coding-agent/.changes/eng-5433-mcp-oauth-refresh.mdnew file mode 100644index 0000000000..0434261e4a--- /dev/null+++ b/packages/coding-agent/.changes/eng-5433-mcp-oauth-refresh.md@@ -0,0 +1 @@+- Refreshed MCP providers immediately after server changes so OAuth connections can be started without restarting Prime Agent.diff --git a/packages/coding-agent/src/core/agent-session.ts b/packages/coding-agent/src/core/agent-session.tsindex 35931e879b..d2befaaf7f 100644--- a/packages/coding-agent/src/core/agent-session.ts+++ b/packages/coding-agent/src/core/agent-session.ts@@ -1298,6 +1298,11 @@ export class AgentSession {});}+ /** Refreshes MCP provider registrations without rebuilding the session runtime. */+ refreshMcpProviders(): void {+ this._mcpManager?.refresh();+ }+/*** Set the RLM heartbeat controller after construction. Used by* print/headless mode to attach an in-process heartbeat schedulerdiff --git a/packages/coding-agent/src/core/mcp/mcp-command.ts b/packages/coding-agent/src/core/mcp/mcp-command.tsindex 252a6f4e24..51c2d88e37 100644--- a/packages/coding-agent/src/core/mcp/mcp-command.ts+++ b/packages/coding-agent/src/core/mcp/mcp-command.ts@@ -11,6 +11,7 @@ export interface McpManagementResult {name: string;transport: McpServerConfig["type"];verb: "added" | "replaced" | "removed";+ usesOAuth: boolean;};}@@ -52,7 +53,12 @@ export async function runMcpManagementCommand(action,message: `Removed MCP server "${name}".`,changed: true,- serverChange: { name, transport: config.type, verb: "removed" },+ serverChange: {+ name,+ transport: config.type,+ verb: "removed",+ usesOAuth: config.type === "http" && config.oauth === true,+ },};}if (action === "add") {@@ -70,7 +76,12 @@ export async function runMcpManagementCommand(action,message: `${replaced ? "Replaced" : "Added"} MCP server "${name}".`,changed: true,- serverChange: { name, transport: config.type, verb: replaced ? "replaced" : "added" },+ serverChange: {+ name,+ transport: config.type,+ verb: replaced ? "replaced" : "added",+ usesOAuth: config.type === "http" && config.oauth === true,+ },};}throw new Error("Usage: mcp <add|list|get|remove>.");diff --git a/packages/coding-agent/src/modes/interactive/interactive-mode-services.ts b/packages/coding-agent/src/modes/interactive/interactive-mode-services.tsindex 761a51a22c..8d79acd828 100644--- a/packages/coding-agent/src/modes/interactive/interactive-mode-services.ts+++ b/packages/coding-agent/src/modes/interactive/interactive-mode-services.ts@@ -20,6 +20,8 @@ export interface InteractiveModeUiServices {getInitialCwd(): string;getInitialSessionName(): string | undefined;getThemes(): Theme[];+ /** Refreshes MCP providers after a client-side MCP settings mutation. */+ refreshMcpProviders?(): void;}type LocalExtensionNewSessionOptions = Parameters<ExtensionCommandContext["newSession"]>[0];@@ -60,6 +62,7 @@ export function createInteractiveModeUiServices(session: AgentSession): InteractgetInitialCwd: () => session.sessionManager.getCwd(),getInitialSessionName: () => session.sessionManager.getSessionName(),getThemes: () => session.resourceLoader.getThemes().themes,+ refreshMcpProviders: () => session.refreshMcpProviders(),};}@@ -75,6 +78,7 @@ export function createInteractiveModeUiServicesFromServices(options: {getInitialCwd: () => sessionManager.getCwd(),getInitialSessionName: () => sessionManager.getSessionName(),getThemes: () => services.resourceLoader.getThemes().themes,+ refreshMcpProviders: () => services.mcpManager.refresh(),};}diff --git a/packages/coding-agent/src/modes/interactive/interactive-mode.ts b/packages/coding-agent/src/modes/interactive/interactive-mode.tsindex 817fb87761..db5abdb5c6 100644--- a/packages/coding-agent/src/modes/interactive/interactive-mode.ts+++ b/packages/coding-agent/src/modes/interactive/interactive-mode.ts@@ -8665,12 +8665,16 @@ export class InteractiveMode {try {const result = await runMcpManagementCommand(argv, this.settingsManager, this.modelRegistry.authStorage);if (result.changed && result.serverChange) {- const { name, transport, verb } = result.serverChange;+ const { name, transport, verb, usesOAuth } = result.serverChange;+ const hasMcpProviderRefresh = this.uiServices.refreshMcpProviders !== undefined;+ this.uiServices.refreshMcpProviders?.();const successMessage =verb === "removed"? `Removed MCP server "${name}" (${transport}). It is no longer available through mcp.`- : `${verb === "replaced" ? "Replaced" : "Added"} MCP server "${name}" (${transport}). Available next turn through mcp.`;- await this.reloadAfterMcpChange(result.message, successMessage);+ : usesOAuth+ ? `${verb === "replaced" ? "Replaced" : "Added"} MCP server "${name}" (${transport}). ${hasMcpProviderRefresh ? "Run" : "Restart Prime Agent, then run"} /mcp login ${name} to connect.`+ : `${verb === "replaced" ? "Replaced" : "Added"} MCP server "${name}" (${transport}). Available next turn through mcp.`;+ await this.reloadAfterMcpChange(usesOAuth ? successMessage : result.message, successMessage);} else if (result.action === "list") {const builtins = BUILTIN_MCP_CATALOG.map((entry) => `${entry.label} (${entry.server}): ${isAuthed(entry.server) ? "connected" : "not connected"}`,diff --git a/packages/coding-agent/test/interactive-mode-services.test.ts b/packages/coding-agent/test/interactive-mode-services.test.tsnew file mode 100644index 0000000000..4367956811--- /dev/null+++ b/packages/coding-agent/test/interactive-mode-services.test.ts@@ -0,0 +1,48 @@+import { describe, expect, it, vi } from "vitest";+import type { AgentSession } from "../src/core/agent-session.js";+import type { AgentSessionServices } from "../src/core/agent-session-services.js";+import type { SessionManager } from "../src/core/session-manager.js";+import {+ createInteractiveModeUiServices,+ createInteractiveModeUiServicesFromServices,+} from "../src/modes/interactive/interactive-mode-services.js";++describe("InteractiveModeUiServices MCP refresh", () => {+ it("wires local sessions through the narrow session refresh method", () => {+ const refreshMcpProviders = vi.fn();+ const session = {+ settingsManager: {},+ modelRegistry: {},+ sessionManager: { getCwd: () => "/local", getSessionName: () => "local-session" },+ resourceLoader: { getThemes: () => ({ themes: [] }) },+ refreshMcpProviders,+ } as unknown as AgentSession;++ const services = createInteractiveModeUiServices(session);+ services.refreshMcpProviders?.();++ expect(refreshMcpProviders).toHaveBeenCalledOnce();+ expect(services.getInitialCwd()).toBe("/local");+ });++ it("wires daemon-backed services directly to the MCP manager", () => {+ const refresh = vi.fn();+ const services = createInteractiveModeUiServicesFromServices({+ services: {+ settingsManager: {},+ modelRegistry: {},+ resourceLoader: { getThemes: () => ({ themes: [] }) },+ mcpManager: { refresh },+ } as unknown as AgentSessionServices,+ sessionManager: {+ getCwd: () => "/daemon",+ getSessionName: () => "daemon-session",+ } as unknown as SessionManager,+ });++ services.refreshMcpProviders?.();++ expect(refresh).toHaveBeenCalledOnce();+ expect(services.getInitialSessionName()).toBe("daemon-session");+ });+});diff --git a/packages/coding-agent/test/interactive-mode-status.test.ts b/packages/coding-agent/test/interactive-mode-status.test.tsindex 16f8e57bc8..4ef691e164 100644--- a/packages/coding-agent/test/interactive-mode-status.test.ts+++ b/packages/coding-agent/test/interactive-mode-status.test.ts@@ -1077,6 +1077,7 @@ describe("InteractiveMode MCP command", () => {type McpCommandHarness = {modelRegistry: { authStorage: { get(providerId: string): unknown } };settingsManager: SettingsManager;+ uiServices: { refreshMcpProviders?(): void };showConfigurationMenu(tab: "mcp-connections"): Promise<void>;showStatus(message: string): void;showError(message: string): void;@@ -1121,6 +1122,7 @@ describe("InteractiveMode MCP command", () => {return {modelRegistry: { authStorage: { get: vi.fn(() => undefined), removeVerified: vi.fn() } },settingsManager: manager,+ uiServices: { refreshMcpProviders: vi.fn() },chatContainer,ui,showStatus,@@ -1146,6 +1148,7 @@ describe("InteractiveMode MCP command", () => {await handleMcpCommand.call(fakeThis, "add fetch -- uvx mcp-server-fetch --token secret");+ expect(fakeThis.uiServices.refreshMcpProviders).toHaveBeenCalledOnce();expect(normalizeRenderedOutput(fakeThis.chatContainer)).toContain('Added MCP server "fetch" (stdio). Available next turn through mcp.',);@@ -1179,6 +1182,52 @@ describe("InteractiveMode MCP command", () => {expect(manager.getGlobalMcpServers()).toHaveProperty("fetch");});+ test("refreshes MCP providers before deferring a changed command while busy", async () => {+ const manager = SettingsManager.inMemory({});+ const events: string[] = [];+ const fakeThis = createRenderedMcpHarness(manager);+ fakeThis.uiServices.refreshMcpProviders = vi.fn(() => events.push("refresh"));+ fakeThis.handleReloadCommand = vi.fn(async () => true);+ fakeThis.isAgentStreaming = vi.fn(() => true);+ fakeThis.showStatus = vi.fn((message: string) => events.push(message));++ await handleMcpCommand.call(fakeThis, "add remote --url https://example.test/mcp --oauth");++ expect(events[0]).toBe("refresh");+ expect(fakeThis.handleReloadCommand).not.toHaveBeenCalled();+ expect(events.join("\n")).toContain("Run /mcp login remote to connect.");+ expect(events.join("\n")).toContain("Run /reload after the current turn to activate it.");+ });++ test("guides OAuth server additions to explicit login after refresh", async () => {+ const manager = SettingsManager.inMemory({});+ const fakeThis = createRenderedMcpHarness(manager);+ const events: string[] = [];+ fakeThis.uiServices.refreshMcpProviders = vi.fn(() => events.push("refresh"));+ fakeThis.handleReloadCommand = vi.fn(async () => {+ events.push("reload");+ return true;+ });++ await handleMcpCommand.call(fakeThis, "add remote --url https://example.test/mcp --oauth");++ expect(events).toEqual(["refresh", "reload"]);+ expect(normalizeRenderedOutput(fakeThis.chatContainer)).toContain("Run /mcp login remote to connect.");+ });++ test("keeps OAuth guidance accurate for legacy UI service hosts", async () => {+ const manager = SettingsManager.inMemory({});+ const fakeThis = createRenderedMcpHarness(manager);+ fakeThis.uiServices = {};+ fakeThis.handleReloadCommand = vi.fn(async () => true);++ await handleMcpCommand.call(fakeThis, "add remote --url https://example.test/mcp --oauth");++ expect(normalizeRenderedOutput(fakeThis.chatContainer)).toContain(+ "Restart Prime Agent, then run /mcp login remote to connect.",+ );+ });+test("renders inspectable redacted list and get output", async () => {const manager = SettingsManager.inMemory({mcpServers: {