cecli-dev 0.95.9__tar.gz → 0.95.10__tar.gz

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.95.9
+Version: 0.95.10
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli
@@ -230,6 +230,7 @@ The current priorities are to improve core capabilities and user experience of t
 4. **Context Delivery** - [Discussion](https://github.com/dwash96/cecli/issues/47)
   * [ ] Use workflow for internal discovery to better target file snippets needed for specific tasks
   * [ ] Add support for partial files and code snippets in model completion messages
+  * [ ] Update message request structure for optimal caching
 
 5. **TUI Experience** - [Discussion](https://github.com/dwash96/cecli/issues/48)
   * [x] Add a full TUI (probably using textual) to have a visual interface competitive with the other coding agent terminal programs
@@ -241,8 +242,8 @@ The current priorities are to improve core capabilities and user experience of t
   * [x] Add an explicit "finished" internal tool
   * [x] Add a configuration json setting for agent mode to specify allowed local tools to use, tool call limits, etc.
   * [ ] Add a RAG tool for the model to ask questions about the codebase
-  * [ ] Make the system prompts more aggressive about removing unneeded files/content from the context
-  * [ ] Add a plugin-like system for allowing agent mode to use user-defined tools in simple python files
+  * [x] Make the system prompts more aggressive about removing unneeded files/content from the context
+  * [x] Add a plugin-like system for allowing agent mode to use user-defined tools in simple python files
   * [x] Add a dynamic tool discovery tool to allow the system to have only the tools it needs in context
 
 ### All Contributors (Both Cecli and Aider main)

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/README.md

@@ -146,6 +146,7 @@ The current priorities are to improve core capabilities and user experience of t
 4. **Context Delivery** - [Discussion](https://github.com/dwash96/cecli/issues/47)
   * [ ] Use workflow for internal discovery to better target file snippets needed for specific tasks
   * [ ] Add support for partial files and code snippets in model completion messages
+  * [ ] Update message request structure for optimal caching
 
 5. **TUI Experience** - [Discussion](https://github.com/dwash96/cecli/issues/48)
   * [x] Add a full TUI (probably using textual) to have a visual interface competitive with the other coding agent terminal programs
@@ -157,8 +158,8 @@ The current priorities are to improve core capabilities and user experience of t
   * [x] Add an explicit "finished" internal tool
   * [x] Add a configuration json setting for agent mode to specify allowed local tools to use, tool call limits, etc.
   * [ ] Add a RAG tool for the model to ask questions about the codebase
-  * [ ] Make the system prompts more aggressive about removing unneeded files/content from the context
-  * [ ] Add a plugin-like system for allowing agent mode to use user-defined tools in simple python files
+  * [x] Make the system prompts more aggressive about removing unneeded files/content from the context
+  * [x] Add a plugin-like system for allowing agent mode to use user-defined tools in simple python files
   * [x] Add a dynamic tool discovery tool to allow the system to have only the tools it needs in context
 
 ### All Contributors (Both Cecli and Aider main)

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.95.9.dev"
+__version__ = "0.95.10.dev"
 safe_version = __version__
 
 try:

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.95.9'
-__version_tuple__ = version_tuple = (0, 95, 9)
+__version__ = version = '0.95.10'
+__version_tuple__ = version_tuple = (0, 95, 10)
 
-__commit_id__ = commit_id = 'g38dc66252'
+__commit_id__ = commit_id = 'gf1225144f'

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/coders/base_coder.py

@@ -1330,14 +1330,24 @@ class Coder:
                     await self.io.input_task
                     user_message = self.io.input_task.result()
 
-                    if self.args and not self.args.tui:
+                    if (
+                        self.args
+                        and not self.args.tui
+                        and self.show_pretty()
+                        and self.args.fancy_input
+                    ):
                         self.io.tool_output("Processing...\n")
 
                     self.io.output_task = asyncio.create_task(self.generate(user_message, preproc))
 
                     await self.io.output_task
 
-                    if self.args and not self.args.tui:
+                    if (
+                        self.args
+                        and not self.args.tui
+                        and self.show_pretty()
+                        and self.args.fancy_input
+                    ):
                         self.io.tool_output("Finished.")
 
                     self.io.ring_bell()
@@ -2766,7 +2776,7 @@ class Coder:
                 return None
 
         async def get_all_server_tools():
-            tasks = [get_server_tools(server) for server in self.mcp_manager]
+            tasks = [get_server_tools(server) for server in self.mcp_manager if server.is_enabled]
             results = await asyncio.gather(*tasks)
             return [result for result in results if result is not None]
 

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/commands/add.py

@@ -65,7 +65,13 @@ class AddCommand(BaseCommand):
                 io.tool_output(f"You can add to git with: /git add {fname}")
                 continue
 
-            if await io.confirm_ask(f"No files matched '{word}'. Do you want to create {fname}?"):
+            confirm_fname = os.path.relpath(fname)
+            if len(confirm_fname) > 64:
+                confirm_fname = f".../{os.path.basename(confirm_fname)}"
+
+            if await io.confirm_ask(
+                f"No files matched '{confirm_fname}'. Do you want to create this file?"
+            ):
                 try:
                     fname.parent.mkdir(parents=True, exist_ok=True)
                     fname.touch()

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/commands/utils/base_command.py

@@ -1,8 +1,34 @@
-from abc import ABC, abstractmethod
+from abc import ABC, ABCMeta, abstractmethod
 from typing import List
 
 
-class BaseCommand(ABC):
+class CommandMeta(ABCMeta):
+    """Metaclass for validating command classes at definition time."""
+
+    def __new__(mcs, name, bases, namespace):
+        # Create the class first
+        cls = super().__new__(mcs, name, bases, namespace)
+
+        # Skip validation for BaseCommand itself
+        if name == "BaseCommand":
+            return cls
+
+        if not name.endswith("Command"):
+            raise TypeError(f"Command class must end with 'Command', got '{name}'")
+
+        if getattr(cls, "NORM_NAME", None) is None:
+            raise TypeError("Command class must define NORM_NAME")
+
+        if getattr(cls, "DESCRIPTION", None) is None:
+            raise TypeError("Command class must define DESCRIPTION")
+
+        if "execute" not in namespace:
+            raise TypeError("Command class must implement execute method")
+
+        return cls
+
+
+class BaseCommand(ABC, metaclass=CommandMeta):
     """Abstract base class for all commands."""
 
     # Class properties (similar to BaseTool)

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/io.py

@@ -42,6 +42,7 @@ from rich.text import Text
 
 from cecli.commands import SwitchCoderSignal
 from cecli.helpers import coroutines
+from cecli.report import update_error_prefix
 
 from .dump import dump  # noqa: F401
 from .editor import pipe_editor
@@ -1039,14 +1040,22 @@ class InputOutput:
                 await output_task
             except (
                 asyncio.CancelledError,
-                Exception,
                 EOFError,
-                IndexError,
-                RuntimeError,
                 SystemExit,
                 SwitchCoderSignal,
             ):
                 pass
+            except (
+                Exception,
+                IndexError,
+                RuntimeError,
+            ):
+                import traceback
+
+                traceback_str = traceback.format_exc()
+                update_error_prefix(traceback_str)
+                update_error_prefix(str(output_task))
+                pass
 
     async def stop_task_streams(self):
         input_task = asyncio.create_task(self.stop_input_task())

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/main.py

@@ -976,6 +976,9 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             ratio = args.context_compaction_max_tokens
         if max_input_tokens:
             args.context_compaction_max_tokens = int(max_input_tokens * ratio)
+        else:
+            # Default since some models do not have max_input_tokens specified somehow
+            args.context_compaction_max_tokens = 65536
     try:
         mcp_servers = load_mcp_servers(
             args.mcp_servers, args.mcp_servers_file, io, args.verbose, args.mcp_transport

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/mcp/manager.py

@@ -22,14 +22,14 @@ class McpServerManager:
         Initialize the MCP server manager.
 
         Args:
-            mcp_servers: JSON string containing MCP server configurations
-            mcp_servers_file: Path to a JSON file containing MCP server configurations
+            servers: List of MCP Servers to manage
             io: InputOutput instance for user interaction
             verbose: Whether to output verbose logging
         """
         self.io = io
         self.verbose = verbose
         self._servers = servers
+
         self._server_tools: dict[str, list] = {}  # Maps server name to its tools
         self._connected_servers: set[McpServer] = set()
 
@@ -74,7 +74,7 @@ class McpServerManager:
             return None
 
     async def connect_all(self) -> None:
-        """Connect to all MCP servers."""
+        """Connect to all MCP servers while skipping ones that are not enabled."""
         if self.is_connected:
             self._log_verbose("Some MCP servers already connected")
             return
@@ -93,7 +93,9 @@ class McpServerManager:
                 self._log_error(f"Failed to connect to MCP server {server.name}: {e}")
                 return (server, False)
 
-        results = await asyncio.gather(*[connect_server(server) for server in self._servers])
+        results = await asyncio.gather(
+            *[connect_server(server) for server in self._servers if server.is_enabled]
+        )
 
         for server, success in results:
             if success:
@@ -142,6 +144,10 @@ class McpServerManager:
             self._log_warning(f"MCP server not found: {name}")
             return False
 
+        if not server.is_enabled:
+            self._log_verbose("MCP is not enabled.")
+            return False
+
         if server in self._connected_servers:
             self._log_verbose(f"MCP server already connected: {name}")
             return True

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/mcp/server.py

@@ -39,6 +39,7 @@ class McpServer:
         """
         self.config = server_config
         self.name = server_config.get("name", "unnamed-server")
+        self.is_enabled = server_config.get("enabled", True)
         self.io = io
         self.verbose = verbose
         self.session = None
@@ -52,8 +53,13 @@ class McpServer:
         Otherwise, establishes a new connection and initializes the session.
 
         Returns:
-            ClientSession: The active session
+            ClientSession: The active session if mcp is not disabled
         """
+        if not self.is_enabled:
+            if self.verbose and self.io:
+                self.io.tool_output(f"Enabled option is set to false for MCP server: {self.name}")
+            return None
+
         if self.session is not None:
             if self.verbose and self.io:
                 self.io.tool_output(f"Using existing session for MCP server: {self.name}")
@@ -123,7 +129,8 @@ class HttpBasedMcpServer(McpServer):
                 existing_redirect_uri = redirect_uris[0]
                 if self.verbose and self.io:
                     self.io.tool_output(
-                        f"Found existing redirect URI: {existing_redirect_uri}", log_only=True
+                        f"Found existing redirect URI: {existing_redirect_uri}",
+                        log_only=True,
                     )
 
         from .utils import find_available_port
@@ -187,6 +194,11 @@ class HttpBasedMcpServer(McpServer):
         raise NotImplementedError("Subclasses must implement _create_transport")
 
     async def connect(self):
+        if not self.is_enabled:
+            if self.verbose and self.io:
+                self.io.tool_output(f"Enabled option is set to false for MCP server: {self.name}")
+            return None
+
         if self.session is not None:
             if self.verbose and self.io:
                 self.io.tool_output(f"Using existing session for {self.name}")

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/report.py

@@ -12,6 +12,7 @@ from cecli.versioncheck import VERSION_CHECK_FNAME
 
 # Global variable to store resolved args data for error reporting
 resolved_args_data = None
+error_prefix = []
 
 FENCE = "`" * 3
 
@@ -68,10 +69,11 @@ def format_args_for_reporting(args):
                 pass
 
     # Format the output line by line
-    lines = ["Configuration:"]
+    lines = ["Configuration:\n```yaml"]
     for key, value in sorted(args_dict.items()):
         lines.append(f"{key}: {value}")
 
+    lines.append("```")
     return "\n".join(lines)
 
 
@@ -85,6 +87,17 @@ def set_args_error_data(args):
     resolved_args_data = args
 
 
+def get_error_prefix():
+    global error_prefix
+    return error_prefix
+
+
+def update_error_prefix(prefix):
+    global error_prefix
+    error_prefix.append(f"{prefix}\n")
+    error_prefix = error_prefix[-10:]
+
+
 def report_github_issue(issue_text, title=None, confirm=True):
     """
     Compose a URL to open a new GitHub issue with the given text prefilled,
@@ -102,6 +115,7 @@ def report_github_issue(issue_text, title=None, confirm=True):
     os_info = get_os_info() + "\n"
     git_info = get_git_info() + "\n"
     args_info = format_args_for_reporting(get_args_error_data()) + "\n"
+    prefix_info = "".join(get_error_prefix())
 
     system_info = (
         version_info
@@ -111,6 +125,8 @@ def report_github_issue(issue_text, title=None, confirm=True):
         + os_info
         + git_info
         + "\n"
+        + prefix_info
+        + "\n"
         + args_info
         + "\n"
     )
@@ -123,11 +139,13 @@ def report_github_issue(issue_text, title=None, confirm=True):
     issue_url = f"{github_issues}?{urllib.parse.urlencode(params)}"
 
     if confirm:
-        print(f"\n# {title}\n")
-        print(issue_text.strip())
-        print()
+        # print(f"\n# {title}\n")
+        # print(issue_text.strip())
+        # print()
         print("Please consider reporting this bug to help improve cecli!")
-        prompt = "Open a GitHub Issue pre-filled with the above error in your browser? (Y/n) "
+        prompt = (
+            "Open a GitHub Issue pre-filled with the above error messages in your browser? (Y/n) "
+        )
         confirmation = input(prompt).strip().lower()
 
         yes = not confirmation or confirmation.startswith("y")

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli/website/docs/config/mcp.md

@@ -59,6 +59,10 @@ mcp-servers-file: /path/to/mcp.json
 
 These options are configurable in any of Aider's config file formats.
 
+Also, you are able to say if you would like an mcp enabled/disabled in the config itself via `"enabled"` key
+By default MCP servers are enabled, so you MUST explicitly disable them in the config if you dont wish
+for them to be included when cecli starts up
+
 ### Flags
 
 You can specify MCP servers directly on the command line using the `--mcp-servers` option with a JSON or YAML string:
@@ -204,7 +208,7 @@ mcp-servers:
         "-i",
         "--rm",
         "-e",
-        "GITHUB_PERSONAL_ACCESS_TOKEN=<access_token>",     
+        "GITHUB_PERSONAL_ACCESS_TOKEN=<access_token>",
         "ghcr.io/github/github-mcp-server"
       ]
 ```

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.95.9
+Version: 0.95.10
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli
@@ -230,6 +230,7 @@ The current priorities are to improve core capabilities and user experience of t
 4. **Context Delivery** - [Discussion](https://github.com/dwash96/cecli/issues/47)
   * [ ] Use workflow for internal discovery to better target file snippets needed for specific tasks
   * [ ] Add support for partial files and code snippets in model completion messages
+  * [ ] Update message request structure for optimal caching
 
 5. **TUI Experience** - [Discussion](https://github.com/dwash96/cecli/issues/48)
   * [x] Add a full TUI (probably using textual) to have a visual interface competitive with the other coding agent terminal programs
@@ -241,8 +242,8 @@ The current priorities are to improve core capabilities and user experience of t
   * [x] Add an explicit "finished" internal tool
   * [x] Add a configuration json setting for agent mode to specify allowed local tools to use, tool call limits, etc.
   * [ ] Add a RAG tool for the model to ask questions about the codebase
-  * [ ] Make the system prompts more aggressive about removing unneeded files/content from the context
-  * [ ] Add a plugin-like system for allowing agent mode to use user-defined tools in simple python files
+  * [x] Make the system prompts more aggressive about removing unneeded files/content from the context
+  * [x] Add a plugin-like system for allowing agent mode to use user-defined tools in simple python files
   * [x] Add a dynamic tool discovery tool to allow the system to have only the tools it needs in context
 
 ### All Contributors (Both Cecli and Aider main)

{cecli_dev-0.95.9 → cecli_dev-0.95.10}/cecli_dev.egg-info/SOURCES.txt

@@ -463,6 +463,7 @@ tests/basic/__init__.py
 tests/basic/test_aws_credentials.py
 tests/basic/test_coder.py
 tests/basic/test_commands.py
+tests/basic/test_custom_commands.py
 tests/basic/test_deprecated.py
 tests/basic/test_editblock.py
 tests/basic/test_editor.py

cecli_dev-0.95.10/tests/basic/test_custom_commands.py

@@ -0,0 +1,64 @@
+import pytest
+
+from cecli.commands.utils.base_command import BaseCommand
+
+
+class TestCommandMeta:
+    """Tests for the CommandMeta metaclass validation."""
+
+    def test_valid_custom_command_is_accepted(self):
+        """Test that a valid custom command class is accepted."""
+
+        class CustomCommand(BaseCommand):
+            NORM_NAME = "custom"
+            DESCRIPTION = "A valid custom command"
+
+            @classmethod
+            async def execute(cls, io, coder, args, **kwargs):
+                pass
+
+        # If we get here without exception, the test passes
+        assert CustomCommand.NORM_NAME == "custom"
+        assert CustomCommand.DESCRIPTION == "A valid custom command"
+
+    def test_class_name_must_end_with_command(self):
+        """Test that class name must end with 'Command'."""
+        with pytest.raises(TypeError, match="Command class must end with 'Command'"):
+
+            class Custom(BaseCommand):
+                NORM_NAME = "custom"
+                DESCRIPTION = "An invalid custom command"
+
+                @classmethod
+                async def execute(cls, io, coder, args, **kwargs):
+                    pass
+
+    def test_must_define_norm_name(self):
+        """Test that NORM_NAME must be defined."""
+        with pytest.raises(TypeError, match="Command class must define NORM_NAME"):
+
+            class CustomCommand(BaseCommand):
+                DESCRIPTION = "Missing NORM_NAME"
+
+                @classmethod
+                async def execute(cls, io, coder, args, **kwargs):
+                    pass
+
+    def test_must_define_description(self):
+        """Test that DESCRIPTION must be defined."""
+        with pytest.raises(TypeError, match="Command class must define DESCRIPTION"):
+
+            class CustomCommand(BaseCommand):
+                NORM_NAME = "custom"
+
+                @classmethod
+                async def execute(cls, io, coder, args, **kwargs):
+                    pass
+
+    def test_must_implement_execute_method(self):
+        """Test that execute method must be implemented."""
+        with pytest.raises(TypeError, match="Command class must implement execute method"):
+
+            class CustomCommand(BaseCommand):
+                NORM_NAME = "custom"
+                DESCRIPTION = "Missing execute method"