Move MCP and skill management to common ResourceManager tool

Author: Your Name

cecli/coders/agent_coder.py

@@ -194,6 +194,7 @@ def _get_agent_config(self):
                     "todo_list",
                     "sub_agents",
                     "skills",
+                    "servers",
                 },
             )
         )
@@ -357,6 +358,7 @@ def _calculate_context_block_tokens(self, force=False):
                 "git_status",
                 "symbol_outline",
                 "skills",
+                "servers",
                 "sub_agents",
                 "loaded_skills",
             ]
@@ -391,6 +393,8 @@ def _generate_context_block(self, block_name):
             content = self.get_todo_list()
         elif block_name == "skills":
             content = self.get_skills_context()
+        elif block_name == "servers":
+            content = self.get_servers_context()
         elif block_name == "loaded_skills":
             content = self.get_skills_content()
         elif block_name == "sub_agents" and (
@@ -624,9 +628,8 @@ def get_context_summary(self):
                 result += f" ({percentage:.1f}% of limit)"
                 if percentage > 80:
                     result += "\n\n⚠ **Context is getting full!**\n"
-                    result += "- Remove non-essential files via the `ContextManager` tool.\n"
-                    result += "- Remove unused MCP servers via the `RemoveMcp` tool to free context space.\n"
-                    result += "- Keep only essential files and MCP servers in context for best performance"
+                    result += "- Remove non-essential files, skills and tool servers via the `ResourceManager` tool.\n"
+                    result += "- Keep only essential files, skills, and MCP servers in context for best performance"
             result += "\n</context>"
             if not hasattr(self, "context_blocks_cache"):
                 self.context_blocks_cache = {}
@@ -1328,7 +1331,7 @@ async def check_for_file_mentions(self, content):
 
         Override parent's method to disable implicit file mention handling in agent mode.
         Files should only be added via explicit tool commands
-        (`ContextManager`).
+        (`ResourceManager`).
         """
         pass
 
@@ -1482,6 +1485,81 @@ def get_skills_content(self):
             self.io.tool_error(f"Error generating skills content context: {str(e)}")
             return None
 
+    def get_servers_context(self):
+        """
+        Generate a context block for available MCP servers.
+
+        Categorizes servers as:
+        - Active: Connected and passing includelist/excludelist filters
+        - Inactive: Connected but filtered out by includelist/excludelist
+        - Available (Disconnected): Managed but not currently connected
+
+        Returns:
+            Formatted context block string or None if no servers available
+        """
+        if not self.use_enhanced_context:
+            return None
+        try:
+            if not self.mcp_manager:
+                return None
+
+            all_servers = self.mcp_manager.servers
+            connected_servers = self.mcp_manager.connected_servers
+            connected_server_names = {s.name for s in connected_servers}
+
+            if not all_servers:
+                return None
+
+            # Apply registered_servers filtering to determine active vs inactive
+            incl = self.registered_servers.get("included", set())
+            excl = self.registered_servers.get("excluded", set())
+
+            active_servers = []
+            inactive_servers = []
+            for server in connected_servers:
+                name = server.name
+                if incl and name not in incl:
+                    inactive_servers.append(name)
+                elif name in excl:
+                    inactive_servers.append(name)
+                else:
+                    active_servers.append(name)
+
+            # Servers managed but not currently connected
+            disconnected_servers = [
+                server.name for server in all_servers if server.name not in connected_server_names
+            ]
+
+            result = '<context name="servers" from="agent">\n'
+            result += "## Connected MCP Servers\n\n"
+
+            if active_servers:
+                result += f"Active ({len(active_servers)}):\n"
+                for name in sorted(active_servers):
+                    result += f"- {name}\n"
+                result += "\n"
+
+            if inactive_servers:
+                result += f"Inactive (Filtered) ({len(inactive_servers)}):\n"
+                for name in sorted(inactive_servers):
+                    result += f"- {name}\n"
+                result += "\n"
+
+            if disconnected_servers:
+                result += f"Available (Disconnected) ({len(disconnected_servers)}):\n"
+                for name in sorted(disconnected_servers):
+                    result += f"- {name}\n"
+                result += "\n"
+
+            if not active_servers and not inactive_servers and not disconnected_servers:
+                result += "No MCP servers currently available.\n\n"
+
+            result += "</context>"
+            return result
+        except Exception as e:
+            self.io.tool_error(f"Error generating servers context: {str(e)}")
+            return None
+
     def get_sub_agents_context(self):
         """
         Generate a context block for registered sub-agents.

cecli/helpers/conversation/integration.py

@@ -890,7 +890,7 @@ def add_static_context_blocks(self) -> None:
         """
         Add static context blocks to conversation (priority 50).
 
-        Static blocks include: environment_info, directory_structure, skills
+        Static blocks include: environment_info, directory_structure, skills, servers, sub_agents
         """
         coder = self.get_coder()
         if not coder:
@@ -922,6 +922,10 @@ def add_static_context_blocks(self) -> None:
                 block = coder._generate_context_block("skills")
                 if block:
                     message_blocks["skills"] = block
+            if "servers" in coder.allowed_context_blocks:
+                block = coder._generate_context_block("servers")
+                if block:
+                    message_blocks["servers"] = block
 
         # Add static blocks to conversation manager with stable hash keys
         for block_type, block_content in message_blocks.items():

cecli/prompts/agent.yml

@@ -42,7 +42,7 @@ main_system: |
   ## Core Workflow
   1. **Plan**: Start by using `UpdateTodoList` to outline the task.
   2. **Explore**: Use discovery tools (`ExploreCode`, `Grep`, `Ls`) to research and gather understanding for you task. Modify search terms when errors are encountered.
-  3. **Execute**: Mark files as editable with `ContextManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
+  3. **Execute**: Mark files as editable with `ResourceManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
   4. **Verify & Recover**: If an edit fails or introduces linting errors, fix the error immediately. Use `UndoChange` if the errors are too complex to incrementally modify.
   5. **Yield**: Use the `Yield` tool after accomplishing the goal and verifying any changes made. Provide helpful summaries of any changes.
 
@@ -52,7 +52,7 @@ main_system: |
 
   ## Operational Rules
   - **Scope**: No unrequested refactors. Avoid full-file rewrites. Only modify what you are asked to.
-  - **Hygiene**: Use `ContextManager`/`RemoveSkill` to evict unneeded files/skills immediately after use.
+  - **Hygiene**: Use `ResourceManager` to evict unneeded files/skills immediately after use.
   - **Outputs**: Tool calls trigger turns. Never include tool syntax in final user summaries.
   - **Sandbox**: Perform all verification and temp logic in `.cecli/temp`.
   - **Responses**: Reason out loud through the problem but be brief.  
@@ -71,7 +71,7 @@ system_reminder: |
 
   {lazy_prompt}
   {shell_cmd_reminder}
-  </context>""
+  </context>
 
 try_again: |
   My previous exploration was insufficient. I will now adjust my strategy, use more specific search patterns, and manage my context more aggressively to find the correct solution.

cecli/prompts/subagent.yml

@@ -27,7 +27,7 @@ main_system: |
   ## Core Workflow
   1. **Plan**: Start by using `UpdateTodoList` to outline the task.
   2. **Explore**: Use discovery tools (`ExploreCode`, `Grep`, `Ls`) to research and gather understanding for you task. Modify search terms when errors are encountered.
-  3. **Execute**: Mark files as editable with `ContextManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
+  3. **Execute**: Mark files as editable with `ResourceManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
   4. **Verify & Recover**: If an edit fails or introduces linting errors, fix the error immediately. Use `UndoChange` if the errors are too complex to incrementally modify.
   5. **Yield**: Use the `Yield` tool after accomplishing the goal and verifying any changes made. Provide helpful summaries of any changes.
 
@@ -37,7 +37,7 @@ main_system: |
 
   ## Operational Rules
   - **Scope**: No unrequested refactors. Avoid full-file rewrites. Only modify what you are asked to.
-  - **Hygiene**: Use `ContextManager`/`RemoveSkill` to evict unneeded files/skills immediately after use.
+  - **Hygiene**: Use `ResourceManager` to evict unneeded files/skills immediately after use.
   - **Outputs**: Tool calls trigger turns. Never include tool syntax in final user summaries.
   - **Sandbox**: Perform all verification and temp logic in `.cecli/temp`.
   - **Responses**: Reason out loud through the problem but be brief.  

cecli/tools/__init__.py

@@ -6,7 +6,6 @@
     _yield,
     command,
     command_interactive,
-    context_manager,
     delegate,
     edit_text,
     explore_code,
@@ -17,13 +16,9 @@
     git_show,
     git_status,
     grep,
-    list_mcp,
-    load_mcp,
-    load_skill,
     ls,
     read_range,
-    remove_mcp,
-    remove_skill,
+    resource_manager,
     thinking,
     undo_change,
     update_todo_list,
@@ -33,7 +28,6 @@
 TOOL_MODULES = [
     command,
     command_interactive,
-    context_manager,
     delegate,
     edit_text,
     explore_code,
@@ -45,13 +39,9 @@
     git_show,
     git_status,
     grep,
-    list_mcp,
-    load_mcp,
-    load_skill,
     ls,
     read_range,
-    remove_mcp,
-    remove_skill,
+    resource_manager,
     thinking,
     undo_change,
     update_todo_list,

cecli/tools/command.py

@@ -310,8 +310,8 @@ async def _execute_with_timeout(cls, coder, command_string, timeout, use_pty=Fal
                     output_content = (
                         f"[Large Response ({total_size} characters). "
                         "Output saved to paginated files.]\n"
-                        f"File Aliases (for use with ContextManager):\n{alias_list_str}\n"
-                        "Use the `ContextManager` tool to view these files."
+                        f"File Aliases (for use with ResourceManager):\n{alias_list_str}\n"
+                        "Use the `ResourceManager` tool to view these files."
                         "Do not use standard cli tools to view these files."
                         "Remove them from context after taking notes on the relevant information "
                         "to prevent overfilling stale context."
@@ -397,8 +397,8 @@ async def _execute_foreground(cls, coder, command_string):
             output_content = (
                 f"[Large Response ({total_size} characters). "
                 "Output saved to paginated files.]\n"
-                f"File Aliases (for use with ContextManager):\n{alias_list_str}\n"
-                "Use the `ContextManager` tool to view these files."
+                f"File Aliases (for use with ResourceManager):\n{alias_list_str}\n"
+                "Use the `ResourceManager` tool to view these files."
                 "Do not use standard cli tools to view these files."
                 "Remove them from context after taking note of the relevant information "
                 "in the output to prevent overfilling stale context."