cecli-dev 1.0.0rc7__tar.gz → 1.0.0rc9__tar.gz

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 1.0.0rc7
+Version: 1.0.0rc9
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.0.0rc7'
-__version_tuple__ = version_tuple = (1, 0, 0, 'rc7')
+__version__ = version = '1.0.0rc9'
+__version_tuple__ = version_tuple = (1, 0, 0, 'rc9')
 
-__commit_id__ = commit_id = 'g7153f3816'
+__commit_id__ = commit_id = 'g898d1fac5'

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/coders/base_coder.py

@@ -55,7 +55,7 @@ from cecli.reasoning_tags import (
     remove_reasoning_content,
     replace_reasoning_tags,
 )
-from cecli.repo import ANY_GIT_ERROR, GitRepo
+from cecli.repo import ANY_GIT_ERROR, GitRepo, GitRepoProxy
 from cecli.repomap import RepoMap
 from cecli.report import update_error_prefix
 from cecli.run_cmd import run_cmd_async
@@ -571,11 +571,13 @@ class Coder(metaclass=UsageMeta):
         self.repo = repo
         if use_git and self.repo is None:
             try:
-                self.repo = GitRepo(
-                    self.io,
-                    fnames,
-                    None,
-                    models=main_model.commit_message_models(),
+                self.repo = GitRepoProxy(
+                    GitRepo(
+                        self.io,
+                        fnames,
+                        None,
+                        models=main_model.commit_message_models(),
+                    )
                 )
             except FileNotFoundError:
                 pass

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/commands/undo.py

@@ -53,8 +53,12 @@ class UndoCommand(BaseCommand):
             )
             return format_command_result(io, "undo", "Commit has multiple parents")
 
-        prev_commit = last_commit.parents[0]
-        changed_files_last_commit = [item.a_path for item in last_commit.diff(prev_commit)]
+        prev_sha = last_commit.parents[0]
+        # Get list of files changed between parent and current commit
+        diff_output = coder.repo.repo.git.diff("--name-only", prev_sha, last_commit.hexsha)
+        changed_files_last_commit = (
+            [f for f in diff_output.splitlines() if f] if diff_output else []
+        )
 
         for fname in changed_files_last_commit:
             if coder.repo.repo.is_dirty(path=fname):
@@ -64,9 +68,12 @@ class UndoCommand(BaseCommand):
                 return format_command_result(io, "undo", f"File {fname} has uncommitted changes")
 
             # Check if the file was in the repo in the previous commit
+            # git ls-tree returns empty string if the file does not exist in that commit
             try:
-                prev_commit.tree[fname]
-            except KeyError:
+                tree_output = coder.repo.repo.git.ls_tree(prev_sha, "--", fname)
+                if not tree_output:
+                    raise KeyError
+            except (KeyError, ANY_GIT_ERROR):
                 io.tool_error(
                     f"The file {fname} was not in the repository in the previous commit. Cannot"
                     " undo safely."

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/helpers/background_commands.py

@@ -767,6 +767,8 @@ class BackgroundCommandManager:
         Returns:
             Tuple of (folder path, rel file paths list, alias paths list), or None if output fits in one page.
         """
+        import math
+
         if not output or len(output) <= page_size:
             return None
 
@@ -774,7 +776,7 @@ class BackgroundCommandManager:
         abs_folder = abs_root_path_func(folder_path)
         os.makedirs(abs_folder, exist_ok=True)
 
-        num_pages = (len(output) + page_size - 1) // page_size
+        num_pages = math.ceil((len(output) + page_size - 1) // page_size)
 
         for i in range(num_pages):
             page_num = i + 1

cecli_dev-1.0.0rc9/cecli/helpers/lock_detect.py

@@ -0,0 +1,54 @@
+import logging
+import sys
+import threading
+import time
+import traceback
+
+# Set up logging to catch asyncio framework logs
+logging.basicConfig(level=logging.INFO)
+logging.getLogger("asyncio").setLevel(logging.DEBUG)
+
+
+def dump_stacks_to_file(filename="hang_dump.log", interval=5, max_prints=10):
+    """Periodically writes stack traces to a file, resetting it after max_prints."""
+    print_count = 0
+
+    while True:
+        time.sleep(interval)
+        try:
+            # Determine mode: "w" to overwrite/clear on the 11th print, "a" to append
+            mode = "w" if print_count >= max_prints else "a"
+
+            with open(filename, mode, encoding="utf-8") as f:
+                if mode == "w":
+                    f.write(f"--- Log reset automatically after {max_prints} prints ---\n")
+                    print_count = 0  # Reset the counter
+
+                timestamp = time.strftime("%Y-%m-%d %H:%M:%S")
+                f.write(
+                    f"\n=================== STACK TRACE DUMP ({timestamp}) ===================\n"
+                )
+
+                for thread_id, frame in sys._current_frames().items():
+                    thread_obj = threading._active.get(thread_id)
+                    thread_name = thread_obj.name if thread_obj else "Unknown Thread"
+
+                    f.write(f"\nThread Name: {thread_name} (ID: {thread_id})\n")
+                    f.write("-" * 40 + "\n")
+                    traceback.print_stack(frame, file=f)
+
+                f.write("=" * 70 + "\n")
+
+            print_count += 1  # Increment after a successful write
+
+        except Exception as e:
+            print(f"Error writing stack dump to file: {e}", file=sys.stderr)
+
+
+# Start the monitor in a background daemon thread
+monitor_thread = threading.Thread(
+    target=dump_stacks_to_file,
+    args=("program_hangs.log", 5, 10),  # Clears every 10 prints
+    daemon=True,
+)
+monitor_thread.start()

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/helpers/orchestration/environment.py

@@ -202,16 +202,30 @@ class AgentExecutionEnv:
     # Shared across all AgentExecutionEnv instances — any agent can read/write
     _shared_state: TrackedDict = TrackedDict()
 
-    def __init__(self, coder: Any) -> None:
+    def __init__(self, coder: Any, orchestration_config: dict[str, Any] | None = None) -> None:
+        from typing import Any as _Any
+
+        self._orchestration_config: dict[str, _Any] = orchestration_config or {}
+        self._DANGEROUS_BUILTINS: set[str] = {
+            "eval",
+            "exec",
+            "open",
+            "__import__",
+            "compile",
+            "breakpoint",
+            "globals",
+            "locals",
+        }
+
         self.state = TrackedDict()
         self.state._set_owner(self)
         self._shared_state._set_owner(self, is_shared=True)
 
         # Initialize early so _safe_builtins can reference them
-        self.globals: dict[str, Any] = {}
-        self.locals: dict[str, Any] = {}
+        self.globals: dict[str, _Any] = {}
+        self.locals: dict[str, _Any] = {}
 
-        self._safe_builtins: dict[str, Any] = {
+        self._safe_builtins: dict[str, _Any] = {
             "print": print,
             "range": range,
             "len": len,
@@ -267,6 +281,32 @@ class AgentExecutionEnv:
             "pathlib": _SafePathlib,
         }
 
+        # Task 3: allowed_builtins — extend _safe_builtins with user-requested builtins
+        allowed_builtins: list[str] = self._orchestration_config.get("allowed_builtins", [])
+        for name in allowed_builtins:
+            if name.startswith("_"):
+                raise ValueError(f"Cannot allow private builtin '{name}'")
+            if name in self._DANGEROUS_BUILTINS and not self._orchestration_config.get(
+                "disable_security"
+            ):
+                raise ValueError(f"Cannot allow dangerous builtin '{name}'")
+            self._safe_builtins[name] = __builtins__[name]
+
+        # When security is fully disabled, expose dangerous builtins
+        if self._orchestration_config.get("disable_security", False):
+            for name in self._DANGEROUS_BUILTINS:
+                self._safe_builtins[name] = __builtins__[name]
+
+        # When allow_classes is enabled, expose __build_class__ needed by Python
+        if self._orchestration_config.get("allow_classes", False):
+            self._safe_builtins["__build_class__"] = __builtins__["__build_class__"]
+
+        # When allowed_imports is configured, expose __import__ so imports work,
+        # and add __name__ since imported modules reference it.
+        if self._orchestration_config.get("allowed_imports"):
+            self._safe_builtins["__import__"] = __builtins__["__import__"]
+            self._safe_builtins["__name__"] = "__sandbox__"
+
         self.globals.clear()
         _agent = AgentProxy(coder)
         _agent._env = self
@@ -382,7 +422,8 @@ class AgentExecutionEnv:
 
         code_str = code_str.strip()
         code_str = _escape_newlines_in_strings(code_str)
-        code_str, extra_globals = _strip_allowed_imports(code_str)
+        extra_allowed = frozenset(self._orchestration_config.get("allowed_imports", []))
+        code_str, extra_globals = _strip_allowed_imports(code_str, extra_allowed=extra_allowed)
         self.globals.update(extra_globals)
         if not code_str:
             return {"results": "", "state_variables": self._state_snapshot()}
@@ -411,8 +452,13 @@ class AgentExecutionEnv:
             return {"results": code, "state_variables": self._state_snapshot()}
 
         try:
-            tree = SecurityFilter().visit(tree)
-            tree = LoopYieldInjector().visit(tree)
+            if not self._orchestration_config.get("disable_security", False):
+                tree = SecurityFilter(
+                    allowed_imports=extra_allowed,
+                    allow_classes=self._orchestration_config.get("allow_classes", False),
+                ).visit(tree)
+            if not self._orchestration_config.get("disable_loop_protection", False):
+                tree = LoopYieldInjector().visit(tree)
             ast.fix_missing_locations(tree)
         except SecurityError as e:
             return _build_result(f"Security Error: {e}")
@@ -477,7 +523,9 @@ def build_orchestration_context_block(agent_config: dict[str, Any]) -> str | Non
     if not agent_config.get("allow_orchestration", True):
         return None
 
-    return """<context name="orchestration" from="agent">
+    orchestration_config = agent_config.get("orchestration", {})
+
+    context = """<context name="orchestration" from="agent">
 The `Orchestrate` tool lets you batch multiple tool calls in a single step by writing Python code in a limited, secure sandbox.
 This is much more efficient than making individual tool calls for loop-heavy workflows.
 Variables and methods defined in a script are persisted in subsequent turns.
@@ -611,6 +659,28 @@ await Agent.edit_region(
 4. Use `print(...)` to output results — only printed output is returned
 </context>"""
 
+    # Task 6: Append sandbox configuration overrides when non-empty
+    if orchestration_config:
+        overrides: list[str] = []
+        if orchestration_config.get("allowed_imports"):
+            overrides.append(
+                f"- Allowed extra imports: {orchestration_config['allowed_imports']}"
+            )
+        if orchestration_config.get("allowed_builtins"):
+            overrides.append(
+                f"- Allowed extra builtins: {orchestration_config['allowed_builtins']}"
+            )
+        if orchestration_config.get("allow_classes"):
+            overrides.append("- Class definitions are allowed (__init__, __str__, etc.)")
+        if orchestration_config.get("disable_security"):
+            overrides.append("- ⚠ Security filtering is DISABLED")
+        if orchestration_config.get("disable_loop_protection"):
+            overrides.append("- ⚠ Loop protection is DISABLED")
+        if overrides:
+            context += "\n### Sandbox Configuration Overrides\n" + "\n".join(overrides) + "\n"
+
+    return context
+
 
 # flake8: noqa
 # fmt: on

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/helpers/orchestration/safe_methods.py

@@ -586,12 +586,21 @@ _PREIMPORTED_MODULES: frozenset[str] = frozenset(
 )
 
 
-def _strip_allowed_imports(code: str) -> tuple[str, dict[str, object]]:
+def _strip_allowed_imports(
+    code: str,
+    extra_allowed: frozenset[str] | None = None,
+) -> tuple[str, dict[str, object]]:
     """Strip import lines for modules already pre-imported in the sandbox.
 
     The sandbox provides ``re``, ``math``, ``itertools``, ``collections``,
     ``datetime``, ``traceback``, and ``json`` as read-only proxies.
 
+    When *extra_allowed* is provided, import statements for those modules
+    are also allowed through (neither stripped nor commented out).  The caller
+    is responsible for ensuring those names are resolvable at execution time
+    (either by pre-importing them into the sandbox globals or letting the
+    ``SecurityFilter`` allow the ``import`` statement through).
+
     Returns ``(code, extra_globals)`` where *extra_globals* maps imported
     names to their resolved values.  The caller must inject these into the
     execution namespace before running the code.
@@ -606,7 +615,11 @@ def _strip_allowed_imports(code: str) -> tuple[str, dict[str, object]]:
 
     import re as _re
 
+    preimported = _PREIMPORTED_MODULES
+    skip_allowed = extra_allowed or frozenset()
+
     lines = code.splitlines()
+
     result = []
     extra_globals: dict[str, object] = {}
 
@@ -619,7 +632,11 @@ def _strip_allowed_imports(code: str) -> tuple[str, dict[str, object]]:
             r"import\s+(\w+)(?:\s+as\s+(\w+))?\s*$",
             stripped,
         )
-        if m and m.group(1) in _PREIMPORTED_MODULES:
+        if m and m.group(1) in skip_allowed:
+            result.append(line)
+            continue
+
+        if m and m.group(1) in preimported:
             mod_name = m.group(1)
             alias = m.group(2) or mod_name
 
@@ -637,7 +654,11 @@ def _strip_allowed_imports(code: str) -> tuple[str, dict[str, object]]:
             r"from\s+(\w+)\s+import\s+(.*)$",
             stripped,
         )
-        if m and m.group(1) in _PREIMPORTED_MODULES:
+        if m and m.group(1) in skip_allowed:
+            result.append(line)
+            continue
+
+        if m and m.group(1) in preimported:
             mod_name = m.group(1)
             names_clause = m.group(2)
 

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/helpers/orchestration/security.py

@@ -59,6 +59,41 @@ class SecurityFilter(ast.NodeTransformer):
 
     _SAFE_DUNDER: set[str] = {"__name__", "__doc__"}
 
+    _SAFE_CLASS_DUNDERS: frozenset[str] = frozenset(
+        {
+            "__init__",
+            "__str__",
+            "__repr__",
+            "__iter__",
+            "__next__",
+            "__len__",
+            "__getitem__",
+            "__setitem__",
+            "__contains__",
+            "__enter__",
+            "__exit__",
+            "__aenter__",
+            "__aexit__",
+            "__await__",
+            "__anext__",
+            "__aiter__",
+            "__del__",
+            "__init_subclass__",
+            "__set_name__",
+            "__class_getitem__",
+        }
+    )
+
+    def __init__(
+        self,
+        allowed_imports: frozenset[str] | None = None,
+        allow_classes: bool = False,
+    ):
+        super().__init__()
+        self._allowed_imports = allowed_imports or frozenset()
+        self._allow_classes = allow_classes
+        self._class_depth = 0
+
     # ------------------------------------------------------------------
     # Helpers
     # ------------------------------------------------------------------
@@ -89,17 +124,24 @@ class SecurityFilter(ast.NodeTransformer):
     # Statement visitors (import / global / nonlocal)
     # ------------------------------------------------------------------
 
-    def visit_Import(self, node: ast.Import) -> ast.Expr:
-        return self._make_raise_stmt(
-            f"Security filter error at line {node.lineno}: "
-            "Imports are disabled in the agent orchestration environment."
-        )
+    def visit_Import(self, node: ast.Import) -> ast.Expr | ast.Import:
+        for alias in node.names:
+            if alias.name not in self._allowed_imports:
+                return self._make_raise_stmt(
+                    f"Security filter error at line {node.lineno}: "
+                    f"Import '{alias.name}' is not in allowed_imports."
+                )
 
-    def visit_ImportFrom(self, node: ast.ImportFrom) -> ast.Expr:
-        return self._make_raise_stmt(
-            f"Security filter error at line {node.lineno}: "
-            "Imports are disabled in the agent orchestration environment."
-        )
+        return node
+
+    def visit_ImportFrom(self, node: ast.ImportFrom) -> ast.Expr | ast.ImportFrom:
+        if node.module is None or node.module not in self._allowed_imports:
+            return self._make_raise_stmt(
+                f"Security filter error at line {node.lineno}: "
+                f"Import from '{node.module}' is not in allowed_imports."
+            )
+
+        return node
 
     def visit_Global(self, node: ast.Global) -> ast.Expr:
         return self._make_raise_stmt(
@@ -114,17 +156,47 @@ class SecurityFilter(ast.NodeTransformer):
         )
 
     # ------------------------------------------------------------------
-    # Expression visitors (attribute access / dangerous calls)
+    def visit_ClassDef(self, node: ast.ClassDef) -> ast.ClassDef | ast.Expr:
+        if self._allow_classes:
+            self._class_depth += 1
+            self.generic_visit(node)
+            self._class_depth -= 1
+            return node
+
+        return self._make_raise_stmt(
+            f"Security filter error at line {node.lineno}: "
+            "Class definitions are disabled in the orchestration environment."
+        )
+
+    def visit_FunctionDef(self, node: ast.FunctionDef) -> ast.FunctionDef | ast.Expr:
+        if self._allow_classes and self._class_depth > 0 and node.name.startswith("__"):
+            if node.name not in self._SAFE_CLASS_DUNDERS:
+                return self._make_raise_stmt(
+                    f"Security filter error at line {node.lineno}: "
+                    f"Method name '{node.name}' is not allowed. "
+                    f"Only safe dunder methods are permitted inside class bodies."
+                )
+
+        return self.generic_visit(node)
+
     # ------------------------------------------------------------------
+    # Expression visitors (attribute access / dangerous calls)
 
     def visit_Attribute(self, node: ast.Attribute):
         if node.attr.startswith("_"):
             if node.attr in self._SAFE_DUNDER:
                 return self.generic_visit(node)
 
+            if (
+                self._allow_classes
+                and self._class_depth > 0
+                and node.attr in self._SAFE_CLASS_DUNDERS
+            ):
+                return self.generic_visit(node)
+
             if isinstance(node.ctx, (ast.Store, ast.Del)):
                 verb = "assign to" if isinstance(node.ctx, ast.Store) else "delete"
-                raise SecurityError(
+                return self._make_raise_expr(
                     f"Security filter error at line {node.lineno}: "
                     f"cannot {verb} private attribute '{node.attr}'"
                 )

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/helpers/orchestration/service.py

@@ -24,7 +24,11 @@ class OrchestrationService:
             cls._instances[coder] = instance
             return instance
 
-        instance = AgentExecutionEnv(coder)
+        orchestration_config = {}
+        if hasattr(coder, "agent_config"):
+            orchestration_config = coder.agent_config.get("orchestration", {})
+
+        instance = AgentExecutionEnv(coder, orchestration_config=orchestration_config)
         cls._instances[coder] = instance
         cls._uuid_index[coder.uuid] = instance
         return instance

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/hooks/registry.py

@@ -149,7 +149,6 @@ class HookRegistry:
                             loaded_hooks.append(hook.name)
                         else:
                             print(f"Warning: Could not register hook '{hook.name}': {e}")
-                        print(f"Warning: Could not register hook '{hook.name}': {e}")
 
         return loaded_hooks
 

{cecli_dev-1.0.0rc7 → cecli_dev-1.0.0rc9}/cecli/main.py

@@ -554,7 +554,7 @@ async def main_async(
     from cecli.mcp import McpServerManager, load_mcp_servers
     from cecli.models import ModelSettings
     from cecli.onboarding import offer_openrouter_oauth, select_default_model
-    from cecli.repo import GitRepo
+    from cecli.repo import GitRepo, GitRepoProxy
     from cecli.report import report_uncaught_exceptions, set_args_error_data
     from cecli.versioncheck import check_version
     from cecli.watch import FileWatcher
@@ -1041,20 +1041,22 @@ async def main_async(
     repo = None
     if args.git:
         try:
-            repo = GitRepo(
-                io,
-                fnames,
-                git_dname,
-                args.cecli_ignore,
-                models=main_model.commit_message_models(),
-                attribute_author=args.attribute_author,
-                attribute_committer=args.attribute_committer,
-                attribute_commit_message_author=args.attribute_commit_message_author,
-                attribute_commit_message_committer=args.attribute_commit_message_committer,
-                commit_prompt=args.commit_prompt,
-                subtree_only=args.subtree_only,
-                git_commit_verify=args.git_commit_verify,
-                attribute_co_authored_by=args.attribute_co_authored_by,
+            repo = GitRepoProxy(
+                GitRepo(
+                    io,
+                    fnames,
+                    git_dname,
+                    args.cecli_ignore,
+                    models=main_model.commit_message_models(),
+                    attribute_author=args.attribute_author,
+                    attribute_committer=args.attribute_committer,
+                    attribute_commit_message_author=args.attribute_commit_message_author,
+                    attribute_commit_message_committer=args.attribute_commit_message_committer,
+                    commit_prompt=args.commit_prompt,
+                    subtree_only=args.subtree_only,
+                    git_commit_verify=args.git_commit_verify,
+                    attribute_co_authored_by=args.attribute_co_authored_by,
+                )
             )
         except FileNotFoundError:
             pass