11import * as fs from "fs/promises"
22import * as os from "os"
33import * as path from "path"
4+ import type { Mock } from "vitest"
45import type { McpServer } from "@roo-code/types"
56import type { ClineProvider } from "../../../core/webview/ClineProvider"
67import { GlobalFileNames } from "../../../shared/globalFileNames"
@@ -13,6 +14,9 @@ vi.mock("../../../core/webview/ClineProvider")
1314describe ( "ToolRouter with McpHub" , ( ) => {
1415 let directory : string
1516 let hub : McpHub
17+ // The hub holds its provider weakly, so the suite keeps the strong reference.
18+ let provider : Partial < ClineProvider >
19+ let post : Mock < ClineProvider [ "postMessageToWebview" ] >
1620 const router = ToolRouter . getInstance ( )
1721 const tools = [ { serverName : "github" , toolName : "issues" , description : "search tickets" } ]
1822 function addServer ( ) : McpServer {
@@ -28,10 +32,11 @@ describe("ToolRouter with McpHub", () => {
2832
2933 beforeEach ( async ( ) => {
3034 directory = await fs . mkdtemp ( path . join ( os . tmpdir ( ) , "tool-router-" ) )
31- const provider : Partial < ClineProvider > = {
35+ post = vi . fn < ClineProvider [ "postMessageToWebview" ] > ( ) . mockResolvedValue ( undefined )
36+ provider = {
3237 cwd : directory ,
3338 ensureSettingsDirectoryExists : async ( ) => directory ,
34- postMessageToWebview : vi . fn ( ) . mockResolvedValue ( undefined ) ,
39+ postMessageToWebview : post ,
3540 getState : vi . fn ( ) . mockResolvedValue ( { mcpEnabled : false } ) ,
3641 }
3742 // The hub uses only cwd, settings directory, state, and webview posting.
@@ -117,14 +122,37 @@ describe("ToolRouter with McpHub", () => {
117122 } )
118123 const changed = vi . fn ( )
119124 hub . onServerListChanged ( changed )
120- addServer ( )
121- const post = vi . spyOn ( hub [ "providerRef" ] . deref ( ) ! , "postMessageToWebview" )
125+ const server = addServer ( )
126+ post . mockClear ( )
122127 await expect ( hub [ "notifyWebviewOfServerChanges" ] ( ) ) . resolves . toBeUndefined ( )
123- expect ( post ) . toHaveBeenCalled ( )
128+ expect ( post ) . toHaveBeenCalledWith ( { type : "mcpServers" , mcpServers : [ server ] } )
124129 expect ( changed ) . toHaveBeenCalledTimes ( 1 )
125130 expect ( log ) . toHaveBeenCalledWith ( "[McpHub] Server-list change listener failed:" , failure )
126131 await expect ( hub . dispose ( ) ) . resolves . toBeUndefined ( )
127132 expect ( changed ) . toHaveBeenCalledTimes ( 2 )
128133 expect ( hub [ "serverListEvents" ] . listenerCount ( "changed" ) ) . toBe ( 0 )
129134 } )
135+
136+ it ( "fires the event before the settings read can fail" , async ( ) => {
137+ await fs . writeFile ( path . join ( directory , GlobalFileNames . mcpSettings ) , "{ not json" )
138+ const changed = vi . fn ( )
139+ hub . onServerListChanged ( changed )
140+ addServer ( )
141+ await expect ( hub [ "notifyWebviewOfServerChanges" ] ( ) ) . rejects . toThrow ( )
142+ expect ( changed ) . toHaveBeenCalledTimes ( 1 )
143+ } )
144+
145+ it ( "fires the event and keeps going when the webview post rejects" , async ( ) => {
146+ const failure = new Error ( "post failed" )
147+ const log = vi . spyOn ( console , "error" ) . mockImplementation ( ( ) => { } )
148+ const changed = vi . fn ( )
149+ hub . onServerListChanged ( changed )
150+ addServer ( )
151+ post . mockClear ( )
152+ post . mockRejectedValueOnce ( failure )
153+ await expect ( hub [ "notifyWebviewOfServerChanges" ] ( ) ) . resolves . toBeUndefined ( )
154+ expect ( post ) . toHaveBeenCalledTimes ( 1 )
155+ expect ( changed ) . toHaveBeenCalledTimes ( 1 )
156+ expect ( log ) . toHaveBeenCalledWith ( "[McpHub] Error calling targetProvider.postMessageToWebview:" , failure )
157+ } )
130158} )
0 commit comments