Merge pull request #358 from dwash96/v0.92.1

v0.92.1

Author: dwash96

benchmark/benchmark.py

@@ -40,7 +40,7 @@
 # Cache for commit-hash -> version lookup
 _VERSION_CACHE = {}
 
-BENCHMARK_DNAME = Path(os.environ.get("CECLIBENCHMARK_DIR", "tmp.benchmarks"))
+BENCHMARK_DNAME = Path(os.environ.get("CECLI_BENCHMARK_DIR", "tmp.benchmarks"))
 EXERCISES_DIR_DEFAULT = "cecli-cat"
 RESULTS_DIR_DEFAULT = "cat-results"
 
@@ -209,9 +209,11 @@ def main(
         return 1
     results_dir = resolved_results_dir
 
-    if not dry and "CECLIDOCKER" not in os.environ:
+    if not dry and "CECLI_DOCKER" not in os.environ:
         logger.warning("Warning: Benchmarking runs unvetted code. Run in a docker container.")
-        logger.warning("Set CECLIDOCKER in the environment to by-pass this check at your own risk.")
+        logger.warning(
+            "Set CECLI_DOCKER in the environment to by-pass this check at your own risk."
+        )
         return
 
     # Check dirs exist

benchmark/benchmark_classic.py

@@ -34,7 +34,7 @@
 # Cache for commit-hash -> version lookup
 _VERSION_CACHE = {}
 
-BENCHMARK_DNAME = Path(os.environ.get("CECLIBENCHMARK_DIR", "tmp.benchmarks"))
+BENCHMARK_DNAME = Path(os.environ.get("CECLI_BENCHMARK_DIR", "tmp.benchmarks"))
 
 EXERCISES_DIR_DEFAULT = "polyglot-benchmark"
 
@@ -267,7 +267,7 @@ def main(
     if repo.is_dirty():
         commit_hash += "-dirty"
 
-    if "CECLIDOCKER" not in os.environ:
+    if "CECLI_DOCKER" not in os.environ:
         print("Warning: benchmarking runs unvetted code from GPT, run in a docker container")
         return
 

cecli/__init__.py

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

cecli/args.py

@@ -38,7 +38,7 @@ def get_parser(default_config_files, git_root):
         add_config_file_help=True,
         default_config_files=default_config_files,
         config_file_parser_class=configargparse.YAMLConfigFileParser,
-        auto_env_var_prefix="CECLI",
+        auto_env_var_prefix="CECLI_",
     )
     # List of valid edit formats for argparse validation & shtab completion.
     # Dynamically gather them from the registered coder classes so the list
@@ -567,7 +567,7 @@ def get_parser(default_config_files, git_root):
 
     group.add_argument(
         "--cecli-ignore",
-        metavar="CECLIIGNORE",
+        metavar="CECLI_IGNORE",
         type=lambda path_str: resolve_cecli_ignore_path(path_str, git_root),
         default=default_cecli_ignore_file,
         help="Specify the cecli ignore file (default: .cecli.ignore in git root)",

cecli/coders/architect_coder.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from ..commands import SwitchCoder
+from ..commands import SwitchCoderSignal
 from .ask_coder import AskCoder
 from .base_coder import Coder
 
@@ -60,4 +60,4 @@ async def reply_completed(self):
         except Exception as e:
             self.io.tool_error(e)
 
-        raise SwitchCoder(main_model=self.main_model, edit_format="architect")
+        raise SwitchCoderSignal(main_model=self.main_model, edit_format="architect")

cecli/coders/base_coder.py

@@ -36,7 +36,7 @@
 
 import cecli.prompts.utils.system as prompts
 from cecli import __version__, models, urls, utils
-from cecli.commands import Commands, SwitchCoder
+from cecli.commands import Commands, SwitchCoderSignal
 from cecli.exceptions import LiteLLMExceptions
 from cecli.helpers import coroutines
 from cecli.helpers.profiler import TokenProfiler
@@ -1370,7 +1370,7 @@ async def _run_parallel(self, with_message=None, preproc=True):
                     if task.exception():
                         raise task.exception()
 
-            except (SwitchCoder, SystemExit):
+            except (SwitchCoderSignal, SystemExit):
                 # Re-raise SwitchCoder to be handled by outer try block
                 raise
             except KeyboardInterrupt:
@@ -1461,7 +1461,7 @@ async def input_task(self, preproc):
                 self.io.set_placeholder("")
                 self.keyboard_interrupt()
                 await self.io.stop_task_streams()
-            except (SwitchCoder, SystemExit):
+            except (SwitchCoderSignal, SystemExit):
                 raise
             except Exception as e:
                 if self.verbose or self.args.debug:
@@ -1496,7 +1496,7 @@ async def output_task(self, preproc):
                     if self.io.output_task.done():
                         exception = self.io.output_task.exception()
                         if exception:
-                            if isinstance(exception, SwitchCoder):
+                            if isinstance(exception, SwitchCoderSignal):
                                 await self.io.output_task
                                 raise exception
 
@@ -1519,7 +1519,7 @@ async def output_task(self, preproc):
                 self.io.stop_spinner()
                 self.keyboard_interrupt()
                 await self.io.stop_task_streams()
-            except (SwitchCoder, SystemExit):
+            except (SwitchCoderSignal, SystemExit):
                 raise
             except Exception as e:
                 if self.verbose or self.args.debug:
@@ -2138,7 +2138,7 @@ def warm_cache(self, chunks):
             return
 
         delay = 5 * 60 - 5
-        delay = float(os.environ.get("CECLICACHE_KEEPALIVE_DELAY", delay))
+        delay = float(os.environ.get("CECLI_CACHE_KEEPALIVE_DELAY", delay))
         self.next_cache_warm = time.time() + delay
         self.warming_pings_left = self.num_cache_warming_pings
         self.cache_warming_chunks = chunks
@@ -2741,7 +2741,7 @@ async def get_server_tools(server):
                 )
                 return (server.name, server_tools)
             except Exception as e:
-                if server.name != "unnamed-server" and server.name != "local_tools":
+                if server.name != "unnamed-server" and server.name != "Local":
                     self.io.tool_warning(f"Error initializing MCP server {server.name}: {e}")
                 return None
 

cecli/commands/__init__.py

@@ -5,10 +5,6 @@
 BaseCommand pattern for modular, testable command execution.
 """
 
-import sys
-import traceback
-from pathlib import Path
-
 from .add import AddCommand
 from .agent import AgentCommand
 from .architect import ArchitectCommand
@@ -22,6 +18,7 @@
 from .context_management import ContextManagementCommand
 from .copy import CopyCommand
 from .copy_context import CopyContextCommand
+from .core import Commands, SwitchCoderSignal
 from .diff import DiffCommand
 
 # Import and register commands
@@ -127,50 +124,6 @@
 CommandRegistry.register(LoadSkillCommand)
 CommandRegistry.register(RemoveSkillCommand)
 
-# Import SwitchCoder and Commands directly from commands.py
-# We need to handle the circular import carefully
-
-# Add parent directory to path to import commands.py directly
-parent_dir = str(Path(__file__).parent.parent)
-if parent_dir not in sys.path:
-    sys.path.insert(0, parent_dir)
-
-# Import the commands module directly
-try:
-    import importlib.util
-
-    spec = importlib.util.spec_from_file_location(
-        "cecli.commands_module", Path(__file__).parent.parent / "commands.py"
-    )
-    commands_module = importlib.util.module_from_spec(spec)
-    sys.modules["cecli.commands_module"] = commands_module
-    spec.loader.exec_module(commands_module)
-
-    # Get the classes from the module
-    Commands = getattr(commands_module, "Commands", None)
-    SwitchCoder = getattr(commands_module, "SwitchCoder", None)
-
-    if Commands is None or SwitchCoder is None:
-        raise ImportError("Commands or SwitchCoder not found in commands.py")
-
-except Exception as e:
-    # Print the error for debugging
-    print(f"Error importing commands.py: {e}")
-    traceback.print_exc()
-
-    # Fallback: define simple placeholder classes
-    class SwitchCoder(Exception):
-        def __init__(self, placeholder=None, **kwargs):
-            self.kwargs = kwargs
-            self.placeholder = placeholder
-
-    class Commands:
-        """Placeholder for Commands class defined in original commands.py"""
-
-        def __init__(self, *args, **kwargs):
-            # Accept any arguments but do nothing
-            pass
-
 
 __all__ = [
     "BaseCommand",
@@ -234,6 +187,6 @@ def __init__(self, *args, **kwargs):
     "CommandPrefixCommand",
     "LoadSkillCommand",
     "RemoveSkillCommand",
-    "SwitchCoder",
+    "SwitchCoderSignal",
     "Commands",
 ]

cecli/commands/add.py

@@ -137,9 +137,9 @@ async def execute(cls, io, coder, args, **kwargs):
             map_tokens = 0
             map_mul_no_files = 1
 
-        from cecli.commands import SwitchCoder
+        from cecli.commands import SwitchCoderSignal
 
-        raise SwitchCoder(
+        raise SwitchCoderSignal(
             edit_format=coder.edit_format,
             summarize_from_coder=False,
             from_coder=coder,

cecli/commands.py cecli/commands/core.pycecli/commands.py renamed to cecli/commands/core.py

@@ -3,16 +3,32 @@
 import sys
 from pathlib import Path
 
+from cecli.commands.utils.registry import CommandRegistry
 from cecli.helpers.file_searcher import handle_core_files
 from cecli.repo import ANY_GIT_ERROR
 
-from .commands.utils.registry import CommandRegistry
 
+class SwitchCoderSignal(BaseException):
+    """
+     Signal to switch the current Coder instance to a new configuration.
+
+     This is NOT an error - it's a control flow signal used to propagate
+     coder switching requests up through the async call stack. It carries
+     the kwargs needed to create a new Coder instance.
+
+     Note: Inherits from BaseException (like KeyboardInterrupt and SystemExit)
+    to avoid being caught by generic `except Exception` handlers, making the
+     non-error nature of this signal explicit.
+
+     Attributes:
+         kwargs: Configuration dict passed to Coder.create() for the new instance
+         placeholder: Optional placeholder text for the input prompt
+    """
 
-class SwitchCoder(Exception):
     def __init__(self, placeholder=None, **kwargs):
         self.kwargs = kwargs
         self.placeholder = placeholder
+        super().__init__()
 
 
 class Commands:
@@ -119,7 +135,7 @@ async def do_run(self, cmd_name, args, **kwargs):
         except ANY_GIT_ERROR as err:
             self.io.tool_error(f"Unable to complete {cmd_name}: {err}")
             return
-        except SwitchCoder as e:
+        except SwitchCoderSignal as e:
             raise e
         except Exception as e:
             self.io.tool_error(f"Error executing command {cmd_name}: {str(e)}")

cecli/commands/drop.py

@@ -82,18 +82,18 @@ async def execute(cls, io, coder, args, **kwargs):
             return format_command_result(io, "drop", "Removed files from chat")
 
         finally:
-            # This mimics the SwitchCoder behavior in the original cmd_drop
+            # This mimics the SwitchCoderSignal behavior in the original cmd_drop
             if coder.repo_map:
                 map_tokens = coder.repo_map.max_map_tokens
                 map_mul_no_files = coder.repo_map.map_mul_no_files
             else:
                 map_tokens = 0
                 map_mul_no_files = 1
 
-            # Raise SwitchCoder to trigger coder recreation
-            from . import SwitchCoder
+            # Raise SwitchCoderSignal to trigger coder recreation
+            from . import SwitchCoderSignal
 
-            raise SwitchCoder(
+            raise SwitchCoderSignal(
                 edit_format=coder.edit_format,
                 summarize_from_coder=False,
                 from_coder=coder,