feat: add update server permission method without re-init server (#1363)

Author: bywang56

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/mcp/mcpManager.test.ts

@@ -5,9 +5,9 @@
 
 import { expect } from 'chai'
 import * as sinon from 'sinon'
-import { McpManager } from './mcpManager'
+import { AGENT_TOOLS_CHANGED, MCP_SERVER_STATUS_CHANGED, McpManager } from './mcpManager'
 import * as mcpUtils from './mcpUtils'
-import type { MCPServerConfig } from './mcpTypes'
+import type { MCPServerConfig, MCPServerPermissionUpdate } from './mcpTypes'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
 
 // Shared fakes
@@ -484,6 +484,97 @@ describe('getEnabledTools()', () => {
         expect(mgr.getAllTools()).to.have.length(1)
         expect(mgr.getEnabledTools()).to.be.empty
     })
+
+    it('server-level permission change (enabled->disabled)', async () => {
+        const cfg = {
+            command: 'c',
+            args: [],
+            env: {},
+            disabled: false,
+            autoApprove: false,
+            toolOverrides: {},
+            __configPath__: 'srv.json',
+        } as MCPServerConfig
+        loadStub.resolves(new Map([['srv', cfg]]))
+        const mgr = await McpManager.init(['srv.json'], features)
+        const client = new Client({ name: 'x', version: 'v' })
+        ;(mgr as any).clients.set('srv', client)
+        ;(mgr as any).mcpTools.push({ serverName: 'srv', toolName: 'tool1', description: '', inputSchema: {} })
+
+        const statusEvents: any[] = []
+        mgr.events.on(MCP_SERVER_STATUS_CHANGED, (_, s) => statusEvents.push(s))
+        const toolsEvents: any[] = []
+        mgr.events.on(AGENT_TOOLS_CHANGED, (_, t) => toolsEvents.push(t))
+
+        const closeSpy = sinon.spy(client, 'close')
+        await mgr.updateServerPermission('srv', { disabled: true } as MCPServerPermissionUpdate)
+
+        expect(closeSpy.calledOnce).to.be.true
+        expect(statusEvents).to.deep.equal([{ status: 'DISABLED', toolsCount: 0, lastError: undefined }])
+        expect(toolsEvents).to.deep.equal([[]])
+    })
+
+    it('server-level permission change (disabled->enabled)', async () => {
+        const cfg = {
+            command: 'c',
+            args: [],
+            env: {},
+            disabled: true,
+            autoApprove: false,
+            toolOverrides: {},
+            __configPath__: 'srv2.json',
+        } as MCPServerConfig
+        loadStub.resolves(new Map([['srv2', cfg]]))
+        const mgr = await McpManager.init([], features)
+        ;(mgr as any).mcpServers.set('srv2', cfg)
+
+        await mgr.updateServerPermission('srv2', { disabled: false } as MCPServerPermissionUpdate)
+        expect(initOneStub.calledOnceWith('srv2')).to.be.true
+    })
+
+    it('disables individual tool-level permission and filters tool list', async () => {
+        const cfg = {
+            command: 'c',
+            args: [],
+            env: {},
+            disabled: false,
+            autoApprove: false,
+            toolOverrides: {},
+            __configPath__: 'srv3.json',
+        } as MCPServerConfig
+        loadStub.resolves(new Map([['srv3', cfg]]))
+        const mgr = await McpManager.init(['srv3.json'], features)
+        ;(mgr as any).mcpTools = [{ serverName: 'srv3', toolName: 'toolA', description: '', inputSchema: {} }]
+
+        const toolsEvents: any[] = []
+        mgr.events.on(AGENT_TOOLS_CHANGED, (_, t) => toolsEvents.push(t))
+        await mgr.updateServerPermission('srv3', { toolOverrides: { toolA: { disabled: true } } })
+
+        expect(toolsEvents[0]).to.deep.equal([])
+    })
+
+    it('re-enables individual tool-level permission and restores tool', async () => {
+        const cfg = {
+            command: 'c',
+            args: [],
+            env: {},
+            disabled: false,
+            autoApprove: false,
+            toolOverrides: { toolB: { disabled: true } },
+            __configPath__: 'srv4.json',
+        } as MCPServerConfig
+        loadStub.resolves(new Map([['srv4', cfg]]))
+        const mgr = await McpManager.init(['srv4.json'], features)
+        ;(mgr as any).mcpTools = [{ serverName: 'srv4', toolName: 'toolB', description: '', inputSchema: {} }]
+
+        const toolsEvents: any[] = []
+        mgr.events.on(AGENT_TOOLS_CHANGED, (_, t) => toolsEvents.push(t))
+        await mgr.updateServerPermission('srv4', { toolOverrides: { toolB: { disabled: false } } })
+
+        expect(toolsEvents[0]).to.deep.equal([
+            { serverName: 'srv4', toolName: 'toolB', description: '', inputSchema: {} },
+        ])
+    })
 })
 
 // getAllToolsWithStates()

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/mcp/mcpManager.ts

@@ -12,6 +12,7 @@ import type {
     ListToolsResponse,
     McpServerRuntimeState,
     McpServerStatus,
+    MCPServerPermissionUpdate,
 } from './mcpTypes'
 import { loadMcpServerConfigs } from './mcpUtils'
 import { AgenticChatError } from '../../errors'
@@ -434,7 +435,56 @@ export class McpManager {
     }
 
     /**
-     * Read, mutate, and write the JSON config at the given path atomically
+     * Update permission for given server: if only tool permission changes, does not teardown and re-init.
+     */
+    public async updateServerPermission(serverName: string, perm: MCPServerPermissionUpdate): Promise<void> {
+        const oldCfg = this.mcpServers.get(serverName)
+        if (!oldCfg || !oldCfg.__configPath__) {
+            throw new Error(`MCP: server '${serverName}' not found`)
+        }
+
+        await this.mutateConfigFile(oldCfg.__configPath__, json => {
+            json.mcpServers ||= {}
+            json.mcpServers[serverName] = {
+                ...json.mcpServers[serverName],
+                ...perm,
+            }
+        })
+
+        const newCfg: MCPServerConfig = {
+            ...oldCfg,
+            ...perm,
+            __configPath__: oldCfg.__configPath__,
+        }
+        this.mcpServers.set(serverName, newCfg)
+
+        const oldDisabled = !!oldCfg.disabled // undefined -> false
+        const newDisabled = perm.disabled ?? oldDisabled // no value -> old value
+
+        if (perm.disabled !== undefined && newDisabled !== oldDisabled) {
+            // Server level ENABLED → DISABLED
+            if (newDisabled) {
+                const client = this.clients.get(serverName)
+                if (client) {
+                    await client.close()
+                    this.clients.delete(serverName)
+                }
+                this.setState(serverName, 'DISABLED', 0)
+            } else {
+                // Server level DISABLED → ENABLED
+                await this.initOneServer(serverName, newCfg)
+                return
+            }
+        } else {
+            const count = this.mcpTools.filter(t => t.serverName === serverName).length
+            this.setState(serverName, newDisabled ? 'DISABLED' : 'ENABLED', count)
+        }
+
+        this.emitToolsChanged(serverName)
+    }
+
+    /**
+     * Read, mutate, and write the JSON config at the given path.
      * @private
      */
     private async mutateConfigFile(configPath: string, mutator: (json: any) => void): Promise<void> {

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/mcp/mcpTypes.ts

@@ -30,6 +30,12 @@ export interface MCPServerConfig {
     __configPath__?: string
 }
 
+export interface MCPServerPermissionUpdate {
+    disabled?: boolean
+    autoApprove?: boolean
+    toolOverrides?: Record<string, { autoApprove?: boolean; disabled?: boolean }>
+}
+
 export interface ListToolsResponse {
     tools: {
         name?: string