- Update when linting and edit restrictions occur to interrupt the LLM less while fixing mistakes

- Remove indent_text tool since it almost never gets used

Author: Your Name

cecli/coders/agent_coder.py

@@ -66,7 +66,6 @@ def __init__(self, *args, **kwargs):
         }
         self.write_tools = {
             "deletetext",
-            "indenttext",
             "inserttext",
             "replacetext",
             "undochange",
@@ -244,14 +243,14 @@ async def initialize_mcp_tools(self):
 
     async def _execute_local_tool_calls(self, tool_calls_list):
         tool_responses = []
-        has_write_tool = False
+        used_write_tool = False
 
         for tool_call in tool_calls_list:
             tool_name = tool_call.function.name
             result_message = ""
             try:
                 if tool_name.lower() in self.write_tools:
-                    has_write_tool = True
+                    used_write_tool = True
 
                 args_string = tool_call.function.arguments.strip()
                 parsed_args_list = []
@@ -342,7 +341,7 @@ async def _execute_local_tool_calls(self, tool_calls_list):
                 {"role": "tool", "tool_call_id": tool_call.id, "content": result_message}
             )
 
-        if self.auto_lint and has_write_tool:
+        if self.auto_lint and used_write_tool and not self.edit_allowed:
             edited = list(self.files_edited_by_tools)
             lint_errors = self.lint_edited(edited)
             self.lint_outcome = not lint_errors

cecli/prompts/agent.yml

@@ -51,9 +51,12 @@ main_system: |
   Do not attempt to write these content ids. They are automatically generated.
 
   **MANDATORY Three-Phase Safety Protocol**:
-    1. **Phase 1**: Use `ShowContext` to get the hashline-prefixed content around the pattern to modify.
-    2. **Phase 2**: Execute the edit (`ReplaceText`, `InsertText`, `DeleteText`, `IndentText`) using the verified hashlines prefixes from the `ShowContext` tool.
+    1. **Phase 1**: Use `ShowContext` to get the hashline-prefixed content around the pattern to modify. Capture entire functions, logical blocks and closures
+    2. **Phase 2**: Execute the edit (`ReplaceText`, `InsertText`, `DeleteText`) using the verified hashlines prefixes from the `ShowContext` tool.
     3. **Phase 3**: Use the diff messages provided after changes are made to ensure the appropriate content was modified. For errant modifications, use `UndoChange` immediately, else proceed with the task.
+
+  **Atomic Scope:** Include the **entire function or logical block**. Never return partial syntax or broken closures. Do not attempt to replace just the beginning or end of a closure.
+  **Indentation**: Preserve all whitespace (spaces, tabs, and newlines).   
   </context>
   
   Use the `.cecli/workspace` directory for all temporary, test, or scratch files.

cecli/tools/__init__.py

@@ -15,7 +15,6 @@
     git_show,
     git_status,
     grep,
-    indent_text,
     insert_text,
     list_changes,
     load_skill,
@@ -44,7 +43,6 @@
     git_show,
     git_status,
     grep,
-    indent_text,
     insert_text,
     list_changes,
     load_skill,

cecli/tools/delete_text.py

@@ -1,4 +1,4 @@
-from cecli.helpers.hashline import HashlineError, apply_hashline_operation
+from cecli.helpers.hashline import apply_hashline_operation
 from cecli.tools.utils.base_tool import BaseTool
 from cecli.tools.utils.helpers import (
     ToolError,
@@ -63,8 +63,6 @@ def execute(
             raise ToolError(
                 "Please call `ShowContext` first to make sure edits are appropriately scoped"
             )
-        else:
-            coder.edit_allowed = False
 
         tool_name = "DeleteText"
         try:
@@ -80,7 +78,7 @@ def execute(
                     operation="delete",
                     text=None,
                 )
-            except (ToolError, HashlineError, ToolError) as e:
+            except Exception as e:
                 raise ToolError(f"Hashline deletion failed: {str(e)}")
 
             # Check if any changes were made
@@ -118,6 +116,8 @@ def execute(
             )
 
             coder.files_edited_by_tools.add(rel_path)
+            coder.edit_allowed = False
+
             # 5. Format and return result
             success_message = f"Deleted lines {start_line} to {end_line} in {file_path}"
             return format_tool_result(

cecli/tools/indent_text.py

@@ -1,6 +1,6 @@
 import traceback
 
-from cecli.helpers.hashline import HashlineError, apply_hashline_operation
+from cecli.helpers.hashline import apply_hashline_operation
 from cecli.tools.utils.base_tool import BaseTool
 from cecli.tools.utils.helpers import (
     ToolError,
@@ -72,8 +72,6 @@ def execute(
             raise ToolError(
                 "Please call `ShowContext` first to make sure edits are appropriately scoped"
             )
-        else:
-            coder.edit_allowed = False
 
         tool_name = "InsertText"
         try:
@@ -89,7 +87,7 @@ def execute(
                     operation="insert",
                     text=content,
                 )
-            except (ToolError, HashlineError, ValueError) as e:
+            except Exception as e:
                 raise ToolError(f"Hashline insertion failed: {str(e)}")
 
             # Check if any changes were made
@@ -125,6 +123,7 @@ def execute(
             )
 
             coder.files_edited_by_tools.add(rel_path)
+            coder.edit_allowed = False
 
             # 5. Format and return result
             success_message = f"Inserted content at {start_line} in {file_path}"