wcgw 2.2.1__py3-none-any.whl → 2.2.2__py3-none-any.whl

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 "&".

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 "&".

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/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()
@@ -592,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
@@ -612,6 +612,7 @@ def find_least_edit_distance_substring(
     # 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)):
@@ -629,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}"
@@ -649,7 +658,7 @@ 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.
             """
         )

{wcgw-2.2.1.dist-info → wcgw-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: wcgw
-Version: 2.2.1
+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.1.dist-info → wcgw-2.2.2.dist-info}/RECORD

@@ -2,21 +2,21 @@ wcgw/__init__.py,sha256=9K2QW7QuSLhMTVbKbBYd9UUp-ZyrfBrxcjuD_xk458k,118
 wcgw/types_.py,sha256=5QM97K3kOJ7vNBgZ1NYmKPqwSe9WfzDImAIvjbRcClo,1772
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
-wcgw/client/anthropic_client.py,sha256=68JNQAdH9Cg5lWTMKX3SvGNbYqPGyGe02VWWUbLaNss,20938
+wcgw/client/anthropic_client.py,sha256=qa8oLztqOCOQTrQcE1DYMwkXEkLwUdD4FD4DN9GCYTk,20950
 wcgw/client/cli.py,sha256=-z0kpDAW3mzfQrQeZfaVJhBCAQY3HXnt9GdgQ8s-u0Y,1003
 wcgw/client/common.py,sha256=grH-yV_4tnTQZ29xExn4YicGLxEq98z-HkEZwH0ReSg,1410
 wcgw/client/computer_use.py,sha256=35NKAlMrxwD0TBlMMRnbCwz4g8TBRGOlcy-cmS-yJ_A,15247
 wcgw/client/diff-instructions.txt,sha256=s5AJKG23JsjwRYhFZFQVvwDpF67vElawrmdXwvukR1A,1683
-wcgw/client/openai_client.py,sha256=xfB96A4qZM7-CUJhyDMqX9rUIzhCw4AtV9ryTKE8SOM,17885
+wcgw/client/openai_client.py,sha256=ByAVGFb1MmBbdMep0vHxH1hypf1WrowAyqlWrvEZq5E,17897
 wcgw/client/openai_utils.py,sha256=YNwCsA-Wqq7jWrxP0rfQmBTb1dI0s7dWXzQqyTzOZT4,2629
 wcgw/client/sys_utils.py,sha256=GajPntKhaTUMn6EOmopENWZNR2G_BJyuVbuot0x6veI,1376
-wcgw/client/tools.py,sha256=e5ul5ZNjvP7UJ8-gubHiNCYjcBIjAPkbkBckKnwKJp4,35724
+wcgw/client/tools.py,sha256=kv0ovpulWLq0WIWkEnuHoIQLY3iSk-X3anB2Dy7z0WY,35956
 wcgw/client/mcp_server/Readme.md,sha256=I8N4dHkTUVGNQ63BQkBMBhCCBTgqGOSF_pUR6iOEiUk,2495
 wcgw/client/mcp_server/__init__.py,sha256=hyPPwO9cabAJsOMWhKyat9yl7OlSmIobaoAZKHu3DMc,381
-wcgw/client/mcp_server/server.py,sha256=DCclYqC8mRzCti2pztnm8ZkwGeXnzzNlkvi5Yh02D20,11226
+wcgw/client/mcp_server/server.py,sha256=gp4xXprqZ6X9u5uYmVq2uHOiOIukQGDkgxVsZf_aXmo,11238
 wcgw/relay/serve.py,sha256=KLYjTvM9CfqdxgFOfHM8LUkFGZ9kKyyJunpNdEIFQUk,8766
 wcgw/relay/static/privacy.txt,sha256=s9qBdbx2SexCpC_z33sg16TptmAwDEehMCLz4L50JLc,529
-wcgw-2.2.1.dist-info/METADATA,sha256=ZI81P-DAaTxkmZmU8tBJ8tYAchOEJ3p0VeRGXpWi3IQ,7939
-wcgw-2.2.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-wcgw-2.2.1.dist-info/entry_points.txt,sha256=eKo1omwbAggWlQ0l7GKoR7uV1-j16nk9tK0BhC2Oz_E,120
-wcgw-2.2.1.dist-info/RECORD,,
+wcgw-2.2.2.dist-info/METADATA,sha256=eqZjrD6d3ifTIKW7HuOyHdhyARP-LyEeHMFtJCbqE9s,7939
+wcgw-2.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wcgw-2.2.2.dist-info/entry_points.txt,sha256=eKo1omwbAggWlQ0l7GKoR7uV1-j16nk9tK0BhC2Oz_E,120
+wcgw-2.2.2.dist-info/RECORD,,

{wcgw-2.2.1.dist-info → wcgw-2.2.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any