@aws/lsp-codewhisperer 0.0.80 → 0.0.81

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.0.81](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.80...lsp-codewhisperer/v0.0.81) (2025-09-19)
+
+
+### Bug Fixes
+
+* **amazonq:** fix for delete mcp for mcp config, disable and create corresponding agent file ([#2298](https://github.com/aws/language-servers/issues/2298)) ([8641860](https://github.com/aws/language-servers/commit/8641860295c4e089d09154fa5411c305f2f4ecce))
+* **amazonq:** fix for legacy mcp permission consistentcy and config update ([#2300](https://github.com/aws/language-servers/issues/2300)) ([c8aa7bd](https://github.com/aws/language-servers/commit/c8aa7bd3e9d39ed327972bbc950ad72e8e401581))
+* **amazonq:** fix for mcp permissions read/write inconsistencies ([#2296](https://github.com/aws/language-servers/issues/2296)) ([c7a9a8e](https://github.com/aws/language-servers/commit/c7a9a8e1ba5c1a284d661e683dd46133860a1d3d))
+* **amazonq:** fix to add filewatcher for mcp config files ([#2295](https://github.com/aws/language-servers/issues/2295)) ([fcee77c](https://github.com/aws/language-servers/commit/fcee77c1b06e69f9096d8e98a0cfcc42d7fddb01))
+* **amazonq:** fix to normlize workspace paths in windows ([#2306](https://github.com/aws/language-servers/issues/2306)) ([fab073c](https://github.com/aws/language-servers/commit/fab073c855109b15005bfd880894471c35652ffc))
+* **amazonq:** improve messaging for code review ([#2303](https://github.com/aws/language-servers/issues/2303)) ([60bc68d](https://github.com/aws/language-servers/commit/60bc68d1d4d2ce8a0373be6ce7551e961fc2cdb8))
+* **amazonq:** support mcp config files for backwards compatbility ([#2292](https://github.com/aws/language-servers/issues/2292)) ([41c99af](https://github.com/aws/language-servers/commit/41c99af02b3f415e39898f11c3c21ac530f9c406))
+* inline UTD empty cases dont differentiate Edit and Completion ([#2287](https://github.com/aws/language-servers/issues/2287)) ([84e2c8c](https://github.com/aws/language-servers/commit/84e2c8c12f5d828192a302fa11483063d33b059c))
+* inline UTD telemetry empty cases dont differentiate Edit and Completion ([#2288](https://github.com/aws/language-servers/issues/2288)) ([d207b6e](https://github.com/aws/language-servers/commit/d207b6e9dfded650c6f65c675ee45c52f8222571))
+* quick fix for repeated logging from squashed commit ([#2291](https://github.com/aws/language-servers/issues/2291)) ([36f3eed](https://github.com/aws/language-servers/commit/36f3eedd1cad3fca4fc48792ba40b6470f733bfa))
+
+
+### Reverts
+
+* inline UTD telemetry empty cases dont differentiate Edit and Completion ([#2288](https://github.com/aws/language-servers/issues/2288)) ([#2297](https://github.com/aws/language-servers/issues/2297)) ([eb081e6](https://github.com/aws/language-servers/commit/eb081e6bc6bef4182ab89e295bff97c4e828096b))
+
 ## [0.0.80](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.79...lsp-codewhisperer/v0.0.80) (2025-09-16)
 
 

package/out/language-server/agenticChat/tools/mcp/agentPermissionManager.d.ts

@@ -8,7 +8,10 @@ import { AgentConfig, McpPermissionType } from './mcpTypes';
  */
 export declare class AgentPermissionManager {
     private agentConfig;
-    constructor(agentConfig: AgentConfig);
+    private getAvailableTools?;
+    private getAllAvailableServers?;
+    private getAllBuiltinTools?;
+    constructor(agentConfig: AgentConfig, getAvailableTools?: ((serverName: string) => string[]) | undefined, getAllAvailableServers?: (() => string[]) | undefined, getAllBuiltinTools?: (() => string[]) | undefined);
     /**
      * Check if a tool matches a pattern using glob-style wildcards
      */
@@ -26,13 +29,9 @@ export declare class AgentPermissionManager {
      */
     getToolPermission(serverName: string, toolName: string): McpPermissionType;
     /**
-     * Set permission for a tool (uses simple patterns for writing)
+     * Set permission for a tool - removes conflicting wildcards and replaces with explicit tools
      */
     setToolPermission(serverName: string, toolName: string, permission: McpPermissionType): void;
-    /**
-     * Remove wildcards that would conflict with specific tool permission
-     */
-    private removeConflictingWildcards;
     /**
      * Add tool to tools array
      */
@@ -46,13 +45,57 @@ export declare class AgentPermissionManager {
      */
     private addToAllowedTools;
     /**
-     * Remove tool from allowedTools array
+     * Remove tool from allowedTools array (only exact matches)
      */
     private removeFromAllowedTools;
     /**
      * Set server-wide permission (uses @serverName pattern)
      */
     setServerPermission(serverName: string, permission: McpPermissionType): void;
+    /**
+     * Convert server-wide permission to individual tools, excluding the denied tool
+     */
+    private convertServerWideToIndividualTools;
+    /**
+     * Remove conflicting wildcards from tools when denying a tool
+     */
+    private removeConflictingWildcardsForDeny;
+    /**
+     * Remove conflicting wildcards from allowedTools when denying a tool
+     */
+    private removeConflictingAllowedWildcardsForDeny;
+    /**
+     * Remove conflicting wildcards from allowedTools when setting to ask
+     */
+    private removeConflictingAllowedWildcardsForAsk;
+    /**
+     * Expand global wildcard (*) to all available tools except the denied one
+     */
+    private expandGlobalWildcard;
+    /**
+     * Expand @builtin wildcard to all builtin tools except the denied one
+     */
+    private expandBuiltinWildcard;
+    /**
+     * Remove pattern wildcards that match the tool and expand them
+     */
+    private removeMatchingPatternWildcards;
+    /**
+     * Expand a pattern wildcard to individual tools except the denied one
+     */
+    private expandPatternWildcard;
+    /**
+     * Expand allowedTools pattern wildcard except the denied tool
+     */
+    private expandAllowedPatternWildcard;
+    /**
+     * Get all available servers
+     */
+    private getAvailableServers;
+    /**
+     * Get all builtin tools
+     */
+    private getBuiltinTools;
     /**
      * Get updated agent config
      */

package/out/language-server/agenticChat/tools/mcp/agentPermissionManager.js

@@ -11,8 +11,14 @@ const mcpTypes_1 = require("./mcpTypes");
  */
 class AgentPermissionManager {
     agentConfig;
-    constructor(agentConfig) {
+    getAvailableTools;
+    getAllAvailableServers;
+    getAllBuiltinTools;
+    constructor(agentConfig, getAvailableTools, getAllAvailableServers, getAllBuiltinTools) {
         this.agentConfig = agentConfig;
+        this.getAvailableTools = getAvailableTools;
+        this.getAllAvailableServers = getAllAvailableServers;
+        this.getAllBuiltinTools = getAllBuiltinTools;
     }
     /**
      * Check if a tool matches a pattern using glob-style wildcards
@@ -36,20 +42,31 @@ class AgentPermissionManager {
     isToolEnabled(serverName, toolName) {
         const toolId = serverName ? `@${serverName}/${toolName}` : toolName;
         const serverPrefix = serverName ? `@${serverName}` : '';
-        // Check exact matches first
+        // Check exact matches first (exact matches take precedence)
         if (this.agentConfig.tools.includes(toolId))
             return true;
         if (serverPrefix && this.agentConfig.tools.includes(serverPrefix))
             return true;
+        // Check for global wildcard
+        if (this.agentConfig.tools.includes('*'))
+            return true;
+        // Check for @builtin pattern (built-in tools only)
+        if (!serverName && this.agentConfig.tools.includes('@builtin'))
+            return true;
         // Check wildcard patterns
         for (const tool of this.agentConfig.tools) {
             if (tool.includes('*') || tool.includes('?')) {
+                // For server patterns like @*-mcp, match against server prefix
+                if (serverName && tool.startsWith('@') && !tool.includes('/')) {
+                    if (this.matchesPattern(serverPrefix, tool))
+                        return true;
+                }
+                // For full tool patterns
                 if (this.matchesPattern(toolId, tool))
                     return true;
             }
         }
-        // Check for global wildcard
-        return this.agentConfig.tools.includes('*');
+        return false;
     }
     /**
      * Check if a tool is always allowed (in allowedTools array)
@@ -75,59 +92,66 @@ class AgentPermissionManager {
      * Get permission type for a tool
      */
     getToolPermission(serverName, toolName) {
+        const toolId = serverName ? `@${serverName}/${toolName}` : toolName;
+        const serverPrefix = serverName ? `@${serverName}` : '';
+        // Check exact matches first (exact matches take precedence over patterns)
+        const exactInTools = this.agentConfig.tools.includes(toolId);
+        const exactInAllowed = this.agentConfig.allowedTools.includes(toolId);
+        const serverInTools = serverPrefix && this.agentConfig.tools.includes(serverPrefix);
+        const serverInAllowed = serverPrefix && this.agentConfig.allowedTools.includes(serverPrefix);
+        // If exact match in allowedTools or server-wide in allowedTools
+        if (exactInAllowed || serverInAllowed) {
+            return mcpTypes_1.McpPermissionType.alwaysAllow;
+        }
+        // If exact match in tools, check if also in allowedTools patterns
+        if (exactInTools) {
+            const isAlwaysAllowed = this.isToolAlwaysAllowed(serverName, toolName);
+            return isAlwaysAllowed ? mcpTypes_1.McpPermissionType.alwaysAllow : mcpTypes_1.McpPermissionType.ask;
+        }
+        // If server-wide in tools, check if also in allowedTools patterns
+        if (serverInTools) {
+            const isAlwaysAllowed = this.isToolAlwaysAllowed(serverName, toolName);
+            return isAlwaysAllowed ? mcpTypes_1.McpPermissionType.alwaysAllow : mcpTypes_1.McpPermissionType.ask;
+        }
+        // Fall back to pattern matching
         const isEnabled = this.isToolEnabled(serverName, toolName);
         const isAlwaysAllowed = this.isToolAlwaysAllowed(serverName, toolName);
-        // If tool is always allowed, it's implicitly enabled
-        if (isAlwaysAllowed) {
+        // Tool must be enabled first before it can be always allowed
+        if (isEnabled && isAlwaysAllowed) {
             return mcpTypes_1.McpPermissionType.alwaysAllow;
         }
-        // If tool is enabled but not always allowed, ask for permission
         if (isEnabled) {
             return mcpTypes_1.McpPermissionType.ask;
         }
-        // Tool is not enabled and not always allowed
         return mcpTypes_1.McpPermissionType.deny;
     }
     /**
-     * Set permission for a tool (uses simple patterns for writing)
+     * Set permission for a tool - removes conflicting wildcards and replaces with explicit tools
      */
     setToolPermission(serverName, toolName, permission) {
         const toolId = serverName ? `@${serverName}/${toolName}` : toolName;
         const serverPrefix = serverName ? `@${serverName}` : '';
-        // Remove conflicting wildcards that would affect this tool
-        this.removeConflictingWildcards(toolId);
         switch (permission) {
             case mcpTypes_1.McpPermissionType.deny:
-                this.removeTool(toolId, serverPrefix);
-                this.removeFromAllowedTools(toolId, serverPrefix);
+                this.removeConflictingWildcardsForDeny(serverName, toolName);
+                this.removeConflictingAllowedWildcardsForDeny(serverName, toolName);
                 break;
             case mcpTypes_1.McpPermissionType.ask:
-                this.addTool(toolId);
-                this.removeFromAllowedTools(toolId, serverPrefix);
+                this.removeConflictingAllowedWildcardsForAsk(serverName, toolName);
+                if (!this.isToolEnabled(serverName, toolName)) {
+                    this.addTool(toolId);
+                }
                 break;
             case mcpTypes_1.McpPermissionType.alwaysAllow:
-                this.addTool(toolId);
-                this.addToAllowedTools(toolId);
+                if (!this.isToolEnabled(serverName, toolName)) {
+                    this.addTool(toolId);
+                }
+                if (!this.isToolAlwaysAllowed(serverName, toolName)) {
+                    this.addToAllowedTools(toolId);
+                }
                 break;
         }
     }
-    /**
-     * Remove wildcards that would conflict with specific tool permission
-     */
-    removeConflictingWildcards(toolId) {
-        // Remove wildcards from tools array that would match this tool
-        this.agentConfig.tools = this.agentConfig.tools.filter(tool => {
-            if (!tool.includes('*') && !tool.includes('?'))
-                return true;
-            return !this.matchesPattern(toolId, tool);
-        });
-        // Remove wildcards from allowedTools array that would match this tool
-        this.agentConfig.allowedTools = this.agentConfig.allowedTools.filter(tool => {
-            if (!tool.includes('*') && !tool.includes('?'))
-                return true;
-            return !this.matchesPattern(toolId, tool);
-        });
-    }
     /**
      * Add tool to tools array
      */
@@ -151,7 +175,7 @@ class AgentPermissionManager {
         }
     }
     /**
-     * Remove tool from allowedTools array
+     * Remove tool from allowedTools array (only exact matches)
      */
     removeFromAllowedTools(toolId, serverPrefix) {
         this.agentConfig.allowedTools = this.agentConfig.allowedTools.filter(tool => tool !== toolId && tool !== serverPrefix);
@@ -179,6 +203,238 @@ class AgentPermissionManager {
                 break;
         }
     }
+    /**
+     * Convert server-wide permission to individual tools, excluding the denied tool
+     */
+    convertServerWideToIndividualTools(serverName, deniedToolName) {
+        const serverPrefix = `@${serverName}`;
+        // Remove server-wide permission
+        this.agentConfig.tools = this.agentConfig.tools.filter(tool => tool !== serverPrefix);
+        // If we have a callback to get available tools, add them individually
+        if (this.getAvailableTools) {
+            const availableTools = this.getAvailableTools(serverName);
+            for (const toolName of availableTools) {
+                if (toolName !== deniedToolName) {
+                    const toolId = `@${serverName}/${toolName}`;
+                    this.addTool(toolId);
+                }
+            }
+        }
+        // If no callback, we just remove server-wide permission (limitation)
+    }
+    /**
+     * Remove conflicting wildcards from tools when denying a tool
+     */
+    removeConflictingWildcardsForDeny(serverName, toolName) {
+        const toolId = serverName ? `@${serverName}/${toolName}` : toolName;
+        const serverPrefix = serverName ? `@${serverName}` : '';
+        // Handle global wildcard (*)
+        if (this.agentConfig.tools.includes('*')) {
+            this.expandGlobalWildcard(serverName, toolName);
+        }
+        // Handle server-wide wildcard (@server)
+        if (serverPrefix && this.agentConfig.tools.includes(serverPrefix)) {
+            this.convertServerWideToIndividualTools(serverName, toolName);
+        }
+        // Handle @builtin wildcard
+        if (!serverName && this.agentConfig.tools.includes('@builtin')) {
+            this.expandBuiltinWildcard(toolName);
+        }
+        // Handle pattern wildcards
+        this.removeMatchingPatternWildcards(serverName, toolName);
+        // Remove explicit tool entry
+        this.removeTool(toolId, serverPrefix);
+    }
+    /**
+     * Remove conflicting wildcards from allowedTools when denying a tool
+     */
+    removeConflictingAllowedWildcardsForDeny(serverName, toolName) {
+        const toolId = serverName ? `@${serverName}/${toolName}` : toolName;
+        const serverPrefix = serverName ? `@${serverName}` : '';
+        // Remove exact matches
+        this.agentConfig.allowedTools = this.agentConfig.allowedTools.filter(tool => tool !== toolId && tool !== serverPrefix);
+        // Remove matching wildcards and expand them
+        const toRemove = [];
+        for (const allowedTool of this.agentConfig.allowedTools) {
+            if (allowedTool.includes('*') || allowedTool.includes('?')) {
+                if (this.matchesPattern(toolId, allowedTool)) {
+                    toRemove.push(allowedTool);
+                }
+            }
+        }
+        for (const pattern of toRemove) {
+            this.expandAllowedPatternWildcard(pattern, serverName, toolName);
+        }
+    }
+    /**
+     * Remove conflicting wildcards from allowedTools when setting to ask
+     */
+    removeConflictingAllowedWildcardsForAsk(serverName, toolName) {
+        const toolId = serverName ? `@${serverName}/${toolName}` : toolName;
+        const serverPrefix = serverName ? `@${serverName}` : '';
+        // Remove exact matches
+        this.agentConfig.allowedTools = this.agentConfig.allowedTools.filter(tool => tool !== toolId && tool !== serverPrefix);
+        // Remove matching wildcards and expand them (excluding the tool being set to ask)
+        const toRemove = [];
+        for (const allowedTool of this.agentConfig.allowedTools) {
+            if (allowedTool.includes('*') || allowedTool.includes('?')) {
+                if (this.matchesPattern(toolId, allowedTool)) {
+                    toRemove.push(allowedTool);
+                }
+            }
+        }
+        for (const pattern of toRemove) {
+            this.expandAllowedPatternWildcard(pattern, serverName, toolName);
+        }
+    }
+    /**
+     * Expand global wildcard (*) to all available tools except the denied one
+     */
+    expandGlobalWildcard(deniedServerName, deniedToolName) {
+        this.agentConfig.tools = this.agentConfig.tools.filter(tool => tool !== '*');
+        if (this.getAvailableTools) {
+            // Get all available servers (this should be provided by the manager)
+            const allServers = this.getAvailableServers();
+            for (const serverName of allServers) {
+                const tools = this.getAvailableTools(serverName);
+                for (const toolName of tools) {
+                    if (!(serverName === deniedServerName && toolName === deniedToolName)) {
+                        this.addTool(`@${serverName}/${toolName}`);
+                    }
+                }
+            }
+            // Add builtin tools (except denied one)
+            const builtinTools = this.getBuiltinTools();
+            for (const toolName of builtinTools) {
+                if (!(deniedServerName === '' && toolName === deniedToolName)) {
+                    this.addTool(toolName);
+                }
+            }
+        }
+    }
+    /**
+     * Expand @builtin wildcard to all builtin tools except the denied one
+     */
+    expandBuiltinWildcard(deniedToolName) {
+        this.agentConfig.tools = this.agentConfig.tools.filter(tool => tool !== '@builtin');
+        const builtinTools = this.getBuiltinTools();
+        for (const toolName of builtinTools) {
+            if (toolName !== deniedToolName) {
+                this.addTool(toolName);
+            }
+        }
+    }
+    /**
+     * Remove pattern wildcards that match the tool and expand them
+     */
+    removeMatchingPatternWildcards(serverName, toolName) {
+        const toolId = serverName ? `@${serverName}/${toolName}` : toolName;
+        const serverPrefix = serverName ? `@${serverName}` : '';
+        const toRemove = [];
+        for (const tool of this.agentConfig.tools) {
+            if (tool.includes('*') || tool.includes('?')) {
+                if (serverName && tool.startsWith('@') && !tool.includes('/')) {
+                    if (this.matchesPattern(serverPrefix, tool)) {
+                        toRemove.push(tool);
+                    }
+                }
+                else if (this.matchesPattern(toolId, tool)) {
+                    toRemove.push(tool);
+                }
+            }
+        }
+        for (const pattern of toRemove) {
+            this.expandPatternWildcard(pattern, serverName, toolName);
+        }
+    }
+    /**
+     * Expand a pattern wildcard to individual tools except the denied one
+     */
+    expandPatternWildcard(pattern, deniedServerName, deniedToolName) {
+        this.agentConfig.tools = this.agentConfig.tools.filter(tool => tool !== pattern);
+        if (!this.getAvailableTools)
+            return;
+        if (pattern.startsWith('@') && !pattern.includes('/')) {
+            // Server pattern like @*-mcp
+            const allServers = this.getAvailableServers();
+            for (const serverName of allServers) {
+                const serverPrefix = `@${serverName}`;
+                if (this.matchesPattern(serverPrefix, pattern)) {
+                    const tools = this.getAvailableTools(serverName);
+                    for (const toolName of tools) {
+                        if (!(serverName === deniedServerName && toolName === deniedToolName)) {
+                            this.addTool(`@${serverName}/${toolName}`);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            // Tool pattern like @fs/read_*
+            const allServers = this.getAvailableServers();
+            for (const serverName of allServers) {
+                const tools = this.getAvailableTools(serverName);
+                for (const toolName of tools) {
+                    const toolId = `@${serverName}/${toolName}`;
+                    if (this.matchesPattern(toolId, pattern)) {
+                        if (!(serverName === deniedServerName && toolName === deniedToolName)) {
+                            this.addTool(toolId);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * Expand allowedTools pattern wildcard except the denied tool
+     */
+    expandAllowedPatternWildcard(pattern, deniedServerName, deniedToolName) {
+        this.agentConfig.allowedTools = this.agentConfig.allowedTools.filter(tool => tool !== pattern);
+        if (!this.getAvailableTools)
+            return;
+        if (pattern.startsWith('@') && !pattern.includes('/')) {
+            // Server pattern like @git
+            const allServers = this.getAvailableServers();
+            for (const serverName of allServers) {
+                const serverPrefix = `@${serverName}`;
+                if (this.matchesPattern(serverPrefix, pattern)) {
+                    const tools = this.getAvailableTools(serverName);
+                    for (const toolName of tools) {
+                        if (!(serverName === deniedServerName && toolName === deniedToolName)) {
+                            this.addToAllowedTools(`@${serverName}/${toolName}`);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            // Tool pattern like @fs/*
+            const allServers = this.getAvailableServers();
+            for (const serverName of allServers) {
+                const tools = this.getAvailableTools(serverName);
+                for (const toolName of tools) {
+                    const toolId = `@${serverName}/${toolName}`;
+                    if (this.matchesPattern(toolId, pattern)) {
+                        if (!(serverName === deniedServerName && toolName === deniedToolName)) {
+                            this.addToAllowedTools(toolId);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * Get all available servers
+     */
+    getAvailableServers() {
+        return this.getAllAvailableServers?.() || [];
+    }
+    /**
+     * Get all builtin tools
+     */
+    getBuiltinTools() {
+        return this.getAllBuiltinTools?.() || [];
+    }
     /**
      * Get updated agent config
      */

package/out/language-server/agenticChat/tools/mcp/agentPermissionManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentPermissionManager.js","sourceRoot":"","sources":["../../../../../src/language-server/agenticChat/tools/mcp/agentPermissionManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentPermissionManager.js","sourceRoot":"","sources":["../../../../../src/language-server/agenticChat/tools/mcp/agentPermissionManager.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,yCAA2D;AAE3D;;GAEG;AACH,MAAa,sBAAsB;IAEnB;IACA;IACA;IACA;IAJZ,YACY,WAAwB,EACxB,iBAAoD,EACpD,sBAAuC,EACvC,kBAAmC;QAHnC,gBAAW,GAAX,WAAW,CAAa;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmC;QACpD,2BAAsB,GAAtB,sBAAsB,CAAiB;QACvC,uBAAkB,GAAlB,kBAAkB,CAAiB;IAC5C,CAAC;IAEJ;;OAEG;IACK,cAAc,CAAC,QAAgB,EAAE,OAAe;QACpD,6BAA6B;QAC7B,IAAI,OAAO,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QAErC,gCAAgC;QAChC,iDAAiD;QACjD,MAAM,YAAY,GAAG,OAAO;aACvB,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC,6BAA6B;aAClE,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,yBAAyB;aAC9C,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA,CAAC,6BAA6B;QAEtD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,YAAY,GAAG,CAAC,CAAA;QAC7C,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC/B,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,UAAkB,EAAE,QAAgB;QAC9C,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,4DAA4D;QAC5D,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAA;QACxD,IAAI,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC;YAAE,OAAO,IAAI,CAAA;QAE9E,4BAA4B;QAC5B,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAA;QAErD,mDAAmD;QACnD,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;YAAE,OAAO,IAAI,CAAA;QAE3E,0BAA0B;QAC1B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3C,+DAA+D;gBAC/D,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC5D,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC;wBAAE,OAAO,IAAI,CAAA;gBAC5D,CAAC;gBACD,yBAAyB;gBACzB,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC;oBAAE,OAAO,IAAI,CAAA;YACtD,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,UAAkB,EAAE,QAAgB;QACpD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,4BAA4B;QAC5B,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAA;QAC/D,IAAI,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC;YAAE,OAAO,IAAI,CAAA;QAErF,0BAA0B;QAC1B,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YACtD,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC;oBAAE,OAAO,IAAI,CAAA;YAC7D,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,UAAkB,EAAE,QAAgB;QAClD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,0EAA0E;QAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACrE,MAAM,aAAa,GAAG,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;QACnF,MAAM,eAAe,GAAG,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;QAE5F,gEAAgE;QAChE,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;YACpC,OAAO,4BAAiB,CAAC,WAAW,CAAA;QACxC,CAAC;QAED,kEAAkE;QAClE,IAAI,YAAY,EAAE,CAAC;YACf,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;YACtE,OAAO,eAAe,CAAC,CAAC,CAAC,4BAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,4BAAiB,CAAC,GAAG,CAAA;QAClF,CAAC;QAED,kEAAkE;QAClE,IAAI,aAAa,EAAE,CAAC;YAChB,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;YACtE,OAAO,eAAe,CAAC,CAAC,CAAC,4BAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,4BAAiB,CAAC,GAAG,CAAA;QAClF,CAAC;QAED,gCAAgC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAEtE,6DAA6D;QAC7D,IAAI,SAAS,IAAI,eAAe,EAAE,CAAC;YAC/B,OAAO,4BAAiB,CAAC,WAAW,CAAA;QACxC,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO,4BAAiB,CAAC,GAAG,CAAA;QAChC,CAAC;QAED,OAAO,4BAAiB,CAAC,IAAI,CAAA;IACjC,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,UAAkB,EAAE,QAAgB,EAAE,UAA6B;QACjF,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,QAAQ,UAAU,EAAE,CAAC;YACjB,KAAK,4BAAiB,CAAC,IAAI;gBACvB,IAAI,CAAC,iCAAiC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;gBAC5D,IAAI,CAAC,wCAAwC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;gBACnE,MAAK;YAET,KAAK,4BAAiB,CAAC,GAAG;gBACtB,IAAI,CAAC,uCAAuC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;gBAClE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACxB,CAAC;gBACD,MAAK;YAET,KAAK,4BAAiB,CAAC,WAAW;gBAC9B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACxB,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAClD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;gBAClC,CAAC;gBACD,MAAK;QACb,CAAC;IACL,CAAC;IAED;;OAEG;IACK,OAAO,CAAC,MAAc;QAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,UAAU,CAAC,MAAc,EAAE,YAAqB;QACpD,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,YAAY,CAAC,CAAA;IAC5G,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,MAAc;QACpC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9C,CAAC;IACL,CAAC;IAED;;OAEG;IACK,sBAAsB,CAAC,MAAc,EAAE,YAAqB;QAChE,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAChE,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,YAAY,CACnD,CAAA;IACL,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,UAAkB,EAAE,UAA6B;QACjE,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QAErC,6CAA6C;QAC7C,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC,CAAA;QACpG,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAChE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC,CAC/C,CAAA;QAED,QAAQ,UAAU,EAAE,CAAC;YACjB,KAAK,4BAAiB,CAAC,IAAI;gBACvB,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;gBAC3C,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;gBACvD,MAAK;YAET,KAAK,4BAAiB,CAAC,GAAG;gBACtB,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAC1B,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;gBACvD,MAAK;YAET,KAAK,4BAAiB,CAAC,WAAW;gBAC9B,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAC1B,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAA;gBACpC,MAAK;QACb,CAAC;IACL,CAAC;IAED;;OAEG;IACK,kCAAkC,CAAC,UAAkB,EAAE,cAAsB;QACjF,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QAErC,gCAAgC;QAChC,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAA;QAErF,sEAAsE;QACtE,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;YACzD,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;gBACpC,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;oBAC9B,MAAM,MAAM,GAAG,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAA;oBAC3C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACxB,CAAC;YACL,CAAC;QACL,CAAC;QACD,qEAAqE;IACzE,CAAC;IAED;;OAEG;IACK,iCAAiC,CAAC,UAAkB,EAAE,QAAgB;QAC1E,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,6BAA6B;QAC7B,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QACnD,CAAC;QAED,wCAAwC;QACxC,IAAI,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,kCAAkC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QACjE,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7D,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,8BAA8B,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAEzD,6BAA6B;QAC7B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACzC,CAAC;IAED;;OAEG;IACK,wCAAwC,CAAC,UAAkB,EAAE,QAAgB;QACjF,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,uBAAuB;QACvB,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAChE,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,YAAY,CACnD,CAAA;QAED,4CAA4C;QAC5C,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YACtD,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC;oBAC3C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC9B,CAAC;YACL,CAAC;QACL,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;QACpE,CAAC;IACL,CAAC;IAED;;OAEG;IACK,uCAAuC,CAAC,UAAkB,EAAE,QAAgB;QAChF,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,uBAAuB;QACvB,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAChE,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,YAAY,CACnD,CAAA;QAED,kFAAkF;QAClF,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YACtD,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC;oBAC3C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC9B,CAAC;YACL,CAAC;QACL,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;QACpE,CAAC;IACL,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,gBAAwB,EAAE,cAAsB;QACzE,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAA;QAE5E,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,qEAAqE;YACrE,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAA;YAC7C,KAAK,MAAM,UAAU,IAAI,UAAU,EAAE,CAAC;gBAClC,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;gBAChD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;oBAC3B,IAAI,CAAC,CAAC,UAAU,KAAK,gBAAgB,IAAI,QAAQ,KAAK,cAAc,CAAC,EAAE,CAAC;wBACpE,IAAI,CAAC,OAAO,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAA;oBAC9C,CAAC;gBACL,CAAC;YACL,CAAC;YAED,wCAAwC;YACxC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;YAC3C,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;gBAClC,IAAI,CAAC,CAAC,gBAAgB,KAAK,EAAE,IAAI,QAAQ,KAAK,cAAc,CAAC,EAAE,CAAC;oBAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAC1B,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,cAAsB;QAChD,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAEnF,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;QAC3C,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;YAClC,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YAC1B,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACK,8BAA8B,CAAC,UAAkB,EAAE,QAAgB;QACvE,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;QACnE,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEvD,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3C,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC5D,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC;wBAC1C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACvB,CAAC;gBACL,CAAC;qBAAM,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;oBAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACvB,CAAC;YACL,CAAC;QACL,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;QAC7D,CAAC;IACL,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,OAAe,EAAE,gBAAwB,EAAE,cAAsB;QAC3F,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAEhF,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,OAAM;QAEnC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpD,6BAA6B;YAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAA;YAC7C,KAAK,MAAM,UAAU,IAAI,UAAU,EAAE,CAAC;gBAClC,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;gBACrC,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;oBAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;oBAChD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;wBAC3B,IAAI,CAAC,CAAC,UAAU,KAAK,gBAAgB,IAAI,QAAQ,KAAK,cAAc,CAAC,EAAE,CAAC;4BACpE,IAAI,CAAC,OAAO,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAA;wBAC9C,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,+BAA+B;YAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAA;YAC7C,KAAK,MAAM,UAAU,IAAI,UAAU,EAAE,CAAC;gBAClC,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;gBAChD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;oBAC3B,MAAM,MAAM,GAAG,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAA;oBAC3C,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;wBACvC,IAAI,CAAC,CAAC,UAAU,KAAK,gBAAgB,IAAI,QAAQ,KAAK,cAAc,CAAC,EAAE,CAAC;4BACpE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;wBACxB,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACK,4BAA4B,CAAC,OAAe,EAAE,gBAAwB,EAAE,cAAsB;QAClG,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QAE9F,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,OAAM;QAEnC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpD,2BAA2B;YAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAA;YAC7C,KAAK,MAAM,UAAU,IAAI,UAAU,EAAE,CAAC;gBAClC,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;gBACrC,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;oBAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;oBAChD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;wBAC3B,IAAI,CAAC,CAAC,UAAU,KAAK,gBAAgB,IAAI,QAAQ,KAAK,cAAc,CAAC,EAAE,CAAC;4BACpE,IAAI,CAAC,iBAAiB,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAA;wBACxD,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,0BAA0B;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAA;YAC7C,KAAK,MAAM,UAAU,IAAI,UAAU,EAAE,CAAC;gBAClC,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;gBAChD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;oBAC3B,MAAM,MAAM,GAAG,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAA;oBAC3C,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;wBACvC,IAAI,CAAC,CAAC,UAAU,KAAK,gBAAgB,IAAI,QAAQ,KAAK,cAAc,CAAC,EAAE,CAAC;4BACpE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;wBAClC,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACK,mBAAmB;QACvB,OAAO,IAAI,CAAC,sBAAsB,EAAE,EAAE,IAAI,EAAE,CAAA;IAChD,CAAC;IAED;;OAEG;IACK,eAAe;QACnB,OAAO,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,CAAA;IAC5C,CAAC;IAED;;OAEG;IACH,cAAc;QACV,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;CACJ;AA1eD,wDA0eC"}

package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js

@@ -670,8 +670,11 @@ class McpEventHandler {
         try {
             if (isEditMode && originalServerName) {
                 const serverToRemove = this.#serverNameBeforeUpdate || originalServerName;
+                const serverConfig = mcpManager_1.McpManager.instance.getAllServerConfigs().get(serverToRemove);
+                const isLegacyMcpServer = serverConfig?.__configPath__?.endsWith('mcp.json') ?? false;
+                const configPath = isLegacyMcpServer ? await this.#getMcpConfigPath(isGlobal) : agentPath;
                 await mcpManager_1.McpManager.instance.removeServer(serverToRemove);
-                await mcpManager_1.McpManager.instance.addServer(serverName, config, agentPath);
+                await mcpManager_1.McpManager.instance.addServer(serverName, config, configPath, isLegacyMcpServer);
             }
             else {
                 // Create new server
@@ -1086,7 +1089,9 @@ class McpEventHandler {
                     enabled: true,
                     numTools: mcpManager_1.McpManager.instance.getAllToolsWithPermissions(serverName).length,
                     scope: serverConfig.__configPath__ ===
-                        (0, mcpUtils_1.getGlobalAgentConfigPath)(this.#features.workspace.fs.getUserHomeDir())
+                        (0, mcpUtils_1.getGlobalAgentConfigPath)(this.#features.workspace.fs.getUserHomeDir()) ||
+                        serverConfig.__configPath__ ===
+                            (0, mcpUtils_1.getGlobalMcpConfigPath)(this.#features.workspace.fs.getUserHomeDir())
                         ? 'global'
                         : 'workspace',
                     transportType: transportType,
@@ -1110,10 +1115,11 @@ class McpEventHandler {
         const mcpManager = mcpManager_1.McpManager.instance;
         const serverConfigs = mcpManager.getAllServerConfigs();
         const activeServers = Array.from(serverConfigs.entries()).filter(([name, _]) => !mcpManager.isServerDisabled(name));
-        // Get the global agent path
+        // Get the global paths
         const globalAgentPath = (0, mcpUtils_1.getGlobalAgentConfigPath)(this.#features.workspace.fs.getUserHomeDir());
+        const globalMcpPath = (0, mcpUtils_1.getGlobalMcpConfigPath)(this.#features.workspace.fs.getUserHomeDir());
         // Count global vs project servers
-        const globalServers = Array.from(serverConfigs.entries()).filter(([_, config]) => config.__configPath__ === globalAgentPath).length;
+        const globalServers = Array.from(serverConfigs.entries()).filter(([_, config]) => config.__configPath__ === globalAgentPath || config.__configPath__ === globalMcpPath).length;
         const projectServers = serverConfigs.size - globalServers;
         // Count tools by permission
         let toolsAlwaysAllowed = 0;
@@ -1147,7 +1153,9 @@ class McpEventHandler {
                 url: transportType === TransportType.HTTP ? config.url : undefined,
                 enabled: enabled,
                 numTools: mcpManager.getAllToolsWithPermissions(serverName).length,
-                scope: config.__configPath__ === globalAgentPath ? 'global' : 'workspace',
+                scope: config.__configPath__ === globalAgentPath || config.__configPath__ === globalMcpPath
+                    ? 'global'
+                    : 'workspace',
                 transportType: transportType,
                 languageServerVersion: this.#features.runtime.serverInfo.version,
             });
@@ -1208,6 +1216,34 @@ class McpEventHandler {
         // Return global path if workspace path doesn't exist or there was an error
         return globalAgentPath;
     }
+    /**
+     * Gets the appropriate MCP config path, checking workspace path first if it exists
+     * @returns The MCP config path to use (workspace if exists, otherwise global)
+     */
+    async #getMcpConfigPath(isGlobal = true) {
+        const globalMcpPath = (0, mcpUtils_1.getGlobalMcpConfigPath)(this.#features.workspace.fs.getUserHomeDir());
+        if (isGlobal) {
+            return globalMcpPath;
+        }
+        // Get workspace folders and check for workspace MCP path
+        const workspaceFolders = this.#features.workspace.getAllWorkspaceFolders();
+        if (workspaceFolders && workspaceFolders.length > 0) {
+            const workspacePaths = workspaceFolders.map(folder => folder.uri);
+            const workspaceMcpPaths = (0, mcpUtils_1.getWorkspaceMcpConfigPaths)(workspacePaths);
+            if (Array.isArray(workspaceMcpPaths) && workspaceMcpPaths.length > 0) {
+                try {
+                    // Convert URI format to filesystem path if needed using the utility function
+                    const mcpPath = (0, mcpUtils_1.normalizePathFromUri)(workspaceMcpPaths[0], this.#features.logging);
+                    return mcpPath;
+                }
+                catch (e) {
+                    this.#features.logging.warn(`Failed to check if workspace MCP path exists: ${e}`);
+                }
+            }
+        }
+        // Return global path if workspace path doesn't exist or there was an error
+        return globalMcpPath;
+    }
     /**
      * Processes permission updates from the UI
      */
@@ -1271,12 +1307,13 @@ class McpEventHandler {
         catch (e) {
             this.#features.logging.warn(`Failed to get user home directory: ${e}`);
         }
-        // Only watch agent config files
+        // Watch both agent config files and MCP config files
         const agentPaths = [
             ...(0, mcpUtils_1.getWorkspaceAgentConfigPaths)(wsUris),
             ...(homeDir ? [(0, mcpUtils_1.getGlobalAgentConfigPath)(homeDir)] : []),
         ];
-        const allPaths = [...agentPaths];
+        const mcpPaths = [...(0, mcpUtils_1.getWorkspaceMcpConfigPaths)(wsUris), ...(homeDir ? [(0, mcpUtils_1.getGlobalMcpConfigPath)(homeDir)] : [])];
+        const allPaths = [...agentPaths, ...mcpPaths];
         this.#fileWatcher.watchPaths(allPaths, () => {
             // Store the current programmatic state when the event is triggered
             this.#lastProgrammaticState = this.#isProgrammaticChange;