Replace ShowNumberedContext for tool_utils

aider/tools/show_numbered_context.py

@@ -1,31 +1,32 @@
 import os
+from .tool_utils import ToolError, resolve_paths, handle_tool_error
 
 def execute_show_numbered_context(coder, file_path, pattern=None, line_number=None, context_lines=3):
     """
     Displays numbered lines from file_path centered around a target location
     (pattern or line_number), without adding the file to context.
+    Uses utility functions for path resolution and error handling.
     """
-    error_message = None
+    tool_name = "ShowNumberedContext"
-    if not (pattern is None) ^ (line_number is None):
-        error_message = "Provide exactly one of 'pattern' or 'line_number'."
-        coder.io.tool_error(error_message)
-        return f"Error: {error_message}"
-
-    abs_path = coder.abs_root_path(file_path)
-    if not os.path.exists(abs_path):
-        error_message = f"File not found: {file_path}"
-        coder.io.tool_error(error_message)
-        return f"Error: {error_message}"
-
     try:
+        # 1. Validate arguments
+        if not (pattern is None) ^ (line_number is None):
+            raise ToolError("Provide exactly one of 'pattern' or 'line_number'.")
+
+        # 2. Resolve path
+        abs_path, rel_path = resolve_paths(coder, file_path)
+        if not os.path.exists(abs_path):
+            # Check existence after resolving, as resolve_paths doesn't guarantee existence
+            raise ToolError(f"File not found: {file_path}")
+
+        # 3. Read file content
         content = coder.io.read_text(abs_path)
         if content is None:
-            error_message = f"Could not read file: {file_path}"
+            raise ToolError(f"Could not read file: {file_path}")
-            coder.io.tool_error(error_message)
-            return f"Error: {error_message}"
         lines = content.splitlines()
         num_lines = len(lines)
 
+        # 4. Determine center line index
         center_line_idx = -1
         found_by = ""
 
@@ -36,15 +37,12 @@ def execute_show_numbered_context(coder, file_path, pattern=None, line_number=No
                     center_line_idx = line_number_int - 1 # Convert to 0-based index
                     found_by = f"line {line_number_int}"
                 else:
-                    error_message = f"Line number {line_number_int} is out of range (1-{num_lines}) for {file_path}."
+                    raise ToolError(f"Line number {line_number_int} is out of range (1-{num_lines}) for {file_path}.")
-                    coder.io.tool_error(error_message)
-                    return f"Error: {error_message}"
             except ValueError:
-                error_message = f"Invalid line number '{line_number}'. Must be an integer."
+                raise ToolError(f"Invalid line number '{line_number}'. Must be an integer.")
-                coder.io.tool_error(error_message)
-                return f"Error: {error_message}"
 
         elif pattern is not None:
+            # TODO: Update this section for multiline pattern support later
             first_match_line_idx = -1
             for i, line in enumerate(lines):
                 if pattern in line:
@@ -55,19 +53,17 @@ def execute_show_numbered_context(coder, file_path, pattern=None, line_number=No
                 center_line_idx = first_match_line_idx
                 found_by = f"pattern '{pattern}' on line {center_line_idx + 1}"
             else:
-                error_message = f"Pattern '{pattern}' not found in {file_path}."
+                raise ToolError(f"Pattern '{pattern}' not found in {file_path}.")
-                coder.io.tool_error(error_message)
-                return f"Error: {error_message}"
 
         if center_line_idx == -1:
              # Should not happen if logic above is correct, but as a safeguard
-             error_message = "Could not determine center line."
+             raise ToolError("Internal error: Could not determine center line.")
-             coder.io.tool_error(error_message)
-             return f"Error: {error_message}"
 
-        # Calculate context window
+        # 5. Calculate context window
         try:
             context_lines_int = int(context_lines)
+            if context_lines_int < 0:
+                 raise ValueError("Context lines must be non-negative")
         except ValueError:
             coder.io.tool_warning(f"Invalid context_lines value '{context_lines}', using default 3.")
             context_lines_int = 3
@@ -75,17 +71,22 @@ def execute_show_numbered_context(coder, file_path, pattern=None, line_number=No
         start_line_idx = max(0, center_line_idx - context_lines_int)
         end_line_idx = min(num_lines - 1, center_line_idx + context_lines_int)
 
-        # Format output
+        # 6. Format output
-        output_lines = [f"Displaying context around {found_by} in {file_path}:"]
+        # Use rel_path for user-facing messages
+        output_lines = [f"Displaying context around {found_by} in {rel_path}:"]
         max_line_num_width = len(str(end_line_idx + 1)) # Width for padding
 
         for i in range(start_line_idx, end_line_idx + 1):
             line_num_str = str(i + 1).rjust(max_line_num_width)
             output_lines.append(f"{line_num_str} | {lines[i]}")
 
+        # Log success and return the formatted context directly
+        coder.io.tool_output(f"Successfully retrieved context for {rel_path}")
         return "\n".join(output_lines)
 
+    except ToolError as e:
+        # Handle expected errors raised by utility functions or validation
+        return handle_tool_error(coder, tool_name, e, add_traceback=False)
     except Exception as e:
-        error_message = f"Error processing {file_path}: {e}"
+        # Handle unexpected errors during processing
-        coder.io.tool_error(error_message)
+        return handle_tool_error(coder, tool_name, e)
-        return f"Error: {error_message}"