cecli-dev 0.100.11rc6__tar.gz → 0.100.12rc2__tar.gz

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.100.11rc6
+Version: 0.100.12rc2
 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-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.100.11rc6'
-__version_tuple__ = version_tuple = (0, 100, 11, 'rc6')
+__version__ = version = '0.100.12rc2'
+__version_tuple__ = version_tuple = (0, 100, 12, 'rc2')
 
-__commit_id__ = commit_id = 'g3d741d2c1'
+__commit_id__ = commit_id = 'g221e9f433'

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/args.py

@@ -1113,7 +1113,7 @@ def get_parser(default_config_files, git_root):
     group.add_argument(
         "--notification-bell",
         action=argparse.BooleanOptionalAction,
-        default=True,
+        default=False,
         help=(
             "Allow notification commands to produce an audible bell. When enabled, command"
             " output is not suppressed so terminal bell escape sequences can ring through"

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/change_tracker.py

@@ -21,7 +21,7 @@ class ChangeTracker:
 
         Parameters:
         - file_path: Path to the file that was changed
-        - change_type: Type of change (e.g., 'edittext', 'insertlines')
+        - change_type: Type of change (e.g., 'editfile', 'insertlines')
         - original_content: Original content before the change
         - new_content: New content after the change
         - metadata: Additional information about the change (line numbers, positions, etc.)

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/coders/agent_coder.py

@@ -65,7 +65,7 @@ class AgentCoder(Coder):
             "commandinteractive",
             "explorecode",
             "ls",
-            "readrange",
+            "readfile",
             "grep",
             "thinking",
             "updatetodolist",
@@ -73,7 +73,7 @@ class AgentCoder(Coder):
         self.write_tools = {
             "command",
             "commandinteractive",
-            "edittext",
+            "editfile",
             "undochange",
         }
         self.edit_allowed = True
@@ -1138,7 +1138,7 @@ class AgentCoder(Coder):
             context_parts.append("\n\n")
             context_parts.append("## File Editing Tools Disabled")
             context_parts.append(
-                "File editing tools are currently disabled. Use `ReadRange` to determine the"
+                "File editing tools are currently disabled. Use `ReadFile` to determine the"
                 " current content ID prefixes needed to perform an edit and activate them when"
                 " you are ready to edit a file."
             )

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/commands/add.py

@@ -125,10 +125,11 @@ class AddCommand(BaseCommand):
                 else:
                     io.tool_error(f"Cannot add {matched_file} as it's not part of the repository")
             else:
-                if is_image_file(matched_file) and not coder.main_model.info.get("supports_vision"):
+                active_model = coder.get_active_model()
+                if is_image_file(matched_file) and not active_model.info.get("supports_vision"):
                     io.tool_error(
                         f"Cannot add image file {matched_file} as the"
-                        f" {coder.main_model.name} does not support images."
+                        f" {active_model.name} does not support images."
                     )
                     continue
                 content = io.read_text(abs_file_path)

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/commands/read_only.py

@@ -156,10 +156,11 @@ class ReadOnlyCommand(BaseCommand):
         source_mode="read-only",
         target_mode="read-only",
     ):
-        if is_image_file(original_name) and not coder.main_model.info.get("supports_vision"):
+        active_model = coder.get_active_model()
+        if is_image_file(original_name) and not active_model.info.get("supports_vision"):
             io.tool_error(
                 f"Cannot add image file {original_name} as the"
-                f" {coder.main_model.name} does not support images."
+                f" {active_model.name} does not support images."
             )
             return
 

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/commands/read_only_stub.py

@@ -156,10 +156,11 @@ class ReadOnlyStubCommand(BaseCommand):
         source_mode="read-only",
         target_mode="read-only",
     ):
-        if is_image_file(original_name) and not coder.main_model.info.get("supports_vision"):
+        active_model = coder.get_active_model()
+        if is_image_file(original_name) and not active_model.info.get("supports_vision"):
             io.tool_error(
                 f"Cannot add image file {original_name} as the"
-                f" {coder.main_model.name} does not support images."
+                f" {active_model.name} does not support images."
             )
             return
 

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/helpers/agents/service.py

@@ -191,8 +191,13 @@ class AgentService:
 
         from .config import parse_subagent_file
 
+        # Always check the default sub-agents directory in the user's home
+        default_dir = str(Path.home() / ".cecli" / "subagents")
+        if default_dir not in paths:
+            paths = [default_dir] + list(paths)
+
         for directory in paths:
-            dir_path = Path(directory)
+            dir_path = Path(directory).expanduser()
             if not dir_path.is_dir():
                 continue
             for md_file in sorted(dir_path.glob("*.md")):

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/helpers/conversation/files.py

@@ -117,7 +117,7 @@ class ConversationFiles:
                     content = coder.io.read_text(abs_fname, silent=True)
                     if coder.hashlines:
                         content, json_str = hashline_formatted(
-                            content, file_name=abs_fname, partial=False
+                            content, file_name=abs_fname, partial=False, expanded=False
                         )
                         self._file_json_contents[abs_fname] = json_str
                 except Exception:
@@ -237,7 +237,7 @@ class ConversationFiles:
             current_content = coder.io.read_text(abs_fname, silent=True)
             if coder.hashlines:
                 current_content, _ = hashline_formatted(
-                    current_content, file_name=abs_fname, partial=False
+                    current_content, file_name=abs_fname, partial=False, expanded=False
                 )
         except Exception:
             return None
@@ -252,6 +252,7 @@ class ConversationFiles:
         )
 
         if not snapshot_content:
+            self.add_file(abs_fname, content=current_content)
             return None
 
         # Generate diff between snapshot and current content using hashline helper
@@ -260,6 +261,7 @@ class ConversationFiles:
             new_content=current_content,
             fromfile=f"{rel_fname} (snapshot)",
             tofile=f"{rel_fname} (current)",
+            context_lines=3,
         )
 
         # If there's a diff, update the last snapshot with current content
@@ -606,7 +608,11 @@ class ConversationFiles:
                 continue
 
             _, json_str = hashline_formatted(
-                range_content, file_name=abs_fname, partial=True, start_line=start_line_adj
+                range_content,
+                file_name=abs_fname,
+                partial=True,
+                expanded=False,
+                start_line=start_line_adj,
             )
             results.append(json.loads(json_str))
 

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/helpers/conversation/integration.py

@@ -1092,21 +1092,21 @@ class ConversationChunks:
             "   <parameter=param_name>param_value_json</parameter>\n"
             "   </function>\n\n"
             "   Example:\n"
-            "   <function=Local--ReadRange>\n"
+            "   <function=Local--ReadFile>\n"
             '   <parameter=read>[{"file_path": "example.py", "range_start": "def hello",'
             ' "range_end": "def goodbye"}]</parameter>\n'
             "   </function>\n\n"
             "2. JSON Tool-Call Format:\n"
             '   Embed a JSON object with "name" and "arguments" keys.\n\n'
             "   Example:\n"
-            '   {"name": "Local--ReadRange", "arguments": {"read": [{"file_path": "example.py",'
+            '   {"name": "Local--ReadFile", "arguments": {"read": [{"file_path": "example.py",'
             ' "range_start": "class A", "range_end": "class Z"}]}}\n\n'
             "3. Bracket Format:\n"
             "   [ToolName(key1=value1, key2=value2)]\n\n"
             "   Example:\n"
-            '   [Local--ReadRange(read=[{"file_path": "example.py", "range_start": "class A"}])]\n\n'
+            '   [Local--ReadFile(read=[{"file_path": "example.py", "range_start": "class A"}])]\n\n'
             "IMPORTANT: Use the FULL prefixed tool name "
-            '(e.g., "Local--ReadRange" not just "ReadRange").\n'
+            '(e.g., "Local--ReadFile" not just "ReadFile").\n'
             "</context>"
         )
 

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/helpers/hashline.py

@@ -1,6 +1,7 @@
 import difflib
 import json
 import re
+from collections import Counter
 
 from cecli.helpers.hashpos.hashpos import HashPos
 
@@ -29,7 +30,7 @@ def hashline(text: str, start_line: int = 1) -> str:
 
 
 def hashline_formatted(
-    text: str, file_name: str, partial: bool, start_line: int = 1
+    text: str, file_name: str, partial: bool, expanded: bool, start_line: int = 1
 ) -> tuple[str, str]:
     """
     Generate hashline-formatted content and return it as both raw hashline text and a JSON structure.
@@ -55,6 +56,7 @@ def hashline_formatted(
         "start_line": start_line,
         "end_line": end_line,
         "partial": partial,
+        "expanded": expanded,
         "prefixed_contents": prefixed,
     }
 
@@ -315,7 +317,7 @@ def resolve_content_to_hashline_ids(
 
     def _find_substring_matches(lines, value):
         """Find all line indices where the value appears as a substring."""
-        value_stripped = value.rstrip("\r\n")
+        value_stripped = value.strip()
         return [i for i, line in enumerate(lines) if value_stripped in line]
 
     def _resolve_to_hash_id(lines, idx, hp):
@@ -1477,10 +1479,55 @@ def _apply_closure_safeguard(
             errors += count_ast_errors(child)
         return errors
 
+    def _detect_indent_unit(source_lines: list) -> int:
+        """Detect the common indentation unit from non-empty source lines."""
+        indents = []
+        for line in source_lines:
+            if line.strip():  # non-empty
+                indent = len(line) - len(line.lstrip())
+                indents.append(indent)
+
+        if len(indents) < 2:
+            return 0
+
+        # Compute differences between consecutive non-empty lines
+        diffs = []
+        for i in range(1, len(indents)):
+            diff = abs(indents[i] - indents[i - 1])
+            if diff > 0:
+                diffs.append(diff)
+
+        if not diffs:
+            return 0
+
+        # Most common non-zero difference is the indentation unit
+        return Counter(diffs).most_common(1)[0][0]
+
+    def _has_indent_jump(test_lines: list, unit: int) -> bool:
+        """Check if the edit result creates an indentation jump of 2+ units."""
+        if unit == 0:
+            return False
+
+        prev_indent = None
+        for line in test_lines:
+            if line.strip():  # non-empty
+                indent = len(line) - len(line.lstrip())
+                if prev_indent is not None:
+                    diff = abs(indent - prev_indent)
+                    if diff > unit:
+                        return True
+                prev_indent = indent
+
+        return False
+
     # Establish the baseline syntax health of the original file
     base_tree = parser.parse(source_bytes)
     baseline_error_count = count_ast_errors(base_tree.root_node)
 
+    # Detect if the original source follows normal indentation (steps of 1 unit)
+    indent_unit = _detect_indent_unit(source_lines)
+    is_normally_indented = indent_unit > 0
+
     safe_resolved_ops = []
     rejected_ops = []
 
@@ -1554,6 +1601,13 @@ def _apply_closure_safeguard(
                 end_line_match = source_lines[candidate_end] == source_lines[llm_end]
                 cumulative_movement = abs(start_shift) + abs(end_shift)
 
+                # Check for indentation jumps in the resulting edit
+                if is_normally_indented:
+                    test_lines = test_source_bytes.decode("utf-8").splitlines()
+                    has_indent_jump = _has_indent_jump(test_lines, indent_unit)
+                else:
+                    has_indent_jump = False
+
                 all_candidates.append(
                     {
                         "start_idx": candidate_start,
@@ -1562,6 +1616,7 @@ def _apply_closure_safeguard(
                         "start_line_match": start_line_match,
                         "end_line_match": end_line_match,
                         "cumulative_movement": cumulative_movement,
+                        "has_indent_jump": has_indent_jump,
                         "is_partial": is_partial,
                         "is_downward": is_downward,
                         "is_both": is_both,
@@ -1576,6 +1631,7 @@ def _apply_closure_safeguard(
                     r["ast_error_count"],  # Ascending: fewer syntax errors wins
                     not r["start_line_match"],  # Descending: True first
                     not r["end_line_match"],  # Descending: True first
+                    r.get("has_indent_jump", False),  # Ascending: False (no jump) first
                     r["cumulative_movement"],  # Ascending: smaller is better
                     not r["is_partial"],  # Booleans: False comes before True
                     not r["is_downward"],  # Booleans: False comes before True

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/helpers/responses.py

@@ -166,7 +166,7 @@ def extract_tools_from_pseudo_json(content: str) -> Optional[List[ChatCompletion
     The parser handles nested parentheses and commas inside JSON values.
 
     Example:
-    [Local--ReadRange(show=[{"file_path": "agent.py", "start_text": "class A"}], verbose=true, mode="strict")]
+    [Local--ReadFile(show=[{"file_path": "agent.py", "start_text": "class A"}], verbose=true, mode="strict")]
     """
     from litellm.types.utils import ChatCompletionMessageToolCall, Function  # noqa
 

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/helpers/skills.py

@@ -66,6 +66,11 @@ class SkillsManager:
             git_root: Optional git root directory for relative path resolution
             coder: Optional reference to the coder instance (weak reference)
         """
+        # Always include the default skills directory in the user's home
+        default_skill_dir = str(Path.home() / ".cecli" / "skills")
+        if default_skill_dir not in directory_paths:
+            directory_paths = list(directory_paths) + [default_skill_dir]
+
         self.directory_paths = [Path(p).expanduser().resolve() for p in directory_paths]
         self.include_list = set(include_list) if include_list else None
         self.exclude_list = set(exclude_list) if exclude_list else set()

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/io.py

@@ -367,7 +367,7 @@ class InputOutput:
         root=".",
         notifications=False,
         notifications_command=None,
-        notification_bell=True,
+        notification_bell=False,
         verbose=False,
     ):
         self.console = Console()
@@ -386,6 +386,7 @@ class InputOutput:
         self.bell_on_next_input = False
         self.notifications = notifications
         self.notification_bell = notification_bell
+        self.custom_notification_command = False
         self.verbose = verbose
         self.profile_start_time = None
         self.profile_last_time = None
@@ -404,10 +405,19 @@ class InputOutput:
         self.confirmation_input_active = False
         self.saved_input_text = ""
 
-        if notifications and notifications_command is None:
-            self.notifications_command = self.get_default_notification_command()
-        else:
+        if notifications_command is not None:
+            # Custom notification command overrides everything
             self.notifications_command = notifications_command
+            self.custom_notification_command = True
+        elif notification_bell and not notifications:
+            # Bell only mode - no command needed, _send_notification will fallback to bell
+            self.notifications_command = None
+        elif notifications:
+            # Generate default notification command based on notification_bell flag
+            include_bell = notification_bell is not False
+            self.notifications_command = self.get_default_notification_command(bell=include_bell)
+        else:
+            self.notifications_command = None
 
         no_color = os.environ.get("NO_COLOR")
         if no_color is not None and no_color != "":
@@ -1693,8 +1703,8 @@ class InputOutput:
         """Mark that the LLM has started processing, so we should ring the bell on next input"""
         self.bell_on_next_input = True
 
-    def get_default_notification_command(self):
-        """Return a command that triggers a system bell followed by a notification."""
+    def get_default_notification_command(self, bell=True):
+        """Return a command that triggers a notification, optionally with a bell."""
         import platform
         import shutil
 
@@ -1744,13 +1754,18 @@ class InputOutput:
             )
             notif_cmd = f"powershell -WindowStyle Hidden -Command {ps_body}"
 
-        # 3. Concatenate them
+        # 3. Concatenate them based on bell preference
         if notif_cmd:
-            # Using ';' as a command separator works for both shell=True on Unix and Windows
-            return f"{bell_cmd} ; {notif_cmd}"
+            if bell:
+                # Using ';' as a command separator works for both shell=True on Unix and Windows
+                return f"{bell_cmd} ; {notif_cmd}"
+            return notif_cmd
 
         # Fallback if no notification tool is found
-        return bell_cmd
+        if bell:
+            return bell_cmd
+
+        return None
 
     def _send_notification(self):
         # Cooldown to prevent notification spam
@@ -1787,18 +1802,33 @@ class InputOutput:
 
             except Exception as e:
                 self.tool_warning(f"Failed to run notifications command: {e}")
-        else:
-            print("\a", end="", flush=True)  # Ring the bell
+        elif self.notification_bell is not False:
+            bell_cmd = self.get_default_notification_command(bell=True)
+            if bell_cmd:
+                try:
+                    kwargs = {
+                        "shell": True,
+                    }
+
+                    if platform.system() == "Windows":
+                        kwargs["creationflags"] = subprocess.CREATE_NO_WINDOW
+                    else:
+                        kwargs["start_new_session"] = True
+
+                    subprocess.Popen(bell_cmd, **kwargs)
+                except Exception as e:
+                    self.tool_warning(f"Failed to run bell command: {e}")
 
     def notify_user_input_required(self):
         """Send a notification that user input is required."""
-        if self.notifications:
+        if self.notifications or self.notification_bell or self.custom_notification_command:
             self._send_notification()
 
     def ring_bell(self):
         """Ring the terminal bell if needed and clear the flag"""
-        if self.bell_on_next_input and self.notifications:
-            self._send_notification()
+        if self.bell_on_next_input:
+            if self.notifications or self.notification_bell or self.custom_notification_command:
+                self._send_notification()
             self.bell_on_next_input = False
 
     def toggle_multiline_mode(self):

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/main.py

@@ -554,6 +554,7 @@ async def main_async(
         git_root = get_git_root()
     conf_fname = handle_core_files(Path(".cecli.conf.yml"))
     default_config_files = [
+        str(Path.home() / ".cecli" / "conf.yml"),
         str(Path.home() / ".cecli.conf.yml"),
         str(Path(".cecli.conf.yml")),
     ]

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/prompts/agent.yml

@@ -64,7 +64,7 @@ main_system: |
 
 system_reminder: |
   <context name="critical_reminders">
-  - Prefer the `ReadRange` tool to cli commands for file reading
+  - Prefer the `ReadFile` tool to cli commands for file reading
   - Pay close attention to indentation and styling when editing files  
   - Batch tool calls as often as possible
   - Reason out loud through problems but be brief.   

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/prompts/subagent.yml

@@ -49,7 +49,7 @@ main_system: |
 
 system_reminder: |
   <context name="critical_reminders">
-  - Prefer the `ReadRange` tool to cli commands for file reading
+  - Prefer the `ReadFile` tool to cli commands for file reading
   - Pay close attention to indentation and styling when editing files  
   - Batch tool calls as often as possible
   - Reason out loud through problems but be brief. 

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/sendchat.py

@@ -196,7 +196,7 @@ def ensure_alternating_roles(messages):
                 result.append(tool_msg)
 
             # Update prev_role to assistant after processing tool sequence
-            prev_role = "assistant"
+            prev_role = "tool"
             continue
 
         # Handle normal message alternation

{cecli_dev-0.100.11rc6 → cecli_dev-0.100.12rc2}/cecli/tools/__init__.py

@@ -7,7 +7,7 @@ from . import (
     command,
     command_interactive,
     delegate,
-    edit_text,
+    edit_file,
     explore_code,
     git_branch,
     git_diff,
@@ -17,7 +17,7 @@ from . import (
     git_status,
     grep,
     ls,
-    read_range,
+    read_file,
     resource_manager,
     thinking,
     undo_change,
@@ -29,7 +29,7 @@ TOOL_MODULES = [
     command,
     command_interactive,
     delegate,
-    edit_text,
+    edit_file,
     explore_code,
     _yield,
     git_branch,
@@ -40,7 +40,7 @@ TOOL_MODULES = [
     git_status,
     grep,
     ls,
-    read_range,
+    read_file,
     resource_manager,
     thinking,
     undo_change,

cecli_dev-0.100.11rc6/cecli/tools/edit_text.py → cecli_dev-0.100.12rc2/cecli/tools/edit_file.py

@@ -31,7 +31,7 @@ USER_EDIT_CATEGORIES = {
 
 
 class Tool(BaseTool):
-    NORM_NAME = "edittext"
+    NORM_NAME = "editfile"
     TRACK_INVOCATIONS = False
     VALIDATIONS = {
         "edits": ["coerce_list"],
@@ -40,7 +40,7 @@ class Tool(BaseTool):
     SCHEMA = {
         "type": "function",
         "function": {
-            "name": "EditText",
+            "name": "EditFile",
             "description": (
                 "Edit text in one or more files using content ID markers. "
                 "You can perform multiple 'replace' or 'delete' operations in a single call. "
@@ -138,19 +138,19 @@ class Tool(BaseTool):
                 message_dict=dict(
                     role="user",
                     content=(
-                        "Please call `ReadRange` on files you intend to edit to"
+                        "Please call `ReadFile` on files you intend to edit to"
                         " make sure edits are appropriately targeted."
                     ),
                 ),
                 tag=MessageTag.CUR,
-                hash_key=("edit_text", "reminder"),
+                hash_key=("edit_file", "reminder"),
                 promotion=ConversationService.get_manager(coder).DEFAULT_TAG_PROMOTION_VALUE,
                 mark_for_delete=0,
                 mark_for_demotion=1,
                 force=True,
             )
 
-        tool_name = "EditText"
+        tool_name = "EditFile"
         try:
             # 1. Validate edits parameter
             if not isinstance(edits, list):
@@ -198,18 +198,18 @@ class Tool(BaseTool):
                                     "Must be 'replace' or 'delete'"
                                 )
 
-                            edit_text_raw = edit.get("text")
-                            edit_text = edit.get("text")
+                            edit_file_raw = edit.get("text")
+                            edit_file = edit.get("text")
                             edit_start_line = edit.get("start_line")
                             edit_end_line = edit.get("end_line")
 
-                            if edit_text_raw is not None:
-                                edit_text_raw = strip_hashline(edit_text_raw)
-                                while edit_text_raw != edit_text:
-                                    edit_text_raw = strip_hashline(edit_text_raw)
-                                    edit_text = strip_hashline(edit_text)
+                            if edit_file_raw is not None:
+                                edit_file_raw = strip_hashline(edit_file_raw)
+                                while edit_file_raw != edit_file:
+                                    edit_file_raw = strip_hashline(edit_file_raw)
+                                    edit_file = strip_hashline(edit_file)
 
-                                edit_text = edit_text_raw
+                                edit_file = edit_file_raw
 
                             # Try to resolve line content values to content IDs
                             # This handles cases where LLMs pass actual line content
@@ -220,7 +220,7 @@ class Tool(BaseTool):
 
                             # Validate required fields based on operation type
                             if operation in ("replace", "insert"):
-                                if edit_text is None:
+                                if edit_file is None:
                                     raise ToolError(
                                         f"Edit {edit_index + 1}: 'text' parameter is required for "
                                         f"'{operation}' operation"
@@ -251,8 +251,8 @@ class Tool(BaseTool):
                                 "end_line_hash": edit_end_line,
                                 "operation": operation,
                             }
-                            if edit_text is not None:
-                                op_dict["text"] = edit_text
+                            if edit_file is not None:
+                                op_dict["text"] = edit_file
 
                             operations.append(op_dict)
 
@@ -261,7 +261,7 @@ class Tool(BaseTool):
                                 "operation": operation,
                                 "start_line": edit_start_line,
                                 "end_line": edit_end_line,
-                                "text": edit_text,
+                                "text": edit_file,
                             }
                             file_metadata.append(metadata)
 
@@ -285,9 +285,7 @@ class Tool(BaseTool):
                         else:
                             # Be specific about why content didn't change
                             if failed_ops:
-                                error_details = "; ".join(
-                                    f"Edit {op['index'] + 1}: {op['error']}" for op in failed_ops
-                                )
+                                error_details = "; ".join(op["error"] for op in failed_ops)
                                 raise ToolError(
                                     f"Invalid Edit - Update content ID bounds: {error_details}"
                                 )
@@ -345,7 +343,7 @@ class Tool(BaseTool):
                         rel_path,
                         original_content,
                         new_content,
-                        "edittext",
+                        "editfile",
                         metadata,
                         change_id,
                     )