wcgw 2.2.0__tar.gz → 2.2.2__tar.gz

{wcgw-2.2.0 → wcgw-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: wcgw
-Version: 2.2.0
+Version: 2.2.2
 Summary: Shell and coding agent on claude and chatgpt
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>

{wcgw-2.2.0 → wcgw-2.2.2}/gpt_instructions.txt

@@ -16,7 +16,7 @@ Instructions for `BashCommand`:
 - Do not use interactive commands like nano. Prefer writing simpler commands.
 - Status of the command and the current working directory will always be returned at the end.
 - Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
-- The first line might be `(...truncated)` if the output is too long.
+- The first or the last line might be `(...truncated)` if the output is too long.
 - The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 - Run long running commands in background using screen instead of "&".
 

{wcgw-2.2.0 → wcgw-2.2.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 authors = [{ name = "Aman Rusia", email = "gapypi@arcfu.com" }]
 name = "wcgw"
-version = "2.2.0"
+version = "2.2.2"
 description = "Shell and coding agent on claude and chatgpt"
 readme = "README.md"
 requires-python = ">=3.11, <3.13"

{wcgw-2.2.0 → wcgw-2.2.2}/src/wcgw/client/anthropic_client.py

@@ -169,7 +169,7 @@ def loop(
 - Do not use interactive commands like nano. Prefer writing simpler commands.
 - Status of the command and the current working directory will always be returned at the end.
 - Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
-- The first line might be `(...truncated)` if the output is too long.
+- The first or the last line might be `(...truncated)` if the output is too long.
 - Always run `pwd` if you get any file or directory not found error to make sure you're not lost.
 - The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 - Run long running commands in background using screen instead of "&".
@@ -186,7 +186,7 @@ def loop(
 - Only one of send_text, send_specials, send_ascii should be provided.
 - This returns within 5 seconds, for heavy programs keep checking status for upto 10 turns before asking user to continue checking again.
     - Programs don't hang easily, so most likely explanation for no output is usually that the program is still running, and you need to check status again using ["Enter"].
-
+    - Do not send Ctrl-c before checking for status till 10 minutes or whatever is appropriate for the program to finish.
 """,
         ),
         ToolParam(
@@ -222,6 +222,7 @@ def loop(
             description="""
 - Use absolute file path only.
 - Use SEARCH/REPLACE blocks to edit the file.
+- If the edit fails due to block not matching, please retry with correct block till it matches. Re-read the file to ensure you've all the lines correct.
 """,
         ),
     ]

{wcgw-2.2.0 → wcgw-2.2.2}/src/wcgw/client/mcp_server/server.py

@@ -89,7 +89,7 @@ async def handle_list_tools() -> list[types.Tool]:
 - Do not use interactive commands like nano. Prefer writing simpler commands.
 - Status of the command and the current working directory will always be returned at the end.
 - Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
-- The first line might be `(...truncated)` if the output is too long.
+- The first or the last line might be `(...truncated)` if the output is too long.
 - Always run `pwd` if you get any file or directory not found error to make sure you're not lost.
 - The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 - Run long running commands in background using screen instead of "&".
@@ -106,6 +106,7 @@ async def handle_list_tools() -> list[types.Tool]:
 - Only one of send_text, send_specials, send_ascii should be provided.
 - This returns within 3 seconds, for heavy programs keep checking status for upto 10 turns before asking user to continue checking again.
     - Programs don't hang easily, so most likely explanation for no output is usually that the program is still running, and you need to check status again using ["Enter"].
+    - Do not send Ctrl-c before checking for status till 10 minutes or whatever is appropriate for the program to finish.
 """,
         ),
         ToolParam(
@@ -141,6 +142,7 @@ async def handle_list_tools() -> list[types.Tool]:
             description="""
 - Use absolute file path only.
 - Use SEARCH/REPLACE blocks to edit the file.
+- If the edit fails due to block not matching, please retry with correct block till it matches. Re-read the file to ensure you've all the lines correct.
 """
             + diffinstructions,
         ),

{wcgw-2.2.0 → wcgw-2.2.2}/src/wcgw/client/openai_client.py

@@ -172,7 +172,7 @@ def loop(
 - Do not use interactive commands like nano. Prefer writing simpler commands.
 - Status of the command and the current working directory will always be returned at the end.
 - Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
-- The first line might be `(...truncated)` if the output is too long.
+- The first or the last line might be `(...truncated)` if the output is too long.
 - Always run `pwd` if you get any file or directory not found error to make sure you're not lost.
 - The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 - Run long running commands in background using screen instead of "&".

{wcgw-2.2.0 → wcgw-2.2.2}/src/wcgw/client/tools.py

@@ -13,7 +13,7 @@ import threading
 import importlib.metadata
 import time
 import traceback
-from tempfile import TemporaryDirectory
+from tempfile import NamedTemporaryFile, TemporaryDirectory
 from typing import (
     Callable,
     Literal,
@@ -412,7 +412,7 @@ def execute_bash(
         tokens = enc.encode(text)
 
         if max_tokens and len(tokens) >= max_tokens:
-            text = "...(truncated)\n" + enc.decode(tokens[-(max_tokens - 1) :])
+            text = "(...truncated)\n" + enc.decode(tokens[-(max_tokens - 1) :])
 
         if is_interrupt:
             text = (
@@ -441,7 +441,7 @@ Otherwise, you may want to try Ctrl-c again or program specific exit interactive
 
     tokens = enc.encode(output)
     if max_tokens and len(tokens) >= max_tokens:
-        output = "...(truncated)\n" + enc.decode(tokens[-(max_tokens - 1) :])
+        output = "(...truncated)\n" + enc.decode(tokens[-(max_tokens - 1) :])
 
     try:
         exit_status = get_status()
@@ -537,6 +537,15 @@ def write_file(writefile: WriteIfEmpty, error_on_exist: bool) -> str:
     else:
         path_ = writefile.file_path
 
+    error_on_exist = (
+        not (
+            len(TOOL_CALLS) > 1
+            and isinstance(TOOL_CALLS[-2], FileEdit)
+            and TOOL_CALLS[-2].file_path == path_
+        )
+        and error_on_exist
+    )
+
     if not BASH_STATE.is_in_docker:
         if error_on_exist and os.path.exists(path_):
             file_data = Path(path_).read_text()
@@ -583,7 +592,7 @@ def write_file(writefile: WriteIfEmpty, error_on_exist: bool) -> str:
 
 def find_least_edit_distance_substring(
     content: str, find_str: str
-) -> tuple[str, float]:
+) -> tuple[str, str, float]:
     orig_content_lines = content.split("\n")
     content_lines = [
         line.strip() for line in orig_content_lines
@@ -598,11 +607,12 @@ def find_least_edit_distance_substring(
     content_lines = new_content_lines
     find_lines = find_str.split("\n")
     find_lines = [
-        line.strip() for line in find_lines
+        line.strip() for line in find_lines if line.strip()
     ]  # Remove trailing and leading space for calculating edit distance
     # Slide window and find one with sum of edit distance least
     min_edit_distance = float("inf")
     min_edit_distance_lines = []
+    context_lines = []
     for i in range(max(1, len(content_lines) - len(find_lines) + 1)):
         edit_distance_sum = 0
         for j in range(len(find_lines)):
@@ -620,19 +630,27 @@ def find_least_edit_distance_substring(
                 + 1
             )
             min_edit_distance_lines = orig_content_lines[
+                orig_start_index:orig_end_index
+            ]
+
+            context_lines = orig_content_lines[
                 max(0, orig_start_index - 10) : (orig_end_index + 10)
             ]
-    return "\n".join(min_edit_distance_lines), min_edit_distance
+    return (
+        "\n".join(min_edit_distance_lines),
+        "\n".join(context_lines),
+        min_edit_distance,
+    )
 
 
 def edit_content(content: str, find_lines: str, replace_with_lines: str) -> str:
     count = content.count(find_lines)
     if count == 0:
-        closest_match, min_edit_distance = find_least_edit_distance_substring(
-            content, find_lines
+        closest_match, context_lines, min_edit_distance = (
+            find_least_edit_distance_substring(content, find_lines)
         )
         if min_edit_distance == 0:
-            return edit_content(content, closest_match, replace_with_lines)
+            return content.replace(closest_match, replace_with_lines, 1)
         else:
             print(
                 f"Exact match not found, found with whitespace removed edit distance: {min_edit_distance}"
@@ -640,7 +658,9 @@ def edit_content(content: str, find_lines: str, replace_with_lines: str) -> str:
         raise Exception(
             f"""Error: no match found for the provided search block.
                 Requested search block: \n```\n{find_lines}\n```
-                Possible relevant section in the file:\n---\n```\n{closest_match}\n```\n---\nFile not edited"""
+                Possible relevant section in the file:\n---\n```\n{context_lines}\n```\n---\nFile not edited
+            \nPlease retry with exact search. Re-read the file if unsure.
+            """
         )
 
     content = content.replace(find_lines, replace_with_lines, 1)
@@ -648,6 +668,24 @@ def edit_content(content: str, find_lines: str, replace_with_lines: str) -> str:
 
 
 def do_diff_edit(fedit: FileEdit) -> str:
+    try:
+        return _do_diff_edit(fedit)
+    except Exception as e:
+        # Try replacing \"
+        try:
+            fedit = FileEdit(
+                file_path=fedit.file_path,
+                file_edit_using_search_replace_blocks=fedit.file_edit_using_search_replace_blocks.replace(
+                    '\\"', '"'
+                ),
+            )
+            return _do_diff_edit(fedit)
+        except Exception:
+            pass
+        raise e
+
+
+def _do_diff_edit(fedit: FileEdit) -> str:
     console.log(f"Editing file: {fedit.file_path}")
 
     if not os.path.isabs(fedit.file_path):
@@ -824,70 +862,24 @@ def which_tool_name(name: str) -> Type[TOOLS]:
         raise ValueError(f"Unknown tool name: {name}")
 
 
+TOOL_CALLS: list[TOOLS] = []
+
+
 def get_tool_output(
-    args: dict[object, object]
-    | Confirmation
-    | BashCommand
-    | BashInteraction
-    | ResetShell
-    | WriteIfEmpty
-    | FileEditFindReplace
-    | FileEdit
-    | AIAssistant
-    | DoneFlag
-    | ReadImage
-    | Initialize
-    | ReadFile
-    | Mouse
-    | Keyboard
-    | ScreenShot
-    | GetScreenInfo,
+    args: dict[object, object] | TOOLS,
     enc: tiktoken.Encoding,
     limit: float,
     loop_call: Callable[[str, float], tuple[str, float]],
     max_tokens: Optional[int],
 ) -> tuple[list[str | ImageData | DoneFlag], float]:
-    global IS_IN_DOCKER
+    global IS_IN_DOCKER, TOOL_CALLS
     if isinstance(args, dict):
-        adapter = TypeAdapter[
-            Confirmation
-            | BashCommand
-            | BashInteraction
-            | ResetShell
-            | WriteIfEmpty
-            | FileEditFindReplace
-            | FileEdit
-            | AIAssistant
-            | DoneFlag
-            | ReadImage
-            | ReadFile
-            | Initialize
-            | Mouse
-            | Keyboard
-            | ScreenShot
-            | GetScreenInfo,
-        ](
-            Confirmation
-            | BashCommand
-            | BashInteraction
-            | ResetShell
-            | WriteIfEmpty
-            | FileEditFindReplace
-            | FileEdit
-            | AIAssistant
-            | DoneFlag
-            | ReadImage
-            | ReadFile
-            | Initialize
-            | Mouse
-            | Keyboard
-            | ScreenShot
-            | GetScreenInfo
-        )
+        adapter = TypeAdapter[TOOLS](TOOLS)
         arg = adapter.validate_python(args)
     else:
         arg = args
     output: tuple[str | DoneFlag | ImageData, float]
+    TOOL_CALLS.append(arg)
     if isinstance(arg, Confirmation):
         console.print("Calling ask confirmation tool")
         output = ask_confirmation(arg), 0.0

{wcgw-2.2.0 → wcgw-2.2.2}/uv.lock

@@ -869,7 +869,7 @@ wheels = [
 
 [[package]]
 name = "wcgw"
-version = "2.2.0"
+version = "2.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },