fix: accept cross-model arg aliases in str_replace_editor (Qwen etc.)

codewiki/src/be/agent_tools/str_replace_editor.py

@@ -1,16 +1,16 @@
 #!/usr/bin/env python3
 
 """Source: https://github.com/SWE-agent/SWE-agent/blob/main/tools/edit_anthropic/bin/str_replace_editor
 This tool is used to view the given source code and view/edit the documentation files in the separate docs directory.
 """
 
 import json
 import re
 import subprocess
 import sys
 from collections import defaultdict
 from pathlib import Path
 from typing import Annotated, List, Literal, Optional, Tuple
 import io
 
 import logging
@@ -19,11 +19,11 @@
 
 logger = logging.getLogger(__name__)
 
 from pydantic import BeforeValidator
 from pydantic_ai import RunContext, Tool
 
 from .deps import CodeWikiDeps
 from ..utils import validate_mermaid_diagrams
 
 
 def _coerce_json_string(value):
@@ -45,8 +45,8 @@
     return value
 
 
 ViewRange = Annotated[Optional[List[int]], BeforeValidator(_coerce_json_string)]
 InsertLine = Annotated[Optional[int], BeforeValidator(_coerce_json_string)]
 
 
 # There are some super strange "ascii can't decode x" errors,
@@ -84,7 +84,7 @@
 """
 
 
 def maybe_truncate(content: str, truncate_after: Optional[int] = MAX_RESPONSE_LEN):
     """Truncate content and append a notice if content exceeds the specified length."""
     return (
         content
@@ -127,7 +127,7 @@
 
 
 def _update_previous_errors(
     previous_errors: List[Flake8Error], replacement_window: Tuple[int, int], replacement_n_lines: int
 ) -> List[Flake8Error]:
     """Update the line numbers of the previous errors to what they would be after the edit window.
     This is a helper function for `_filter_previous_errors`.
@@ -734,15 +734,24 @@
 
 async def str_replace_editor(
     ctx: RunContext[CodeWikiDeps],
-    working_dir: Literal["repo", "docs"],
     command: Literal["view", "create", "str_replace", "insert", "undo_edit"],
+    working_dir: Literal["repo", "docs"] = "docs",
     path: Optional[str] = None,
     file: Optional[str] = None,
     file_text: Optional[str] = None,
     view_range: ViewRange = None,
     old_str: Optional[str] = None,
     new_str: Optional[str] = None,
     insert_line: InsertLine = None,
+    # Aliases accepted for cross-model compatibility. Weaker/local models (e.g.
+    # Qwen3) often emit the OpenAI `str_replace_based_edit_tool` field names
+    # (old_string/new_string) or `content` for the created file body. Declaring
+    # them here means pydantic-ai accepts those calls instead of rejecting them
+    # as unknown arguments (which no number of retries can fix). They are mapped
+    # onto the canonical parameters below.
+    old_string: Optional[str] = None,
+    new_string: Optional[str] = None,
+    content: Optional[str] = None,
 ) -> str:
     """
     Custom editing tool for viewing, creating and editing files
@@ -754,16 +763,28 @@
         * Only `view` command is allowed when `working_dir` is `repo`.
 
     Args:
-        working_dir: The working directory to use. Choose `repo` to work with the repository files, or `docs` to work with the generated documentation files.
         command: The command to run. Allowed options are: `view`, `create`, `str_replace`, `insert`, `undo_edit`.
+        working_dir: The working directory to use. Choose `repo` to work with the repository files, or `docs` to work with the generated documentation files. Defaults to `docs`.
         path: Path to file or directory, e.g. `./chat_core.md` or `./agents/`
         file: Alias for `path` parameter (for compatibility with some models)
         file_text: Required parameter of `create` command, with the content of the file to be created.
         view_range: Optional parameter of `view` command when `path` points to a file. If none is given, the full file is shown. If provided, the file will be shown in the indicated line number range, e.g. [11, 12] will show lines 11 and 12. Indexing at 1 to start. Setting `[start_line, -1]` shows all lines from `start_line` to the end of the file.
         old_str: Required parameter of `str_replace` command containing the string in `path` to replace.
         new_str: Optional parameter of `str_replace` command containing the new string (if not given, no string will be added). Required parameter of `insert` command containing the string to insert.
+        old_string: Alias for `old_str` (some models emit this name).
+        new_string: Alias for `new_str` (some models emit this name).
+        content: Alias for `file_text` (some models emit this name for `create`).
     """
 
+    # Map cross-model aliases onto the canonical parameters. Prefer the
+    # canonical value when both are supplied.
+    if old_str is None and old_string is not None:
+        old_str = old_string
+    if new_str is None and new_string is not None:
+        new_str = new_string
+    if file_text is None and content is not None:
+        file_text = content
+
     # Handle both `path` and `file` parameters for model compatibility
     if path is None and file is None:
         return "Error: Either `path` or `file` parameter must be provided."